Merge branch 16 into 16.1

.github/workflows/espresso-integration.yaml

@@ -35,8 +35,15 @@ jobs:
       - name: Set up Nix environment
         uses: nicknovitski/nix-develop@v1
 
-      - name: Cache Go modules
+      - name: Set up Go and cache modules
         uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          cache: true
+          cache-dependency-path: go.sum
+
+      - name: Download Go modules
+        run: go mod download && go list -deps ./espresso/... > /dev/null
 
       - name: Install gotestsum
         run: go install gotest.tools/gotestsum@latest
@@ -79,8 +86,7 @@ jobs:
           junit-summary: ./junit-test-summary.xml
 
       - name: Run Go tests for group ${{ matrix.group }}
-        run: |
-          gotestsum --junitfile junit-summary-${{ matrix.group }}.xml --format github-actions -- -short -timeout 30m -p 1 -count 1 -run "^(${{ steps.test_split.outputs.run}})$" ./espresso/...
+        run: gotestsum --junitfile junit-summary-${{ matrix.group }}.xml --format testdox -- -short -timeout 30m -p 1 -count 1 -v -run "^(${{ steps.test_split.outputs.run}})$" ./espresso/...
 
       - name: Upload JUnit test summary
         if: always()

cannon/mipsevm/testutil/evm.go

@@ -102,6 +102,7 @@ func NewEVMEnv(t testing.TB, contracts *ContractMetadata) (*vm.EVM, *state.State
 	if err != nil {
 		t.Fatalf("failed to create memory state db: %v", err)
 	}
+
 	blockContext := core.NewEVMBlockContext(header, bc, nil, chainCfg, state)
 	vmCfg := vm.Config{}
 

espresso/devnet-tests/forced_transaction_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-core/predeploys"
 	"github.com/ethereum-optimism/optimism/op-e2e/bindings"
-	"github.com/ethereum-optimism/optimism/op-service/predeploys"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

espresso/docker/l1-geth/Dockerfile

@@ -1,5 +1,5 @@
 # L1 Geth Dockerfile, modified from ops/docker/deployment-utils/Dockerfile
-FROM golang:1.23-alpine AS builder
+FROM golang:1.24-alpine AS builder
 
 # Install build dependencies
 RUN apk add --no-cache \
@@ -17,16 +17,17 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
 
 # Build eth2-val-tools
 RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
-    go install -ldflags '-linkmode external -extldflags "-static"' \
-    github.com/protolambda/eth2-val-tools@latest
+    CGO_ENABLED=0 go install \
+    github.com/protolambda/eth2-val-tools@aeec3fcc6e7ae67be1aec8dc8f463e5585b2612e
 
 # Main runtime image
 FROM debian:12.7-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install runtime dependencies
+# Install runtime dependencies (coreutils provides sha256sum)
 RUN apt-get update && apt-get install -y \
+    coreutils \
     curl \
     jq \
     ca-certificates \

espresso/docker/l1-geth/l1-geth-init.sh

@@ -9,6 +9,11 @@ L1_CHAIN_ID=${L1_CHAIN_ID:-11155111}
 # Mode can be "genesis" or "geth" (default).
 MODE=${MODE:-geth}
 
+# sha256sum is required (provided by coreutils in the image).
+hash_file() {
+  sha256sum "$1" | awk '{print $1}'
+}
+
 if [[ "$MODE" == "genesis" ]]; then
   echo "Running Genesis Initialization"
 
@@ -27,18 +32,64 @@ if [[ "$MODE" == "genesis" ]]; then
       fi
   fi
 
-  echo "Updating genesis timestamp..."
-  dasel put -f /config/genesis.json -s .timestamp -v $(printf '0x%x\n' $(date +%s))
+  # eth-beacon-genesis is expensive. Reuse pre-generated artifacts only when
+  # all genesis inputs match exactly; otherwise force regeneration.
+  # Set FORCE_BEACON_GENESIS_REGEN=1 to force regeneration unconditionally.
+  REGENERATE_BEACON_GENESIS=0
+  GENESIS_INPUTS_VERSION="v2"
+  CURRENT_GENESIS_FINGERPRINT_FILE="/tmp/current_genesis_fingerprint"
+  STORED_GENESIS_FINGERPRINT_FILE="/config/genesis.fingerprint"
+
+  {
+    printf "%s\n" "$GENESIS_INPUTS_VERSION"
+    hash_file "/config/genesis.json"
+    hash_file "/templates/beacon-config.yaml"
+    hash_file "/templates/mnemonics.yaml"
+  } > "$CURRENT_GENESIS_FINGERPRINT_FILE"
+
+  if [[ "${FORCE_BEACON_GENESIS_REGEN:-0}" == "1" ]]; then
+    echo "FORCE_BEACON_GENESIS_REGEN=1 set, regenerating beacon genesis..."
+    REGENERATE_BEACON_GENESIS=1
+  elif [[ ! -f "/config/genesis.ssz" ]]; then
+    REGENERATE_BEACON_GENESIS=1
+  elif [[ ! -f "$STORED_GENESIS_FINGERPRINT_FILE" ]]; then
+    echo "Missing genesis fingerprint metadata, regenerating beacon genesis..."
+    REGENERATE_BEACON_GENESIS=1
+  elif ! cmp -s "$CURRENT_GENESIS_FINGERPRINT_FILE" "$STORED_GENESIS_FINGERPRINT_FILE"; then
+    echo "Genesis inputs changed, regenerating beacon genesis..."
+    REGENERATE_BEACON_GENESIS=1
+  fi
+
+  if [[ "$REGENERATE_BEACON_GENESIS" -eq 1 ]]; then
+    rm -f /config/genesis.ssz /config/config.yaml /config/jwt.txt \
+      /config/deposit_contract_block.txt /config/deposit_contract.txt
+
+    echo "Updating genesis timestamp..."
+    dasel put -f /config/genesis.json -s .timestamp -v $(printf '0x%x\n' $(date +%s))
 
-  echo "Generating consensus layer genesis..."
-  eth-beacon-genesis devnet \
-                    --quiet \
-                    --eth1-config "/config/genesis.json" \
-                    --config "/templates/beacon-config.yaml" \
-                    --mnemonics "/templates/mnemonics.yaml" \
-                    --state-output "/config/genesis.ssz"
-  cp -r /templates/beacon-config.yaml /config/config.yaml
+    echo "Generating consensus layer genesis..."
+    eth-beacon-genesis devnet \
+                      --quiet \
+                      --eth1-config "/config/genesis.json" \
+                      --config "/templates/beacon-config.yaml" \
+                      --mnemonics "/templates/mnemonics.yaml" \
+                      --state-output "/config/genesis.ssz"
+    cp -r /templates/beacon-config.yaml /config/config.yaml
 
+    if [[ ! -f "/config/jwt.txt" ]]; then
+      echo "Generating JWT secret..."
+      openssl rand -hex 32 > "/config/jwt.txt"
+    fi
+
+    echo "0" > /config/deposit_contract_block.txt
+    echo "0x00000000219ab540356cBB839Cbe05303d7705Fa" > /config/deposit_contract.txt
+    cp "$CURRENT_GENESIS_FINGERPRINT_FILE" "$STORED_GENESIS_FINGERPRINT_FILE"
+  else
+    echo "Beacon genesis already matches current inputs, skipping slow generation..."
+  fi
+
+  # Validator keystores must always be regenerated: they are copied to the
+  # l1-data Docker volume (/data) which is cleared on every `docker compose down -v`.
   echo "Generating validator keys..."
   rm -rf /config/keystore && \
   eth2-val-tools keystores --out-loc /config/keystore \
@@ -50,14 +101,6 @@ if [[ "$MODE" == "genesis" ]]; then
   cp -r /config/keystore/keys/* /data/lighthouse-validator/validators/
   cp -r /config/keystore/secrets/ /data/lighthouse-validator/
 
-  if [[ ! -f "/config/jwt.txt" ]]; then
-      echo "Generating JWT secret..."
-      openssl rand -hex 32 > "/config/jwt.txt"
-  fi
-
-  echo "0" > /config/deposit_contract_block.txt
-  echo "0x00000000219ab540356cBB839Cbe05303d7705Fa" > /config/deposit_contract.txt
-
   echo "Genesis initialization complete"
   exit 0
 

espresso/docker/op-geth/Dockerfile

@@ -6,14 +6,10 @@ ARG TARGETARCH
 ARG GIT_COMMIT
 ARG GIT_DATE
 
-# CGO builder for components that need Espresso crypto linking
+# CGO builder for components that need Espresso crypto linking (go.mod requires go >= 1.24.0)
 FROM golang:1.24-alpine AS op-cgo-builder
 # Install dependencies
-RUN apk add musl-dev gcc g++ curl tar gzip make linux-headers git jq bash yq
-# Install just from mise
-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
+RUN apk add musl-dev gcc g++ curl tar gzip make linux-headers git jq bash yq just
 
 # Go sources
 COPY ./go.mod /app/go.mod

espresso/docker/op-stack/Dockerfile

@@ -5,15 +5,15 @@ ARG TARGET_BASE_IMAGE=alpine:3.22
 ARG TARGETOS
 ARG TARGETARCH
 
-# Base builder image
+# Base builder image (go.mod requires go >= 1.24.0)
 FROM golang:1.24-alpine AS builder
 
 RUN apk add --no-cache \
   curl netcat-openbsd tar gzip make gcc g++ musl-dev \
   linux-headers git bash jq yq
 
 # Install mise for toolchain management
-RUN curl https://mise.run | MISE_INSTALL_PATH=/usr/local/bin/mise sh
+RUN curl https://mise.run | MISE_INSTALL_PATH=/usr/local/bin/mise MISE_INSTALL_EXT=tar.gz sh
 
 # Install yq, dasel and foundry
 RUN case "$TARGETARCH" in \
@@ -32,15 +32,8 @@ RUN case "$TARGETARCH" in \
   chmod +x /usr/local/bin/cast && \
   chmod +x /usr/local/bin/forge
 
-# Install just (direct binary to avoid mise trust issues)
-ARG TARGETARCH
-RUN case "$TARGETARCH" in \
-  "amd64") JUST_ARCH="x86_64-unknown-linux-musl" ;; \
-  "arm64") JUST_ARCH="aarch64-unknown-linux-musl" ;; \
-  *) echo "Unsupported architecture for just: $TARGETARCH" >&2; exit 1 ;; \
-  esac && \
-  wget -q "https://github.com/casey/just/releases/download/1.37.0/just-1.37.0-${JUST_ARCH}.tar.gz" -O /tmp/just.tar.gz && \
-  tar -xzf /tmp/just.tar.gz -C /usr/local/bin just && rm /tmp/just.tar.gz && just --version
+# Install just from apk
+RUN apk add just && just --version
 
 # Ensure just and other tools are on PATH for all FROM builder stages
 ENV PATH="/usr/local/bin:$PATH"
@@ -67,7 +60,8 @@ ARG GIT_DATE
 ARG OP_NODE_VERSION=v0.0.0
 ENV GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_NODE_VERSION"
 RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
-  cd /app/op-node && mkdir -p bin && go build -v -ldflags "-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=" -o ./bin/op-node ./cmd
+  cd /app/op-node && mkdir -p bin && \
+  CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static" -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=' -o bin/op-node ./cmd/main.go
 
 # Build op-batcher
 FROM builder AS op-batcher-builder

espresso/environment/10_soft_confirmation_integrity_test.go

@@ -44,7 +44,6 @@ import (
 	geth_crypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/trie"
 )
 
 // messageWithTimestamp is a struct that contains an entry of type T
@@ -314,36 +313,12 @@ func submitRandomDataToSequencerNamespace(ctx context.Context, espCli espressoCl
 	}
 }
 
-type FakeBlockType struct{}
-
-// HasOptimismWithdrawalsRoot implements types.BlockType.
-func (f *FakeBlockType) HasOptimismWithdrawalsRoot(blkTime uint64) bool {
-	return false
-}
-
-// IsGingerbread implements types.BlockType.
-func (f *FakeBlockType) IsGingerbread(blockNumber *big.Int) bool {
-	return false
-}
-
-// IsIsthmus implements types.BlockType.
-func (f *FakeBlockType) IsIsthmus(blkTime uint64) bool {
-	return false
-}
-
-// IsMigratedChain implements types.BlockType.
-func (f *FakeBlockType) IsMigratedChain() bool {
-	return false
-}
-
-var _ geth_types.BlockType = (*FakeBlockType)(nil)
-
 // createMaliciousEspressoBatch creates a malicious Espresso batch by
 // constructing a block with a deposit transaction. It uses the latest
 // block from the sequencer to create a new block with a deposit
 // transaction. The block is then converted to an Espresso batch using
 // the derive.BlockToEspressoBatch function.
-func createMaliciousEspressoBatch(ctx context.Context, cli *ethclient.Client, rollupCfg *rollup.Config, hasher geth_types.TrieHasher) (*derive.EspressoBatch, error) {
+func createMaliciousEspressoBatch(ctx context.Context, cli *ethclient.Client, rollupCfg *rollup.Config) (*derive.EspressoBatch, error) {
 	// / Determine what the latest block in the sequencer is, so we can
 	// hope to create a valid transaction, to get something out of it.
 	latestBlock, err := cli.BlockByNumber(ctx, nil)
@@ -352,7 +327,22 @@ func createMaliciousEspressoBatch(ctx context.Context, cli *ethclient.Client, ro
 	}
 
 	latestHeader := latestBlock.Header()
-	body := &geth_types.Body{
+	header := &geth_types.Header{
+		ParentHash: latestBlock.Hash(),
+		UncleHash:  latestHeader.UncleHash,
+		Coinbase:   latestHeader.Coinbase,
+		Root:       latestHeader.Root,
+		Bloom:      latestHeader.Bloom,
+		Difficulty: latestHeader.Difficulty,
+		Number:     new(big.Int).Add(latestBlock.Number(), big.NewInt(1)),
+		GasLimit:   latestHeader.GasLimit,
+		GasUsed:    latestHeader.GasUsed,
+		Time:       latestHeader.Time + 1,
+		Extra:      latestHeader.Extra,
+		MixDigest:  latestHeader.MixDigest,
+		Nonce:      latestHeader.Nonce,
+	}
+	body := geth_types.Body{
 		Transactions: []*geth_types.Transaction{
 			geth_types.NewTx(
 				&geth_types.DepositTx{
@@ -361,31 +351,9 @@ func createMaliciousEspressoBatch(ctx context.Context, cli *ethclient.Client, ro
 			),
 		},
 	}
+	block := geth_types.NewBlockWithHeader(header).WithBody(body)
 
-	return derive.BlockToEspressoBatch(
-		rollupCfg,
-		geth_types.NewBlock(
-			&geth_types.Header{
-				ParentHash: latestBlock.Hash(),
-				UncleHash:  latestHeader.UncleHash,
-				Coinbase:   latestHeader.Coinbase,
-				Root:       latestHeader.Root,
-				Bloom:      latestHeader.Bloom,
-				Difficulty: latestHeader.Difficulty,
-				Number:     new(big.Int).Add(latestBlock.Number(), big.NewInt(1)),
-				GasLimit:   latestHeader.GasLimit,
-				GasUsed:    latestHeader.GasUsed,
-				Time:       latestHeader.Time + 1,
-				Extra:      latestHeader.Extra,
-				MixDigest:  latestHeader.MixDigest,
-				Nonce:      latestHeader.Nonce,
-			},
-			body,
-			nil,
-			hasher,
-			&FakeBlockType{},
-		),
-	)
+	return derive.BlockToEspressoBatch(rollupCfg, block)
 }
 
 // SUBMIT_VALID_DATA_WITH_WRONG_SIGNATURE_INTERVAlL is the interval / frequency
@@ -398,7 +366,6 @@ const SUBMIT_VALID_DATA_WITH_WRONG_SIGNATURE_INTERVAlL = 500 * time.Millisecond
 func submitValidDataWithWrongSignature(ctx context.Context, rollupCfg *rollup.Config, l2Seq *ethclient.Client, espCli espressoClient.EspressoClient, namespace uint64) {
 	// We only want to submit garbage data to the sequencer so quickly
 	ticker := time.NewTicker(SUBMIT_VALID_DATA_WITH_WRONG_SIGNATURE_INTERVAlL)
-	stackTrie := trie.NewStackTrie(func(path []byte, hash geth_common.Hash, blob []byte) {})
 
 	for {
 		select {
@@ -417,7 +384,7 @@ func submitValidDataWithWrongSignature(ctx context.Context, rollupCfg *rollup.Co
 		}
 		randomChainSigner := factory(big.NewInt(int64(namespace)), geth_common.Address{})
 
-		batch, err := createMaliciousEspressoBatch(ctx, l2Seq, rollupCfg, stackTrie)
+		batch, err := createMaliciousEspressoBatch(ctx, l2Seq, rollupCfg)
 
 		if err != nil {
 			// Skip
@@ -479,7 +446,6 @@ func submitValidDataWithRandomSignature(
 ) {
 	// We only want to submit garbage data to the sequencer so quickly
 	ticker := time.NewTicker(SUBMIT_VALID_DATA_WITH_RANDOM_SIGNATURE_INTERVAL)
-	stackTrie := trie.NewStackTrie(func(path []byte, hash geth_common.Hash, blob []byte) {})
 	signer := new(fakeChainSigner)
 
 	for {
@@ -489,7 +455,7 @@ func submitValidDataWithRandomSignature(
 		case <-ticker.C:
 		}
 
-		batch, err := createMaliciousEspressoBatch(ctx, l2Seq, rollupCfg, stackTrie)
+		batch, err := createMaliciousEspressoBatch(ctx, l2Seq, rollupCfg)
 
 		if err != nil {
 			// Skip

espresso/environment/11_forced_transaction_test.go

@@ -7,13 +7,12 @@ import (
 	"time"
 
 	env "github.com/ethereum-optimism/optimism/espresso/environment"
+	"github.com/ethereum-optimism/optimism/op-core/predeploys"
 	"github.com/ethereum-optimism/optimism/op-e2e/bindings"
 	"github.com/ethereum-optimism/optimism/op-e2e/config"
 	"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/predeploys"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 )
 
@@ -94,7 +93,7 @@ func ForcedTransaction(t *testing.T, withSmallSequencerWindow bool, withEspresso
 	withdrawalAmount := new(big.Int).SetUint64(1000)
 	tx, err := portal.DepositTransaction(
 		opts,
-		common.HexToAddress(predeploys.L2ToL1MessagePasser),
+		predeploys.L2ToL1MessagePasserAddr,
 		withdrawalAmount,
 		uint64(300_000),
 		false,