cherry pick upstream up to 318838e9841de8865ecd4a580e66d99d7fa98a78

.circleci/continue/rust-e2e.yml

@@ -4,91 +4,26 @@ version: 2.1
 # This file contains E2E tests that depend on both kona and op-reth.
 # It is merged with main.yml and rust-ci.yml when rust/** changes are detected.
 # Shared orbs, commands, and jobs come from main.yml and rust-ci.yml during merge.
+orbs:
+  utils: ethereum-optimism/circleci-utils@1.0.27
 
 parameters:
-  # Required parameters (also in main.yml, merged during continuation)
   c-default_docker_image:
     type: string
     default: cimg/base:2026.03
-  c-rust_e2e_dispatch:
-    type: boolean
-    default: false
+  c-rust_base_image:
+    type: string
+    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-base-clang@sha256:852cb2dcd64eb5c039abf857a2217f341351eb7e4ef1a989ba9eefb86f158105
   c-go-cache-version:
     type: string
     default: "v0.0"
-  c-rust_changes_detected:
-    type: boolean
-    default: false
-  c-non_docs_changes:
-    type: boolean
-    default: false
-  # Passthrough declarations for setup config parameters.
-  # CircleCI forwards all explicitly-passed pipeline parameters to continuation configs.
-  # Without these declarations, manually triggered pipelines fail with "Unexpected argument(s)".
-  # These are not referenced by any job — the c- prefixed versions above are used instead.
-  default_docker_image:
-    type: string
-    default: cimg/base:2026.03
-  base_image:
-    type: string
-    default: default
-  main_dispatch:
-    type: boolean
-    default: true
-  fault_proofs_dispatch:
-    type: boolean
-    default: false
-  reproducibility_dispatch:
-    type: boolean
-    default: false
-  kontrol_dispatch:
-    type: boolean
-    default: false
-  cannon_full_test_dispatch:
-    type: boolean
-    default: false
-  sdk_dispatch:
-    type: boolean
-    default: false
-  docker_publish_dispatch:
-    type: boolean
-    default: false
-  stale_check_dispatch:
-    type: boolean
-    default: false
-  contracts_coverage_dispatch:
-    type: boolean
-    default: false
-  heavy_fuzz_dispatch:
-    type: boolean
-    default: false
-  sync_test_op_node_dispatch:
-    type: boolean
-    default: false
-  ai_contracts_test_dispatch:
-    type: boolean
-    default: false
-  rust_ci_dispatch:
-    type: boolean
-    default: false
-  rust_e2e_dispatch:
+  # Workflow activation flags (set by the decision tree in config.yml)
+  c-run_rust_e2e_ci:
     type: boolean
     default: false
-  github-event-type:
-    type: string
-    default: "__not_set__"
-  github-event-action:
-    type: string
-    default: "__not_set__"
-  github-event-base64:
-    type: string
-    default: "__not_set__"
-  devnet-metrics-collect:
+  c-run_rust_e2e_gate_skip:
     type: boolean
     default: false
-  go-cache-version:
-    type: string
-    default: "v0.0"
 
 # Commands used by rust-e2e jobs
 commands:
@@ -143,19 +78,15 @@ jobs:
         type: boolean
         default: false
     docker:
-      - image: <<pipeline.parameters.c-default_docker_image>>
-    resource_class: xlarge
+      - image: <<pipeline.parameters.c-rust_base_image>>
+    resource_class: xlarge.gen2
     steps:
       - utils/checkout-with-mise:
           checkout-method: blobless
       - attach_workspace:
           at: .
       - go-restore-cache:
           namespace: kona-ci
-      - rust-build: &kona-rust-build-release
-          directory: rust
-          profile: release
-          binary: "kona-node"
       - run:
           name: Run common tests for node with sysgo orchestrator
           no_output_timeout: 60m
@@ -189,17 +120,15 @@ jobs:
   # Kona Node Restart Tests (from node_e2e_sysgo_tests.yaml)
   rust-restart-sysgo-tests:
     docker:
-      - image: <<pipeline.parameters.c-default_docker_image>>
-    resource_class: xlarge
+      - image: <<pipeline.parameters.c-rust_base_image>>
+    resource_class: xlarge.gen2
     steps:
       - utils/checkout-with-mise:
           checkout-method: blobless
       - attach_workspace:
           at: .
       - go-restore-cache:
           namespace: kona-ci
-      - rust-build:
-          <<: *kona-rust-build-release
       - run:
           name: Run restart tests for node with sysgo orchestrator
           no_output_timeout: 60m
@@ -219,19 +148,15 @@ jobs:
   # op-reth E2E Sysgo Tests
   op-reth-e2e-sysgo-tests:
     docker:
-      - image: <<pipeline.parameters.c-default_docker_image>>
-    resource_class: xlarge
+      - image: <<pipeline.parameters.c-rust_base_image>>
+    resource_class: xlarge.gen2
     steps:
       - utils/checkout-with-mise:
           checkout-method: blobless
       - attach_workspace:
           at: .
       - go-restore-cache:
           namespace: op-reth-e2e
-      - rust-build:
-          directory: rust
-          profile: release
-          binary: "op-reth"
       - run:
           name: Run op-reth E2E tests with sysgo orchestrator
           working_directory: rust/op-reth/tests
@@ -254,8 +179,8 @@ jobs:
         description: The kind of action test (single or interop)
         type: string
     docker:
-      - image: <<pipeline.parameters.c-default_docker_image>>
-    resource_class: xlarge
+      - image: <<pipeline.parameters.c-rust_base_image>>
+    resource_class: xlarge.gen2
     parallelism: 4
     steps:
       - utils/checkout-with-mise:
@@ -264,9 +189,6 @@ jobs:
           at: .
       - go-restore-cache:
           namespace: kona-ci
-      - rust-build:
-          <<: *kona-rust-build-release
-          binary: "kona-host"
       - run:
           name: Build kona and run action tests
           working_directory: rust/kona
@@ -286,25 +208,22 @@ jobs:
   required-rust-e2e:
     docker:
       - image: <<pipeline.parameters.c-default_docker_image>>
-    resource_class: small
+    parameters:
+      always-succeed:
+        description: Force always succeed (skip API gate)
+        type: boolean
+        default: false
     steps:
-      - run: echo "Required Rust E2E checks passed"
+      - utils/ci-gate:
+          always-succeed: << parameters.always-succeed >>
 
 # ============================================================================
 # RUST E2E WORKFLOWS
 # ============================================================================
 workflows:
   # Rust E2E CI — runs on rust path changes or manual dispatch
   rust-e2e-ci:
-    when:
-      or:
-        - and:
-            - equal: ["webhook", << pipeline.trigger_source >>]
-            - << pipeline.parameters.c-rust_changes_detected >>
-            - << pipeline.parameters.c-non_docs_changes >>
-        - and:
-            - equal: [true, <<pipeline.parameters.c-rust_e2e_dispatch>>]
-            - equal: ["api", << pipeline.trigger_source >>]
+    when: << pipeline.parameters.c-run_rust_e2e_ci >>
     jobs:
       - contracts-bedrock-build:
           build_args: --skip test
@@ -313,58 +232,46 @@ workflows:
       - cannon-prestate: &rust-e2e-job-base
           context:
             - circleci-repo-readonly-authenticated-github-token
-      - rust-build-binary: &cannon-kona-host
-          name: cannon-kona-host
-          directory: rust
-          profile: release
-          binary: "kona-host"
-          context:
-            - circleci-repo-readonly-authenticated-github-token
-      - rust-build-binary: &kona-build-release
-          name: kona-build-release
-          directory: rust
-          profile: release
-          context:
-            - circleci-repo-readonly-authenticated-github-token
-      - rust-build-binary:
-          name: op-reth-build
+      # rust-workspace-release builds the whole rust workspace (no binary filter),
+      # so it produces kona-host, kona-node, op-reth, and the rest. Downstream
+      # e2e jobs attach the workspace and consume the binaries directly.
+      - rust-build-binary: &rust-workspace-release
+          name: rust-workspace-release
           directory: rust
           profile: release
-          binary: "op-reth"
+          persist_to_workspace: true
           context:
             - circleci-repo-readonly-authenticated-github-token
       - rust-e2e-sysgo-tests:
           name: rust-e2e-<<matrix.devnet_config>>
           matrix:
             parameters:
-              devnet_config: ["simple-kona", "simple-kona-geth", "simple-kona-sequencer"]
+              devnet_config:
+                ["simple-kona", "simple-kona-geth", "simple-kona-sequencer"]
           context:
             - circleci-repo-readonly-authenticated-github-token
           requires:
             - contracts-bedrock-build
             - cannon-prestate
-            - cannon-kona-host
-            - kona-build-release
-            - op-reth-build
+            - rust-workspace-release
       - op-reth-e2e-sysgo-tests:
           <<: *rust-e2e-job-base
           requires:
             - contracts-bedrock-build
-            - op-reth-build
+            - rust-workspace-release
       - rust-restart-sysgo-tests:
           name: rust-e2e-restart
           <<: *rust-e2e-job-base
           requires:
             - contracts-bedrock-build
             - cannon-prestate
-            - cannon-kona-host
-            - kona-build-release
+            - rust-workspace-release
       # Proof tests - single kind only, interop excluded per original config
       - kona-proof-action-tests:
           name: kona-proof-action-single
           kind: single
           requires:
-            - kona-build-release
+            - rust-workspace-release
             - contracts-bedrock-build
           context:
             - circleci-repo-readonly-authenticated-github-token
@@ -373,41 +280,39 @@ workflows:
       # -----------------------------------------------------------------------
       - required-rust-e2e:
           requires:
-            - rust-e2e-simple-kona
-            - rust-e2e-simple-kona-geth
-            - rust-e2e-simple-kona-sequencer
-            - rust-e2e-restart
-            - kona-proof-action-single
-
-  # Required Rust E2E gate (skip) — runs when no rust changes and no dispatch
-  # Just runs action tests
+            - rust-e2e-simple-kona: terminal
+            - rust-e2e-simple-kona-geth: terminal
+            - rust-e2e-simple-kona-sequencer: terminal
+            - rust-e2e-restart: terminal
+            - kona-proof-action-single: terminal
+          context:
+            - circleci-api-token
   rust-e2e-gate-skip:
-    when:
-      and:
-        - equal: ["webhook", << pipeline.trigger_source >>]
-        - not: << pipeline.parameters.c-rust_changes_detected >>
+    when: << pipeline.parameters.c-run_rust_e2e_gate_skip >>
     jobs:
       - contracts-bedrock-build:
           build_args: --skip test
           context:
             - circleci-repo-readonly-authenticated-github-token
       - rust-build-binary:
-          name: kona-build-release
+          name: rust-workspace-release
           directory: rust
           profile: release
+          persist_to_workspace: true
           context:
             - circleci-repo-readonly-authenticated-github-token
       # Proof tests - single kind only, interop excluded per original config
       - kona-proof-action-tests:
           name: kona-proof-action-single
           kind: single
           requires:
-            - kona-build-release
+            - rust-workspace-release
             - contracts-bedrock-build
           context:
             - circleci-repo-readonly-authenticated-github-token
 
       - required-rust-e2e:
           requires:
-            - kona-proof-action-single
-
+            - kona-proof-action-single: terminal
+          context:
+            - circleci-api-token

.circleci/l2-rpcs.json

@@ -0,0 +1,14 @@
+{
+  "op-mainnet": "",
+  "zora": "https://rpc.zora.energy",
+  "ink": "https://rpc-gel.inkonchain.com",
+  "mode": "https://mainnet.mode.network",
+  "metal": "https://rpc.metall2.com",
+  "arena-z": "https://rpc.arena-z.gg",
+  "swell": "https://swell-mainnet.alt.technology",
+  "unichain": "https://mainnet.unichain.org",
+  "soneium": "https://rpc.soneium.org",
+  "world-chain": "https://worldchain-mainnet.g.alchemy.com/public",
+  "base": "https://mainnet.base.org",
+  "xlayer": "https://xlayerrpc.okx.com"
+}

.circleci/rust-nightly-bump.yml

@@ -6,7 +6,7 @@ version: 2.1
 jobs:
   bump-nightly:
     docker:
-      - image: cimg/base:2024.01
+      - image: cimg/base:2026.03
     steps:
       - checkout
 
@@ -45,7 +45,7 @@ jobs:
             GH_TOKEN="$GITHUB_TOKEN_GOVERNANCE" gh pr create \
               --title "ci: bump rust nightly pin to ${LATEST}" \
               --body "Automated daily bump of the pinned nightly Rust toolchain from \`${CURRENT}\` to \`${LATEST}\`. CI on this PR will validate the new toolchain compiles cleanly." \
-              --base main \
+              --base develop \
               --label "ci" || echo "PR may already exist for this branch."
 
 workflows:
@@ -56,7 +56,7 @@ workflows:
           filters:
             branches:
               only:
-                - main
+                - develop
     jobs:
       - bump-nightly:
           context: