op-reth: merge upstream op-reth/v2.6.1

.circleci/config.yml

@@ -87,7 +87,7 @@ parameters:
 
 orbs:
   continuation: circleci/continuation@2.0.1
-  utils: ethereum-optimism/circleci-utils@1.0.31
+  utils: ethereum-optimism/circleci-utils@1.0.32
 
 jobs:
   # --------------------------------------------------------------------------

.circleci/continue/main.yml

@@ -140,7 +140,7 @@ parameters:
     default: false
 
 orbs:
-  utils: ethereum-optimism/circleci-utils@1.0.31
+  utils: ethereum-optimism/circleci-utils@1.0.32
   go: circleci/go@1.8.0
   gcp-cli: circleci/gcp-cli@3.0.1
   slack: circleci/slack@6.0.0
@@ -304,25 +304,35 @@ commands:
         description: "The versions of solc to install"
         type: string
         default: "0.8.15,0.8.19,0.8.25,0.8.28"
+      use_cache:
+        description: Restore and save the solc cache. Disable to download every compiler fresh.
+        type: boolean
+        default: true
     steps:
-      - restore_cache:
-          keys:
-            # use mise.toml to anchor on the underlying forge/svm versions
-            - svm-cache-{{ checksum "mise.toml" }}-<<parameters.solc_versions>>
-            # Fall back to any svm cache for the same forge/svm versions so a
-            # changed solc_versions list reuses what's there and installs only
-            # the difference instead of a full cold install.
-            - svm-cache-{{ checksum "mise.toml" }}-
+      - when:
+          condition: << parameters.use_cache >>
+          steps:
+            - restore_cache:
+                keys:
+                  # use mise.toml to anchor on the underlying forge/svm versions
+                  - svm-cache-{{ checksum "mise.toml" }}-<<parameters.solc_versions>>
+                  # Fall back to any svm cache for the same forge/svm versions so a
+                  # changed solc_versions list reuses what's there and installs only
+                  # the difference instead of a full cold install.
+                  - svm-cache-{{ checksum "mise.toml" }}-
       - run:
           name: Install solc compilers
           command: |
             for version in $(echo "<<parameters.solc_versions>>" | tr ',' '\n'); do
               svm which $version || svm install $version
             done
-      - save_cache:
-          key: svm-cache-{{ checksum "mise.toml" }}-<<parameters.solc_versions>>
-          paths:
-            - ~/.svm
+      - when:
+          condition: << parameters.use_cache >>
+          steps:
+            - save_cache:
+                key: svm-cache-{{ checksum "mise.toml" }}-<<parameters.solc_versions>>
+                paths:
+                  - ~/.svm
 
   install-contracts-dependencies:
     description: "Install the dependencies for the smart contracts"
@@ -331,8 +341,13 @@ commands:
         description: "The versions of solc to install"
         type: string
         default: "0.8.15,0.8.19,0.8.25,0.8.28"
+      use_cache:
+        description: Restore and save the solc cache.
+        type: boolean
+        default: true
     steps:
-      - install-solc-compilers
+      - install-solc-compilers:
+          use_cache: << parameters.use_cache >>
       - run:
           name: Install dependencies
           command: |
@@ -650,23 +665,6 @@ commands:
             export CARGO_TARGET_DIR="$PWD/<< parameters.directory >>/target"
             echo "CARGO_TARGET_DIR: $CARGO_TARGET_DIR"
 
-            # Leave one core idle so the build does not fill the executor's RAM.
-            # The release profile's peak is the tail of the build, where the big
-            # binaries (op-reth, kona-zkvm-canary, kona-sp1-proposer, the op-reth
-            # examples) link at once under `lto = "thin"`; rust-workspace-release
-            # has been OOM-killed there (`sccache: Compile terminated by
-            # signal 9`).
-            # nproc reflects the resource class on these executors, so this is 7
-            # on xlarge.gen2. The spare core is headroom, not a throughput knob:
-            # cargo's default is one unit per core, and dropping to n-1 costs far
-            # less than a retry.
-            CARGO_BUILD_JOBS="$(nproc)"
-            if [ "$CARGO_BUILD_JOBS" -gt 1 ]; then
-              CARGO_BUILD_JOBS=$((CARGO_BUILD_JOBS - 1))
-            fi
-            export CARGO_BUILD_JOBS
-            echo "CARGO_BUILD_JOBS: $CARGO_BUILD_JOBS (nproc: $(nproc))"
-
             export PROFILE="--profile << parameters.profile >>"
 
             # Debug profile is specified as "debug" in the config/target, but cargo build expects "dev"
@@ -745,7 +743,7 @@ jobs:
     description: "Build a Rust workspace with target directory caching"
     docker:
       - image: <<pipeline.parameters.c-rust_base_image>>
-    resource_class: xlarge.gen2
+    resource_class: << parameters.resource_class >>
     parameters:
       directory:
         description: "Directory containing the Cargo workspace"
@@ -782,6 +780,10 @@ jobs:
         description: "Whether to persist the built binaries to the CircleCI workspace"
         type: boolean
         default: false
+      resource_class:
+        description: "Machine resource class"
+        type: string
+        default: xlarge.gen2
     steps:
       - rust-build:
           directory: << parameters.directory >>
@@ -946,61 +948,90 @@ jobs:
         description: Profile to use for building
         type: string
         default: ci
+      use_caches:
+        description: >-
+          Restore and save the mise, solc, forge build and Go caches. The
+          op-deployer release build disables them so the artifacts it ships don't
+          depend on content an earlier job saved to a cache.
+        type: boolean
+        default: true
     steps:
-      - utils/checkout-with-mise:
-          checkout-method: blobless
-          enable-mise-cache: true
-      - install-contracts-dependencies
+      - when:
+          condition: << parameters.use_caches >>
+          steps:
+            - utils/checkout-with-mise:
+                checkout-method: blobless
+                enable-mise-cache: true
+      - unless:
+          condition: << parameters.use_caches >>
+          steps:
+            - utils/checkout-with-mise:
+                checkout-method: blobless
+                fresh-install: true
+      - install-contracts-dependencies:
+          use_cache: << parameters.use_caches >>
       - run:
           name: Print forge version
           command: forge --version
-      - run:
-          name: Compute forge build cache key
-          command: |
-            # Key over every input affecting forge output: all tracked package
-            # files via `git ls-files -s` (sources, config, lib/ submodule
-            # pins), mise.toml toolchain pins, and profile/args. Exact-key only
-            # (no fallback restore): a hit never serves artifacts for changed
-            # or deleted contracts; a miss is a normal clean build. The
-            # installed solc set is deliberately unkeyed — drift only makes
-            # forge recompile mismatched artifacts, never serve stale ones.
-            {
-              echo "profile=<<parameters.profile>> args=<<parameters.build_args>>"
-              sha256sum mise.toml
-              git ls-files -s -- packages/contracts-bedrock
-            } | sha256sum | cut -d' ' -f1 | tee /tmp/forge-cache-key.txt
-      - restore_cache:
-          name: Restore forge build cache
-          keys:
-            - forge-build-v1-<<parameters.profile>>-{{ checksum "/tmp/forge-cache-key.txt" }}
+      - when:
+          condition: << parameters.use_caches >>
+          steps:
+            - run:
+                name: Compute forge build cache key
+                command: |
+                  # Key over every input affecting forge output: all tracked package
+                  # files via `git ls-files -s` (sources, config, lib/ submodule
+                  # pins), mise.toml toolchain pins, and profile/args. Exact-key only
+                  # (no fallback restore): a hit never serves artifacts for changed
+                  # or deleted contracts; a miss is a normal clean build. The
+                  # installed solc set is deliberately unkeyed — drift only makes
+                  # forge recompile mismatched artifacts, never serve stale ones.
+                  {
+                    echo "profile=<<parameters.profile>> args=<<parameters.build_args>>"
+                    sha256sum mise.toml
+                    git ls-files -s -- packages/contracts-bedrock
+                  } | sha256sum | cut -d' ' -f1 | tee /tmp/forge-cache-key.txt
+            - restore_cache:
+                name: Restore forge build cache
+                keys:
+                  - forge-build-v1-<<parameters.profile>>-{{ checksum "/tmp/forge-cache-key.txt" }}
       - run:
           name: Build contracts
           command: just forge-build <<parameters.build_args>>
           environment:
             FOUNDRY_PROFILE: <<parameters.profile>>
           working_directory: packages/contracts-bedrock
-      - save_cache:
-          name: Save forge build cache
-          key: forge-build-v1-<<parameters.profile>>-{{ checksum "/tmp/forge-cache-key.txt" }}
-          # These paths hold for profiles that keep foundry.toml's default
-          # output dirs; a profile that redirects them (e.g. kprove's
-          # out = kout-proofs) needs this list extended.
-          paths:
-            - packages/contracts-bedrock/cache
-            - packages/contracts-bedrock/artifacts
-            - packages/contracts-bedrock/forge-artifacts
+      - when:
+          condition: << parameters.use_caches >>
+          steps:
+            - save_cache:
+                name: Save forge build cache
+                key: forge-build-v1-<<parameters.profile>>-{{ checksum "/tmp/forge-cache-key.txt" }}
+                # These paths hold for profiles that keep foundry.toml's default
+                # output dirs; a profile that redirects them (e.g. kprove's
+                # out = kout-proofs) needs this list extended.
+                paths:
+                  - packages/contracts-bedrock/cache
+                  - packages/contracts-bedrock/artifacts
+                  - packages/contracts-bedrock/forge-artifacts
       # copy-contract-artifacts runs `go run ... mktar`, which needs the Go
       # module set. Restore the shared cache (warmed by prep-go-modules) so it
       # doesn't hit proxy.golang.org.
-      - go-restore-cache:
-          namespace: contracts-bedrock-build
+      - when:
+          condition: << parameters.use_caches >>
+          steps:
+            - go-restore-cache:
+                namespace: contracts-bedrock-build
       - run:
           name: "Copy artifacts into deployer"
           command: |
             just copy-contract-artifacts
           working_directory: op-deployer
-      - go-save-cache:
-          namespace: contracts-bedrock-build
+      - when:
+          condition: << parameters.use_caches >>
+          steps:
+            - go-save-cache:
+                namespace: contracts-bedrock-build
       - persist_to_workspace:
           root: "."
           paths:
@@ -1615,6 +1646,9 @@ jobs:
           name: run Go linter
           command: |
             just lint-go
+      - run:
+          name: Test prestate build driver
+          command: mise exec -- ./ops/prestate-reproducibility/test-build-prestates.sh
       - go-save-cache:
           namespace: go-lint
       - save_cache:
@@ -2313,21 +2347,39 @@ jobs:
         description: Goreleaser config file
         default: .goreleaser.yaml
         type: string
+      use_caches:
+        description: >-
+          Restore the mise and Go module caches and use Docker layer caching. The
+          op-deployer release disables them so its binary and images are built with
+          freshly installed tools and freshly downloaded modules.
+        type: boolean
+        default: true
     docker:
       - image: <<pipeline.parameters.c-default_docker_image>>
     resource_class: large.gen2
     steps:
       - setup_remote_docker:
-          docker_layer_caching: true
+          docker_layer_caching: << parameters.use_caches >>
       - gcp-cli/install
       - gcp-oidc-authenticate:
           gcp_cred_config_file_path: /tmp/gcp_cred_config.json
           oidc_token_file_path: /tmp/oidc_token.json
-      - utils/checkout-with-mise:
-          enable-mise-cache: true
+      - when:
+          condition: << parameters.use_caches >>
+          steps:
+            - utils/checkout-with-mise:
+                enable-mise-cache: true
+      - unless:
+          condition: << parameters.use_caches >>
+          steps:
+            - utils/checkout-with-mise:
+                fresh-install: true
       - attach_workspace: {at: "."}
       # goreleaser compiles the Go release binaries on the host.
-      - restore-go-mod-cache
+      - when:
+          condition: << parameters.use_caches >>
+          steps:
+            - restore-go-mod-cache
       - run:
           name: Build superchain bundle
           command: just build-superchain-go
@@ -2707,6 +2759,7 @@ workflows:
             branches:
               ignore: /.*/
           build_args: --skip test
+          use_caches: false
           context:
             - circleci-repo-readonly-authenticated-github-token
       - go-release:
@@ -2716,6 +2769,7 @@ workflows:
             branches:
               ignore: /.*/
           module: op-deployer
+          use_caches: false
           context:
             - oplabs-gcr-release
             - circleci-repo-readonly-authenticated-github-token