Fix the build after rebase

.github/workflows/docker-images.yml

@@ -14,6 +14,7 @@ env:
 jobs:
   prepare-deployment:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     outputs:
       deployment-hash: ${{ steps.hash.outputs.hash }}
     steps:
@@ -48,7 +49,10 @@ jobs:
           echo "$(pwd)/bin" >> $GITHUB_PATH
 
       - name: Compile contracts
-        run: cd packages/contracts-bedrock && just build
+        env:
+          FOUNDRY_DISABLE_NIGHTLY_WARNING: 1
+        run: cd packages/contracts-bedrock && just build-no-tests
+        timeout-minutes: 25
 
       - name: Fix Proxy artifact bytecode
         run: cd packages/contracts-bedrock && just fix-proxy-artifact

espresso/docker/op-geth/Dockerfile

@@ -7,7 +7,7 @@ ARG GIT_COMMIT
 ARG GIT_DATE
 
 # CGO builder for components that need Espresso crypto linking
-FROM golang:1.23.8-alpine3.20 AS op-cgo-builder
+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

espresso/docker/op-stack/Dockerfile

@@ -6,7 +6,7 @@ ARG TARGETOS
 ARG TARGETARCH
 
 # Base builder image
-FROM golang:1.23.8-alpine3.20 AS builder
+FROM golang:1.24-alpine AS builder
 
 RUN apk add --no-cache \
   curl netcat-openbsd tar gzip make gcc g++ musl-dev \
@@ -32,10 +32,18 @@ RUN case "$TARGETARCH" in \
   chmod +x /usr/local/bin/cast && \
   chmod +x /usr/local/bin/forge
 
-# Install versioned toolchain
-COPY ./mise.toml .
-RUN mise trust && mise install -v -y just && cp $(mise which just) /usr/local/bin/just && just --version
+# 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
 
+# Ensure just and other tools are on PATH for all FROM builder stages
+ENV PATH="/usr/local/bin:$PATH"
 
 # Copy and download Go dependencies
 COPY ./go.mod /app/go.mod
@@ -52,45 +60,64 @@ ARG GIT_DATE
 
 # Build op-node
 FROM builder AS op-node-builder
+ARG TARGETOS
+ARG TARGETARCH
+ARG GIT_COMMIT
+ARG GIT_DATE
 ARG OP_NODE_VERSION=v0.0.0
-RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-node && \
-  CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
-  go build -a -ldflags '-extldflags "-static"' \
-  -o bin/op-node ./cmd/main.go
+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
 
 # Build op-batcher
 FROM builder AS op-batcher-builder
+ARG TARGETOS
+ARG TARGETARCH
+ARG GIT_COMMIT
+ARG GIT_DATE
 ARG OP_BATCHER_VERSION=v0.0.0
-WORKDIR /app/op-batcher
 ENV GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_BATCHER_VERSION"
-RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build just op-batcher
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+  cd /app/op-batcher && mkdir -p bin && go build -v -ldflags "-X main.GitCommit=$GITCOMMIT -X main.GitDate=$GITDATE -X main.Version=$VERSION" -o ./bin/op-batcher ./cmd
 
 # Build enclave-tools
 FROM builder AS enclave-tools-builder
+ARG TARGETOS
+ARG TARGETARCH
+ARG GIT_COMMIT
+ARG GIT_DATE
 ARG ENCLAVE_TOOLS_VERSION=v0.0.0
-WORKDIR /app/op-batcher
 ENV GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$ENCLAVE_TOOLS_VERSION"
-RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build just enclave-tools
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+  cd /app/op-batcher && mkdir -p bin && go build -v -o ./bin/enclave-tools ./enclave-tools/cmd
 
 # Build op-proposer
 FROM builder AS op-proposer-builder
+ARG TARGETOS
+ARG TARGETARCH
+ARG GIT_COMMIT
+ARG GIT_DATE
 ARG OP_PROPOSER_VERSION=v0.0.0
-RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-proposer && make op-proposer  \
-  GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROPOSER_VERSION"
-RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-challenger && make op-challenger  \
-  GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROPOSER_VERSION"
+ENV GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROPOSER_VERSION"
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd /app/op-proposer && make op-proposer
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd /app/op-challenger && make op-challenger
 
 # Build op-deployer
 FROM builder AS op-deployer-builder
-ARG OP_DEPLOER_VERSION=v0.0.0
-RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-deployer && \
-  GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DEPLOYER_VERSION" just
+ARG TARGETOS
+ARG TARGETARCH
+ARG GIT_COMMIT
+ARG GIT_DATE
+ARG OP_DEPLOYER_VERSION=v0.0.0
+ENV GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DEPLOYER_VERSION"
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+  cd /app/op-deployer && just build-go
 
 
 # Final runtime images
 FROM $TARGET_BASE_IMAGE AS op-node-target
 RUN apk add gcc
-ENV AZTEC_SRS_PATH /aztec/kzg10-aztec20-srs-1048584.bin
+ENV AZTEC_SRS_PATH=/aztec/kzg10-aztec20-srs-1048584.bin
 ADD "https://github.com/EspressoSystems/ark-srs/releases/download/v0.2.0/kzg10-aztec20-srs-1048584.bin" /aztec/kzg10-aztec20-srs-1048584.bin
 COPY --from=op-node-builder /app/op-node/bin/op-node /usr/local/bin/
 
@@ -104,7 +131,7 @@ CMD ["op-node"]
 
 FROM $TARGET_BASE_IMAGE AS op-batcher-target
 RUN apk add gcc
-ENV AZTEC_SRS_PATH /aztec/kzg10-aztec20-srs-1048584.bin
+ENV AZTEC_SRS_PATH=/aztec/kzg10-aztec20-srs-1048584.bin
 ADD "https://github.com/EspressoSystems/ark-srs/releases/download/v0.2.0/kzg10-aztec20-srs-1048584.bin" /aztec/kzg10-aztec20-srs-1048584.bin
 COPY --from=op-batcher-builder /app/op-batcher/bin/op-batcher /usr/local/bin/
 CMD ["op-batcher"]
@@ -121,7 +148,7 @@ COPY espresso/deployment/ /source/espresso/deployment/
 # Copy the run-enclave.sh script
 COPY espresso/docker/op-batcher-tee/run-enclave.sh ./espresso/docker/op-batcher-tee/run-enclave.sh
 RUN chmod +x ./espresso/docker/op-batcher-tee/run-enclave.sh
-ENV AZTEC_SRS_PATH /aztec/kzg10-aztec20-srs-1048584.bin
+ENV AZTEC_SRS_PATH=/aztec/kzg10-aztec20-srs-1048584.bin
 ADD "https://github.com/EspressoSystems/ark-srs/releases/download/v0.2.0/kzg10-aztec20-srs-1048584.bin" /aztec/kzg10-aztec20-srs-1048584.bin
 COPY --from=enclave-tools-builder /app/op-batcher/bin/enclave-tools /usr/local/bin/
 CMD ["enclave-tools"]
@@ -132,7 +159,7 @@ COPY espresso/docker/op-stack/entrypoint.sh /bin/entrypoint.sh
 RUN chmod +x /bin/entrypoint.sh
 COPY --from=op-proposer-builder /app/op-proposer/bin/op-proposer /usr/local/bin/
 COPY --from=op-proposer-builder /app/espresso/deployment/deployer /deployer
-ENV ENV_PREFIX OP_PROPOSER
+ENV ENV_PREFIX=OP_PROPOSER
 ENTRYPOINT [ "/bin/entrypoint.sh" ]
 CMD ["op-proposer"]
 
@@ -150,7 +177,7 @@ COPY --from=op-proposer-builder /app/op-challenger/bin/op-challenger /usr/local/
 # ENV OP_CHALLENGER_CANNON_BIN /usr/local/bin/cannon
 # ENV OP_CHALLENGER_CANNON_SERVER /usr/local/bin/op-program
 # ENV OP_CHALLENGER_CANNON_PRESTATE /app/prestate-proof.json
-ENV ENV_PREFIX OP_CHALLENGER
+ENV ENV_PREFIX=OP_CHALLENGER
 
 ENTRYPOINT [ "/bin/entrypoint.sh" ]
 CMD ["op-challenger"]

espresso/environment/enclave_helpers.go

@@ -145,13 +145,16 @@ func LaunchBatcherInEnclave() E2eDevnetLauncherOption {
 						appendArg(&args, flags.MaxL1TxSizeBytesFlag.Name, c.MaxL1TxSize)
 						appendArg(&args, flags.MaxPendingTransactionsFlag.Name, c.MaxPendingTransactions)
 						appendArg(&args, flags.PollIntervalFlag.Name, c.PollInterval)
-						appendArg(&args, flags.AdditionalThrottlingEndpointsFlag.Name, c.AdditionalThrottlingEndpoints)
+						appendArg(&args, flags.AdditionalThrottlingEndpointsFlag.Name, strings.Join(c.ThrottleConfig.AdditionalEndpoints, ","))
 						appendArg(&args, flags.SubSafetyMarginFlag.Name, c.SubSafetyMargin)
 						appendArg(&args, flags.TargetNumFramesFlag.Name, c.TargetNumFrames)
-						appendArg(&args, flags.ThrottleAlwaysBlockSizeFlag.Name, c.ThrottleAlwaysBlockSize)
-						appendArg(&args, flags.ThrottleBlockSizeFlag.Name, c.ThrottleBlockSize)
-						appendArg(&args, flags.ThrottleThresholdFlag.Name, c.ThrottleThreshold)
-						appendArg(&args, flags.ThrottleTxSizeFlag.Name, c.ThrottleTxSize)
+						appendArg(&args, flags.ThrottleBlockSizeLowerLimitFlag.Name, c.ThrottleConfig.BlockSizeLowerLimit)
+						appendArg(&args, flags.ThrottleBlockSizeUpperLimitFlag.Name, c.ThrottleConfig.BlockSizeUpperLimit)
+						appendArg(&args, flags.ThrottleUsafeDABytesLowerThresholdFlag.Name, c.ThrottleConfig.LowerThreshold)
+						appendArg(&args, flags.ThrottleUsafeDABytesUpperThresholdFlag.Name, c.ThrottleConfig.UpperThreshold)
+						appendArg(&args, flags.ThrottleTxSizeLowerLimitFlag.Name, c.ThrottleConfig.TxSizeLowerLimit)
+						appendArg(&args, flags.ThrottleTxSizeUpperLimitFlag.Name, c.ThrottleConfig.TxSizeUpperLimit)
+						appendArg(&args, flags.ThrottleControllerTypeFlag.Name, string(c.ThrottleConfig.ControllerType))
 						appendArg(&args, flags.WaitNodeSyncFlag.Name, c.WaitNodeSync)
 
 						// TxMgr flags

espresso/environment/espresso_caff_node.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/config"
+	"github.com/ethereum-optimism/optimism/op-service/clock"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
 )
@@ -138,7 +139,7 @@ func LaunchCaffNode(t *testing.T, system *e2esys.System, espressoDevNode Espress
 	l := system.Cfg.Loggers[RoleCaffNode]
 
 	var opNodeError error
-	caffNode, err := opnode.NewOpnode(l, &caffNodeConfig, func(e error) {
+	caffNode, err := opnode.NewOpnode(l, &caffNodeConfig, clock.SystemClock, func(e error) {
 		opNodeError = e
 	})
 	if have, want := err, error(nil); have != want {

espresso/scripts/prepare-allocs.sh

@@ -40,12 +40,6 @@ sleep 1
 cast rpc anvil_setBalance "${OPERATOR_ADDRESS}" 0x100000000000000000000000000000000000 --rpc-url "${ANVIL_URL}"
 cast rpc anvil_setBalance "${PROPOSER_ADDRESS}" 0x100000000000000000000000000000000000 --rpc-url "${ANVIL_URL}"
 
-op-deployer bootstrap proxy \
-                      --l1-rpc-url="${ANVIL_URL}" \
-                      --private-key="${OPERATOR_PRIVATE_KEY}" \
-                      --artifacts-locator="${ARTIFACTS_DIR}" \
-                      --proxy-owner="${OPERATOR_ADDRESS}"
-
 export LOG_LEVEL=debug
 
 op-deployer bootstrap superchain \
@@ -97,6 +91,8 @@ dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .globalDeployOverrides.disputeGame
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].baseFeeVaultRecipient -v "${OPERATOR_ADDRESS}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].l1FeeVaultRecipient -v "${OPERATOR_ADDRESS}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].sequencerFeeVaultRecipient -v "${OPERATOR_ADDRESS}"
+dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].operatorFeeVaultRecipient -v "${OPERATOR_ADDRESS}"
+dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].chainFeesRecipient -v "${OPERATOR_ADDRESS}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].roles.systemConfigOwner -v "${OPERATOR_ADDRESS}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].roles.unsafeBlockSigner -v "${OPERATOR_ADDRESS}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].roles.batcher -v "${OPERATOR_ADDRESS}"

go.mod

@@ -113,7 +113,6 @@ require (
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/redact v1.1.5 // indirect
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
-	github.com/consensys/bavard v0.1.27 // indirect
 	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -172,7 +171,6 @@ require (
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
 	github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e // indirect
-	github.com/hf/nitrite v0.0.0-20241225144000-c2d5d3c4f303 // indirect
 	github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect

kurtosis-devnet/enclaver/Dockerfile

@@ -17,7 +17,7 @@ ARG UBUNTU_TARGET_BASE_IMAGE=ubuntu:22.04
 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.23.8-alpine3.20 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS builder
 
 
 RUN apk add --no-cache curl tar gzip make gcc musl-dev linux-headers git jq bash
@@ -77,7 +77,7 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
 
 
 # We don't use the golang image for batcher because it doesn't play well with CGO
-FROM --platform=$BUILDPLATFORM golang:1.23.8-alpine3.20 AS op-batcher-builder
+FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS op-batcher-builder
 ARG OP_BATCHER_VERSION=v0.0.0
 # Install dependencies
 RUN apk add  musl-dev gcc g++ curl tar gzip make linux-headers git jq bash yq

kurtosis-devnet/enclaver/Dockerfile.nonEnclave

@@ -17,7 +17,7 @@ ARG UBUNTU_TARGET_BASE_IMAGE=ubuntu:22.04
 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.23.8-alpine3.20 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS builder
 
 
 RUN apk add --no-cache curl tar gzip make gcc musl-dev linux-headers git jq bash
@@ -76,10 +76,10 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
   GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$CANNON_VERSION"
 
 # We don't use the golang image for batcher because it doesn't play well with CGO
-FROM --platform=$BUILDPLATFORM alpine:3.20 AS op-batcher-builder
+FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS op-batcher-builder
 ARG OP_BATCHER_VERSION=v0.0.0
 # Install dependencies
-RUN apk add  musl-dev gcc go g++ curl tar gzip make gcc linux-headers git jq bash yq
+RUN apk add  musl-dev gcc g++ curl tar gzip make linux-headers git jq bash yq
 # Install just from mise (alpine's outdated and incompatible)
 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 | \

op-batcher/batcher/config.go

@@ -271,10 +271,7 @@ func NewConfig(ctx *cli.Context) *CLIConfig {
 			PidOutputMax:        ctx.Float64(flags.ThrottlePidOutputMaxFlag.Name),
 			PidSampleTime:       ctx.Duration(flags.ThrottlePidSampleTimeFlag.Name),
 		},
-		EspressoUrl:             ctx.String(flags.EspressoUrlFlag.Name),
-		EspressoLightClientAddr: ctx.String(flags.EspressoLCAddrFlag.Name),
-		TestingEspressoBatcherPrivateKey: ctx.String(flags.TestingEspressoBatcherPrivateKeyFlag.Name),
-		EspressoPollInterval:             ctx.Duration(flags.EspressoPollIntervalFlag.Name),
-		PreferLocalSafeL2:                ctx.Bool(flags.PreferLocalSafeL2Flag.Name),
+		Espresso:       espresso.ReadCLIConfig(ctx),
+		PreferLocalSafeL2: ctx.Bool(flags.PreferLocalSafeL2Flag.Name),
 	}
 }