refactor(storage): introduce RocksDBWriteMode for flexible write strategies

- Replaced RocksTx with RocksDBWriteMode in EitherWriter to support both transaction and batch writes. - Updated constructors and methods to utilize RocksDBWriteMode, enhancing write flexibility. - Added batch handling capabilities in RocksDBProvider, allowing manual commit of batch operations. - Improved documentation for clarity on usage and commit behavior.
chore(deps): weekly cargo update (#20359 )
2026-04-30 03:01:58 -04:00 · 2025-12-15 05:10:02 +00:00 · 2025-12-14 20:54:42 +00:00 · 2025-12-14 20:54:15 +00:00 · 2025-12-13 09:04:07 +00:00 · 2025-12-13 04:06:44 +00:00
200 changed files with 4182 additions and 2141 deletions
--- a/.github/assets/hive/build_simulators.sh
+++ b/.github/assets/hive/build_simulators.sh
@@ -11,17 +11,14 @@ go build .

 # Run each hive command in the background for each simulator and wait
 echo "Building images"
-./hive -client reth --sim "ethereum/eels" \
-  --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/bal@v1.8.0/fixtures_bal.tar.gz \
-  --sim.buildarg branch=eips/amsterdam/eip-7928 \
-  --sim.timelimit 1s || true &
+# TODO: test code has been moved from https://github.com/ethereum/execution-spec-tests to https://github.com/ethereum/execution-specs  we need to pin eels branch with `--sim.buildarg branch=<release-branch-name>` once we have the fusaka release tagged on the new repo
+./hive -client reth --sim "ethereum/eels" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz -sim.timelimit 1s || true &
 ./hive -client reth --sim "ethereum/engine" -sim.timelimit 1s || true &
 ./hive -client reth --sim "devp2p" -sim.timelimit 1s || true &
 ./hive -client reth --sim "ethereum/rpc-compat" -sim.timelimit 1s || true &
 ./hive -client reth --sim "smoke/genesis" -sim.timelimit 1s || true &
 ./hive -client reth --sim "smoke/network" -sim.timelimit 1s || true &
 ./hive -client reth --sim "ethereum/sync" -sim.timelimit 1s || true &
-
 wait

 # Run docker save in parallel, wait and exit on error
@@ -40,7 +37,7 @@ for pid in "${saving_pids[@]}"; do
    wait "$pid" || exit
 done

-# Make sure we don't rebuild images on the CI  jobs
+# Make sure we don't rebuild images on the CI jobs
 git apply ../.github/assets/hive/no_sim_build.diff
 go build .
 mv ./hive ../hive_assets/
--- a/.github/assets/hive/load_images.sh
+++ b/.github/assets/hive/load_images.sh
@@ -24,4 +24,4 @@ done

 wait

-docker image ls -a
+docker image ls -a
--- a/.github/assets/hive/run_simulator.sh
+++ b/.github/assets/hive/run_simulator.sh
@@ -7,7 +7,7 @@ sim="${1}"
 limit="${2}"

 run_hive() {
-    hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 8 --client reth 2>&1 | tee /tmp/log || true
+    hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 16 --client reth 2>&1 | tee /tmp/log || true
 }

 check_log() {
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -3,14 +3,15 @@
 on:
  pull_request:
  # TODO: Disabled temporarily for https://github.com/CodSpeedHQ/runner/issues/55
-  # merge_group :
+  # merge_group:
  push:
-    branches: ["**"]
+    branches: [main]

 env:
  CARGO_TERM_COLOR: always
  BASELINE: base
  SEED: reth
+  RUSTC_WRAPPER: "sccache"

 name: bench
 jobs:
@@ -22,6 +23,7 @@ jobs:
          submodules: true
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -10,9 +10,12 @@ on:
    types: [opened, reopened, synchronize, closed]
  merge_group:

+env:
+  RUSTC_WRAPPER: "sccache"
+
 jobs:
  build:
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest-8
    timeout-minutes: 90
    steps:
      - name: Checkout
@@ -33,6 +36,8 @@ jobs:
      - name: Install Rust nightly
        uses: dtolnay/rust-toolchain@nightly

+      - uses: mozilla-actions/sccache-action@v0.0.9
+
      - name: Build docs
        run: cd docs/vocs && bash scripts/build-cargo-docs.sh

@@ -69,4 +74,4 @@ jobs:
    steps:
      - name: Deploy to GitHub Pages
        id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
--- a/.github/workflows/compact.yml
+++ b/.github/workflows/compact.yml
@@ -9,15 +9,16 @@ on:
  pull_request:
  merge_group:
  push:
-    branches: ["**"]
+    branches: [main]

 env:
  CARGO_TERM_COLOR: always
+  RUSTC_WRAPPER: "sccache"

 name: compact-codec
 jobs:
  compact-codec:
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    strategy:
      matrix:
        bin:
@@ -26,6 +27,7 @@ jobs:
    steps:
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,11 +6,12 @@ on:
  pull_request:
  merge_group:
  push:
-    branches: ["**"]
+    branches: [main]

 env:
  CARGO_TERM_COLOR: always
  SEED: rustethereumethereumrust
+  RUSTC_WRAPPER: "sccache"

 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -19,13 +20,14 @@ concurrency:
 jobs:
  test:
    name: e2e-testsuite
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest-4
    env:
      RUST_BACKTRACE: 1
    timeout-minutes: 90
    steps:
      - uses: actions/checkout@v6
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: taiki-e/install-action@nextest
      - uses: Swatinem/rust-cache@v2
        with:
--- a/.github/workflows/hive.yml
+++ b/.github/workflows/hive.yml
@@ -6,9 +6,7 @@ on:
  workflow_dispatch:
  schedule:
    - cron: "0 */6 * * *"
-  pull_request:
-    branches:
-      - main
+
 env:
  CARGO_TERM_COLOR: always

@@ -26,14 +24,13 @@ jobs:
  prepare-hive:
    if: github.repository == 'paradigmxyz/reth'
    timeout-minutes: 45
-    runs-on: depot-ubuntu-latest
+    runs-on: depot-ubuntu-latest-16
    steps:
      - uses: actions/checkout@v6
      - name: Checkout hive tests
        uses: actions/checkout@v6
        with:
          repository: ethereum/hive
-          ref: master
          path: hivetests

      - name: Get hive commit hash
@@ -47,7 +44,7 @@ jobs:

      - name: Restore hive assets cache
        id: cache-hive
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        with:
          path: ./hive_assets
          key: hive-assets-${{ steps.hive-commit.outputs.hash }}-${{ hashFiles('.github/assets/hive/build_simulators.sh') }}
@@ -70,7 +67,7 @@ jobs:
          chmod +x hive

      - name: Upload hive assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: hive_assets
          path: ./hive_assets
@@ -118,29 +115,27 @@ jobs:
          # eth_ rpc methods
          - sim: ethereum/rpc-compat
            include:
-              # - eth_blockNumber
+              - eth_blockNumber
              - eth_call
-              # - eth_chainId
-              # - eth_createAccessList
-              # - eth_estimateGas
-              # - eth_feeHistory
-              # - eth_getBalance
-              # - eth_getBlockBy
-              # - eth_getBlockTransactionCountBy
-              # - eth_getCode
-              # - eth_getProof
-              # - eth_getStorage
-              # - eth_getTransactionBy
-              # - eth_getTransactionCount
-              # - eth_getTransactionReceipt
-              # - eth_sendRawTransaction
-              # - eth_syncing
-              # # debug_ rpc methods
-              # - debug_
+              - eth_chainId
+              - eth_createAccessList
+              - eth_estimateGas
+              - eth_feeHistory
+              - eth_getBalance
+              - eth_getBlockBy
+              - eth_getBlockTransactionCountBy
+              - eth_getCode
+              - eth_getProof
+              - eth_getStorage
+              - eth_getTransactionBy
+              - eth_getTransactionCount
+              - eth_getTransactionReceipt
+              - eth_sendRawTransaction
+              - eth_syncing
+              # debug_ rpc methods
+              - debug_

          # consume-engine
-          - sim: ethereum/eels/consume-engine
-            limit: .*tests/amsterdam.*
          - sim: ethereum/eels/consume-engine
            limit: .*tests/osaka.*
          - sim: ethereum/eels/consume-engine
@@ -157,10 +152,10 @@ jobs:
            limit: .*tests/homestead.*
          - sim: ethereum/eels/consume-engine
            limit: .*tests/frontier.*
+          - sim: ethereum/eels/consume-engine
+            limit: .*tests/paris.*

          # consume-rlp
-          - sim: ethereum/eels/consume-rlp
-            limit: .*tests/amsterdam.*
          - sim: ethereum/eels/consume-rlp
            limit: .*tests/osaka.*
          - sim: ethereum/eels/consume-rlp
@@ -177,11 +172,13 @@ jobs:
            limit: .*tests/homestead.*
          - sim: ethereum/eels/consume-rlp
            limit: .*tests/frontier.*
+          - sim: ethereum/eels/consume-rlp
+            limit: .*tests/paris.*
    needs:
      - prepare-reth
      - prepare-hive
    name: run ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
-    runs-on: depot-ubuntu-latest
+    runs-on: depot-ubuntu-latest-16
    permissions:
      issues: write
    steps:
@@ -190,13 +187,13 @@ jobs:
          fetch-depth: 0

      - name: Download hive assets
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
        with:
          name: hive_assets
          path: /tmp

      - name: Download reth image
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
        with:
          name: artifacts
          path: /tmp
@@ -248,7 +245,7 @@ jobs:
  notify-on-error:
    needs: test
    if: failure()
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
    steps:
      - name: Slack Webhook Action
        uses: rtCamp/action-slack-notify@v2
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -6,7 +6,7 @@ on:
  pull_request:
  merge_group:
  push:
-    branches: ["**"]
+    branches: [main]
  schedule:
    # Run once a day at 3:00 UTC
    - cron: "0 3 * * *"
@@ -14,6 +14,7 @@ on:
 env:
  CARGO_TERM_COLOR: always
  SEED: rustethereumethereumrust
+  RUSTC_WRAPPER: "sccache"

 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -23,7 +24,7 @@ jobs:
  test:
    name: test / ${{ matrix.network }}
    if: github.event_name != 'schedule'
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest-4
    env:
      RUST_BACKTRACE: 1
    strategy:
@@ -37,6 +38,7 @@ jobs:
      - name: Install Geth
        run: .github/assets/install_geth.sh
      - uses: taiki-e/install-action@nextest
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -74,6 +76,7 @@ jobs:
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
      - uses: taiki-e/install-action@nextest
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/.github/workflows/kurtosis-op.yml
+++ b/.github/workflows/kurtosis-op.yml
@@ -85,7 +85,7 @@ jobs:
  notify-on-error:
    needs: test
    if: failure()
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
    steps:
      - name: Slack Webhook Action
        uses: rtCamp/action-slack-notify@v2
--- a/.github/workflows/kurtosis.yml
+++ b/.github/workflows/kurtosis.yml
@@ -58,7 +58,7 @@ jobs:
  notify-on-error:
    needs: test
    if: failure()
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
    steps:
      - name: Slack Webhook Action
        uses: rtCamp/action-slack-notify@v2
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -4,10 +4,11 @@ on:
  pull_request:
  merge_group:
  push:
-    branches: ["**"]
+    branches: [main]

 env:
  CARGO_TERM_COLOR: always
+  RUSTC_WRAPPER: "sccache"

 jobs:
  clippy-binaries:
@@ -26,6 +27,7 @@ jobs:
      - uses: dtolnay/rust-toolchain@clippy
        with:
          components: clippy
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -40,7 +42,7 @@ jobs:

  clippy:
    name: clippy
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    timeout-minutes: 30
    steps:
      - uses: actions/checkout@v6
@@ -48,6 +50,7 @@ jobs:
      - uses: dtolnay/rust-toolchain@nightly
        with:
          components: clippy
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -65,6 +68,7 @@ jobs:
        with:
          target: wasm32-wasip1
      - uses: taiki-e/install-action@cargo-hack
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -84,6 +88,7 @@ jobs:
        with:
          target: riscv32imac-unknown-none-elf
      - uses: taiki-e/install-action@cargo-hack
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -93,17 +98,18 @@ jobs:

  crate-checks:
    name: crate-checks (${{ matrix.partition }}/${{ matrix.total_partitions }})
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest-4
    strategy:
      matrix:
-        partition: [1, 2]
-        total_partitions: [2]
+        partition: [1, 2, 3]
+        total_partitions: [3]
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
      - uses: taiki-e/install-action@cargo-hack
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -124,6 +130,7 @@ jobs:
      - uses: dtolnay/rust-toolchain@master
        with:
          toolchain: "1.88" # MSRV
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -133,12 +140,13 @@ jobs:

  docs:
    name: docs
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest-4
    timeout-minutes: 30
    steps:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@nightly
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -158,17 +166,19 @@ jobs:
      - uses: dtolnay/rust-toolchain@nightly
        with:
          components: rustfmt
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - name: Run fmt
        run: cargo fmt --all --check

  udeps:
    name: udeps
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    timeout-minutes: 30
    steps:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@nightly
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -177,12 +187,13 @@ jobs:

  book:
    name: book
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    timeout-minutes: 30
    steps:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@nightly
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -235,7 +246,7 @@ jobs:
  # Checks that selected crates can compile with power set of features
  features:
    name: features (${{ matrix.partition }}/${{ matrix.total_partitions }})
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    strategy:
      matrix:
        partition: [1, 2]
@@ -245,6 +256,7 @@ jobs:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@clippy
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -267,6 +279,7 @@ jobs:
    steps:
      - uses: actions/checkout@v6
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: rui314/setup-mold@v1
      - uses: taiki-e/cache-cargo-install-action@v2
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,6 +22,7 @@ env:
  CARGO_TERM_COLOR: always
  DOCKER_IMAGE_NAME_URL: https://ghcr.io/${{ github.repository_owner }}/reth
  DOCKER_OP_IMAGE_NAME_URL: https://ghcr.io/${{ github.repository_owner }}/op-reth
+  RUSTC_WRAPPER: "sccache"

 jobs:
  dry-run:
@@ -51,6 +52,7 @@ jobs:
    steps:
      - uses: actions/checkout@v6
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - name: Verify crate version matches tag
        # Check that the Cargo version starts with the tag,
        # so that Cargo version 1.4.8 can be matched against both v1.4.8 and v1.4.8-rc.1
@@ -104,6 +106,7 @@ jobs:
      - uses: dtolnay/rust-toolchain@stable
        with:
          target: ${{ matrix.configs.target }}
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - name: Install cross main
        id: cross_main
        run: |
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -6,12 +6,13 @@ on:
  pull_request:
  merge_group:
  push:
-    branches: ["**"]
+    branches: [main]

 env:
  CARGO_TERM_COLOR: always
  FROM_BLOCK: 0
  TO_BLOCK: 50000
+  RUSTC_WRAPPER: "sccache"

 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -31,6 +32,7 @@ jobs:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/.github/workflows/sync-era.yml
+++ b/.github/workflows/sync-era.yml
@@ -9,6 +9,7 @@ on:

 env:
  CARGO_TERM_COLOR: always
+  RUSTC_WRAPPER: "sccache"

 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -41,6 +42,7 @@ jobs:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -9,6 +9,7 @@ on:

 env:
  CARGO_TERM_COLOR: always
+  RUSTC_WRAPPER: "sccache"

 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -41,6 +42,7 @@ jobs:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -4,14 +4,14 @@ name: unit

 on:
  pull_request:
-    branches: ["**"]
  merge_group:
  push:
-    branches: ["**"]
+    branches: [main]

 env:
  CARGO_TERM_COLOR: always
  SEED: rustethereumethereumrust
+  RUSTC_WRAPPER: "sccache"

 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -20,7 +20,7 @@ concurrency:
 jobs:
  test:
    name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }})
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest-4
    env:
      RUST_BACKTRACE: 1
    strategy:
@@ -47,6 +47,7 @@ jobs:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -92,6 +93,7 @@ jobs:
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
      - uses: taiki-e/install-action@nextest
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -99,7 +101,7 @@ jobs:

  doc:
    name: doc tests
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    env:
      RUST_BACKTRACE: 1
    timeout-minutes: 30
@@ -107,6 +109,7 @@ jobs:
      - uses: actions/checkout@v6
      - uses: rui314/setup-mold@v1
      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -4,14 +4,17 @@ name: windows

 on:
  push:
-    branches: ["**"]
+    branches: [main]
  pull_request:
-    branches: ["**"]
+    branches: [main]
  merge_group:

+env:
+  RUSTC_WRAPPER: "sccache"
+
 jobs:
  check-reth:
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    timeout-minutes: 60

    steps:
@@ -21,6 +24,7 @@ jobs:
        with:
          target: x86_64-pc-windows-gnu
      - uses: taiki-e/install-action@cross
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
@@ -30,7 +34,7 @@ jobs:
        run: cargo check --target x86_64-pc-windows-gnu

  check-op-reth:
-    runs-on: depot-ubuntu-latest-16
+    runs-on: depot-ubuntu-latest
    timeout-minutes: 60

    steps:
@@ -40,6 +44,7 @@ jobs:
        with:
          target: x86_64-pc-windows-gnu
      - uses: taiki-e/install-action@cross
+      - uses: mozilla-actions/sccache-action@v0.0.9
      - uses: Swatinem/rust-cache@v2
        with:
          cache-on-failure: true
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -113,7 +113,8 @@ dependencies = [
 [[package]]
 name = "alloy-consensus"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e318e25fb719e747a7e8db1654170fc185024f3ed5b10f86c08d448a912f6e2"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@@ -140,7 +141,8 @@ dependencies = [
 [[package]]
 name = "alloy-consensus-any"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "364380a845193a317bcb7a5398fc86cdb66c47ebe010771dde05f6869bf9e64a"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -154,7 +156,8 @@ dependencies = [
 [[package]]
 name = "alloy-contract"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d39c80ffc806f27a76ed42f3351a455f3dc4f81d6ff92c8aad2cf36b7d3a34"
 dependencies = [
 "alloy-consensus",
 "alloy-dyn-abi",
@@ -238,11 +241,11 @@ dependencies = [
 [[package]]
 name = "alloy-eip7928"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/eips.git#2197bdb48ae842b00f43b2cb29d59f20b29ec419"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "926b2c0d34e641cf8b17bf54ce50fda16715b9f68ad878fa6128bae410c6f890"
 dependencies = [
 "alloy-primitives",
 "alloy-rlp",
- "arbitrary",
 "borsh",
 "serde",
 ]
@@ -250,12 +253,12 @@ dependencies = [
 [[package]]
 name = "alloy-eips"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c4d7c5839d9f3a467900c625416b24328450c65702eb3d8caff8813e4d1d33"
 dependencies = [
 "alloy-eip2124",
 "alloy-eip2930",
 "alloy-eip7702",
- "alloy-eip7928",
 "alloy-primitives",
 "alloy-rlp",
 "alloy-serde",
@@ -275,8 +278,9 @@ dependencies = [

 [[package]]
 name = "alloy-evm"
-version = "0.24.2"
-source = "git+https://github.com/Rimeeeeee/evm?branch=new-approach4#2b07037ef61397244f23fa832aee8e593a840201"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ccc4c702c840148af1ce784cc5c6ed9274a020ef32417c5b1dbeab8c317673"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -292,13 +296,13 @@ dependencies = [
 "op-revm",
 "revm",
 "thiserror 2.0.17",
- "tracing",
 ]

 [[package]]
 name = "alloy-genesis"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba4b1be0988c11f0095a2380aa596e35533276b8fa6c9e06961bbfe0aebcac5"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@@ -338,7 +342,8 @@ dependencies = [
 [[package]]
 name = "alloy-json-rpc"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f72cf87cda808e593381fb9f005ffa4d2475552b7a6c5ac33d087bf77d82abd0"
 dependencies = [
 "alloy-primitives",
 "alloy-sol-types",
@@ -352,7 +357,8 @@ dependencies = [
 [[package]]
 name = "alloy-network"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12aeb37b6f2e61b93b1c3d34d01ee720207c76fe447e2a2c217e433ac75b17f5"
 dependencies = [
 "alloy-consensus",
 "alloy-consensus-any",
@@ -377,7 +383,8 @@ dependencies = [
 [[package]]
 name = "alloy-network-primitives"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abd29ace62872083e30929cd9b282d82723196d196db589f3ceda67edcc05552"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -388,8 +395,9 @@ dependencies = [

 [[package]]
 name = "alloy-op-evm"
-version = "0.24.2"
-source = "git+https://github.com/Rimeeeeee/evm?branch=new-approach4#2b07037ef61397244f23fa832aee8e593a840201"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f640da852f93ddaa3b9a602b7ca41d80e0023f77a67b68aaaf511c32f1fe0ce"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -424,7 +432,6 @@ checksum = "355bf68a433e0fd7f7d33d5a9fc2583fde70bf5c530f63b80845f8da5505cf28"
 dependencies = [
 "alloy-rlp",
 "arbitrary",
- "borsh",
 "bytes",
 "cfg-if",
 "const-hex",
@@ -450,7 +457,8 @@ dependencies = [
 [[package]]
 name = "alloy-provider"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b710636d7126e08003b8217e24c09f0cca0b46d62f650a841736891b1ed1fc1"
 dependencies = [
 "alloy-chains",
 "alloy-consensus",
@@ -494,7 +502,8 @@ dependencies = [
 [[package]]
 name = "alloy-pubsub"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdd4c64eb250a18101d22ae622357c6b505e158e9165d4c7974d59082a600c5e"
 dependencies = [
 "alloy-json-rpc",
 "alloy-primitives",
@@ -537,7 +546,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-client"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0882e72d2c1c0c79dcf4ab60a67472d3f009a949f774d4c17d0bdb669cfde05"
 dependencies = [
 "alloy-json-rpc",
 "alloy-primitives",
@@ -562,7 +572,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cf1398cb33aacb139a960fa3d8cf8b1202079f320e77e952a0b95967bf7a9f"
 dependencies = [
 "alloy-primitives",
 "alloy-rpc-types-engine",
@@ -574,7 +585,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-admin"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65a583d2029b171301f5dcf122aa2ef443a65a373778ec76540d999691ae867d"
 dependencies = [
 "alloy-genesis",
 "alloy-primitives",
@@ -585,7 +597,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-anvil"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ce4c24e416bd0f17fceeb2f26cd8668df08fe19e1dc02f9d41c3b8ed1e93e0"
 dependencies = [
 "alloy-primitives",
 "alloy-rpc-types-eth",
@@ -596,7 +609,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-any"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a63fb40ed24e4c92505f488f9dd256e2afaed17faa1b7a221086ebba74f4122"
 dependencies = [
 "alloy-consensus-any",
 "alloy-rpc-types-eth",
@@ -606,7 +620,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-beacon"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16633087e23d8d75161c3a59aa183203637b817a5a8d2f662f612ccb6d129af0"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@@ -625,7 +640,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-debug"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4936f579d9d10eae01772b2ab3497f9d568684f05f26f8175e12f9a1a2babc33"
 dependencies = [
 "alloy-primitives",
 "derive_more",
@@ -636,7 +652,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-engine"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c60bdce3be295924122732b7ecd0b2495ce4790bedc5370ca7019c08ad3f26e"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -656,7 +673,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-eth"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eae0c7c40da20684548cbc8577b6b7447f7bf4ddbac363df95e3da220e41e72"
 dependencies = [
 "alloy-consensus",
 "alloy-consensus-any",
@@ -677,7 +695,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-mev"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81c0dd81c24944cfbf45b5df7cd149d9cd3e354db81ccf08aa47e0e05be8ab97"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -691,7 +710,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-trace"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef206a4b8d436fbb7cf2e6a61c692d11df78f9382becc3c9a283bd58e64f0583"
 dependencies = [
 "alloy-primitives",
 "alloy-rpc-types-eth",
@@ -704,7 +724,8 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-txpool"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecb5a795264a02222f9534435b8f40dcbd88de8e9d586647884aae24f389ebf2"
 dependencies = [
 "alloy-primitives",
 "alloy-rpc-types-eth",
@@ -715,7 +736,8 @@ dependencies = [
 [[package]]
 name = "alloy-serde"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0df1987ed0ff2d0159d76b52e7ddfc4e4fbddacc54d2fbee765e0d14d7c01b5"
 dependencies = [
 "alloy-primitives",
 "arbitrary",
@@ -726,7 +748,8 @@ dependencies = [
 [[package]]
 name = "alloy-signer"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff69deedee7232d7ce5330259025b868c5e6a52fa8dffda2c861fb3a5889b24"
 dependencies = [
 "alloy-primitives",
 "async-trait",
@@ -740,7 +763,8 @@ dependencies = [
 [[package]]
 name = "alloy-signer-local"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72cfe0be3ec5a8c1a46b2e5a7047ed41121d360d97f4405bb7c1c784880c86cb"
 dependencies = [
 "alloy-consensus",
 "alloy-network",
@@ -828,7 +852,8 @@ dependencies = [
 [[package]]
 name = "alloy-transport"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be98b07210d24acf5b793c99b759e9a696e4a2e67593aec0487ae3b3e1a2478c"
 dependencies = [
 "alloy-json-rpc",
 "auto_impl",
@@ -850,7 +875,8 @@ dependencies = [
 [[package]]
 name = "alloy-transport-http"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4198a1ee82e562cab85e7f3d5921aab725d9bd154b6ad5017f82df1695877c97"
 dependencies = [
 "alloy-json-rpc",
 "alloy-transport",
@@ -864,7 +890,8 @@ dependencies = [
 [[package]]
 name = "alloy-transport-ipc"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8db249779ebc20dc265920c7e706ed0d31dbde8627818d1cbde60919b875bb0"
 dependencies = [
 "alloy-json-rpc",
 "alloy-pubsub",
@@ -883,7 +910,8 @@ dependencies = [
 [[package]]
 name = "alloy-transport-ws"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ad2344a12398d7105e3722c9b7a7044ea837128e11d453604dec6e3731a86e2"
 dependencies = [
 "alloy-pubsub",
 "alloy-transport",
@@ -920,7 +948,8 @@ dependencies = [
 [[package]]
 name = "alloy-tx-macros"
 version = "1.1.3"
-source = "git+https://github.com/Soubhik-10/alloy?branch=bal#34c5b093a4a9e889634c1c20de5365bb6a7477ef"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "333544408503f42d7d3792bfc0f7218b643d968a03d2c0ed383ae558fb4a76d0"
 dependencies = [
 "darling 0.21.3",
 "proc-macro2",
@@ -1352,9 +1381,9 @@ dependencies = [

 [[package]]
 name = "async-compression"
-version = "0.4.35"
+version = "0.4.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07a926debf178f2d355197f9caddb08e54a9329d44748034bba349c5848cb519"
+checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37"
 dependencies = [
 "compression-codecs",
 "compression-core",
@@ -2360,9 +2389,9 @@ dependencies = [

 [[package]]
 name = "compression-codecs"
-version = "0.4.34"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34a3cbbb8b6eca96f3a5c4bf6938d5b27ced3675d69f95bb51948722870bc323"
+checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2"
 dependencies = [
 "brotli",
 "compression-core",
@@ -6182,9 +6211,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"

 [[package]]
 name = "op-alloy"
-version = "0.22.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b13412d297c1f9341f678b763750b120a73ffe998fa54a94d6eda98449e7ca"
+checksum = "e9b8fee21003dd4f076563de9b9d26f8c97840157ef78593cd7f262c5ca99848"
 dependencies = [
 "op-alloy-consensus",
 "op-alloy-network",
@@ -6195,9 +6224,9 @@ dependencies = [

 [[package]]
 name = "op-alloy-consensus"
-version = "0.22.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726da827358a547be9f1e37c2a756b9e3729cb0350f43408164794b370cad8ae"
+checksum = "736381a95471d23e267263cfcee9e1d96d30b9754a94a2819148f83379de8a86"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -6221,9 +6250,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc"

 [[package]]
 name = "op-alloy-network"
-version = "0.22.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63f27e65be273ec8fcb0b6af0fd850b550979465ab93423705ceb3dfddbd2ab"
+checksum = "4034183dca6bff6632e7c24c92e75ff5f0eabb58144edb4d8241814851334d47"
 dependencies = [
 "alloy-consensus",
 "alloy-network",
@@ -6237,9 +6266,9 @@ dependencies = [

 [[package]]
 name = "op-alloy-provider"
-version = "0.22.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a71456699aa256dc20119736422ad9a44da8b9585036117afb936778122093b9"
+checksum = "6753d90efbaa8ea8bcb89c1737408ca85fa60d7adb875049d3f382c063666f86"
 dependencies = [
 "alloy-network",
 "alloy-primitives",
@@ -6252,9 +6281,9 @@ dependencies = [

 [[package]]
 name = "op-alloy-rpc-jsonrpsee"
-version = "0.22.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ef9114426b16172254555aad34a8ea96c01895e40da92f5d12ea680a1baeaa7"
+checksum = "c1c820ef9c802ebc732281a940bfb6ac2345af4d9fff041cbb64b4b546676686"
 dependencies = [
 "alloy-primitives",
 "jsonrpsee",
@@ -6262,9 +6291,9 @@ dependencies = [

 [[package]]
 name = "op-alloy-rpc-types"
-version = "0.22.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562dd4462562c41f9fdc4d860858c40e14a25df7f983ae82047f15f08fce4d19"
+checksum = "ddd87c6b9e5b6eee8d6b76f41b04368dca0e9f38d83338e5b00e730c282098a4"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -6282,9 +6311,9 @@ dependencies = [

 [[package]]
 name = "op-alloy-rpc-types-engine"
-version = "0.22.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f24b8cb66e4b33e6c9e508bf46b8ecafc92eadd0b93fedd306c0accb477657"
+checksum = "77727699310a18cdeed32da3928c709e2704043b6584ed416397d5da65694efc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -6298,6 +6327,7 @@ dependencies = [
 "ethereum_ssz_derive",
 "op-alloy-consensus",
 "serde",
+ "sha2",
 "snap",
 "thiserror 2.0.17",
 ]
@@ -6323,7 +6353,8 @@ dependencies = [
 [[package]]
 name = "op-revm"
 version = "14.1.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1475a779c73999fc803778524042319691b31f3d6699d2b560c4ed8be1db802a"
 dependencies = [
 "auto_impl",
 "revm",
@@ -7763,13 +7794,11 @@ dependencies = [
 "alloy-consensus",
 "alloy-eips",
 "alloy-primitives",
- "alloy-rlp",
 "rand 0.9.2",
 "reth-chainspec",
 "reth-consensus",
 "reth-ethereum-primitives",
 "reth-primitives-traits",
- "tracing",
 ]

 [[package]]
@@ -8191,6 +8220,7 @@ name = "reth-engine-tree"
 version = "1.9.3"
 dependencies = [
 "alloy-consensus",
+ "alloy-eip7928",
 "alloy-eips",
 "alloy-evm",
 "alloy-primitives",
@@ -8277,7 +8307,6 @@ dependencies = [
 "reth-primitives-traits",
 "reth-revm",
 "reth-storage-api",
- "revm",
 "serde",
 "serde_json",
 "tokio",
@@ -8493,7 +8522,6 @@ dependencies = [
 "alloy-consensus",
 "alloy-eips",
 "alloy-primitives",
- "alloy-rlp",
 "reth-chainspec",
 "reth-consensus",
 "reth-consensus-common",
@@ -8632,7 +8660,6 @@ dependencies = [
 "alloy-evm",
 "alloy-genesis",
 "alloy-primitives",
- "alloy-rlp",
 "alloy-rpc-types-engine",
 "derive_more",
 "parking_lot",
@@ -9218,6 +9245,7 @@ dependencies = [
 "alloy-sol-types",
 "eyre",
 "futures",
+ "jsonrpsee-core",
 "rand 0.9.2",
 "reth-chainspec",
 "reth-db",
@@ -9253,6 +9281,7 @@ dependencies = [
 "serde",
 "serde_json",
 "similar-asserts",
+ "tempfile",
 "tokio",
 ]

@@ -10143,6 +10172,7 @@ dependencies = [
 "reth-db-api",
 "reth-engine-primitives",
 "reth-errors",
+ "reth-ethereum-engine-primitives",
 "reth-ethereum-primitives",
 "reth-evm",
 "reth-evm-ethereum",
@@ -10205,6 +10235,9 @@ dependencies = [
 "reth-network-peers",
 "reth-rpc-eth-api",
 "reth-trie-common",
+ "serde",
+ "serde_json",
+ "tokio",
 ]

 [[package]]
@@ -10269,6 +10302,7 @@ dependencies = [
 "reth-rpc-server-types",
 "reth-storage-api",
 "reth-tasks",
+ "reth-tokio-util",
 "reth-tracing",
 "reth-transaction-pool",
 "serde",
@@ -11035,7 +11069,8 @@ dependencies = [
 [[package]]
 name = "revm"
 version = "33.1.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c85ed0028f043f87b3c88d4a4cb6f0a76440085523b6a8afe5ff003cf418054"
 dependencies = [
 "revm-bytecode",
 "revm-context",
@@ -11053,7 +11088,8 @@ dependencies = [
 [[package]]
 name = "revm-bytecode"
 version = "7.1.1"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2c6b5e6e8dd1e28a4a60e5f46615d4ef0809111c9e63208e55b5c7058200fb0"
 dependencies = [
 "bitvec",
 "phf",
@@ -11064,7 +11100,8 @@ dependencies = [
 [[package]]
 name = "revm-context"
 version = "12.1.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f038f0c9c723393ac897a5df9140b21cfa98f5753a2cb7d0f28fa430c4118abf"
 dependencies = [
 "bitvec",
 "cfg-if",
@@ -11080,7 +11117,8 @@ dependencies = [
 [[package]]
 name = "revm-context-interface"
 version = "13.1.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "431c9a14e4ef1be41ae503708fd02d974f80ef1f2b6b23b5e402e8d854d1b225"
 dependencies = [
 "alloy-eip2930",
 "alloy-eip7702",
@@ -11095,7 +11133,8 @@ dependencies = [
 [[package]]
 name = "revm-database"
 version = "9.0.6"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "980d8d6bba78c5dd35b83abbb6585b0b902eb25ea4448ed7bfba6283b0337191"
 dependencies = [
 "alloy-eips",
 "revm-bytecode",
@@ -11108,20 +11147,21 @@ dependencies = [
 [[package]]
 name = "revm-database-interface"
 version = "8.0.5"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cce03e3780287b07abe58faf4a7f5d8be7e81321f93ccf3343c8f7755602bae"
 dependencies = [
 "auto_impl",
 "either",
 "revm-primitives",
 "revm-state",
 "serde",
- "thiserror 2.0.17",
 ]

 [[package]]
 name = "revm-handler"
 version = "14.1.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d44f8f6dbeec3fecf9fe55f78ef0a758bdd92ea46cd4f1ca6e2a946b32c367f3"
 dependencies = [
 "auto_impl",
 "derive-where",
@@ -11139,7 +11179,8 @@ dependencies = [
 [[package]]
 name = "revm-inspector"
 version = "14.1.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5617e49216ce1ca6c8826bcead0386bc84f49359ef67cde6d189961735659f93"
 dependencies = [
 "auto_impl",
 "either",
@@ -11155,9 +11196,9 @@ dependencies = [

 [[package]]
 name = "revm-inspectors"
-version = "0.33.1"
+version = "0.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c93974333e7acc4b2dc024b10def99707f7375a4d53db7a7f8351722d25673f"
+checksum = "01def7351cd9af844150b8e88980bcd11304f33ce23c3d7c25f2a8dab87c1345"
 dependencies = [
 "alloy-primitives",
 "alloy-rpc-types-eth",
@@ -11176,7 +11217,8 @@ dependencies = [
 [[package]]
 name = "revm-interpreter"
 version = "31.1.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26ec36405f7477b9dccdc6caa3be19adf5662a7a0dffa6270cdb13a090c077e5"
 dependencies = [
 "revm-bytecode",
 "revm-context-interface",
@@ -11188,7 +11230,8 @@ dependencies = [
 [[package]]
 name = "revm-precompile"
 version = "31.0.0"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a62958af953cc4043e93b5be9b8497df84cc3bd612b865c49a7a7dfa26a84e2"
 dependencies = [
 "ark-bls12-381",
 "ark-bn254",
@@ -11212,7 +11255,8 @@ dependencies = [
 [[package]]
 name = "revm-primitives"
 version = "21.0.2"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29e161db429d465c09ba9cbff0df49e31049fe6b549e28eb0b7bd642fcbd4412"
 dependencies = [
 "alloy-primitives",
 "num_enum",
@@ -11223,9 +11267,9 @@ dependencies = [
 [[package]]
 name = "revm-state"
 version = "8.1.1"
-source = "git+https://github.com/Rimeeeeee/revm?branch=rakita%2Fbal#d86e05673463cb83e0fb0c69e39b3119ba5916bd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8be953b7e374dbdea0773cf360debed8df394ea8d82a8b240a6b5da37592fc"
 dependencies = [
- "alloy-eip7928",
 "bitflags 2.10.0",
 "revm-bytecode",
 "revm-primitives",
@@ -11400,7 +11444,6 @@ dependencies = [
 "ark-ff 0.3.0",
 "ark-ff 0.4.2",
 "ark-ff 0.5.0",
- "borsh",
 "bytes",
 "fastrlp 0.3.1",
 "fastrlp 0.4.0",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -376,11 +376,11 @@ reth-era-utils = { path = "crates/era-utils" }
 reth-errors = { path = "crates/errors" }
 reth-eth-wire = { path = "crates/net/eth-wire" }
 reth-eth-wire-types = { path = "crates/net/eth-wire-types" }
+reth-ethereum-payload-builder = { path = "crates/ethereum/payload" }
 reth-ethereum-cli = { path = "crates/ethereum/cli", default-features = false }
 reth-ethereum-consensus = { path = "crates/ethereum/consensus", default-features = false }
 reth-ethereum-engine-primitives = { path = "crates/ethereum/engine-primitives", default-features = false }
 reth-ethereum-forks = { path = "crates/ethereum/hardforks", default-features = false }
-reth-ethereum-payload-builder = { path = "crates/ethereum/payload" }
 reth-ethereum-primitives = { path = "crates/ethereum/primitives", default-features = false }
 reth-ethereum = { path = "crates/ethereum/reth" }
 reth-etl = { path = "crates/etl" }
@@ -475,21 +475,21 @@ reth-ress-provider = { path = "crates/ress/provider" }
 # revm
 revm = { version = "33.1.0", default-features = false }
 revm-bytecode = { version = "7.1.1", default-features = false }
-revm-database = { version = "9.0.6", default-features = false }
+revm-database = { version = "9.0.5", default-features = false }
 revm-state = { version = "8.1.1", default-features = false }
 revm-primitives = { version = "21.0.2", default-features = false }
 revm-interpreter = { version = "31.1.0", default-features = false }
 revm-database-interface = { version = "8.0.5", default-features = false }
 op-revm = { version = "14.1.0", default-features = false }
-revm-inspectors = "0.33.1"
+revm-inspectors = "0.33.2"

 # eth
-
-alloy-primitives = { version = "1.4.1", default-features = false, features = ["map-foldhash"] }
 alloy-chains = { version = "0.2.5", default-features = false }
-alloy-evm = { version = "0.24.2", default-features = false }
 alloy-dyn-abi = "1.4.1"
 alloy-eip2124 = { version = "0.2.0", default-features = false }
+alloy-eip7928 = { version = "0.1.0" }
+alloy-evm = { version = "0.25.1", default-features = false }
+alloy-primitives = { version = "1.4.1", default-features = false, features = ["map-foldhash"] }
 alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] }
 alloy-sol-macro = "1.4.1"
 alloy-sol-types = { version = "1.4.1", default-features = false }
@@ -526,13 +526,13 @@ alloy-transport-ipc = { version = "1.1.3", default-features = false }
 alloy-transport-ws = { version = "1.1.3", default-features = false }

 # op
-alloy-op-evm = { version = "0.24.2", default-features = false }
-alloy-op-hardforks = "0.4.3"
-op-alloy-rpc-types = { version = "0.22.0", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false }
-op-alloy-network = { version = "0.22.0", default-features = false }
-op-alloy-consensus = { version = "0.22.0", default-features = false }
-op-alloy-rpc-jsonrpsee = { version = "0.22.0", default-features = false }
+alloy-op-evm = { version = "0.25.0", default-features = false }
+alloy-op-hardforks = "0.4.4"
+op-alloy-rpc-types = { version = "0.23.1", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.23.1", default-features = false }
+op-alloy-network = { version = "0.23.1", default-features = false }
+op-alloy-consensus = { version = "0.23.1", default-features = false }
+op-alloy-rpc-jsonrpsee = { version = "0.23.1", default-features = false }
 op-alloy-flz = { version = "0.13.1", default-features = false }

 # misc
@@ -736,40 +736,39 @@ vergen = "9.0.4"
 visibility = "0.1.1"
 walkdir = "2.3.3"
 vergen-git2 = "1.0.5"
+
 # networking
 ipnet = "2.11"

-[patch.crates-io]
-alloy-consensus = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-contract = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-eips = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-genesis = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-json-rpc = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-network = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-network-primitives = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-provider = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-pubsub = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-client = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-admin = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-anvil = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-beacon = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-debug = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-engine = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-eth = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-mev = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-trace = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-rpc-types-txpool = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-serde = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-signer = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-signer-local = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-transport = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-transport-http = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-transport-ipc = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-alloy-transport-ws = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
-# alloy-hardforks = { git = "https://github.com/Rimeeeeee/hardforks", branch = "amsterdam" }
+# [patch.crates-io]
+# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }

-# alloy-op-hardforks = { git = "https://github.com/Rimeeeeee/hardforks", branch = "amsterdam" }
 # op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
 # op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
 # op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
@@ -777,20 +776,6 @@ alloy-transport-ws = { git = "https://github.com/Soubhik-10/alloy", branch = "ba
 # op-alloy-rpc-jsonrpsee = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
 #
 # revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "1207e33" }
-# need to change to bluealloy rakita/bal
-revm = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-alloy-evm = { git = "https://github.com/Rimeeeeee/evm", branch = "new-approach4" }
-alloy-op-evm = { git = "https://github.com/Rimeeeeee/evm", branch = "new-approach4" }
-revm-bytecode = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-database = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-state = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-primitives = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-interpreter = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-inspector = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-context = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-context-interface = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-revm-database-interface = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
-op-revm = { git = "https://github.com/Rimeeeeee/revm", branch = "rakita/bal" }
 #
 # jsonrpsee = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
 # jsonrpsee-core = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
--- a/bin/reth-bench/src/valid_payload.rs
+++ b/bin/reth-bench/src/valid_payload.rs
@@ -150,45 +150,6 @@ pub(crate) fn block_to_new_payload(
    let (payload, sidecar) = ExecutionPayload::from_block_slow(&block);

    let (version, params) = match payload {
-        ExecutionPayload::V4(payload) => {
-            let cancun = sidecar.cancun().unwrap();
-
-            if let Some(prague) = sidecar.prague() {
-                if is_optimism {
-                    (
-                        EngineApiMessageVersion::V4,
-                        serde_json::to_value((
-                            OpExecutionPayloadV4 {
-                                payload_inner: payload.payload_inner,
-                                withdrawals_root: block.withdrawals_root.unwrap(),
-                            },
-                            cancun.versioned_hashes.clone(),
-                            cancun.parent_beacon_block_root,
-                            Requests::default(),
-                        ))?,
-                    )
-                } else {
-                    (
-                        EngineApiMessageVersion::V4,
-                        serde_json::to_value((
-                            payload,
-                            cancun.versioned_hashes.clone(),
-                            cancun.parent_beacon_block_root,
-                            prague.requests.requests_hash(),
-                        ))?,
-                    )
-                }
-            } else {
-                (
-                    EngineApiMessageVersion::V3,
-                    serde_json::to_value((
-                        payload,
-                        cancun.versioned_hashes.clone(),
-                        cancun.parent_beacon_block_root,
-                    ))?,
-                )
-            }
-        }
        ExecutionPayload::V3(payload) => {
            let cancun = sidecar.cancun().unwrap();

@@ -283,10 +244,7 @@ pub(crate) async fn call_forkchoice_updated<N, P: EngineApiValidWaitExt<N>>(
    payload_attributes: Option<PayloadAttributes>,
 ) -> TransportResult<ForkchoiceUpdated> {
    match message_version {
-        EngineApiMessageVersion::V3 |
-        EngineApiMessageVersion::V4 |
-        EngineApiMessageVersion::V5 |
-        EngineApiMessageVersion::V6 => {
+        EngineApiMessageVersion::V3 | EngineApiMessageVersion::V4 | EngineApiMessageVersion::V5 => {
            provider.fork_choice_updated_v3_wait(forkchoice_state, payload_attributes).await
        }
        EngineApiMessageVersion::V2 => {
--- a/crates/chain-state/src/test_utils.rs
+++ b/crates/chain-state/src/test_utils.rs
@@ -173,7 +173,6 @@ impl<N: NodePrimitives> TestBlockBuilder<N> {
                transactions: transactions.into_iter().map(|tx| tx.into_inner()).collect(),
                ommers: Vec::new(),
                withdrawals: Some(vec![].into()),
-                block_access_list: None,
            },
        )
    }
--- a/crates/chainspec/src/spec.rs
+++ b/crates/chainspec/src/spec.rs
@@ -45,10 +45,6 @@ use reth_network_peers::{
 };
 use reth_primitives_traits::{sync::LazyLock, BlockHeader, SealedHeader};

-/// The hash of an empty block access list.
-const EMPTY_BLOCK_ACCESS_LIST_HASH: B256 =
-    b256!("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347");
-
 /// Helper method building a [`Header`] given [`Genesis`] and [`ChainHardforks`].
 pub fn make_genesis_header(genesis: &Genesis, hardforks: &ChainHardforks) -> Header {
    // If London is activated at genesis, we set the initial base fee as per EIP-1559.
@@ -83,12 +79,6 @@ pub fn make_genesis_header(genesis: &Genesis, hardforks: &ChainHardforks) -> Hea
        .active_at_timestamp(genesis.timestamp)
        .then_some(EMPTY_REQUESTS_HASH);

-    // If Amsterdam is activated at genesis we set block access list hash empty hash.
-    let block_access_list_hash = hardforks
-        .fork(EthereumHardfork::Amsterdam)
-        .active_at_timestamp(genesis.timestamp)
-        .then_some(EMPTY_BLOCK_ACCESS_LIST_HASH);
-
    Header {
        gas_limit: genesis.gas_limit,
        difficulty: genesis.difficulty,
@@ -104,7 +94,6 @@ pub fn make_genesis_header(genesis: &Genesis, hardforks: &ChainHardforks) -> Hea
        blob_gas_used,
        excess_blob_gas,
        requests_hash,
-        block_access_list_hash,
        ..Default::default()
    }
 }
@@ -309,7 +298,6 @@ pub fn create_chain_config(
        cancun_time: timestamp(EthereumHardfork::Cancun),
        prague_time: timestamp(EthereumHardfork::Prague),
        osaka_time: timestamp(EthereumHardfork::Osaka),
-        amsterdam_time: timestamp(EthereumHardfork::Amsterdam),
        bpo1_time: timestamp(EthereumHardfork::Bpo1),
        bpo2_time: timestamp(EthereumHardfork::Bpo2),
        bpo3_time: timestamp(EthereumHardfork::Bpo3),
@@ -899,7 +887,6 @@ impl From<Genesis> for ChainSpec {
            (EthereumHardfork::Bpo3.boxed(), genesis.config.bpo3_time),
            (EthereumHardfork::Bpo4.boxed(), genesis.config.bpo4_time),
            (EthereumHardfork::Bpo5.boxed(), genesis.config.bpo5_time),
-            (EthereumHardfork::Amsterdam.boxed(), genesis.config.amsterdam_time),
        ];

        let mut time_hardforks = time_hardfork_opts
@@ -1206,19 +1193,6 @@ impl ChainSpecBuilder {
        self
    }

-    /// Enable Amsterdam at genesis.
-    pub fn amsterdam_activated(mut self) -> Self {
-        self = self.osaka_activated();
-        self.hardforks.insert(EthereumHardfork::Amsterdam, ForkCondition::Timestamp(0));
-        self
-    }
-
-    /// Enable Amsterdam at the given timestamp.
-    pub fn with_amsterdam_at(mut self, timestamp: u64) -> Self {
-        self.hardforks.insert(EthereumHardfork::Amsterdam, ForkCondition::Timestamp(timestamp));
-        self
-    }
-
    /// Build the resulting [`ChainSpec`].
    ///
    /// # Panics
--- a/crates/cli/commands/src/db/settings.rs
+++ b/crates/cli/commands/src/db/settings.rs
@@ -92,6 +92,8 @@ impl Command {
            receipts_in_static_files: _,
            transaction_senders_in_static_files: _,
            storages_history_in_rocksdb: _,
+            transaction_hash_numbers_in_rocksdb: _,
+            account_history_in_rocksdb: _,
        } = settings.unwrap_or_else(StorageSettings::legacy);

        // Update the setting based on the key
--- a/crates/cli/commands/src/stage/drop.rs
+++ b/crates/cli/commands/src/stage/drop.rs
@@ -110,7 +110,6 @@ impl<C: ChainSpecParser> Command<C> {
                tx.clear::<tables::TransactionBlocks>()?;
                tx.clear::<tables::BlockOmmers<HeaderTy<N>>>()?;
                tx.clear::<tables::BlockWithdrawals>()?;
-                tx.clear::<tables::BlockAccessLists>()?;
                reset_stage_checkpoint(tx, StageId::Bodies)?;

                insert_genesis_header(&provider_rw, &self.env.chain)?;
--- a/crates/consensus/common/Cargo.toml
+++ b/crates/consensus/common/Cargo.toml
@@ -14,14 +14,11 @@ workspace = true
 # reth
 reth-chainspec.workspace = true
 reth-consensus.workspace = true
-tracing.workspace = true

 # ethereum
 reth-primitives-traits.workspace = true
 alloy-consensus.workspace = true
-alloy-primitives.workspace = true
 alloy-eips.workspace = true
-alloy-rlp.workspace = true

 [dev-dependencies]
 alloy-primitives = { workspace = true, features = ["rand"] }
@@ -38,6 +35,4 @@ std = [
    "reth-primitives-traits/std",
    "reth-ethereum-primitives/std",
    "alloy-primitives/std",
-    "alloy-rlp/std",
-    "tracing/std",
 ]
--- a/crates/consensus/common/src/validation.rs
+++ b/crates/consensus/common/src/validation.rs
@@ -69,29 +69,6 @@ pub fn validate_shanghai_withdrawals<B: Block>(
    Ok(())
 }

-/// Validate that block access lists are present in Amsterdam
-///
-/// [EIP-7928]: https://eips.ethereum.org/EIPS/eip-7928
-#[inline]
-pub fn validate_amsterdam_block_access_lists<B: Block>(
-    block: &SealedBlock<B>,
-) -> Result<(), ConsensusError> {
-    let bal = block.body().block_access_list().ok_or(ConsensusError::BlockAccessListMissing)?;
-    let bal_hash = alloy_primitives::keccak256(alloy_rlp::encode(bal));
-    let header_bal_hash =
-        block.block_access_list_hash().ok_or(ConsensusError::BlockAccessListHashMissing)?;
-    if bal_hash != header_bal_hash {
-        tracing::error!(
-            target: "consensus",
-            ?header_bal_hash,
-            ?bal,
-            "Block access list hash mismatch in validation.rs in L81"
-        );
-        return Err(ConsensusError::InvalidBalHash);
-    }
-    Ok(())
-}
-
 /// Validate that blob gas is present in the block if Cancun is active.
 ///
 /// See [EIP-4844]: Shard Blob Transactions
@@ -154,21 +131,6 @@ where
        }
        _ => return Err(ConsensusError::WithdrawalsRootUnexpected),
    }
-    if let (Some(expected_hash), Some(body_bal)) =
-        (header.block_access_list_hash(), body.block_access_list())
-    {
-        let got_hash = alloy_primitives::keccak256(alloy_rlp::encode(body_bal));
-
-        if got_hash != expected_hash {
-            tracing::error!(
-                target: "consensus",
-                ?expected_hash,
-                ?body_bal,
-                "Block access list hash mismatch in validation.rs in L164"
-            );
-            return Err(ConsensusError::InvalidBalHash);
-        }
-    }

    Ok(())
 }
@@ -255,10 +217,6 @@ where
        })
    }

-    if chain_spec.is_amsterdam_active_at_timestamp(block.header().timestamp()) {
-        validate_amsterdam_block_access_lists(block)?;
-    }
-
    Ok(())
 }

@@ -526,7 +484,6 @@ mod tests {
            transactions: vec![transaction],
            ommers: vec![],
            withdrawals: Some(Withdrawals::default()),
-            block_access_list: None,
        };

        let block = SealedBlock::seal_slow(alloy_consensus::Block { header, body });
--- a/crates/consensus/consensus/src/lib.rs
+++ b/crates/consensus/consensus/src/lib.rs
@@ -404,41 +404,9 @@ pub enum ConsensusError {
        /// The maximum allowed RLP length.
        max_rlp_length: usize,
    },
-
-    /// Error when the hash of block access list is different from the expected hash.
-    #[error("Block header's BAL hash does not match the computed BAL hash.")]
-    InvalidBalHash,
-
-    /// Error when the block access list hash is missing.
-    #[error("block access list hash missing")]
-    BlockAccessListHashMissing,
-
-    /// Error when the block access list is different from the expected access list.
-    #[error("Block's access list is invalid.")]
-    InvalidBlockAccessList,
-
-    /// Error when the block access list is missing.
-    #[error("block access list missing")]
-    BlockAccessListMissing,
-
-    /// Error when the block access list hash is unexpected.
-    #[error("block access list hash unexpected")]
-    BlockAccessListHashUnexpected,
-
-    /// Error when the block access list contains an account change that is not present in the
-    /// computed access list.
-    #[error("Block BAL contains an account change that is not present in the computed BAL.")]
-    InvalidBalExtraAccount,
-
-    /// Error when the block access list is missing an account change that is present in the
-    /// computed access list.
-    #[error("Block BAL is missing an account change that is present in the computed BAL.")]
-    InvalidBalMissingAccount,
-
    /// EIP-7825: Transaction gas limit exceeds maximum allowed
    #[error(transparent)]
    TransactionGasLimitTooHigh(Box<TxGasLimitTooHighErr>),
-
    /// Other, likely an injected L2 error.
    #[error("{0}")]
    Other(String),
--- a/crates/consensus/debug-client/src/providers/rpc.rs
+++ b/crates/consensus/debug-client/src/providers/rpc.rs
@@ -1,5 +1,5 @@
 use crate::BlockProvider;
-use alloy_provider::{ConnectionConfig, Network, Provider, ProviderBuilder};
+use alloy_provider::{ConnectionConfig, Network, Provider, ProviderBuilder, WebSocketConfig};
 use alloy_transport::TransportResult;
 use futures::{Stream, StreamExt};
 use reth_node_api::Block;
@@ -29,7 +29,12 @@ impl<N: Network, PrimitiveBlock> RpcBlockProvider<N, PrimitiveBlock> {
                ProviderBuilder::default()
                    .connect_with_config(
                        rpc_url,
-                        ConnectionConfig::default().with_max_retries(u32::MAX),
+                        ConnectionConfig::default().with_max_retries(u32::MAX).with_ws_config(
+                            WebSocketConfig::default()
+                                // allow larger messages/frames for big blocks
+                                .max_frame_size(Some(128 * 1024 * 1024))
+                                .max_message_size(Some(128 * 1024 * 1024)),
+                        ),
                    )
                    .await?,
            ),
--- a/crates/e2e-test-utils/src/test_rlp_utils.rs
+++ b/crates/e2e-test-utils/src/test_rlp_utils.rs
@@ -56,7 +56,6 @@ pub fn generate_test_blocks(chain_spec: &ChainSpec, count: u64) -> Vec<SealedBlo
            excess_blob_gas: None,
            parent_beacon_block_root: None,
            requests_hash: None,
-            block_access_list_hash: None,
        };

        // Set required fields based on chain spec
@@ -107,7 +106,6 @@ pub fn generate_test_blocks(chain_spec: &ChainSpec, count: u64) -> Vec<SealedBlo
            transactions: vec![],
            ommers: vec![],
            withdrawals: header.withdrawals_root.is_some().then(Withdrawals::default),
-            block_access_list: None,
        };

        // Create the block
--- a/crates/engine/invalid-block-hooks/src/witness.rs
+++ b/crates/engine/invalid-block-hooks/src/witness.rs
@@ -448,14 +448,12 @@ mod tests {
                    nonce: account.nonce,
                    code_hash: account.bytecode_hash.unwrap_or_default(),
                    code: None,
-                    storage_id: None,
                }),
                original_info: (i == 0).then(|| AccountInfo {
                    balance: account.balance.checked_div(U256::from(2)).unwrap_or(U256::ZERO),
                    nonce: 0,
                    code_hash: account.bytecode_hash.unwrap_or_default(),
                    code: None,
-                    storage_id: None,
                }),
                storage,
                status: AccountStatus::default(),
@@ -841,7 +839,6 @@ mod tests {
                receipts: vec![],
                requests: Requests::default(),
                gas_used: 0,
-                block_access_list: Default::default(),
                blob_gas_used: 0,
            },
        };
--- a/crates/engine/local/src/miner.rs
+++ b/crates/engine/local/src/miner.rs
@@ -204,7 +204,7 @@ where
                EngineApiMessageVersion::default(),
            )
            .await?;
-        tracing::debug!(target: "engine::local", "FCU result: {res:?}");
+
        if !res.is_valid() {
            eyre::bail!("Invalid payload status")
        }
--- a/crates/engine/primitives/src/config.rs
+++ b/crates/engine/primitives/src/config.rs
@@ -1,5 +1,7 @@
 //! Engine tree configuration.

+use alloy_eips::merge::EPOCH_SLOTS;
+
 /// Triggers persistence when the number of canonical blocks in memory exceeds this threshold.
 pub const DEFAULT_PERSISTENCE_THRESHOLD: u64 = 2;

@@ -40,7 +42,7 @@ pub const DEFAULT_RESERVED_CPU_CORES: usize = 1;
 /// Default maximum concurrency for prewarm task.
 pub const DEFAULT_PREWARM_MAX_CONCURRENCY: usize = 16;

-const DEFAULT_BLOCK_BUFFER_LIMIT: u32 = 256;
+const DEFAULT_BLOCK_BUFFER_LIMIT: u32 = EPOCH_SLOTS as u32 * 2;
 const DEFAULT_MAX_INVALID_HEADER_CACHE_LENGTH: u32 = 256;
 const DEFAULT_MAX_EXECUTE_BLOCK_BATCH_SIZE: usize = 4;
 const DEFAULT_CROSS_BLOCK_CACHE_SIZE: u64 = 4 * 1024 * 1024 * 1024;
@@ -89,6 +91,8 @@ pub struct TreeConfig {
    /// Whether to always compare trie updates from the state root task to the trie updates from
    /// the regular state root calculation.
    always_compare_trie_updates: bool,
+    /// Whether to disable state cache.
+    disable_state_cache: bool,
    /// Whether to disable parallel prewarming.
    disable_prewarming: bool,
    /// Whether to disable the parallel sparse trie state root algorithm.
@@ -143,6 +147,7 @@ impl Default for TreeConfig {
            max_execute_block_batch_size: DEFAULT_MAX_EXECUTE_BLOCK_BATCH_SIZE,
            legacy_state_root: false,
            always_compare_trie_updates: false,
+            disable_state_cache: false,
            disable_prewarming: false,
            disable_parallel_sparse_trie: false,
            state_provider_metrics: false,
@@ -173,6 +178,7 @@ impl TreeConfig {
        max_execute_block_batch_size: usize,
        legacy_state_root: bool,
        always_compare_trie_updates: bool,
+        disable_state_cache: bool,
        disable_prewarming: bool,
        disable_parallel_sparse_trie: bool,
        state_provider_metrics: bool,
@@ -197,6 +203,7 @@ impl TreeConfig {
            max_execute_block_batch_size,
            legacy_state_root,
            always_compare_trie_updates,
+            disable_state_cache,
            disable_prewarming,
            disable_parallel_sparse_trie,
            state_provider_metrics,
@@ -271,7 +278,12 @@ impl TreeConfig {
        self.disable_parallel_sparse_trie
    }

-    /// Returns whether or not parallel prewarming should be used.
+    /// Returns whether or not state cache is disabled.
+    pub const fn disable_state_cache(&self) -> bool {
+        self.disable_state_cache
+    }
+
+    /// Returns whether or not parallel prewarming is disabled.
    pub const fn disable_prewarming(&self) -> bool {
        self.disable_prewarming
    }
@@ -363,6 +375,12 @@ impl TreeConfig {
        self
    }

+    /// Setter for whether to disable state cache.
+    pub const fn without_state_cache(mut self, disable_state_cache: bool) -> Self {
+        self.disable_state_cache = disable_state_cache;
+        self
+    }
+
    /// Setter for whether to disable parallel prewarming.
    pub const fn without_prewarming(mut self, disable_prewarming: bool) -> Self {
        self.disable_prewarming = disable_prewarming;
--- a/crates/engine/primitives/src/lib.rs
+++ b/crates/engine/primitives/src/lib.rs
@@ -61,8 +61,7 @@ pub trait EngineTypes:
                          + TryInto<Self::ExecutionPayloadEnvelopeV2>
                          + TryInto<Self::ExecutionPayloadEnvelopeV3>
                          + TryInto<Self::ExecutionPayloadEnvelopeV4>
-                          + TryInto<Self::ExecutionPayloadEnvelopeV5>
-                          + TryInto<Self::ExecutionPayloadEnvelopeV6>,
+                          + TryInto<Self::ExecutionPayloadEnvelopeV5>,
    > + DeserializeOwned
    + Serialize
 {
@@ -106,14 +105,6 @@ pub trait EngineTypes:
        + Send
        + Sync
        + 'static;
-    /// Execution Payload V6 envelope type.
-    type ExecutionPayloadEnvelopeV6: DeserializeOwned
-        + Serialize
-        + Clone
-        + Unpin
-        + Send
-        + Sync
-        + 'static;
 }

 /// Type that validates the payloads processed by the engine API.
--- a/crates/engine/tree/Cargo.toml
+++ b/crates/engine/tree/Cargo.toml
@@ -39,6 +39,7 @@ reth-trie.workspace = true
 alloy-evm.workspace = true
 alloy-consensus.workspace = true
 alloy-eips.workspace = true
+alloy-eip7928.workspace = true
 alloy-primitives.workspace = true
 alloy-rlp.workspace = true
 alloy-rpc-types-engine.workspace = true
--- a/crates/engine/tree/benches/channel_perf.rs
+++ b/crates/engine/tree/benches/channel_perf.rs
@@ -26,12 +26,10 @@ fn create_bench_state(num_accounts: usize) -> EvmState {
                nonce: 10,
                code_hash: B256::from_slice(&rng.random::<[u8; 32]>()),
                code: Default::default(),
-                storage_id: None,
            },
            storage,
            status: AccountStatus::empty(),
            transaction_id: 0,
-            ..Default::default()
        };

        let address = Address::with_last_byte(i as u8);
--- a/crates/engine/tree/benches/state_root_task.rs
+++ b/crates/engine/tree/benches/state_root_task.rs
@@ -62,7 +62,6 @@ fn create_bench_state_updates(params: &BenchParams) -> Vec<EvmState> {
                    storage: HashMap::default(),
                    status: AccountStatus::SelfDestructed,
                    transaction_id: 0,
-                    ..Default::default()
                }
            } else {
                RevmAccount {
@@ -71,7 +70,6 @@ fn create_bench_state_updates(params: &BenchParams) -> Vec<EvmState> {
                        nonce: rng.random::<u64>(),
                        code_hash: KECCAK_EMPTY,
                        code: Some(Default::default()),
-                        storage_id: None,
                    },
                    storage: (0..rng.random_range(0..=params.storage_slots_per_account))
                        .map(|_| {
@@ -87,7 +85,6 @@ fn create_bench_state_updates(params: &BenchParams) -> Vec<EvmState> {
                        .collect(),
                    status: AccountStatus::Touched,
                    transaction_id: 0,
-                    ..Default::default()
                }
            };

--- a/crates/engine/tree/src/tree/instrumented_state.rs
+++ b/crates/engine/tree/src/tree/instrumented_state.rs
@@ -22,7 +22,7 @@ const NANOS_PER_SEC: u32 = 1_000_000_000;

 /// An atomic version of [`Duration`], using an [`AtomicU64`] to store the total nanoseconds in the
 /// duration.
-#[derive(Default)]
+#[derive(Debug, Default)]
 pub(crate) struct AtomicDuration {
    /// The nanoseconds part of the duration
    ///
@@ -59,7 +59,8 @@ impl AtomicDuration {
 }

 /// A wrapper of a state provider and latency metrics.
-pub(crate) struct InstrumentedStateProvider<S> {
+#[derive(Debug)]
+pub struct InstrumentedStateProvider<S> {
    /// The state provider
    state_provider: S,

@@ -80,11 +81,12 @@ impl<S> InstrumentedStateProvider<S>
 where
    S: StateProvider,
 {
-    /// Creates a new [`InstrumentedStateProvider`] from a state provider
-    pub(crate) fn from_state_provider(state_provider: S) -> Self {
+    /// Creates a new [`InstrumentedStateProvider`] from a state provider with the provided label
+    /// for metrics.
+    pub fn from_state_provider(state_provider: S, source: &'static str) -> Self {
        Self {
            state_provider,
-            metrics: StateProviderMetrics::default(),
+            metrics: StateProviderMetrics::new_with_labels(&[("source", source)]),
            total_storage_fetch_latency: AtomicDuration::zero(),
            total_code_fetch_latency: AtomicDuration::zero(),
            total_account_fetch_latency: AtomicDuration::zero(),
@@ -134,6 +136,12 @@ impl<S> InstrumentedStateProvider<S> {
    }
 }

+impl<S> Drop for InstrumentedStateProvider<S> {
+    fn drop(&mut self) {
+        self.record_total_latency();
+    }
+}
+
 /// Metrics for the instrumented state provider
 #[derive(Metrics, Clone)]
 #[metrics(scope = "sync.state_provider")]
--- a/crates/engine/tree/src/tree/metrics.rs
+++ b/crates/engine/tree/src/tree/metrics.rs
@@ -477,7 +477,6 @@ mod tests {
                    receipts: vec![],
                    requests: Requests::default(),
                    gas_used: 1000,
-                    block_access_list: None,
                    blob_gas_used: 0,
                },
            ))
@@ -571,12 +570,10 @@ mod tests {
                        nonce: 10,
                        code_hash: B256::random(),
                        code: Default::default(),
-                        storage_id: None,
                    },
                    storage,
                    status: AccountStatus::default(),
                    transaction_id: 0,
-                    ..Default::default()
                },
            );
            state
--- a/crates/engine/tree/src/tree/mod.rs
+++ b/crates/engine/tree/src/tree/mod.rs
@@ -54,7 +54,7 @@ use tracing::*;
 mod block_buffer;
 mod cached_state;
 pub mod error;
-mod instrumented_state;
+pub mod instrumented_state;
 mod invalid_headers;
 mod metrics;
 mod payload_processor;
@@ -536,7 +536,7 @@ where
        //      null}` if the expected and the actual arrays don't match.
        //
        // This validation **MUST** be instantly run in all cases even during active sync process.
-        tracing::debug!("Payload received {:?}", payload);
+
        let num_hash = payload.num_hash();
        let engine_event = ConsensusEngineEvent::BlockReceived(num_hash);
        self.emit_event(EngineApiEvent::BeaconConsensus(engine_event));
@@ -545,7 +545,6 @@ where

        // Check for invalid ancestors
        if let Some(invalid) = self.find_invalid_ancestor(&payload) {
-            tracing::debug!(target: "engine::tree", ?invalid, "found invalid ancestor for payload");
            let status = self.handle_invalid_ancestor_payload(payload, invalid)?;
            return Ok(TreeOutcome::new(status));
        }
@@ -554,7 +553,6 @@ where
        self.metrics.block_validation.record_payload_validation(start.elapsed().as_secs_f64());

        let status = if self.backfill_sync_state.is_idle() {
-            tracing::debug!(target: "engine::tree", "inserting payload directly");
            self.try_insert_payload(payload)?
        } else {
            self.try_buffer_payload(payload)?
@@ -593,7 +591,7 @@ where
        let parent_hash = payload.parent_hash();
        let mut latest_valid_hash = None;

-        match self.insert_payload(payload.clone()) {
+        match self.insert_payload(payload) {
            Ok(status) => {
                let status = match status {
                    InsertPayloadOk::Inserted(BlockStatus::Valid) => {
@@ -615,10 +613,7 @@ where
                Ok(PayloadStatus::new(status, latest_valid_hash))
            }
            Err(error) => match error {
-                InsertPayloadError::Block(error) => {
-                    tracing::debug!("payload in new payload l 617 {:?}", payload);
-                    Ok(self.on_insert_block_error(error)?)
-                }
+                InsertPayloadError::Block(error) => Ok(self.on_insert_block_error(error)?),
                InsertPayloadError::Payload(error) => {
                    Ok(self.on_new_payload_error(error, num_hash, parent_hash)?)
                }
--- a/crates/engine/tree/src/tree/payload_processor/mod.rs
+++ b/crates/engine/tree/src/tree/payload_processor/mod.rs
@@ -106,6 +106,8 @@ where
    cross_block_cache_size: u64,
    /// Whether transactions should not be executed on prewarming task.
    disable_transaction_prewarming: bool,
+    /// Whether state cache should be disable
+    disable_state_cache: bool,
    /// Determines how to configure the evm for execution.
    evm_config: Evm,
    /// Whether precompile cache should be disabled.
@@ -149,6 +151,7 @@ where
            cross_block_cache_size: config.cross_block_cache_size(),
            disable_transaction_prewarming: config.disable_prewarming(),
            evm_config,
+            disable_state_cache: config.disable_state_cache(),
            precompile_cache_disabled: config.precompile_cache_disabled(),
            precompile_cache_map,
            sparse_state_trie: Arc::default(),
@@ -382,9 +385,15 @@ where
            transactions = mpsc::channel().1;
        }

-        let saved_cache = self.cache_for(env.parent_hash);
-        let cache = saved_cache.cache().clone();
-        let cache_metrics = saved_cache.metrics().clone();
+        let (saved_cache, cache, cache_metrics) = if self.disable_state_cache {
+            (None, None, None)
+        } else {
+            let saved_cache = self.cache_for(env.parent_hash);
+            let cache = saved_cache.cache().clone();
+            let cache_metrics = saved_cache.metrics().clone();
+            (Some(saved_cache), Some(cache), Some(cache_metrics))
+        };
+
        // configure prewarming
        let prewarm_ctx = PrewarmContext {
            env,
@@ -596,12 +605,12 @@ impl<Tx, Err> PayloadHandle<Tx, Err> {
    }

    /// Returns a clone of the caches used by prewarming
-    pub(super) fn caches(&self) -> StateExecutionCache {
+    pub(super) fn caches(&self) -> Option<StateExecutionCache> {
        self.prewarm_handle.cache.clone()
    }

    /// Returns a clone of the cache metrics used by prewarming
-    pub(super) fn cache_metrics(&self) -> CachedStateMetrics {
+    pub(super) fn cache_metrics(&self) -> Option<CachedStateMetrics> {
        self.prewarm_handle.cache_metrics.clone()
    }

@@ -631,9 +640,9 @@ impl<Tx, Err> PayloadHandle<Tx, Err> {
 #[derive(Debug)]
 pub(crate) struct CacheTaskHandle {
    /// The shared cache the task operates with.
-    cache: StateExecutionCache,
+    cache: Option<StateExecutionCache>,
    /// Metrics for the caches
-    cache_metrics: CachedStateMetrics,
+    cache_metrics: Option<CachedStateMetrics>,
    /// Channel to the spawned prewarm task if any
    to_prewarm_task: Option<std::sync::mpsc::Sender<PrewarmTaskEvent>>,
 }
@@ -972,12 +981,10 @@ mod tests {
                        nonce: rng.random::<u64>(),
                        code_hash: KECCAK_EMPTY,
                        code: Some(Default::default()),
-                        storage_id: None,
                    },
                    storage,
                    status: AccountStatus::Touched,
                    transaction_id: 0,
-                    ..Default::default()
                };

                state_update.insert(address, account);
--- a/crates/engine/tree/src/tree/payload_processor/multiproof.rs
+++ b/crates/engine/tree/src/tree/payload_processor/multiproof.rs
@@ -354,7 +354,7 @@ impl MultiproofManager {
    fn dispatch(&self, input: PendingMultiproofTask) {
        // If there are no proof targets, we can just send an empty multiproof back immediately
        if input.proof_targets_is_empty() {
-            debug!(
+            trace!(
                sequence_number = input.proof_sequence_number(),
                "No proof targets, sending empty multiproof back immediately"
            );
@@ -1045,7 +1045,7 @@ impl MultiProofTask {
                let storage_targets =
                    merged_targets.values().map(|slots| slots.len()).sum::<usize>();
                batch_metrics.prefetch_proofs_requested += self.on_prefetch_proof(merged_targets);
-                debug!(
+                trace!(
                    target: "engine::tree::payload_processor::multiproof",
                    account_targets,
                    storage_targets,
@@ -1135,7 +1135,7 @@ impl MultiProofTask {
                let batch_len = merged_update.len();
                batch_metrics.state_update_proofs_requested +=
                    self.on_state_update(batch_source, merged_update);
-                debug!(
+                trace!(
                    target: "engine::tree::payload_processor::multiproof",
                    ?batch_source,
                    len = batch_len,
@@ -1271,7 +1271,7 @@ impl MultiProofTask {
                            // Convert ProofResultMessage to SparseTrieUpdate
                            match proof_result.result {
                                Ok(proof_result_data) => {
-                                    debug!(
+                                    trace!(
                                        target: "engine::tree::payload_processor::multiproof",
                                        sequence = proof_result.sequence_number,
                                        total_proofs = batch_metrics.proofs_processed,
@@ -2083,9 +2083,7 @@ mod tests {
                    nonce: 1,
                    code_hash: Default::default(),
                    code: Default::default(),
-                    storage_id: Some(0),
                },
-                original_info: Default::default(),
                transaction_id: Default::default(),
                storage: Default::default(),
                status: revm_state::AccountStatus::Touched,
@@ -2101,9 +2099,7 @@ mod tests {
                    nonce: 2,
                    code_hash: Default::default(),
                    code: Default::default(),
-                    storage_id: Some(0),
                },
-                original_info: Default::default(),
                transaction_id: Default::default(),
                storage: Default::default(),
                status: revm_state::AccountStatus::Touched,
@@ -2163,9 +2159,7 @@ mod tests {
                        nonce: 1,
                        code_hash: Default::default(),
                        code: Default::default(),
-                        storage_id: Some(0),
                    },
-                    original_info: Default::default(),
                    transaction_id: Default::default(),
                    storage: Default::default(),
                    status: revm_state::AccountStatus::Touched,
@@ -2291,9 +2285,7 @@ mod tests {
                        nonce: 1,
                        code_hash: Default::default(),
                        code: Default::default(),
-                        storage_id: Some(0),
                    },
-                    original_info: Default::default(),
                    transaction_id: Default::default(),
                    storage: Default::default(),
                    status: revm_state::AccountStatus::Touched,
@@ -2418,9 +2410,7 @@ mod tests {
                    nonce: 1,
                    code_hash: Default::default(),
                    code: Default::default(),
-                    storage_id: Some(0),
                },
-                original_info: Default::default(),
                transaction_id: Default::default(),
                storage: Default::default(),
                status: revm_state::AccountStatus::Touched,
@@ -2437,9 +2427,7 @@ mod tests {
                    nonce: 2,
                    code_hash: Default::default(),
                    code: Default::default(),
-                    storage_id: Some(0),
                },
-                original_info: Default::default(),
                transaction_id: Default::default(),
                storage: Default::default(),
                status: revm_state::AccountStatus::Touched,
@@ -2540,9 +2528,7 @@ mod tests {
                    nonce: 1,
                    code_hash: Default::default(),
                    code: Default::default(),
-                    storage_id: Some(0),
                },
-                original_info: Default::default(),
                transaction_id: Default::default(),
                storage: Default::default(),
                status: revm_state::AccountStatus::Touched,
@@ -2625,9 +2611,7 @@ mod tests {
                        nonce: 1,
                        code_hash: Default::default(),
                        code: Default::default(),
-                        storage_id: Some(0),
                    },
-                    original_info: Default::default(),
                    transaction_id: Default::default(),
                    storage: Default::default(),
                    status: revm_state::AccountStatus::Touched,
--- a/crates/engine/tree/src/tree/payload_processor/prewarm.rs
+++ b/crates/engine/tree/src/tree/payload_processor/prewarm.rs
@@ -29,7 +29,7 @@ use metrics::{Counter, Gauge, Histogram};
 use reth_evm::{execute::ExecutableTxFor, ConfigureEvm, Evm, EvmFor, SpecFor};
 use reth_metrics::Metrics;
 use reth_primitives_traits::NodePrimitives;
-use reth_provider::{BlockReader, StateProviderFactory, StateReader};
+use reth_provider::{BlockReader, StateProviderBox, StateProviderFactory, StateReader};
 use reth_revm::{database::StateProviderDatabase, db::BundleState, state::EvmState};
 use reth_trie::MultiProofTargets;
 use std::{
@@ -255,31 +255,35 @@ where
            self;
        let hash = env.hash;

-        debug!(target: "engine::caching", parent_hash=?hash, "Updating execution cache");
-        // Perform all cache operations atomically under the lock
-        execution_cache.update_with_guard(|cached| {
-            // consumes the `SavedCache` held by the prewarming task, which releases its usage guard
-            let (caches, cache_metrics) = saved_cache.split();
-            let new_cache = SavedCache::new(hash, caches, cache_metrics);
+        if let Some(saved_cache) = saved_cache {
+            debug!(target: "engine::caching", parent_hash=?hash, "Updating execution cache");
+            // Perform all cache operations atomically under the lock
+            execution_cache.update_with_guard(|cached| {
+                // consumes the `SavedCache` held by the prewarming task, which releases its usage
+                // guard
+                let (caches, cache_metrics) = saved_cache.split();
+                let new_cache = SavedCache::new(hash, caches, cache_metrics);

-            // Insert state into cache while holding the lock
-            if new_cache.cache().insert_state(&state).is_err() {
-                // Clear the cache on error to prevent having a polluted cache
-                *cached = None;
-                debug!(target: "engine::caching", "cleared execution cache on update error");
-                return;
-            }
+                // Insert state into cache while holding the lock
+                if new_cache.cache().insert_state(&state).is_err() {
+                    // Clear the cache on error to prevent having a polluted cache
+                    *cached = None;
+                    debug!(target: "engine::caching", "cleared execution cache on update error");
+                    return;
+                }

-            new_cache.update_metrics();
+                new_cache.update_metrics();

-            // Replace the shared cache with the new one; the previous cache (if any) is dropped.
-            *cached = Some(new_cache);
-        });
+                // Replace the shared cache with the new one; the previous cache (if any) is
+                // dropped.
+                *cached = Some(new_cache);
+            });

-        let elapsed = start.elapsed();
-        debug!(target: "engine::caching", parent_hash=?hash, elapsed=?elapsed, "Updated execution cache");
+            let elapsed = start.elapsed();
+            debug!(target: "engine::caching", parent_hash=?hash, elapsed=?elapsed, "Updated execution cache");

-        metrics.cache_saving_duration.set(elapsed.as_secs_f64());
+            metrics.cache_saving_duration.set(elapsed.as_secs_f64());
+        }
    }

    /// Executes the task.
@@ -356,7 +360,7 @@ where
 {
    pub(super) env: ExecutionEnv<Evm>,
    pub(super) evm_config: Evm,
-    pub(super) saved_cache: SavedCache,
+    pub(super) saved_cache: Option<SavedCache>,
    /// Provider to obtain the state
    pub(super) provider: StateProviderBuilder<N, P>,
    pub(super) metrics: PrewarmMetrics,
@@ -400,10 +404,13 @@ where
        };

        // Use the caches to create a new provider with caching
-        let caches = saved_cache.cache().clone();
-        let cache_metrics = saved_cache.metrics().clone();
-        let state_provider =
-            CachedStateProvider::new_with_caches(state_provider, caches, cache_metrics);
+        let state_provider: StateProviderBox = if let Some(saved_cache) = saved_cache {
+            let caches = saved_cache.cache().clone();
+            let cache_metrics = saved_cache.metrics().clone();
+            Box::new(CachedStateProvider::new_with_caches(state_provider, caches, cache_metrics))
+        } else {
+            state_provider
+        };

        let state_provider = StateProviderDatabase::new(state_provider);

--- a/crates/engine/tree/src/tree/payload_validator.rs
+++ b/crates/engine/tree/src/tree/payload_validator.rs
@@ -11,6 +11,7 @@ use crate::tree::{
    StateProviderDatabase, TreeConfig,
 };
 use alloy_consensus::transaction::Either;
+use alloy_eip7928::BlockAccessList;
 use alloy_eips::{eip1898::BlockWithParent, NumHash};
 use alloy_evm::Evm;
 use alloy_primitives::B256;
@@ -368,7 +369,7 @@ where
            )
            .into())
        };
-        let state_provider = ensure_ok!(provider_builder.build());
+        let mut state_provider = ensure_ok!(provider_builder.build());
        drop(_enter);

        // fetch parent block
@@ -411,18 +412,19 @@ where

        // Use cached state provider before executing, used in execution after prewarming threads
        // complete
-        let state_provider = CachedStateProvider::new_with_caches(
-            state_provider,
-            handle.caches(),
-            handle.cache_metrics(),
-        );
+        if let Some((caches, cache_metrics)) = handle.caches().zip(handle.cache_metrics()) {
+            state_provider = Box::new(CachedStateProvider::new_with_caches(
+                state_provider,
+                caches,
+                cache_metrics,
+            ));
+        };

        // Execute the block and handle any execution errors
        let (output, senders) = match if self.config.state_provider_metrics() {
-            let state_provider = InstrumentedStateProvider::from_state_provider(&state_provider);
-            let result = self.execute_block(&state_provider, env, &input, &mut handle);
-            state_provider.record_total_latency();
-            result
+            let state_provider =
+                InstrumentedStateProvider::from_state_provider(&state_provider, "engine");
+            self.execute_block(&state_provider, env, &input, &mut handle)
        } else {
            self.execute_block(&state_provider, env, &input, &mut handle)
        } {
@@ -602,14 +604,12 @@ where
        Evm: ConfigureEngineEvm<T::ExecutionData, Primitives = N>,
    {
        debug!(target: "engine::tree::payload_validator", "Executing block");
+
        let mut db = State::builder()
            .with_database(StateProviderDatabase::new(&state_provider))
            .with_bundle_update()
-            .with_bal_builder() //TODO
            .without_state_clear()
            .build();
-        db.bal_state.bal_index = 0;
-        db.bal_state.bal_builder = Some(revm::state::bal::Bal::new());

        let evm = self.evm_config.evm_with_env(&mut db, env.evm_env.clone());
        let ctx =
@@ -1245,4 +1245,10 @@ impl<T: PayloadTypes> BlockOrPayload<T> {
            Self::Block(_) => "block",
        }
    }
+
+    /// Returns the block access list if available.
+    pub const fn block_access_list(&self) -> Option<Result<BlockAccessList, alloy_rlp::Error>> {
+        // TODO decode and return `BlockAccessList`
+        None
+    }
 }
--- a/crates/engine/tree/src/tree/precompile_cache.rs
+++ b/crates/engine/tree/src/tree/precompile_cache.rs
@@ -276,9 +276,9 @@ mod tests {
        let dyn_precompile: DynPrecompile = (|_input: PrecompileInput<'_>| -> PrecompileResult {
            Ok(PrecompileOutput {
                gas_used: 0,
+                gas_refunded: 0,
                bytes: Bytes::default(),
                reverted: false,
-                gas_refunded: 0,
            })
        })
        .into();
@@ -288,9 +288,9 @@ mod tests {

        let output = PrecompileOutput {
            gas_used: 50,
+            gas_refunded: 0,
            bytes: alloy_primitives::Bytes::copy_from_slice(b"cached_result"),
            reverted: false,
-            gas_refunded: 0,
        };

        let key = CacheKey::new(SpecId::PRAGUE, b"test_input".into());
@@ -321,9 +321,9 @@ mod tests {

                Ok(PrecompileOutput {
                    gas_used: 5000,
+                    gas_refunded: 0,
                    bytes: alloy_primitives::Bytes::copy_from_slice(b"output_from_precompile_1"),
                    reverted: false,
-                    gas_refunded: 0,
                })
            }
        })
@@ -336,9 +336,9 @@ mod tests {

                Ok(PrecompileOutput {
                    gas_used: 7000,
+                    gas_refunded: 0,
                    bytes: alloy_primitives::Bytes::copy_from_slice(b"output_from_precompile_2"),
                    reverted: false,
-                    gas_refunded: 0,
                })
            }
        })
--- a/crates/engine/util/Cargo.toml
+++ b/crates/engine/util/Cargo.toml
@@ -27,9 +27,6 @@ reth-payload-primitives.workspace = true
 alloy-rpc-types-engine.workspace = true
 alloy-consensus.workspace = true

-# revm
-revm.workspace = true
-
 # async
 tokio = { workspace = true, default-features = false }
 tokio-util.workspace = true
--- a/crates/engine/util/src/reorg.rs
+++ b/crates/engine/util/src/reorg.rs
@@ -283,12 +283,8 @@ where
    let mut state = State::builder()
        .with_database_ref(StateProviderDatabase::new(&state_provider))
        .with_bundle_update()
-        .with_bal_builder()
        .build();

-    state.bal_state.bal_index = 0;
-    state.bal_state.bal_builder = Some(revm::state::bal::Bal::new());
-
    let ctx = evm_config.context_for_block(&reorg_target).map_err(RethError::other)?;
    let evm = evm_config.evm_for_block(&mut state, &reorg_target).map_err(RethError::other)?;
    let mut builder = evm_config.create_block_builder(evm, &reorg_target_parent, ctx);
--- a/crates/era/src/era1/types/execution.rs
+++ b/crates/era/src/era1/types/execution.rs
@@ -39,7 +39,6 @@
 //!     transactions: vec![Bytes::from(vec![1, 2, 3])],
 //!     ommers: vec![],
 //!     withdrawals: None,
-//!     block_access_list: None,
 //! };
 //! // Compress the body: rlp encoding and snappy compression
 //! let compressed_body = CompressedBody::from_body(&body)?;
@@ -582,12 +581,8 @@ mod tests {

    #[test]
    fn test_block_body_conversion() {
-        let block_body: BlockBody<Bytes> = BlockBody {
-            transactions: vec![],
-            ommers: vec![],
-            withdrawals: None,
-            block_access_list: None,
-        };
+        let block_body: BlockBody<Bytes> =
+            BlockBody { transactions: vec![], ommers: vec![], withdrawals: None };

        let compressed_body = CompressedBody::from_body(&block_body).unwrap();

@@ -642,8 +637,7 @@ mod tests {

        let withdrawals = Some(Withdrawals(vec![]));

-        let block_body =
-            BlockBody { transactions, ommers: vec![], withdrawals, block_access_list: None };
+        let block_body = BlockBody { transactions, ommers: vec![], withdrawals };

        let block = Block::new(header, block_body);

--- a/crates/era/src/test_utils.rs
+++ b/crates/era/src/test_utils.rs
@@ -34,7 +34,6 @@ pub(crate) fn create_header() -> Header {
        excess_blob_gas: None,
        parent_beacon_block_root: None,
        requests_hash: None,
-        block_access_list_hash: None,
    }
 }

@@ -139,7 +138,6 @@ pub(crate) fn create_test_block_with_compressed_data(number: BlockNumber) -> Blo
        excess_blob_gas: None,
        parent_beacon_block_root: None,
        requests_hash: None,
-        block_access_list_hash: None,
    };

    // Create test body
@@ -147,7 +145,6 @@ pub(crate) fn create_test_block_with_compressed_data(number: BlockNumber) -> Blo
        transactions: vec![Bytes::from(vec![(number % 256) as u8; 10])],
        ommers: vec![],
        withdrawals: Some(Withdrawals(vec![])),
-        block_access_list: None,
    };

    // Create test receipt list with bloom
--- a/crates/ethereum/consensus/Cargo.toml
+++ b/crates/ethereum/consensus/Cargo.toml
@@ -22,7 +22,6 @@ reth-consensus.workspace = true
 alloy-eips.workspace = true
 alloy-primitives.workspace = true
 alloy-consensus.workspace = true
-alloy-rlp.workspace = true

 tracing.workspace = true

@@ -39,7 +38,6 @@ std = [
    "reth-execution-types/std",
    "reth-primitives-traits/std",
    "tracing/std",
-    "alloy-rlp/std",
 ]

 [dev-dependencies]
--- a/crates/ethereum/consensus/src/lib.rs
+++ b/crates/ethereum/consensus/src/lib.rs
@@ -75,13 +75,7 @@ where
        block: &RecoveredBlock<N::Block>,
        result: &BlockExecutionResult<N::Receipt>,
    ) -> Result<(), ConsensusError> {
-        validate_block_post_execution(
-            block,
-            &self.chain_spec,
-            &result.receipts,
-            &result.requests,
-            &result.block_access_list,
-        )
+        validate_block_post_execution(block, &self.chain_spec, &result.receipts, &result.requests)
    }
 }

@@ -182,15 +176,6 @@ where
        } else if header.requests_hash().is_some() {
            return Err(ConsensusError::RequestsHashUnexpected)
        }
-        // if self.chain_spec.is_amsterdam_active_at_timestamp(header.timestamp()) &&
-        //     header.block_access_list_hash().is_none()
-        // {
-        //     return Err(ConsensusError::BlockAccessListHashMissing)
-        // } else if !self.chain_spec.is_amsterdam_active_at_timestamp(header.timestamp()) &&
-        //     header.block_access_list_hash().is_some()
-        // {
-        //     return Err(ConsensusError::BlockAccessListHashUnexpected)
-        // }

        Ok(())
    }
--- a/crates/ethereum/consensus/src/validation.rs
+++ b/crates/ethereum/consensus/src/validation.rs
@@ -1,11 +1,11 @@
 use alloc::vec::Vec;
 use alloy_consensus::{proofs::calculate_receipt_root, BlockHeader, TxReceipt};
-use alloy_eips::{eip7685::Requests, eip7928::BlockAccessList, Encodable2718};
+use alloy_eips::{eip7685::Requests, Encodable2718};
 use alloy_primitives::{Bloom, Bytes, B256};
 use reth_chainspec::EthereumHardforks;
 use reth_consensus::ConsensusError;
 use reth_primitives_traits::{
-    receipt::gas_spent_by_transactions, Block, BlockBody, GotExpected, Receipt, RecoveredBlock,
+    receipt::gas_spent_by_transactions, Block, GotExpected, Receipt, RecoveredBlock,
 };

 /// Validate a block with regard to execution results:
@@ -17,7 +17,6 @@ pub fn validate_block_post_execution<B, R, ChainSpec>(
    chain_spec: &ChainSpec,
    receipts: &[R],
    requests: &Requests,
-    block_access_list: &Option<BlockAccessList>,
 ) -> Result<(), ConsensusError>
 where
    B: Block,
@@ -66,33 +65,6 @@ where
        }
    }

-    // Validate bal hash matches the calculated hash
-    if chain_spec.is_amsterdam_active_at_timestamp(block.header().timestamp()) {
-        let Some(header_block_access_list_hash) = block.header().block_access_list_hash() else {
-            return Err(ConsensusError::BlockAccessListHashMissing)
-        };
-        if let Some(bal) = block_access_list {
-            let bal_hash = alloy_primitives::keccak256(alloy_rlp::encode(bal));
-            let block_bal = block.body().block_access_list();
-            tracing::debug!("Block Bal :{:?}", block_bal);
-            if let Some(body_bal) = block_bal {
-                if body_bal.len() == 0 {
-                    tracing::debug!("Hit Empty BAL : Block is {:?}", block);
-                }
-                verify_bal(body_bal, bal)?;
-            }
-
-            if bal_hash != header_block_access_list_hash {
-                tracing::debug!(
-                    ?bal_hash,
-                    ?header_block_access_list_hash,
-                    "block access list hash mismatch"
-                );
-                return Err(ConsensusError::InvalidBalHash);
-            }
-        }
-    }
-
    Ok(())
 }

@@ -143,47 +115,6 @@ fn compare_receipts_root_and_logs_bloom(
    Ok(())
 }

-/// Validates that the block access list in the body matches the expected block access list.
-fn verify_bal(
-    body_bal: &BlockAccessList,
-    expected_bal: &BlockAccessList,
-) -> Result<(), ConsensusError> {
-    if body_bal == expected_bal {
-        return Ok(());
-    }
-
-    // Extract addresses
-    let body_addrs: Vec<_> = body_bal.iter().map(|a| a.address).collect();
-    let expected_addrs: Vec<_> = expected_bal.iter().map(|a| a.address).collect();
-
-    // Missing accounts (expected but not found in body)
-    for addr in &expected_addrs {
-        if !body_addrs.contains(addr) {
-            tracing::debug!("Missing acc : computed bal {:?},body bal{:?}", expected_bal, body_bal);
-            tracing::debug!("Missing Address: {:?}", addr);
-            return Err(ConsensusError::InvalidBalMissingAccount);
-        }
-    }
-
-    // Extra accounts (body has accounts not in expected)
-    for addr in &body_addrs {
-        if !expected_addrs.contains(addr) {
-            tracing::debug!("Extra acc : computed bal {:?},body bal{:?}", expected_bal, body_bal);
-            tracing::debug!("Extra Address: {:?}", addr);
-            return Err(ConsensusError::InvalidBalExtraAccount);
-        }
-    }
-
-    tracing::debug!(
-        ?expected_bal,
-        ?body_bal,
-        "block access list in body does not match the provided block access list"
-    );
-
-    // Fallback: mismatched access lists
-    Err(ConsensusError::InvalidBlockAccessList)
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/crates/ethereum/engine-primitives/src/lib.rs
+++ b/crates/ethereum/engine-primitives/src/lib.rs
@@ -17,9 +17,7 @@ pub use payload::{payload_id, BlobSidecars, EthBuiltPayload, EthPayloadBuilderAt
 mod error;
 pub use error::*;

-use alloy_rpc_types_engine::{
-    ExecutionData, ExecutionPayload, ExecutionPayloadEnvelopeV5, ExecutionPayloadEnvelopeV6,
-};
+use alloy_rpc_types_engine::{ExecutionData, ExecutionPayload, ExecutionPayloadEnvelopeV5};
 pub use alloy_rpc_types_engine::{
    ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV4,
    ExecutionPayloadV1, PayloadAttributes as EthPayloadAttributes,
@@ -68,15 +66,13 @@ where
        + TryInto<ExecutionPayloadEnvelopeV2>
        + TryInto<ExecutionPayloadEnvelopeV3>
        + TryInto<ExecutionPayloadEnvelopeV4>
-        + TryInto<ExecutionPayloadEnvelopeV5>
-        + TryInto<ExecutionPayloadEnvelopeV6>,
+        + TryInto<ExecutionPayloadEnvelopeV5>,
 {
    type ExecutionPayloadEnvelopeV1 = ExecutionPayloadV1;
    type ExecutionPayloadEnvelopeV2 = ExecutionPayloadEnvelopeV2;
    type ExecutionPayloadEnvelopeV3 = ExecutionPayloadEnvelopeV3;
    type ExecutionPayloadEnvelopeV4 = ExecutionPayloadEnvelopeV4;
    type ExecutionPayloadEnvelopeV5 = ExecutionPayloadEnvelopeV5;
-    type ExecutionPayloadEnvelopeV6 = ExecutionPayloadEnvelopeV6;
 }

 /// A default payload type for [`EthEngineTypes`]
--- a/crates/ethereum/engine-primitives/src/payload.rs
+++ b/crates/ethereum/engine-primitives/src/payload.rs
@@ -11,9 +11,8 @@ use alloy_primitives::{Address, B256, U256};
 use alloy_rlp::Encodable;
 use alloy_rpc_types_engine::{
    BlobsBundleV1, BlobsBundleV2, ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3,
-    ExecutionPayloadEnvelopeV4, ExecutionPayloadEnvelopeV5, ExecutionPayloadEnvelopeV6,
-    ExecutionPayloadFieldV2, ExecutionPayloadV1, ExecutionPayloadV3, ExecutionPayloadV4,
-    PayloadAttributes, PayloadId,
+    ExecutionPayloadEnvelopeV4, ExecutionPayloadEnvelopeV5, ExecutionPayloadFieldV2,
+    ExecutionPayloadV1, ExecutionPayloadV3, PayloadAttributes, PayloadId,
 };
 use core::convert::Infallible;
 use reth_ethereum_primitives::EthPrimitives;
@@ -159,38 +158,6 @@ impl EthBuiltPayload {
            execution_requests: requests.unwrap_or_default(),
        })
    }
-
-    /// Try converting built payload into [`ExecutionPayloadEnvelopeV6`].
-    pub fn try_into_v6(self) -> Result<ExecutionPayloadEnvelopeV6, BuiltPayloadConversionError> {
-        let Self { block, fees, sidecars, requests, .. } = self;
-
-        let blobs_bundle = match sidecars {
-            BlobSidecars::Empty => BlobsBundleV2::empty(),
-            BlobSidecars::Eip7594(sidecars) => BlobsBundleV2::from(sidecars),
-            BlobSidecars::Eip4844(_) => {
-                return Err(BuiltPayloadConversionError::UnexpectedEip4844Sidecars)
-            }
-        };
-
-        Ok(ExecutionPayloadEnvelopeV6 {
-            execution_payload: ExecutionPayloadV4::from_block_unchecked(
-                block.hash(),
-                &Arc::unwrap_or_clone(block).into_block(),
-            ),
-            block_value: fees,
-            // From the engine API spec:
-            //
-            // > Client software **MAY** use any heuristics to decide whether to set
-            // `shouldOverrideBuilder` flag or not. If client software does not implement any
-            // heuristic this flag **SHOULD** be set to `false`.
-            //
-            // Spec:
-            // <https://github.com/ethereum/execution-apis/blob/fe8e13c288c592ec154ce25c534e26cb7ce0530d/src/engine/cancun.md#specification-2>
-            should_override_builder: false,
-            blobs_bundle,
-            execution_requests: requests.unwrap_or_default(),
-        })
-    }
 }

 impl<N: NodePrimitives> BuiltPayload for EthBuiltPayload<N> {
@@ -258,14 +225,6 @@ impl TryFrom<EthBuiltPayload> for ExecutionPayloadEnvelopeV5 {
    }
 }

-impl TryFrom<EthBuiltPayload> for ExecutionPayloadEnvelopeV6 {
-    type Error = BuiltPayloadConversionError;
-
-    fn try_from(value: EthBuiltPayload) -> Result<Self, Self::Error> {
-        value.try_into_v6()
-    }
-}
-
 /// An enum representing blob transaction sidecars belonging to [`EthBuiltPayload`].
 #[derive(Clone, Default, Debug)]
 pub enum BlobSidecars {
--- a/crates/ethereum/evm/Cargo.toml
+++ b/crates/ethereum/evm/Cargo.toml
@@ -27,7 +27,6 @@ alloy-eips.workspace = true
 alloy-evm.workspace = true
 alloy-consensus.workspace = true
 alloy-rpc-types-engine.workspace = true
-alloy-rlp.workspace = true

 # Misc
 parking_lot = { workspace = true, optional = true }
@@ -58,7 +57,6 @@ std = [
    "derive_more?/std",
    "alloy-rpc-types-engine/std",
    "reth-storage-errors/std",
-    "alloy-rlp/std",
 ]
 test-utils = [
    "dep:parking_lot",
--- a/crates/ethereum/evm/src/build.rs
+++ b/crates/ethereum/evm/src/build.rs
@@ -5,7 +5,6 @@ use alloy_consensus::{
 };
 use alloy_eips::merge::BEACON_NONCE;
 use alloy_evm::{block::BlockExecutorFactory, eth::EthBlockExecutionCtx};
-use alloy_primitives::Bytes;
 use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_evm::execute::{BlockAssembler, BlockAssemblerInput, BlockExecutionError};
 use reth_execution_types::BlockExecutionResult;
@@ -17,14 +16,12 @@ use revm::context::Block as _;
 pub struct EthBlockAssembler<ChainSpec = reth_chainspec::ChainSpec> {
    /// The chainspec.
    pub chain_spec: Arc<ChainSpec>,
-    /// Extra data to use for the blocks.
-    pub extra_data: Bytes,
 }

 impl<ChainSpec> EthBlockAssembler<ChainSpec> {
    /// Creates a new [`EthBlockAssembler`].
-    pub fn new(chain_spec: Arc<ChainSpec>) -> Self {
-        Self { chain_spec, extra_data: Default::default() }
+    pub const fn new(chain_spec: Arc<ChainSpec>) -> Self {
+        Self { chain_spec }
    }
 }

@@ -48,8 +45,7 @@ where
            execution_ctx: ctx,
            parent,
            transactions,
-            output:
-                BlockExecutionResult { receipts, requests, gas_used, blob_gas_used, block_access_list },
+            output: BlockExecutionResult { receipts, requests, gas_used, blob_gas_used },
            state_root,
            ..
        } = input;
@@ -94,18 +90,6 @@ where
            };
        }

-        let (built_block_access_list, block_access_list_hash) =
-            if self.chain_spec.is_amsterdam_active_at_timestamp(timestamp) {
-                if let Some(bal) = block_access_list {
-                    let hash = alloy_primitives::keccak256(alloy_rlp::encode(bal));
-                    (Some(bal), Some(hash))
-                } else {
-                    (None, None)
-                }
-            } else {
-                (None, None)
-            };
-
        let header = Header {
            parent_hash: ctx.parent_hash,
            ommers_hash: EMPTY_OMMER_ROOT_HASH,
@@ -123,22 +107,16 @@ where
            gas_limit: evm_env.block_env.gas_limit(),
            difficulty: evm_env.block_env.difficulty(),
            gas_used: *gas_used,
-            extra_data: self.extra_data.clone(),
+            extra_data: ctx.extra_data,
            parent_beacon_block_root: ctx.parent_beacon_block_root,
            blob_gas_used: block_blob_gas_used,
            excess_blob_gas,
            requests_hash,
-            block_access_list_hash,
        };

        Ok(Block {
            header,
-            body: BlockBody {
-                transactions,
-                ommers: Default::default(),
-                withdrawals,
-                block_access_list: built_block_access_list.cloned(),
-            },
+            body: BlockBody { transactions, ommers: Default::default(), withdrawals },
        })
    }
 }
--- a/crates/ethereum/evm/src/lib.rs
+++ b/crates/ethereum/evm/src/lib.rs
@@ -116,12 +116,6 @@ impl<ChainSpec, EvmFactory> EthEvmConfig<ChainSpec, EvmFactory> {
    pub const fn chain_spec(&self) -> &Arc<ChainSpec> {
        self.executor_factory.spec()
    }
-
-    /// Sets the extra data for the block assembler.
-    pub fn with_extra_data(mut self, extra_data: Bytes) -> Self {
-        self.block_assembler.extra_data = extra_data;
-        self
-    }
 }

 impl<ChainSpec, EvmF> ConfigureEvm for EthEvmConfig<ChainSpec, EvmF>
@@ -193,6 +187,7 @@ where
            parent_beacon_block_root: block.header().parent_beacon_block_root,
            ommers: &block.body().ommers,
            withdrawals: block.body().withdrawals.as_ref().map(Cow::Borrowed),
+            extra_data: block.header().extra_data.clone(),
        })
    }

@@ -206,6 +201,7 @@ where
            parent_beacon_block_root: attributes.parent_beacon_block_root,
            ommers: &[],
            withdrawals: attributes.withdrawals.map(Cow::Owned),
+            extra_data: attributes.extra_data,
        })
    }
 }
@@ -282,6 +278,7 @@ where
            parent_beacon_block_root: payload.sidecar.parent_beacon_block_root(),
            ommers: &[],
            withdrawals: payload.payload.withdrawals().map(|w| Cow::Owned(w.clone().into())),
+            extra_data: payload.payload.as_v1().extra_data.clone(),
        })
    }

--- a/crates/ethereum/evm/src/test_utils.rs
+++ b/crates/ethereum/evm/src/test_utils.rs
@@ -2,7 +2,7 @@ use crate::EthEvmConfig;
 use alloc::{boxed::Box, sync::Arc, vec, vec::Vec};
 use alloy_consensus::Header;
 use alloy_eips::eip7685::Requests;
-use alloy_evm::{block::StateDB, precompiles::PrecompilesMap};
+use alloy_evm::precompiles::PrecompilesMap;
 use alloy_primitives::Bytes;
 use alloy_rpc_types_engine::ExecutionData;
 use parking_lot::Mutex;
@@ -19,6 +19,7 @@ use reth_execution_types::{BlockExecutionResult, ExecutionOutcome};
 use reth_primitives_traits::{BlockTy, SealedBlock, SealedHeader};
 use revm::{
    context::result::{ExecutionResult, Output, ResultAndState, SuccessReason},
+    database::State,
    Inspector,
 };

@@ -57,12 +58,12 @@ impl BlockExecutorFactory for MockEvmConfig {

    fn create_executor<'a, DB, I>(
        &'a self,
-        evm: EthEvm<DB, I, PrecompilesMap>,
+        evm: EthEvm<&'a mut State<DB>, I, PrecompilesMap>,
        _ctx: Self::ExecutionCtx<'a>,
    ) -> impl BlockExecutorFor<'a, Self, DB, I>
    where
-        DB: StateDB + Database + 'a,
-        I: Inspector<<Self::EvmFactory as EvmFactory>::Context<DB>> + 'a,
+        DB: Database + 'a,
+        I: Inspector<<Self::EvmFactory as EvmFactory>::Context<&'a mut State<DB>>> + 'a,
    {
        MockExecutor { result: self.exec_results.lock().pop().unwrap(), evm, hook: None }
    }
@@ -70,17 +71,17 @@ impl BlockExecutorFactory for MockEvmConfig {

 /// Mock executor that returns a fixed execution result.
 #[derive(derive_more::Debug)]
-pub struct MockExecutor<DB: Database, I> {
+pub struct MockExecutor<'a, DB: Database, I> {
    result: ExecutionOutcome,
-    evm: EthEvm<DB, I, PrecompilesMap>,
+    evm: EthEvm<&'a mut State<DB>, I, PrecompilesMap>,
    #[debug(skip)]
    hook: Option<Box<dyn reth_evm::OnStateHook>>,
 }

-impl<DB: StateDB + Database, I: Inspector<EthEvmContext<DB>>> BlockExecutor
-    for MockExecutor<DB, I>
+impl<'a, DB: Database, I: Inspector<EthEvmContext<&'a mut State<DB>>>> BlockExecutor
+    for MockExecutor<'a, DB, I>
 {
-    type Evm = EthEvm<DB, I, PrecompilesMap>;
+    type Evm = EthEvm<&'a mut State<DB>, I, PrecompilesMap>;
    type Transaction = TransactionSigned;
    type Receipt = Receipt;

@@ -124,11 +125,10 @@ impl<DB: StateDB + Database, I: Inspector<EthEvmContext<DB>>> BlockExecutor
                reqs
            }),
            gas_used: 0,
-            block_access_list: None,
            blob_gas_used: 0,
        };

-        *evm.db_mut().bundle_state_mut() = bundle;
+        evm.db_mut().bundle_state = bundle;

        Ok((evm, result))
    }
--- a/crates/ethereum/evm/tests/execute.rs
+++ b/crates/ethereum/evm/tests/execute.rs
@@ -38,7 +38,6 @@ fn create_database_with_beacon_root_contract() -> CacheDB<EmptyDB> {
        code_hash: keccak256(BEACON_ROOTS_CODE.clone()),
        nonce: 1,
        code: Some(Bytecode::new_raw(BEACON_ROOTS_CODE.clone())),
-        storage_id: None,
    };

    db.insert_account_info(BEACON_ROOTS_ADDRESS, beacon_root_contract_account);
@@ -54,7 +53,6 @@ fn create_database_with_withdrawal_requests_contract() -> CacheDB<EmptyDB> {
        balance: U256::ZERO,
        code_hash: keccak256(WITHDRAWAL_REQUEST_PREDEPLOY_CODE.clone()),
        code: Some(Bytecode::new_raw(WITHDRAWAL_REQUEST_PREDEPLOY_CODE.clone())),
-        storage_id: None,
    };

    db.insert_account_info(
@@ -88,12 +86,7 @@ fn eip_4788_non_genesis_call() {
        .execute_one(&RecoveredBlock::new_unhashed(
            Block {
                header: header.clone(),
-                body: BlockBody {
-                    transactions: vec![],
-                    ommers: vec![],
-                    withdrawals: None,
-                    block_access_list: None,
-                },
+                body: BlockBody { transactions: vec![], ommers: vec![], withdrawals: None },
            },
            vec![],
        ))
@@ -112,12 +105,7 @@ fn eip_4788_non_genesis_call() {
        .execute_one(&RecoveredBlock::new_unhashed(
            Block {
                header: header.clone(),
-                body: BlockBody {
-                    transactions: vec![],
-                    ommers: vec![],
-                    withdrawals: None,
-                    block_access_list: None,
-                },
+                body: BlockBody { transactions: vec![], ommers: vec![], withdrawals: None },
            },
            vec![],
        ))
@@ -177,12 +165,7 @@ fn eip_4788_no_code_cancun() {
        .execute_one(&RecoveredBlock::new_unhashed(
            Block {
                header,
-                body: BlockBody {
-                    transactions: vec![],
-                    ommers: vec![],
-                    withdrawals: None,
-                    block_access_list: None,
-                },
+                body: BlockBody { transactions: vec![], ommers: vec![], withdrawals: None },
            },
            vec![],
        ))
@@ -224,12 +207,7 @@ fn eip_4788_empty_account_call() {
        .execute_one(&RecoveredBlock::new_unhashed(
            Block {
                header,
-                body: BlockBody {
-                    transactions: vec![],
-                    ommers: vec![],
-                    withdrawals: None,
-                    block_access_list: None,
-                },
+                body: BlockBody { transactions: vec![], ommers: vec![], withdrawals: None },
            },
            vec![],
        ))
@@ -361,7 +339,6 @@ fn create_database_with_block_hashes(latest_block: u64) -> CacheDB<EmptyDB> {
        code_hash: keccak256(HISTORY_STORAGE_CODE.clone()),
        code: Some(Bytecode::new_raw(HISTORY_STORAGE_CODE.clone())),
        nonce: 1,
-        storage_id: None,
    };

    db.insert_account_info(HISTORY_STORAGE_ADDRESS, blockhashes_contract_account);
@@ -819,7 +796,6 @@ fn test_balance_increment_not_duplicated() {
                transactions: vec![],
                ommers: vec![],
                withdrawals: Some(vec![withdrawal].into()),
-                block_access_list: None,
            },
        },
        vec![],
--- a/crates/ethereum/node/Cargo.toml
+++ b/crates/ethereum/node/Cargo.toml
@@ -61,6 +61,8 @@ reth-node-core.workspace = true
 reth-e2e-test-utils.workspace = true
 reth-tasks.workspace = true
 reth-testing-utils.workspace = true
+tempfile.workspace = true
+jsonrpsee-core.workspace = true

 alloy-primitives.workspace = true
 alloy-provider.workspace = true
--- a/crates/ethereum/node/src/node.rs
+++ b/crates/ethereum/node/src/node.rs
@@ -32,15 +32,15 @@ use reth_node_builder::{
        EngineValidatorBuilder, EthApiBuilder, EthApiCtx, Identity, PayloadValidatorBuilder,
        RethRpcAddOns, RpcAddOns, RpcHandle,
    },
-    BuilderContext, DebugNode, Node, NodeAdapter, PayloadBuilderConfig,
+    BuilderContext, DebugNode, Node, NodeAdapter,
 };
 use reth_payload_primitives::PayloadTypes;
 use reth_provider::{providers::ProviderFactoryBuilder, EthStorage};
 use reth_rpc::{
    eth::core::{EthApiFor, EthRpcConverterFor},
-    ValidationApi,
+    TestingApi, ValidationApi,
 };
-use reth_rpc_api::servers::BlockSubmissionValidationApiServer;
+use reth_rpc_api::servers::{BlockSubmissionValidationApiServer, TestingApiServer};
 use reth_rpc_builder::{config::RethRpcServerConfig, middleware::RethRpcMiddleware};
 use reth_rpc_eth_api::{
    helpers::{
@@ -313,6 +313,17 @@ where
                    .modules
                    .merge_if_module_configured(RethRpcModule::Eth, eth_config.into_rpc())?;

+                // testing_buildBlockV1: only wire when the hidden testing module is explicitly
+                // requested on any transport. Default stays disabled to honor security guidance.
+                let testing_api = TestingApi::new(
+                    container.registry.eth_api().clone(),
+                    container.registry.evm_config().clone(),
+                )
+                .into_rpc();
+                container
+                    .modules
+                    .merge_if_module_configured(RethRpcModule::Testing, testing_api)?;
+
                Ok(())
            })
            .await
@@ -426,9 +437,7 @@ where
    type EVM = EthEvmConfig<Types::ChainSpec>;

    async fn build_evm(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::EVM> {
-        let evm_config = EthEvmConfig::new(ctx.chain_spec())
-            .with_extra_data(ctx.payload_builder_config().extra_data_bytes());
-        Ok(evm_config)
+        Ok(EthEvmConfig::new(ctx.chain_spec()))
    }
 }

--- a/crates/ethereum/node/src/payload.rs
+++ b/crates/ethereum/node/src/payload.rs
@@ -54,7 +54,8 @@ where
            evm_config,
            EthereumBuilderConfig::new()
                .with_gas_limit(gas_limit)
-                .with_max_blobs_per_block(conf.max_blobs_per_block()),
+                .with_max_blobs_per_block(conf.max_blobs_per_block())
+                .with_extra_data(conf.extra_data_bytes()),
        ))
    }
 }
--- a/crates/ethereum/node/tests/it/main.rs
+++ b/crates/ethereum/node/tests/it/main.rs
@@ -2,5 +2,6 @@

 mod builder;
 mod exex;
+mod testing;

 const fn main() {}
--- a/crates/ethereum/node/tests/it/testing.rs
+++ b/crates/ethereum/node/tests/it/testing.rs
@@ -0,0 +1,84 @@
+//! E2E tests for the testing RPC namespace.
+
+use alloy_primitives::{Address, B256};
+use alloy_rpc_types_engine::ExecutionPayloadEnvelopeV4;
+use jsonrpsee_core::client::ClientT;
+use reth_db::test_utils::create_test_rw_db;
+use reth_ethereum_engine_primitives::EthPayloadAttributes;
+use reth_node_builder::{NodeBuilder, NodeConfig};
+use reth_node_core::{
+    args::DatadirArgs,
+    dirs::{DataDirPath, MaybePlatformPath},
+};
+use reth_node_ethereum::{node::EthereumAddOns, EthereumNode};
+use reth_rpc_api::TestingBuildBlockRequestV1;
+use reth_rpc_server_types::{RethRpcModule, RpcModuleSelection};
+use reth_tasks::TaskManager;
+use std::str::FromStr;
+use tempfile::tempdir;
+use tokio::sync::oneshot;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn testing_rpc_build_block_works() -> eyre::Result<()> {
+    let tasks = TaskManager::current();
+    let mut rpc_args = reth_node_core::args::RpcServerArgs::default().with_http();
+    rpc_args.http_api = Some(RpcModuleSelection::from_iter([RethRpcModule::Testing]));
+    let tempdir = tempdir().expect("temp datadir");
+    let datadir_args = DatadirArgs {
+        datadir: MaybePlatformPath::<DataDirPath>::from_str(tempdir.path().to_str().unwrap())
+            .expect("valid datadir"),
+        static_files_path: Some(tempdir.path().join("static")),
+    };
+    let config = NodeConfig::test().with_datadir_args(datadir_args).with_rpc(rpc_args);
+    let db = create_test_rw_db();
+
+    let (tx, rx): (
+        oneshot::Sender<eyre::Result<ExecutionPayloadEnvelopeV4>>,
+        oneshot::Receiver<eyre::Result<ExecutionPayloadEnvelopeV4>>,
+    ) = oneshot::channel();
+
+    let builder = NodeBuilder::new(config)
+        .with_database(db)
+        .with_launch_context(tasks.executor())
+        .with_types::<EthereumNode>()
+        .with_components(EthereumNode::components())
+        .with_add_ons(EthereumAddOns::default())
+        .on_rpc_started(move |ctx, handles| {
+            let Some(client) = handles.rpc.http_client() else { return Ok(()) };
+
+            let chain = ctx.config().chain.clone();
+            let parent_block_hash = chain.genesis_hash();
+            let payload_attributes = EthPayloadAttributes {
+                timestamp: chain.genesis().timestamp + 1,
+                prev_randao: B256::ZERO,
+                suggested_fee_recipient: Address::ZERO,
+                withdrawals: None,
+                parent_beacon_block_root: None,
+            };
+
+            let request = TestingBuildBlockRequestV1 {
+                parent_block_hash,
+                payload_attributes,
+                transactions: vec![],
+                extra_data: None,
+            };
+
+            tokio::spawn(async move {
+                let res: eyre::Result<ExecutionPayloadEnvelopeV4> =
+                    client.request("testing_buildBlockV1", [request]).await.map_err(Into::into);
+                let _ = tx.send(res);
+            });
+
+            Ok(())
+        });
+
+    // Launch the node with the default engine launcher.
+    let launcher = builder.engine_api_launcher();
+    let _node = builder.launch_with(launcher).await?;
+
+    // Wait for the testing RPC call to return.
+    let res = rx.await.expect("testing_buildBlockV1 response");
+    assert!(res.is_ok(), "testing_buildBlockV1 failed: {:?}", res.err());
+
+    Ok(())
+}
--- a/crates/ethereum/payload/src/config.rs
+++ b/crates/ethereum/payload/src/config.rs
@@ -1,4 +1,5 @@
 use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M;
+use alloy_primitives::Bytes;
 use reth_primitives_traits::constants::GAS_LIMIT_BOUND_DIVISOR;

 /// Settings for the Ethereum builder.
@@ -13,6 +14,8 @@ pub struct EthereumBuilderConfig {
    ///
    /// If `None`, defaults to the protocol maximum.
    pub max_blobs_per_block: Option<u64>,
+    /// Extra data for built blocks.
+    pub extra_data: Bytes,
 }

 impl Default for EthereumBuilderConfig {
@@ -28,6 +31,7 @@ impl EthereumBuilderConfig {
            desired_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M,
            await_payload_on_missing: true,
            max_blobs_per_block: None,
+            extra_data: Bytes::new(),
        }
    }

@@ -49,6 +53,12 @@ impl EthereumBuilderConfig {
        self.max_blobs_per_block = max_blobs_per_block;
        self
    }
+
+    /// Set the extra data for built blocks.
+    pub fn with_extra_data(mut self, extra_data: Bytes) -> Self {
+        self.extra_data = extra_data;
+        self
+    }
 }

 impl EthereumBuilderConfig {
--- a/crates/ethereum/payload/src/lib.rs
+++ b/crates/ethereum/payload/src/lib.rs
@@ -154,13 +154,9 @@ where

    let state_provider = client.state_by_block_hash(parent_header.hash())?;
    let state = StateProviderDatabase::new(&state_provider);
-    let mut db = State::builder()
-        .with_database(cached_reads.as_db_mut(state))
-        .with_bundle_update()
-        .with_bal_builder()
-        .build();
-    db.bal_state.bal_index = 0;
-    db.bal_state.bal_builder = Some(revm::state::bal::Bal::new());
+    let mut db =
+        State::builder().with_database(cached_reads.as_db_mut(state)).with_bundle_update().build();
+
    let mut builder = evm_config
        .builder_for_next_block(
            &mut db,
@@ -172,6 +168,7 @@ where
                gas_limit: builder_config.gas_limit(parent_header.gas_limit),
                parent_beacon_block_root: attributes.parent_beacon_block_root(),
                withdrawals: Some(attributes.withdrawals().clone()),
+                extra_data: builder_config.extra_data,
            },
        )
        .map_err(PayloadBuilderError::other)?;
--- a/crates/ethereum/payload/src/validator.rs
+++ b/crates/ethereum/payload/src/validator.rs
@@ -3,7 +3,7 @@
 use alloy_consensus::Block;
 use alloy_rpc_types_engine::{ExecutionData, PayloadError};
 use reth_chainspec::EthereumHardforks;
-use reth_payload_validator::{amsterdam, cancun, prague, shanghai};
+use reth_payload_validator::{cancun, prague, shanghai};
 use reth_primitives_traits::{Block as _, SealedBlock, SignedTransaction};
 use std::sync::Arc;

@@ -103,10 +103,5 @@ where
        chain_spec.is_prague_active_at_timestamp(sealed_block.timestamp),
    )?;

-    amsterdam::ensure_well_formed_fields(
-        sealed_block.body(),
-        chain_spec.is_amsterdam_active_at_timestamp(sealed_block.timestamp),
-    )?;
-
    Ok(sealed_block)
 }
--- a/crates/evm/evm/src/execute.rs
+++ b/crates/evm/evm/src/execute.rs
@@ -1,12 +1,12 @@
 //! Traits for execution.

 use crate::{ConfigureEvm, Database, OnStateHook, TxEnvFor};
-use alloc::{borrow::Cow, boxed::Box, sync::Arc, vec::Vec};
+use alloc::{boxed::Box, sync::Arc, vec::Vec};
 use alloy_consensus::{BlockHeader, Header};
 use alloy_eips::eip2718::WithEncoded;
 pub use alloy_evm::block::{BlockExecutor, BlockExecutorFactory};
 use alloy_evm::{
-    block::{CommitChanges, ExecutableTx, StateDB},
+    block::{CommitChanges, ExecutableTx},
    Evm, EvmEnv, EvmFactory, RecoveredTx, ToTxEnv,
 };
 use alloy_primitives::{Address, B256};
@@ -214,7 +214,7 @@ pub struct BlockAssemblerInput<'a, 'b, F: BlockExecutorFactory, H = Header> {
    /// Output of block execution.
    pub output: &'b BlockExecutionResult<F::Receipt>,
    /// [`BundleState`] after the block execution.
-    pub bundle_state: Cow<'a, BundleState>,
+    pub bundle_state: &'a BundleState,
    /// Provider with access to state.
    #[debug(skip)]
    pub state_provider: &'b dyn StateProvider,
@@ -234,7 +234,7 @@ impl<'a, 'b, F: BlockExecutorFactory, H> BlockAssemblerInput<'a, 'b, F, H> {
        parent: &'a SealedHeader<H>,
        transactions: Vec<F::Transaction>,
        output: &'b BlockExecutionResult<F::Receipt>,
-        bundle_state: impl Into<Cow<'a, BundleState>>,
+        bundle_state: &'a BundleState,
        state_provider: &'b dyn StateProvider,
        state_root: B256,
    ) -> Self {
@@ -244,7 +244,7 @@ impl<'a, 'b, F: BlockExecutorFactory, H> BlockAssemblerInput<'a, 'b, F, H> {
            parent,
            transactions,
            output,
-            bundle_state: bundle_state.into(),
+            bundle_state,
            state_provider,
            state_root,
        }
@@ -461,7 +461,8 @@ where
    }
 }

-impl<'a, F, Executor, Builder, N> BlockBuilder for BasicBlockBuilder<'a, F, Executor, Builder, N>
+impl<'a, F, DB, Executor, Builder, N> BlockBuilder
+    for BasicBlockBuilder<'a, F, Executor, Builder, N>
 where
    F: BlockExecutorFactory<Transaction = N::SignedTx, Receipt = N::Receipt>,
    Executor: BlockExecutor<
@@ -469,11 +470,12 @@ where
            Spec = <F::EvmFactory as EvmFactory>::Spec,
            HaltReason = <F::EvmFactory as EvmFactory>::HaltReason,
            BlockEnv = <F::EvmFactory as EvmFactory>::BlockEnv,
-            DB: StateDB + 'a,
+            DB = &'a mut State<DB>,
        >,
        Transaction = N::SignedTx,
        Receipt = N::Receipt,
    >,
+    DB: Database + 'a,
    Builder: BlockAssembler<F, Block = N::Block>,
    N: NodePrimitives,
 {
@@ -506,13 +508,13 @@ where
        state: impl StateProvider,
    ) -> Result<BlockBuilderOutcome<N>, BlockExecutionError> {
        let (evm, result) = self.executor.finish()?;
-        let (mut db, evm_env) = evm.finish();
+        let (db, evm_env) = evm.finish();

        // merge all transitions into bundle state
        db.merge_transitions(BundleRetention::Reverts);

        // calculate the state root
-        let hashed_state = state.hashed_post_state(db.bundle_state());
+        let hashed_state = state.hashed_post_state(&db.bundle_state);
        let (state_root, trie_updates) = state
            .state_root_with_updates(hashed_state.clone())
            .map_err(BlockExecutionError::other)?;
@@ -526,7 +528,7 @@ where
            parent: self.parent,
            transactions,
            output: &result,
-            bundle_state: Cow::Owned(db.take_bundle()),
+            bundle_state: &db.bundle_state,
            state_provider: &state,
            state_root,
        })?;
@@ -562,14 +564,8 @@ pub struct BasicBlockExecutor<F, DB> {
 impl<F, DB: Database> BasicBlockExecutor<F, DB> {
    /// Creates a new `BasicBlockExecutor` with the given strategy.
    pub fn new(strategy_factory: F, db: DB) -> Self {
-        let mut db = State::builder()
-            .with_database(db)
-            .with_bundle_update()
-            .with_bal_builder()
-            .without_state_clear()
-            .build();
-        db.bal_state.bal_index = 0;
-        db.bal_state.bal_builder = Some(revm::state::bal::Bal::new());
+        let db =
+            State::builder().with_database(db).with_bundle_update().without_state_clear().build();
        Self { strategy_factory, db }
    }
 }
@@ -745,7 +741,6 @@ mod tests {
            nonce,
            code_hash: KECCAK_EMPTY,
            code: None,
-            storage_id: None,
        };
        state.insert_account(addr, account_info);
        state
@@ -782,13 +777,8 @@ mod tests {

        let mut state = setup_state_with_account(addr1, 100, 1);

-        let account2 = AccountInfo {
-            balance: U256::from(200),
-            nonce: 1,
-            code_hash: KECCAK_EMPTY,
-            code: None,
-            storage_id: None,
-        };
+        let account2 =
+            AccountInfo { balance: U256::from(200), nonce: 1, code_hash: KECCAK_EMPTY, code: None };
        state.insert_account(addr2, account2);

        let mut increments = HashMap::default();
@@ -809,13 +799,8 @@ mod tests {

        let mut state = setup_state_with_account(addr1, 100, 1);

-        let account2 = AccountInfo {
-            balance: U256::from(200),
-            nonce: 1,
-            code_hash: KECCAK_EMPTY,
-            code: None,
-            storage_id: None,
-        };
+        let account2 =
+            AccountInfo { balance: U256::from(200), nonce: 1, code_hash: KECCAK_EMPTY, code: None };
        state.insert_account(addr2, account2);

        let mut increments = HashMap::default();
--- a/crates/evm/evm/src/lib.rs
+++ b/crates/evm/evm/src/lib.rs
@@ -18,7 +18,6 @@
 extern crate alloc;

 use crate::execute::{BasicBlockBuilder, Executor};
-use ::revm::context::TxEnv;
 use alloc::vec::Vec;
 use alloy_eips::{
    eip2718::{EIP2930_TX_TYPE_ID, LEGACY_TX_TYPE_ID},
@@ -26,17 +25,17 @@ use alloy_eips::{
    eip4895::Withdrawals,
 };
 use alloy_evm::{
-    block::{BlockExecutorFactory, BlockExecutorFor, StateDB},
+    block::{BlockExecutorFactory, BlockExecutorFor},
    precompiles::PrecompilesMap,
 };
-use alloy_primitives::{Address, B256};
+use alloy_primitives::{Address, Bytes, B256};
 use core::{error::Error, fmt::Debug};
 use execute::{BasicBlockExecutor, BlockAssembler, BlockBuilder};
 use reth_execution_errors::BlockExecutionError;
 use reth_primitives_traits::{
    BlockTy, HeaderTy, NodePrimitives, ReceiptTy, SealedBlock, SealedHeader, TxTy,
 };
-use revm::DatabaseCommit;
+use revm::{context::TxEnv, database::State};

 pub mod either;
 /// EVM environment configuration.
@@ -313,20 +312,20 @@ pub trait ConfigureEvm: Clone + Debug + Send + Sync + Unpin {
    /// Creates a strategy with given EVM and execution context.
    fn create_executor<'a, DB, I>(
        &'a self,
-        evm: EvmFor<Self, DB, I>,
+        evm: EvmFor<Self, &'a mut State<DB>, I>,
        ctx: <Self::BlockExecutorFactory as BlockExecutorFactory>::ExecutionCtx<'a>,
    ) -> impl BlockExecutorFor<'a, Self::BlockExecutorFactory, DB, I>
    where
-        DB: StateDB + DatabaseCommit + Database + 'a,
-        I: InspectorFor<Self, DB> + 'a,
+        DB: Database,
+        I: InspectorFor<Self, &'a mut State<DB>> + 'a,
    {
        self.block_executor_factory().create_executor(evm, ctx)
    }

    /// Creates a strategy for execution of a given block.
-    fn executor_for_block<'a, DB: StateDB + DatabaseCommit + Database + 'a>(
+    fn executor_for_block<'a, DB: Database>(
        &'a self,
-        db: DB,
+        db: &'a mut State<DB>,
        block: &'a SealedBlock<<Self::Primitives as NodePrimitives>::Block>,
    ) -> Result<impl BlockExecutorFor<'a, Self::BlockExecutorFactory, DB>, Self::Error> {
        let evm = self.evm_for_block(db, block.header())?;
@@ -351,7 +350,7 @@ pub trait ConfigureEvm: Clone + Debug + Send + Sync + Unpin {
    /// ```
    fn create_block_builder<'a, DB, I>(
        &'a self,
-        evm: EvmFor<Self, DB, I>,
+        evm: EvmFor<Self, &'a mut State<DB>, I>,
        parent: &'a SealedHeader<HeaderTy<Self::Primitives>>,
        ctx: <Self::BlockExecutorFactory as BlockExecutorFactory>::ExecutionCtx<'a>,
    ) -> impl BlockBuilder<
@@ -359,8 +358,8 @@ pub trait ConfigureEvm: Clone + Debug + Send + Sync + Unpin {
        Executor: BlockExecutorFor<'a, Self::BlockExecutorFactory, DB, I>,
    >
    where
-        DB: StateDB + DatabaseCommit + Database + 'a,
-        I: InspectorFor<Self, DB> + 'a,
+        DB: Database,
+        I: InspectorFor<Self, &'a mut State<DB>> + 'a,
    {
        BasicBlockBuilder {
            executor: self.create_executor(evm, ctx.clone()),
@@ -400,9 +399,9 @@ pub trait ConfigureEvm: Clone + Debug + Send + Sync + Unpin {
    /// // Complete block building
    /// let outcome = builder.finish(state_provider)?;
    /// ```
-    fn builder_for_next_block<'a, DB: StateDB + DatabaseCommit + Database + 'a>(
+    fn builder_for_next_block<'a, DB: Database>(
        &'a self,
-        db: DB,
+        db: &'a mut State<DB>,
        parent: &'a SealedHeader<<Self::Primitives as NodePrimitives>::BlockHeader>,
        attributes: Self::NextBlockEnvCtx,
    ) -> Result<
@@ -502,6 +501,8 @@ pub struct NextBlockEnvAttributes {
    pub parent_beacon_block_root: Option<B256>,
    /// Withdrawals
    pub withdrawals: Option<Withdrawals>,
+    /// Optional extra data.
+    pub extra_data: Bytes,
 }

 /// Abstraction over transaction environment.
--- a/crates/evm/execution-types/src/execution_outcome.rs
+++ b/crates/evm/execution-types/src/execution_outcome.rs
@@ -929,20 +929,10 @@ mod tests {
        let address3 = Address::random();

        // Set up account info with some changes
-        let account_info1 = AccountInfo {
-            nonce: 1,
-            balance: U256::from(100),
-            code_hash: B256::ZERO,
-            code: None,
-            storage_id: None,
-        };
-        let account_info2 = AccountInfo {
-            nonce: 2,
-            balance: U256::from(200),
-            code_hash: B256::ZERO,
-            code: None,
-            storage_id: None,
-        };
+        let account_info1 =
+            AccountInfo { nonce: 1, balance: U256::from(100), code_hash: B256::ZERO, code: None };
+        let account_info2 =
+            AccountInfo { nonce: 2, balance: U256::from(200), code_hash: B256::ZERO, code: None };

        // Set up the bundle state with these accounts
        let mut bundle_state = BundleState::default();
--- a/crates/exex/exex/src/wal/storage.rs
+++ b/crates/exex/exex/src/wal/storage.rs
@@ -185,22 +185,22 @@ mod tests {

    // wal with 1 block and tx
    // <https://github.com/paradigmxyz/reth/issues/15012>
-    // #[test]
-    // fn decode_notification_wal() {
-    //     let wal = include_bytes!("../../test-data/28.wal");
-    //     let notification: reth_exex_types::serde_bincode_compat::ExExNotification<
-    //         '_,
-    //         reth_ethereum_primitives::EthPrimitives,
-    //     > = rmp_serde::decode::from_slice(wal.as_slice()).unwrap();
-    //     let notification: ExExNotification = notification.into();
-    //     match notification {
-    //         ExExNotification::ChainCommitted { new } => {
-    //             assert_eq!(new.blocks().len(), 1);
-    //             assert_eq!(new.tip().transaction_count(), 1);
-    //         }
-    //         _ => panic!("unexpected notification"),
-    //     }
-    // }
+    #[test]
+    fn decode_notification_wal() {
+        let wal = include_bytes!("../../test-data/28.wal");
+        let notification: reth_exex_types::serde_bincode_compat::ExExNotification<
+            '_,
+            reth_ethereum_primitives::EthPrimitives,
+        > = rmp_serde::decode::from_slice(wal.as_slice()).unwrap();
+        let notification: ExExNotification = notification.into();
+        match notification {
+            ExExNotification::ChainCommitted { new } => {
+                assert_eq!(new.blocks().len(), 1);
+                assert_eq!(new.tip().transaction_count(), 1);
+            }
+            _ => panic!("unexpected notification"),
+        }
+    }

    #[test]
    fn test_roundtrip() -> eyre::Result<()> {
--- a/crates/net/downloaders/src/file_client.rs
+++ b/crates/net/downloaders/src/file_client.rs
@@ -256,10 +256,6 @@ impl<B: FullBlock<Header: reth_primitives_traits::BlockHeader>> FromReader
                    Err(err) => return Err(err),
                };

-                tracing::debug!(target: "downloaders::file",
-                    block=?block,
-                    "decoded block from file chunk"
-                );
                let block = SealedBlock::seal_slow(block);

                // Validate standalone header
@@ -276,11 +272,6 @@ impl<B: FullBlock<Header: reth_primitives_traits::BlockHeader>> FromReader
                let block_hash = block.hash();
                let block_number = block.number();
                let (header, body) = block.split_sealed_header_body();
-                tracing::debug!(target: "downloaders::file",
-                    header=?header,
-                    body=?body,
-                    "adding block to file client buffers"
-                );
                headers.insert(block_number, header.unseal());
                hash_to_number.insert(block_hash, block_number);
                bodies.insert(block_hash, body);
--- a/crates/net/eth-wire-types/src/blocks.rs
+++ b/crates/net/eth-wire-types/src/blocks.rs
@@ -265,7 +265,6 @@ mod tests {
                    excess_blob_gas: None,
                    parent_beacon_block_root: None,
                    requests_hash: None,
-                    block_access_list_hash:None
                },
            ]),
        }.encode(&mut data);
@@ -303,7 +302,6 @@ mod tests {
                    excess_blob_gas: None,
                    parent_beacon_block_root: None,
                    requests_hash: None,
-                    block_access_list_hash: None
                },
            ]),
        };
@@ -410,11 +408,9 @@ mod tests {
                            excess_blob_gas: None,
                            parent_beacon_block_root: None,
                            requests_hash: None,
-                            block_access_list_hash:None
                        },
                    ],
                    withdrawals: None,
-                    block_access_list:None
                }
            ]),
        };
@@ -489,11 +485,9 @@ mod tests {
                            excess_blob_gas: None,
                            parent_beacon_block_root: None,
                            requests_hash: None,
-                            block_access_list_hash:None
                        },
                    ],
                    withdrawals: None,
-                    block_access_list:None
                }
            ]),
        };
--- a/crates/net/eth-wire-types/src/header.rs
+++ b/crates/net/eth-wire-types/src/header.rs
@@ -152,7 +152,6 @@ mod tests {
            excess_blob_gas: None,
            parent_beacon_block_root: None,
            requests_hash: None,
-            block_access_list_hash:None
        };
        assert_eq!(header.hash_slow(), expected_hash);
    }
@@ -269,7 +268,6 @@ mod tests {
            excess_blob_gas: Some(0),
            parent_beacon_block_root: None,
            requests_hash: None,
-            block_access_list_hash: None,
        };

        let header = Header::decode(&mut data.as_slice()).unwrap();
@@ -312,7 +310,6 @@ mod tests {
            blob_gas_used: Some(0),
            excess_blob_gas: Some(0x1600000),
            requests_hash: None,
-            block_access_list_hash: None,
        };

        let header = Header::decode(&mut data.as_slice()).unwrap();
--- a/crates/net/eth-wire-types/src/message.rs
+++ b/crates/net/eth-wire-types/src/message.rs
@@ -755,7 +755,6 @@ mod tests {
                    transactions: vec![],
                    ommers: vec![],
                    withdrawals: Some(Default::default()),
-                    block_access_list: None,
                }]
                .into(),
            }));
--- a/crates/net/network/src/transactions/mod.rs
+++ b/crates/net/network/src/transactions/mod.rs
@@ -1372,21 +1372,6 @@ where
        //    reallocations
        let mut new_txs = Vec::with_capacity(transactions.len());
        for tx in transactions {
-            // recover transaction
-            let tx = match tx.try_into_recovered() {
-                Ok(tx) => tx,
-                Err(badtx) => {
-                    trace!(target: "net::tx",
-                        peer_id=format!("{peer_id:#}"),
-                        hash=%badtx.tx_hash(),
-                        client_version=%peer.client_version,
-                        "failed ecrecovery for transaction"
-                    );
-                    has_bad_transactions = true;
-                    continue
-                }
-            };
-
            match self.transactions_by_peers.entry(*tx.tx_hash()) {
                Entry::Occupied(mut entry) => {
                    // transaction was already inserted
@@ -1404,6 +1389,21 @@ where
                    } else {
                        // this is a new transaction that should be imported into the pool

+                        // recover transaction
+                        let tx = match tx.try_into_recovered() {
+                            Ok(tx) => tx,
+                            Err(badtx) => {
+                                trace!(target: "net::tx",
+                                    peer_id=format!("{peer_id:#}"),
+                                    hash=%badtx.tx_hash(),
+                                    client_version=%peer.client_version,
+                                    "failed ecrecovery for transaction"
+                                );
+                                has_bad_transactions = true;
+                                continue
+                            }
+                        };
+
                        let pool_transaction = Pool::Transaction::from_pooled(tx);
                        new_txs.push(pool_transaction);

--- a/crates/node/builder/src/builder/mod.rs
+++ b/crates/node/builder/src/builder/mod.rs
@@ -533,6 +533,27 @@ where
    }

    /// Modifies the addons with the given closure.
+    ///
+    /// This method provides access to methods on the addons type that don't have
+    /// direct builder methods. It's useful for advanced configuration scenarios
+    /// where you need to call addon-specific methods.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,ignore
+    /// use tower::layer::util::Identity;
+    ///
+    /// let builder = NodeBuilder::new(config)
+    ///     .with_types::<EthereumNode>()
+    ///     .with_components(EthereumNode::components())
+    ///     .with_add_ons(EthereumAddOns::default())
+    ///     .map_add_ons(|addons| addons.with_rpc_middleware(Identity::default()));
+    /// ```
+    ///
+    /// # See also
+    ///
+    /// - [`NodeAddOns`] trait for available addon types
+    /// - [`crate::NodeBuilderWithComponents::extend_rpc_modules`] for RPC module configuration
    pub fn map_add_ons<F>(self, f: F) -> Self
    where
        F: FnOnce(AO) -> AO,
@@ -579,10 +600,10 @@ where
    ///     .extend_rpc_modules(|ctx| {
    ///         // Access node components, so they can used by the CustomApi
    ///         let pool = ctx.pool().clone();
-    ///         
+    ///
    ///         // Add custom RPC namespace
    ///         ctx.modules.merge_configured(CustomApi { pool }.into_rpc())?;
-    ///         
+    ///
    ///         Ok(())
    ///     })
    ///     .build()?;
@@ -838,8 +859,8 @@ impl<Node: FullNodeTypes> BuilderContext<Node> {
            .request_handler(self.provider().clone())
            .split_with_handle();

-        self.executor.spawn_critical("p2p txpool", Box::pin(txpool));
-        self.executor.spawn_critical("p2p eth request handler", Box::pin(eth));
+        self.executor.spawn_critical_blocking("p2p txpool", Box::pin(txpool));
+        self.executor.spawn_critical_blocking("p2p eth request handler", Box::pin(eth));

        let default_peers_path = self.config().datadir().known_peers();
        let known_peers_file = self.config().network.persistent_peers_file(default_peers_path);
--- a/crates/node/builder/src/builder/states.rs
+++ b/crates/node/builder/src/builder/states.rs
@@ -235,6 +235,27 @@ where
    }

    /// Modifies the addons with the given closure.
+    ///
+    /// This method provides access to methods on the addons type that don't have
+    /// direct builder methods. It's useful for advanced configuration scenarios
+    /// where you need to call addon-specific methods.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,ignore
+    /// use tower::layer::util::Identity;
+    ///
+    /// let builder = NodeBuilder::new(config)
+    ///     .with_types::<EthereumNode>()
+    ///     .with_components(EthereumNode::components())
+    ///     .with_add_ons(EthereumAddOns::default())
+    ///     .map_add_ons(|addons| addons.with_rpc_middleware(Identity::default()));
+    /// ```
+    ///
+    /// # See also
+    ///
+    /// - [`NodeAddOns`] trait for available addon types
+    /// - [`crate::NodeBuilderWithComponents::extend_rpc_modules`] for RPC module configuration
    pub fn map_add_ons<F>(mut self, f: F) -> Self
    where
        F: FnOnce(AO) -> AO,
--- a/crates/node/builder/src/launch/engine.rs
+++ b/crates/node/builder/src/launch/engine.rs
@@ -281,7 +281,6 @@ impl EngineNodeLauncher {
        let startup_sync_state_idle = ctx.node_config().debug.startup_sync_state_idle;

        info!(target: "reth::cli", "Starting consensus engine");
-        info!(target: "reth::cli", "built payloads ready: {:#?}", built_payloads);
        ctx.task_executor().spawn_critical("consensus engine", Box::pin(async move {
            if let Some(initial_target) = initial_target {
                debug!(target: "reth::cli", %initial_target,  "start backfill sync");
--- a/crates/node/builder/src/rpc.rs
+++ b/crates/node/builder/src/rpc.rs
@@ -1010,7 +1010,7 @@ where
            .with_executor(Box::new(node.task_executor().clone()))
            .with_evm_config(node.evm_config().clone())
            .with_consensus(node.consensus().clone())
-            .build_with_auth_server(module_config, engine_api, eth_api);
+            .build_with_auth_server(module_config, engine_api, eth_api, engine_events.clone());

        // in dev mode we generate 20 random dev-signer accounts
        if config.dev.dev {
@@ -1179,6 +1179,7 @@ impl<'a, N: FullNodeComponents<Types: NodeTypes<ChainSpec: Hardforks + EthereumH
            .proof_permits(self.config.proof_permits)
            .gas_oracle_config(self.config.gas_oracle)
            .max_batch_size(self.config.max_batch_size)
+            .max_blocking_io_requests(self.config.max_blocking_io_requests)
            .pending_block_kind(self.config.pending_block_kind)
            .raw_tx_forwarder(self.config.raw_tx_forwarder)
            .evm_memory_limit(self.config.rpc_evm_memory_limit)
@@ -1188,10 +1189,7 @@ impl<'a, N: FullNodeComponents<Types: NodeTypes<ChainSpec: Hardforks + EthereumH
 /// A `EthApi` that knows how to build `eth` namespace API from [`FullNodeComponents`].
 pub trait EthApiBuilder<N: FullNodeComponents>: Default + Send + 'static {
    /// The Ethapi implementation this builder will build.
-    type EthApi: EthApiTypes
-        + FullEthApiServer<Provider = N::Provider, Pool = N::Pool>
-        + Unpin
-        + 'static;
+    type EthApi: FullEthApiServer<Provider = N::Provider, Pool = N::Pool>;

    /// Builds the [`EthApiServer`](reth_rpc_api::eth::EthApiServer) from the given context.
    fn build_eth_api(
--- a/crates/node/core/src/args/engine.rs
+++ b/crates/node/core/src/args/engine.rs
@@ -1,13 +1,198 @@
 //! clap [Args](clap::Args) for engine purposes

-use clap::Args;
+use clap::{builder::Resettable, Args};
 use reth_engine_primitives::{TreeConfig, DEFAULT_MULTIPROOF_TASK_CHUNK_SIZE};
+use std::sync::OnceLock;

 use crate::node_config::{
    DEFAULT_CROSS_BLOCK_CACHE_SIZE_MB, DEFAULT_MEMORY_BLOCK_BUFFER_TARGET,
    DEFAULT_PERSISTENCE_THRESHOLD, DEFAULT_RESERVED_CPU_CORES,
 };

+/// Global static engine defaults
+static ENGINE_DEFAULTS: OnceLock<DefaultEngineValues> = OnceLock::new();
+
+/// Default values for engine that can be customized
+///
+/// Global defaults can be set via [`DefaultEngineValues::try_init`].
+#[derive(Debug, Clone)]
+pub struct DefaultEngineValues {
+    persistence_threshold: u64,
+    memory_block_buffer_target: u64,
+    legacy_state_root_task_enabled: bool,
+    state_cache_disabled: bool,
+    prewarming_disabled: bool,
+    parallel_sparse_trie_disabled: bool,
+    state_provider_metrics: bool,
+    cross_block_cache_size: u64,
+    state_root_task_compare_updates: bool,
+    accept_execution_requests_hash: bool,
+    multiproof_chunking_enabled: bool,
+    multiproof_chunk_size: usize,
+    reserved_cpu_cores: usize,
+    precompile_cache_disabled: bool,
+    state_root_fallback: bool,
+    always_process_payload_attributes_on_canonical_head: bool,
+    allow_unwind_canonical_header: bool,
+    storage_worker_count: Option<usize>,
+    account_worker_count: Option<usize>,
+}
+
+impl DefaultEngineValues {
+    /// Initialize the global engine defaults with this configuration
+    pub fn try_init(self) -> Result<(), Self> {
+        ENGINE_DEFAULTS.set(self)
+    }
+
+    /// Get a reference to the global engine defaults
+    pub fn get_global() -> &'static Self {
+        ENGINE_DEFAULTS.get_or_init(Self::default)
+    }
+
+    /// Set the default persistence threshold
+    pub const fn with_persistence_threshold(mut self, v: u64) -> Self {
+        self.persistence_threshold = v;
+        self
+    }
+
+    /// Set the default memory block buffer target
+    pub const fn with_memory_block_buffer_target(mut self, v: u64) -> Self {
+        self.memory_block_buffer_target = v;
+        self
+    }
+
+    /// Set whether to enable legacy state root task by default
+    pub const fn with_legacy_state_root_task_enabled(mut self, v: bool) -> Self {
+        self.legacy_state_root_task_enabled = v;
+        self
+    }
+
+    /// Set whether to disable state cache by default
+    pub const fn with_state_cache_disabled(mut self, v: bool) -> Self {
+        self.state_cache_disabled = v;
+        self
+    }
+
+    /// Set whether to disable prewarming by default
+    pub const fn with_prewarming_disabled(mut self, v: bool) -> Self {
+        self.prewarming_disabled = v;
+        self
+    }
+
+    /// Set whether to disable parallel sparse trie by default
+    pub const fn with_parallel_sparse_trie_disabled(mut self, v: bool) -> Self {
+        self.parallel_sparse_trie_disabled = v;
+        self
+    }
+
+    /// Set whether to enable state provider metrics by default
+    pub const fn with_state_provider_metrics(mut self, v: bool) -> Self {
+        self.state_provider_metrics = v;
+        self
+    }
+
+    /// Set the default cross-block cache size in MB
+    pub const fn with_cross_block_cache_size(mut self, v: u64) -> Self {
+        self.cross_block_cache_size = v;
+        self
+    }
+
+    /// Set whether to compare state root task updates by default
+    pub const fn with_state_root_task_compare_updates(mut self, v: bool) -> Self {
+        self.state_root_task_compare_updates = v;
+        self
+    }
+
+    /// Set whether to accept execution requests hash by default
+    pub const fn with_accept_execution_requests_hash(mut self, v: bool) -> Self {
+        self.accept_execution_requests_hash = v;
+        self
+    }
+
+    /// Set whether to enable multiproof chunking by default
+    pub const fn with_multiproof_chunking_enabled(mut self, v: bool) -> Self {
+        self.multiproof_chunking_enabled = v;
+        self
+    }
+
+    /// Set the default multiproof chunk size
+    pub const fn with_multiproof_chunk_size(mut self, v: usize) -> Self {
+        self.multiproof_chunk_size = v;
+        self
+    }
+
+    /// Set the default number of reserved CPU cores
+    pub const fn with_reserved_cpu_cores(mut self, v: usize) -> Self {
+        self.reserved_cpu_cores = v;
+        self
+    }
+
+    /// Set whether to disable precompile cache by default
+    pub const fn with_precompile_cache_disabled(mut self, v: bool) -> Self {
+        self.precompile_cache_disabled = v;
+        self
+    }
+
+    /// Set whether to enable state root fallback by default
+    pub const fn with_state_root_fallback(mut self, v: bool) -> Self {
+        self.state_root_fallback = v;
+        self
+    }
+
+    /// Set whether to always process payload attributes on canonical head by default
+    pub const fn with_always_process_payload_attributes_on_canonical_head(
+        mut self,
+        v: bool,
+    ) -> Self {
+        self.always_process_payload_attributes_on_canonical_head = v;
+        self
+    }
+
+    /// Set whether to allow unwinding canonical header by default
+    pub const fn with_allow_unwind_canonical_header(mut self, v: bool) -> Self {
+        self.allow_unwind_canonical_header = v;
+        self
+    }
+
+    /// Set the default storage worker count
+    pub const fn with_storage_worker_count(mut self, v: Option<usize>) -> Self {
+        self.storage_worker_count = v;
+        self
+    }
+
+    /// Set the default account worker count
+    pub const fn with_account_worker_count(mut self, v: Option<usize>) -> Self {
+        self.account_worker_count = v;
+        self
+    }
+}
+
+impl Default for DefaultEngineValues {
+    fn default() -> Self {
+        Self {
+            persistence_threshold: DEFAULT_PERSISTENCE_THRESHOLD,
+            memory_block_buffer_target: DEFAULT_MEMORY_BLOCK_BUFFER_TARGET,
+            legacy_state_root_task_enabled: false,
+            state_cache_disabled: false,
+            prewarming_disabled: false,
+            parallel_sparse_trie_disabled: false,
+            state_provider_metrics: false,
+            cross_block_cache_size: DEFAULT_CROSS_BLOCK_CACHE_SIZE_MB,
+            state_root_task_compare_updates: false,
+            accept_execution_requests_hash: false,
+            multiproof_chunking_enabled: true,
+            multiproof_chunk_size: DEFAULT_MULTIPROOF_TASK_CHUNK_SIZE,
+            reserved_cpu_cores: DEFAULT_RESERVED_CPU_CORES,
+            precompile_cache_disabled: false,
+            state_root_fallback: false,
+            always_process_payload_attributes_on_canonical_head: false,
+            allow_unwind_canonical_header: false,
+            storage_worker_count: None,
+            account_worker_count: None,
+        }
+    }
+}
+
 /// Parameters for configuring the engine driver.
 #[derive(Debug, Clone, Args, PartialEq, Eq)]
 #[command(next_help_heading = "Engine")]
@@ -18,15 +203,15 @@ pub struct EngineArgs {
    ///
    /// To persist blocks as fast as the node receives them, set this value to zero. This will
    /// cause more frequent DB writes.
-    #[arg(long = "engine.persistence-threshold", default_value_t = DEFAULT_PERSISTENCE_THRESHOLD)]
+    #[arg(long = "engine.persistence-threshold", default_value_t = DefaultEngineValues::get_global().persistence_threshold)]
    pub persistence_threshold: u64,

    /// Configure the target number of blocks to keep in memory.
-    #[arg(long = "engine.memory-block-buffer-target", default_value_t = DEFAULT_MEMORY_BLOCK_BUFFER_TARGET)]
+    #[arg(long = "engine.memory-block-buffer-target", default_value_t = DefaultEngineValues::get_global().memory_block_buffer_target)]
    pub memory_block_buffer_target: u64,

    /// Enable legacy state root
-    #[arg(long = "engine.legacy-state-root", default_value = "false")]
+    #[arg(long = "engine.legacy-state-root", default_value_t = DefaultEngineValues::get_global().legacy_state_root_task_enabled)]
    pub legacy_state_root_task_enabled: bool,

    /// CAUTION: This CLI flag has no effect anymore, use --engine.disable-caching-and-prewarming
@@ -35,8 +220,12 @@ pub struct EngineArgs {
    #[deprecated]
    pub caching_and_prewarming_enabled: bool,

+    /// Disable state cache
+    #[arg(long = "engine.disable-state-cache", default_value_t = DefaultEngineValues::get_global().state_cache_disabled)]
+    pub state_cache_disabled: bool,
+
    /// Disable parallel prewarming
-    #[arg(long = "engine.disable-prewarming", alias = "engine.disable-caching-and-prewarming")]
+    #[arg(long = "engine.disable-prewarming", alias = "engine.disable-caching-and-prewarming", default_value_t = DefaultEngineValues::get_global().prewarming_disabled)]
    pub prewarming_disabled: bool,

    /// CAUTION: This CLI flag has no effect anymore, use --engine.disable-parallel-sparse-trie
@@ -46,38 +235,38 @@ pub struct EngineArgs {
    pub parallel_sparse_trie_enabled: bool,

    /// Disable the parallel sparse trie in the engine.
-    #[arg(long = "engine.disable-parallel-sparse-trie", default_value = "false")]
+    #[arg(long = "engine.disable-parallel-sparse-trie", default_value_t = DefaultEngineValues::get_global().parallel_sparse_trie_disabled)]
    pub parallel_sparse_trie_disabled: bool,

    /// Enable state provider latency metrics. This allows the engine to collect and report stats
    /// about how long state provider calls took during execution, but this does introduce slight
    /// overhead to state provider calls.
-    #[arg(long = "engine.state-provider-metrics", default_value = "false")]
+    #[arg(long = "engine.state-provider-metrics", default_value_t = DefaultEngineValues::get_global().state_provider_metrics)]
    pub state_provider_metrics: bool,

    /// Configure the size of cross-block cache in megabytes
-    #[arg(long = "engine.cross-block-cache-size", default_value_t = DEFAULT_CROSS_BLOCK_CACHE_SIZE_MB)]
+    #[arg(long = "engine.cross-block-cache-size", default_value_t = DefaultEngineValues::get_global().cross_block_cache_size)]
    pub cross_block_cache_size: u64,

    /// Enable comparing trie updates from the state root task to the trie updates from the regular
    /// state root calculation.
-    #[arg(long = "engine.state-root-task-compare-updates")]
+    #[arg(long = "engine.state-root-task-compare-updates", default_value_t = DefaultEngineValues::get_global().state_root_task_compare_updates)]
    pub state_root_task_compare_updates: bool,

    /// Enables accepting requests hash instead of an array of requests in `engine_newPayloadV4`.
-    #[arg(long = "engine.accept-execution-requests-hash")]
+    #[arg(long = "engine.accept-execution-requests-hash", default_value_t = DefaultEngineValues::get_global().accept_execution_requests_hash)]
    pub accept_execution_requests_hash: bool,

    /// Whether multiproof task should chunk proof targets.
-    #[arg(long = "engine.multiproof-chunking", default_value = "true")]
+    #[arg(long = "engine.multiproof-chunking", default_value_t = DefaultEngineValues::get_global().multiproof_chunking_enabled)]
    pub multiproof_chunking_enabled: bool,

    /// Multiproof task chunk size for proof targets.
-    #[arg(long = "engine.multiproof-chunk-size", default_value_t = DEFAULT_MULTIPROOF_TASK_CHUNK_SIZE)]
+    #[arg(long = "engine.multiproof-chunk-size", default_value_t = DefaultEngineValues::get_global().multiproof_chunk_size)]
    pub multiproof_chunk_size: usize,

    /// Configure the number of reserved CPU cores for non-reth processes
-    #[arg(long = "engine.reserved-cpu-cores", default_value_t = DEFAULT_RESERVED_CPU_CORES)]
+    #[arg(long = "engine.reserved-cpu-cores", default_value_t = DefaultEngineValues::get_global().reserved_cpu_cores)]
    pub reserved_cpu_cores: usize,

    /// CAUTION: This CLI flag has no effect anymore, use --engine.disable-precompile-cache
@@ -87,11 +276,11 @@ pub struct EngineArgs {
    pub precompile_cache_enabled: bool,

    /// Disable precompile cache
-    #[arg(long = "engine.disable-precompile-cache", default_value = "false")]
+    #[arg(long = "engine.disable-precompile-cache", default_value_t = DefaultEngineValues::get_global().precompile_cache_disabled)]
    pub precompile_cache_disabled: bool,

    /// Enable state root fallback, useful for testing
-    #[arg(long = "engine.state-root-fallback", default_value = "false")]
+    #[arg(long = "engine.state-root-fallback", default_value_t = DefaultEngineValues::get_global().state_root_fallback)]
    pub state_root_fallback: bool,

    /// Always process payload attributes and begin a payload build process even if
@@ -101,51 +290,73 @@ pub struct EngineArgs {
    /// Note: This is a no-op on OP Stack.
    #[arg(
        long = "engine.always-process-payload-attributes-on-canonical-head",
-        default_value = "false"
+        default_value_t = DefaultEngineValues::get_global().always_process_payload_attributes_on_canonical_head
    )]
    pub always_process_payload_attributes_on_canonical_head: bool,

    /// Allow unwinding canonical header to ancestor during forkchoice updates.
    /// See `TreeConfig::unwind_canonical_header` for more details.
-    #[arg(long = "engine.allow-unwind-canonical-header", default_value = "false")]
+    #[arg(long = "engine.allow-unwind-canonical-header", default_value_t = DefaultEngineValues::get_global().allow_unwind_canonical_header)]
    pub allow_unwind_canonical_header: bool,

    /// Configure the number of storage proof workers in the Tokio blocking pool.
    /// If not specified, defaults to 2x available parallelism, clamped between 2 and 64.
-    #[arg(long = "engine.storage-worker-count")]
+    #[arg(long = "engine.storage-worker-count", default_value = Resettable::from(DefaultEngineValues::get_global().storage_worker_count.map(|v| v.to_string().into())))]
    pub storage_worker_count: Option<usize>,

    /// Configure the number of account proof workers in the Tokio blocking pool.
    /// If not specified, defaults to the same count as storage workers.
-    #[arg(long = "engine.account-worker-count")]
+    #[arg(long = "engine.account-worker-count", default_value = Resettable::from(DefaultEngineValues::get_global().account_worker_count.map(|v| v.to_string().into())))]
    pub account_worker_count: Option<usize>,
 }

 #[allow(deprecated)]
 impl Default for EngineArgs {
    fn default() -> Self {
+        let DefaultEngineValues {
+            persistence_threshold,
+            memory_block_buffer_target,
+            legacy_state_root_task_enabled,
+            state_cache_disabled,
+            prewarming_disabled,
+            parallel_sparse_trie_disabled,
+            state_provider_metrics,
+            cross_block_cache_size,
+            state_root_task_compare_updates,
+            accept_execution_requests_hash,
+            multiproof_chunking_enabled,
+            multiproof_chunk_size,
+            reserved_cpu_cores,
+            precompile_cache_disabled,
+            state_root_fallback,
+            always_process_payload_attributes_on_canonical_head,
+            allow_unwind_canonical_header,
+            storage_worker_count,
+            account_worker_count,
+        } = DefaultEngineValues::get_global().clone();
        Self {
-            persistence_threshold: DEFAULT_PERSISTENCE_THRESHOLD,
-            memory_block_buffer_target: DEFAULT_MEMORY_BLOCK_BUFFER_TARGET,
-            legacy_state_root_task_enabled: false,
-            state_root_task_compare_updates: false,
+            persistence_threshold,
+            memory_block_buffer_target,
+            legacy_state_root_task_enabled,
+            state_root_task_compare_updates,
            caching_and_prewarming_enabled: true,
-            prewarming_disabled: false,
+            state_cache_disabled,
+            prewarming_disabled,
            parallel_sparse_trie_enabled: true,
-            parallel_sparse_trie_disabled: false,
-            state_provider_metrics: false,
-            cross_block_cache_size: DEFAULT_CROSS_BLOCK_CACHE_SIZE_MB,
-            accept_execution_requests_hash: false,
-            multiproof_chunking_enabled: true,
-            multiproof_chunk_size: DEFAULT_MULTIPROOF_TASK_CHUNK_SIZE,
-            reserved_cpu_cores: DEFAULT_RESERVED_CPU_CORES,
+            parallel_sparse_trie_disabled,
+            state_provider_metrics,
+            cross_block_cache_size,
+            accept_execution_requests_hash,
+            multiproof_chunking_enabled,
+            multiproof_chunk_size,
+            reserved_cpu_cores,
            precompile_cache_enabled: true,
-            precompile_cache_disabled: false,
-            state_root_fallback: false,
-            always_process_payload_attributes_on_canonical_head: false,
-            allow_unwind_canonical_header: false,
-            storage_worker_count: None,
-            account_worker_count: None,
+            precompile_cache_disabled,
+            state_root_fallback,
+            always_process_payload_attributes_on_canonical_head,
+            allow_unwind_canonical_header,
+            storage_worker_count,
+            account_worker_count,
        }
    }
 }
@@ -157,6 +368,7 @@ impl EngineArgs {
            .with_persistence_threshold(self.persistence_threshold)
            .with_memory_block_buffer_target(self.memory_block_buffer_target)
            .with_legacy_state_root(self.legacy_state_root_task_enabled)
+            .without_state_cache(self.state_cache_disabled)
            .without_prewarming(self.prewarming_disabled)
            .with_disable_parallel_sparse_trie(self.parallel_sparse_trie_disabled)
            .with_state_provider_metrics(self.state_provider_metrics)
@@ -202,4 +414,66 @@ mod tests {
        let args = CommandParser::<EngineArgs>::parse_from(["reth"]).args;
        assert_eq!(args, default_args);
    }
+
+    #[test]
+    #[allow(deprecated)]
+    fn engine_args() {
+        let args = EngineArgs {
+            persistence_threshold: 100,
+            memory_block_buffer_target: 50,
+            legacy_state_root_task_enabled: true,
+            caching_and_prewarming_enabled: true,
+            state_cache_disabled: true,
+            prewarming_disabled: true,
+            parallel_sparse_trie_enabled: true,
+            parallel_sparse_trie_disabled: true,
+            state_provider_metrics: true,
+            cross_block_cache_size: 256,
+            state_root_task_compare_updates: true,
+            accept_execution_requests_hash: true,
+            multiproof_chunking_enabled: true,
+            multiproof_chunk_size: 512,
+            reserved_cpu_cores: 4,
+            precompile_cache_enabled: true,
+            precompile_cache_disabled: true,
+            state_root_fallback: true,
+            always_process_payload_attributes_on_canonical_head: true,
+            allow_unwind_canonical_header: true,
+            storage_worker_count: Some(16),
+            account_worker_count: Some(8),
+        };
+
+        let parsed_args = CommandParser::<EngineArgs>::parse_from([
+            "reth",
+            "--engine.persistence-threshold",
+            "100",
+            "--engine.memory-block-buffer-target",
+            "50",
+            "--engine.legacy-state-root",
+            "--engine.disable-state-cache",
+            "--engine.disable-prewarming",
+            "--engine.disable-parallel-sparse-trie",
+            "--engine.state-provider-metrics",
+            "--engine.cross-block-cache-size",
+            "256",
+            "--engine.state-root-task-compare-updates",
+            "--engine.accept-execution-requests-hash",
+            "--engine.multiproof-chunking",
+            "--engine.multiproof-chunk-size",
+            "512",
+            "--engine.reserved-cpu-cores",
+            "4",
+            "--engine.disable-precompile-cache",
+            "--engine.state-root-fallback",
+            "--engine.always-process-payload-attributes-on-canonical-head",
+            "--engine.allow-unwind-canonical-header",
+            "--engine.storage-worker-count",
+            "16",
+            "--engine.account-worker-count",
+            "8",
+        ])
+        .args;
+
+        assert_eq!(parsed_args, args);
+    }
 }
--- a/crates/node/core/src/args/mod.rs
+++ b/crates/node/core/src/args/mod.rs
@@ -6,7 +6,7 @@ pub use network::{DiscoveryArgs, NetworkArgs};

 /// RpcServerArg struct for configuring the RPC
 mod rpc_server;
-pub use rpc_server::RpcServerArgs;
+pub use rpc_server::{DefaultRpcServerArgs, RpcServerArgs};

 /// `RpcStateCacheArgs` struct for configuring RPC state cache
 mod rpc_state_cache;
@@ -66,7 +66,7 @@ pub use benchmark_args::BenchmarkArgs;

 /// EngineArgs for configuring the engine
 mod engine;
-pub use engine::EngineArgs;
+pub use engine::{DefaultEngineValues, EngineArgs};

 /// `RessArgs` for configuring ress subprotocol.
 mod ress_args;
--- a/crates/node/core/src/args/network.rs
+++ b/crates/node/core/src/args/network.rs
@@ -119,6 +119,18 @@ pub struct NetworkArgs {
    #[arg(long)]
    pub max_inbound_peers: Option<usize>,

+    /// Maximum number of total peers (inbound + outbound).
+    ///
+    /// Splits peers using approximately 2:1 inbound:outbound ratio. Cannot be used together with
+    /// `--max-outbound-peers` or `--max-inbound-peers`.
+    #[arg(
+        long,
+        value_name = "COUNT",
+        conflicts_with = "max_outbound_peers",
+        conflicts_with = "max_inbound_peers"
+    )]
+    pub max_peers: Option<usize>,
+
    /// Max concurrent `GetPooledTransactions` requests.
    #[arg(long = "max-tx-reqs", value_name = "COUNT", default_value_t = DEFAULT_MAX_COUNT_CONCURRENT_REQUESTS, verbatim_doc_comment)]
    pub max_concurrent_tx_requests: u32,
@@ -245,6 +257,34 @@ impl NetworkArgs {
            bootnodes.into_iter().filter_map(|node| node.resolve_blocking().ok()).collect()
        })
    }
+
+    /// Returns the max inbound peers (2:1 ratio).
+    pub fn resolved_max_inbound_peers(&self) -> Option<usize> {
+        if let Some(max_peers) = self.max_peers {
+            if max_peers == 0 {
+                Some(0)
+            } else {
+                let outbound = (max_peers / 3).max(1);
+                Some(max_peers.saturating_sub(outbound))
+            }
+        } else {
+            self.max_inbound_peers
+        }
+    }
+
+    /// Returns the max outbound peers (1:2 ratio).
+    pub fn resolved_max_outbound_peers(&self) -> Option<usize> {
+        if let Some(max_peers) = self.max_peers {
+            if max_peers == 0 {
+                Some(0)
+            } else {
+                Some((max_peers / 3).max(1))
+            }
+        } else {
+            self.max_outbound_peers
+        }
+    }
+
    /// Configures and returns a `TransactionsManagerConfig` based on the current settings.
    pub const fn transactions_manager_config(&self) -> TransactionsManagerConfig {
        TransactionsManagerConfig {
@@ -291,8 +331,8 @@ impl NetworkArgs {
            .peers_config_with_basic_nodes_from_file(
                self.persistent_peers_file(peers_file).as_deref(),
            )
-            .with_max_inbound_opt(self.max_inbound_peers)
-            .with_max_outbound_opt(self.max_outbound_peers)
+            .with_max_inbound_opt(self.resolved_max_inbound_peers())
+            .with_max_outbound_opt(self.resolved_max_outbound_peers())
            .with_ip_filter(ip_filter);

        // Configure basic network stack
@@ -434,6 +474,7 @@ impl Default for NetworkArgs {
            port: DEFAULT_DISCOVERY_PORT,
            max_outbound_peers: None,
            max_inbound_peers: None,
+            max_peers: None,
            max_concurrent_tx_requests: DEFAULT_MAX_COUNT_CONCURRENT_REQUESTS,
            max_concurrent_tx_requests_per_peer: DEFAULT_MAX_COUNT_CONCURRENT_REQUESTS_PER_PEER,
            soft_limit_byte_size_pooled_transactions_response:
@@ -758,6 +799,96 @@ mod tests {
        assert!(args.disable_tx_gossip);
    }

+    #[test]
+    fn parse_max_peers_flag() {
+        let args = CommandParser::<NetworkArgs>::parse_from(["reth", "--max-peers", "90"]).args;
+
+        assert_eq!(args.max_peers, Some(90));
+        assert_eq!(args.max_outbound_peers, None);
+        assert_eq!(args.max_inbound_peers, None);
+        assert_eq!(args.resolved_max_outbound_peers(), Some(30));
+        assert_eq!(args.resolved_max_inbound_peers(), Some(60));
+    }
+
+    #[test]
+    fn max_peers_conflicts_with_outbound() {
+        let result = CommandParser::<NetworkArgs>::try_parse_from([
+            "reth",
+            "--max-peers",
+            "90",
+            "--max-outbound-peers",
+            "50",
+        ]);
+        assert!(
+            result.is_err(),
+            "Should fail when both --max-peers and --max-outbound-peers are used"
+        );
+    }
+
+    #[test]
+    fn max_peers_conflicts_with_inbound() {
+        let result = CommandParser::<NetworkArgs>::try_parse_from([
+            "reth",
+            "--max-peers",
+            "90",
+            "--max-inbound-peers",
+            "30",
+        ]);
+        assert!(
+            result.is_err(),
+            "Should fail when both --max-peers and --max-inbound-peers are used"
+        );
+    }
+
+    #[test]
+    fn max_peers_split_calculation() {
+        let args = CommandParser::<NetworkArgs>::parse_from(["reth", "--max-peers", "90"]).args;
+
+        assert_eq!(args.max_peers, Some(90));
+        assert_eq!(args.resolved_max_outbound_peers(), Some(30));
+        assert_eq!(args.resolved_max_inbound_peers(), Some(60));
+    }
+
+    #[test]
+    fn max_peers_small_values() {
+        let args1 = CommandParser::<NetworkArgs>::parse_from(["reth", "--max-peers", "1"]).args;
+        assert_eq!(args1.resolved_max_outbound_peers(), Some(1));
+        assert_eq!(args1.resolved_max_inbound_peers(), Some(0));
+
+        let args2 = CommandParser::<NetworkArgs>::parse_from(["reth", "--max-peers", "2"]).args;
+        assert_eq!(args2.resolved_max_outbound_peers(), Some(1));
+        assert_eq!(args2.resolved_max_inbound_peers(), Some(1));
+
+        let args3 = CommandParser::<NetworkArgs>::parse_from(["reth", "--max-peers", "3"]).args;
+        assert_eq!(args3.resolved_max_outbound_peers(), Some(1));
+        assert_eq!(args3.resolved_max_inbound_peers(), Some(2));
+    }
+
+    #[test]
+    fn resolved_peers_without_max_peers() {
+        let args = CommandParser::<NetworkArgs>::parse_from([
+            "reth",
+            "--max-outbound-peers",
+            "75",
+            "--max-inbound-peers",
+            "15",
+        ])
+        .args;
+
+        assert_eq!(args.max_peers, None);
+        assert_eq!(args.resolved_max_outbound_peers(), Some(75));
+        assert_eq!(args.resolved_max_inbound_peers(), Some(15));
+    }
+
+    #[test]
+    fn resolved_peers_with_defaults() {
+        let args = CommandParser::<NetworkArgs>::parse_from(["reth"]).args;
+
+        assert_eq!(args.max_peers, None);
+        assert_eq!(args.resolved_max_outbound_peers(), None);
+        assert_eq!(args.resolved_max_inbound_peers(), None);
+    }
+
    #[test]
    fn network_args_default_sanity_test() {
        let default_args = NetworkArgs::default();
--- a/crates/node/core/src/args/rpc_server.rs
+++ b/crates/node/core/src/args/rpc_server.rs
@@ -7,7 +7,7 @@ use crate::args::{
 use alloy_primitives::Address;
 use alloy_rpc_types_engine::JwtSecret;
 use clap::{
-    builder::{PossibleValue, RangedU64ValueParser, TypedValueParser},
+    builder::{PossibleValue, RangedU64ValueParser, Resettable, TypedValueParser},
    Arg, Args, Command,
 };
 use rand::Rng;
@@ -19,12 +19,16 @@ use std::{
    ffi::OsStr,
    net::{IpAddr, Ipv4Addr},
    path::PathBuf,
+    sync::OnceLock,
    time::Duration,
 };
 use url::Url;

 use super::types::MaxOr;

+/// Global static RPC server defaults
+static RPC_SERVER_DEFAULTS: OnceLock<DefaultRpcServerArgs> = OnceLock::new();
+
 /// Default max number of subscriptions per connection.
 pub(crate) const RPC_DEFAULT_MAX_SUBS_PER_CONN: u32 = 1024;

@@ -37,76 +41,442 @@ pub(crate) const RPC_DEFAULT_MAX_REQUEST_SIZE_MB: u32 = 15;
 pub(crate) const RPC_DEFAULT_MAX_RESPONSE_SIZE_MB: u32 = 160;

 /// Default number of incoming connections.
+///
+/// This restricts how many active connections (http, ws) the server accepts.
+/// Once exceeded, the server can reject new connections.
 pub(crate) const RPC_DEFAULT_MAX_CONNECTIONS: u32 = 500;

+/// Default values for RPC server that can be customized
+///
+/// Global defaults can be set via [`DefaultRpcServerArgs::try_init`].
+#[derive(Debug, Clone)]
+pub struct DefaultRpcServerArgs {
+    http: bool,
+    http_addr: IpAddr,
+    http_port: u16,
+    http_disable_compression: bool,
+    http_api: Option<RpcModuleSelection>,
+    http_corsdomain: Option<String>,
+    ws: bool,
+    ws_addr: IpAddr,
+    ws_port: u16,
+    ws_allowed_origins: Option<String>,
+    ws_api: Option<RpcModuleSelection>,
+    ipcdisable: bool,
+    ipcpath: String,
+    ipc_socket_permissions: Option<String>,
+    auth_addr: IpAddr,
+    auth_port: u16,
+    auth_jwtsecret: Option<PathBuf>,
+    auth_ipc: bool,
+    auth_ipc_path: String,
+    disable_auth_server: bool,
+    rpc_jwtsecret: Option<JwtSecret>,
+    rpc_max_request_size: MaxU32,
+    rpc_max_response_size: MaxU32,
+    rpc_max_subscriptions_per_connection: MaxU32,
+    rpc_max_connections: MaxU32,
+    rpc_max_tracing_requests: usize,
+    rpc_max_blocking_io_requests: usize,
+    rpc_max_trace_filter_blocks: u64,
+    rpc_max_blocks_per_filter: ZeroAsNoneU64,
+    rpc_max_logs_per_response: ZeroAsNoneU64,
+    rpc_gas_cap: u64,
+    rpc_evm_memory_limit: u64,
+    rpc_tx_fee_cap: u128,
+    rpc_max_simulate_blocks: u64,
+    rpc_eth_proof_window: u64,
+    rpc_proof_permits: usize,
+    rpc_pending_block: PendingBlockKind,
+    rpc_forwarder: Option<Url>,
+    builder_disallow: Option<HashSet<Address>>,
+    rpc_state_cache: RpcStateCacheArgs,
+    gas_price_oracle: GasPriceOracleArgs,
+    rpc_send_raw_transaction_sync_timeout: Duration,
+}
+
+impl DefaultRpcServerArgs {
+    /// Initialize the global RPC server defaults with this configuration
+    pub fn try_init(self) -> Result<(), Self> {
+        RPC_SERVER_DEFAULTS.set(self)
+    }
+
+    /// Get a reference to the global RPC server defaults
+    pub fn get_global() -> &'static Self {
+        RPC_SERVER_DEFAULTS.get_or_init(Self::default)
+    }
+
+    /// Set the default HTTP enabled state
+    pub const fn with_http(mut self, v: bool) -> Self {
+        self.http = v;
+        self
+    }
+
+    /// Set the default HTTP address
+    pub const fn with_http_addr(mut self, v: IpAddr) -> Self {
+        self.http_addr = v;
+        self
+    }
+
+    /// Set the default HTTP port
+    pub const fn with_http_port(mut self, v: u16) -> Self {
+        self.http_port = v;
+        self
+    }
+
+    /// Set whether to disable HTTP compression by default
+    pub const fn with_http_disable_compression(mut self, v: bool) -> Self {
+        self.http_disable_compression = v;
+        self
+    }
+
+    /// Set the default HTTP API modules
+    pub fn with_http_api(mut self, v: Option<RpcModuleSelection>) -> Self {
+        self.http_api = v;
+        self
+    }
+
+    /// Set the default HTTP CORS domain
+    pub fn with_http_corsdomain(mut self, v: Option<String>) -> Self {
+        self.http_corsdomain = v;
+        self
+    }
+
+    /// Set the default WS enabled state
+    pub const fn with_ws(mut self, v: bool) -> Self {
+        self.ws = v;
+        self
+    }
+
+    /// Set the default WS address
+    pub const fn with_ws_addr(mut self, v: IpAddr) -> Self {
+        self.ws_addr = v;
+        self
+    }
+
+    /// Set the default WS port
+    pub const fn with_ws_port(mut self, v: u16) -> Self {
+        self.ws_port = v;
+        self
+    }
+
+    /// Set the default WS allowed origins
+    pub fn with_ws_allowed_origins(mut self, v: Option<String>) -> Self {
+        self.ws_allowed_origins = v;
+        self
+    }
+
+    /// Set the default WS API modules
+    pub fn with_ws_api(mut self, v: Option<RpcModuleSelection>) -> Self {
+        self.ws_api = v;
+        self
+    }
+
+    /// Set whether to disable IPC by default
+    pub const fn with_ipcdisable(mut self, v: bool) -> Self {
+        self.ipcdisable = v;
+        self
+    }
+
+    /// Set the default IPC path
+    pub fn with_ipcpath(mut self, v: String) -> Self {
+        self.ipcpath = v;
+        self
+    }
+
+    /// Set the default IPC socket permissions
+    pub fn with_ipc_socket_permissions(mut self, v: Option<String>) -> Self {
+        self.ipc_socket_permissions = v;
+        self
+    }
+
+    /// Set the default auth server address
+    pub const fn with_auth_addr(mut self, v: IpAddr) -> Self {
+        self.auth_addr = v;
+        self
+    }
+
+    /// Set the default auth server port
+    pub const fn with_auth_port(mut self, v: u16) -> Self {
+        self.auth_port = v;
+        self
+    }
+
+    /// Set the default auth JWT secret path
+    pub fn with_auth_jwtsecret(mut self, v: Option<PathBuf>) -> Self {
+        self.auth_jwtsecret = v;
+        self
+    }
+
+    /// Set the default auth IPC enabled state
+    pub const fn with_auth_ipc(mut self, v: bool) -> Self {
+        self.auth_ipc = v;
+        self
+    }
+
+    /// Set the default auth IPC path
+    pub fn with_auth_ipc_path(mut self, v: String) -> Self {
+        self.auth_ipc_path = v;
+        self
+    }
+
+    /// Set whether to disable the auth server by default
+    pub const fn with_disable_auth_server(mut self, v: bool) -> Self {
+        self.disable_auth_server = v;
+        self
+    }
+
+    /// Set the default RPC JWT secret
+    pub const fn with_rpc_jwtsecret(mut self, v: Option<JwtSecret>) -> Self {
+        self.rpc_jwtsecret = v;
+        self
+    }
+
+    /// Set the default max request size
+    pub const fn with_rpc_max_request_size(mut self, v: MaxU32) -> Self {
+        self.rpc_max_request_size = v;
+        self
+    }
+
+    /// Set the default max response size
+    pub const fn with_rpc_max_response_size(mut self, v: MaxU32) -> Self {
+        self.rpc_max_response_size = v;
+        self
+    }
+
+    /// Set the default max subscriptions per connection
+    pub const fn with_rpc_max_subscriptions_per_connection(mut self, v: MaxU32) -> Self {
+        self.rpc_max_subscriptions_per_connection = v;
+        self
+    }
+
+    /// Set the default max connections
+    pub const fn with_rpc_max_connections(mut self, v: MaxU32) -> Self {
+        self.rpc_max_connections = v;
+        self
+    }
+
+    /// Set the default max tracing requests
+    pub const fn with_rpc_max_tracing_requests(mut self, v: usize) -> Self {
+        self.rpc_max_tracing_requests = v;
+        self
+    }
+
+    /// Set the default max blocking IO requests
+    pub const fn with_rpc_max_blocking_io_requests(mut self, v: usize) -> Self {
+        self.rpc_max_blocking_io_requests = v;
+        self
+    }
+
+    /// Set the default max trace filter blocks
+    pub const fn with_rpc_max_trace_filter_blocks(mut self, v: u64) -> Self {
+        self.rpc_max_trace_filter_blocks = v;
+        self
+    }
+
+    /// Set the default max blocks per filter
+    pub const fn with_rpc_max_blocks_per_filter(mut self, v: ZeroAsNoneU64) -> Self {
+        self.rpc_max_blocks_per_filter = v;
+        self
+    }
+
+    /// Set the default max logs per response
+    pub const fn with_rpc_max_logs_per_response(mut self, v: ZeroAsNoneU64) -> Self {
+        self.rpc_max_logs_per_response = v;
+        self
+    }
+
+    /// Set the default gas cap
+    pub const fn with_rpc_gas_cap(mut self, v: u64) -> Self {
+        self.rpc_gas_cap = v;
+        self
+    }
+
+    /// Set the default EVM memory limit
+    pub const fn with_rpc_evm_memory_limit(mut self, v: u64) -> Self {
+        self.rpc_evm_memory_limit = v;
+        self
+    }
+
+    /// Set the default tx fee cap
+    pub const fn with_rpc_tx_fee_cap(mut self, v: u128) -> Self {
+        self.rpc_tx_fee_cap = v;
+        self
+    }
+
+    /// Set the default max simulate blocks
+    pub const fn with_rpc_max_simulate_blocks(mut self, v: u64) -> Self {
+        self.rpc_max_simulate_blocks = v;
+        self
+    }
+
+    /// Set the default eth proof window
+    pub const fn with_rpc_eth_proof_window(mut self, v: u64) -> Self {
+        self.rpc_eth_proof_window = v;
+        self
+    }
+
+    /// Set the default proof permits
+    pub const fn with_rpc_proof_permits(mut self, v: usize) -> Self {
+        self.rpc_proof_permits = v;
+        self
+    }
+
+    /// Set the default pending block kind
+    pub const fn with_rpc_pending_block(mut self, v: PendingBlockKind) -> Self {
+        self.rpc_pending_block = v;
+        self
+    }
+
+    /// Set the default RPC forwarder
+    pub fn with_rpc_forwarder(mut self, v: Option<Url>) -> Self {
+        self.rpc_forwarder = v;
+        self
+    }
+
+    /// Set the default builder disallow addresses
+    pub fn with_builder_disallow(mut self, v: Option<HashSet<Address>>) -> Self {
+        self.builder_disallow = v;
+        self
+    }
+
+    /// Set the default RPC state cache args
+    pub const fn with_rpc_state_cache(mut self, v: RpcStateCacheArgs) -> Self {
+        self.rpc_state_cache = v;
+        self
+    }
+
+    /// Set the default gas price oracle args
+    pub const fn with_gas_price_oracle(mut self, v: GasPriceOracleArgs) -> Self {
+        self.gas_price_oracle = v;
+        self
+    }
+
+    /// Set the default send raw transaction sync timeout
+    pub const fn with_rpc_send_raw_transaction_sync_timeout(mut self, v: Duration) -> Self {
+        self.rpc_send_raw_transaction_sync_timeout = v;
+        self
+    }
+}
+
+impl Default for DefaultRpcServerArgs {
+    fn default() -> Self {
+        Self {
+            http: false,
+            http_addr: Ipv4Addr::LOCALHOST.into(),
+            http_port: constants::DEFAULT_HTTP_RPC_PORT,
+            http_disable_compression: false,
+            http_api: None,
+            http_corsdomain: None,
+            ws: false,
+            ws_addr: Ipv4Addr::LOCALHOST.into(),
+            ws_port: constants::DEFAULT_WS_RPC_PORT,
+            ws_allowed_origins: None,
+            ws_api: None,
+            ipcdisable: false,
+            ipcpath: constants::DEFAULT_IPC_ENDPOINT.to_string(),
+            ipc_socket_permissions: None,
+            auth_addr: Ipv4Addr::LOCALHOST.into(),
+            auth_port: constants::DEFAULT_AUTH_PORT,
+            auth_jwtsecret: None,
+            auth_ipc: false,
+            auth_ipc_path: constants::DEFAULT_ENGINE_API_IPC_ENDPOINT.to_string(),
+            disable_auth_server: false,
+            rpc_jwtsecret: None,
+            rpc_max_request_size: RPC_DEFAULT_MAX_REQUEST_SIZE_MB.into(),
+            rpc_max_response_size: RPC_DEFAULT_MAX_RESPONSE_SIZE_MB.into(),
+            rpc_max_subscriptions_per_connection: RPC_DEFAULT_MAX_SUBS_PER_CONN.into(),
+            rpc_max_connections: RPC_DEFAULT_MAX_CONNECTIONS.into(),
+            rpc_max_tracing_requests: constants::default_max_tracing_requests(),
+            rpc_max_blocking_io_requests: constants::DEFAULT_MAX_BLOCKING_IO_REQUEST,
+            rpc_max_trace_filter_blocks: constants::DEFAULT_MAX_TRACE_FILTER_BLOCKS,
+            rpc_max_blocks_per_filter: constants::DEFAULT_MAX_BLOCKS_PER_FILTER.into(),
+            rpc_max_logs_per_response: (constants::DEFAULT_MAX_LOGS_PER_RESPONSE as u64).into(),
+            rpc_gas_cap: constants::gas_oracle::RPC_DEFAULT_GAS_CAP,
+            rpc_evm_memory_limit: (1 << 32) - 1,
+            rpc_tx_fee_cap: constants::DEFAULT_TX_FEE_CAP_WEI,
+            rpc_max_simulate_blocks: constants::DEFAULT_MAX_SIMULATE_BLOCKS,
+            rpc_eth_proof_window: constants::DEFAULT_ETH_PROOF_WINDOW,
+            rpc_proof_permits: constants::DEFAULT_PROOF_PERMITS,
+            rpc_pending_block: PendingBlockKind::Full,
+            rpc_forwarder: None,
+            builder_disallow: None,
+            rpc_state_cache: RpcStateCacheArgs::default(),
+            gas_price_oracle: GasPriceOracleArgs::default(),
+            rpc_send_raw_transaction_sync_timeout:
+                constants::RPC_DEFAULT_SEND_RAW_TX_SYNC_TIMEOUT_SECS,
+        }
+    }
+}
+
 /// Parameters for configuring the rpc more granularity via CLI
 #[derive(Debug, Clone, Args, PartialEq, Eq)]
 #[command(next_help_heading = "RPC")]
 pub struct RpcServerArgs {
    /// Enable the HTTP-RPC server
-    #[arg(long, default_value_if("dev", "true", "true"))]
+    #[arg(long, default_value_if("dev", "true", "true"), default_value_t = DefaultRpcServerArgs::get_global().http)]
    pub http: bool,

    /// Http server address to listen on
-    #[arg(long = "http.addr", default_value_t = IpAddr::V4(Ipv4Addr::LOCALHOST))]
+    #[arg(long = "http.addr", default_value_t = DefaultRpcServerArgs::get_global().http_addr)]
    pub http_addr: IpAddr,

    /// Http server port to listen on
-    #[arg(long = "http.port", default_value_t = constants::DEFAULT_HTTP_RPC_PORT)]
+    #[arg(long = "http.port", default_value_t = DefaultRpcServerArgs::get_global().http_port)]
    pub http_port: u16,

    /// Disable compression for HTTP responses
-    #[arg(long = "http.disable-compression", default_value_t = false)]
+    #[arg(long = "http.disable-compression", default_value_t = DefaultRpcServerArgs::get_global().http_disable_compression)]
    pub http_disable_compression: bool,

    /// Rpc Modules to be configured for the HTTP server
-    #[arg(long = "http.api", value_parser = RpcModuleSelectionValueParser::default())]
+    #[arg(long = "http.api", value_parser = RpcModuleSelectionValueParser::default(), default_value = Resettable::from(DefaultRpcServerArgs::get_global().http_api.as_ref().map(|v| v.to_string().into())))]
    pub http_api: Option<RpcModuleSelection>,

    /// Http Corsdomain to allow request from
-    #[arg(long = "http.corsdomain")]
+    #[arg(long = "http.corsdomain", default_value = Resettable::from(DefaultRpcServerArgs::get_global().http_corsdomain.as_ref().map(|v| v.to_string().into())))]
    pub http_corsdomain: Option<String>,

    /// Enable the WS-RPC server
-    #[arg(long)]
+    #[arg(long, default_value_t = DefaultRpcServerArgs::get_global().ws)]
    pub ws: bool,

    /// Ws server address to listen on
-    #[arg(long = "ws.addr", default_value_t = IpAddr::V4(Ipv4Addr::LOCALHOST))]
+    #[arg(long = "ws.addr", default_value_t = DefaultRpcServerArgs::get_global().ws_addr)]
    pub ws_addr: IpAddr,

    /// Ws server port to listen on
-    #[arg(long = "ws.port", default_value_t = constants::DEFAULT_WS_RPC_PORT)]
+    #[arg(long = "ws.port", default_value_t = DefaultRpcServerArgs::get_global().ws_port)]
    pub ws_port: u16,

    /// Origins from which to accept `WebSocket` requests
-    #[arg(id = "ws.origins", long = "ws.origins", alias = "ws.corsdomain")]
+    #[arg(id = "ws.origins", long = "ws.origins", alias = "ws.corsdomain", default_value = Resettable::from(DefaultRpcServerArgs::get_global().ws_allowed_origins.as_ref().map(|v| v.to_string().into())))]
    pub ws_allowed_origins: Option<String>,

    /// Rpc Modules to be configured for the WS server
-    #[arg(long = "ws.api", value_parser = RpcModuleSelectionValueParser::default())]
+    #[arg(long = "ws.api", value_parser = RpcModuleSelectionValueParser::default(), default_value = Resettable::from(DefaultRpcServerArgs::get_global().ws_api.as_ref().map(|v| v.to_string().into())))]
    pub ws_api: Option<RpcModuleSelection>,

    /// Disable the IPC-RPC server
-    #[arg(long)]
+    #[arg(long, default_value_t = DefaultRpcServerArgs::get_global().ipcdisable)]
    pub ipcdisable: bool,

    /// Filename for IPC socket/pipe within the datadir
-    #[arg(long, default_value_t = constants::DEFAULT_IPC_ENDPOINT.to_string())]
+    #[arg(long, default_value_t = DefaultRpcServerArgs::get_global().ipcpath.clone())]
    pub ipcpath: String,

    /// Set the permissions for the IPC socket file, in octal format.
    ///
    /// If not specified, the permissions will be set by the system's umask.
-    #[arg(long = "ipc.permissions")]
+    #[arg(long = "ipc.permissions", default_value = Resettable::from(DefaultRpcServerArgs::get_global().ipc_socket_permissions.as_ref().map(|v| v.to_string().into())))]
    pub ipc_socket_permissions: Option<String>,

    /// Auth server address to listen on
-    #[arg(long = "authrpc.addr", default_value_t = IpAddr::V4(Ipv4Addr::LOCALHOST))]
+    #[arg(long = "authrpc.addr", default_value_t = DefaultRpcServerArgs::get_global().auth_addr)]
    pub auth_addr: IpAddr,

    /// Auth server port to listen on
-    #[arg(long = "authrpc.port", default_value_t = constants::DEFAULT_AUTH_PORT)]
+    #[arg(long = "authrpc.port", default_value_t = DefaultRpcServerArgs::get_global().auth_port)]
    pub auth_port: u16,

    /// Path to a JWT secret to use for the authenticated engine-API RPC server.
@@ -115,22 +485,22 @@ pub struct RpcServerArgs {
    ///
    /// If no path is provided, a secret will be generated and stored in the datadir under
    /// `<DIR>/<CHAIN_ID>/jwt.hex`. For mainnet this would be `~/.reth/mainnet/jwt.hex` by default.
-    #[arg(long = "authrpc.jwtsecret", value_name = "PATH", global = true, required = false)]
+    #[arg(long = "authrpc.jwtsecret", value_name = "PATH", global = true, required = false, default_value = Resettable::from(DefaultRpcServerArgs::get_global().auth_jwtsecret.as_ref().map(|v| v.to_string_lossy().into())))]
    pub auth_jwtsecret: Option<PathBuf>,

    /// Enable auth engine API over IPC
-    #[arg(long)]
+    #[arg(long, default_value_t = DefaultRpcServerArgs::get_global().auth_ipc)]
    pub auth_ipc: bool,

    /// Filename for auth IPC socket/pipe within the datadir
-    #[arg(long = "auth-ipc.path", default_value_t = constants::DEFAULT_ENGINE_API_IPC_ENDPOINT.to_string())]
+    #[arg(long = "auth-ipc.path", default_value_t = DefaultRpcServerArgs::get_global().auth_ipc_path.clone())]
    pub auth_ipc_path: String,

    /// Disable the auth/engine API server.
    ///
    /// This will prevent the authenticated engine-API server from starting. Use this if you're
    /// running a node that doesn't need to serve engine API requests.
-    #[arg(long = "disable-auth-server", alias = "disable-engine-api")]
+    #[arg(long = "disable-auth-server", alias = "disable-engine-api", default_value_t = DefaultRpcServerArgs::get_global().disable_auth_server)]
    pub disable_auth_server: bool,

    /// Hex encoded JWT secret to authenticate the regular RPC server(s), see `--http.api` and
@@ -138,23 +508,23 @@ pub struct RpcServerArgs {
    ///
    /// This is __not__ used for the authenticated engine-API RPC server, see
    /// `--authrpc.jwtsecret`.
-    #[arg(long = "rpc.jwtsecret", value_name = "HEX", global = true, required = false)]
+    #[arg(long = "rpc.jwtsecret", value_name = "HEX", global = true, required = false, default_value = Resettable::from(DefaultRpcServerArgs::get_global().rpc_jwtsecret.as_ref().map(|v| format!("{:?}", v).into())))]
    pub rpc_jwtsecret: Option<JwtSecret>,

    /// Set the maximum RPC request payload size for both HTTP and WS in megabytes.
-    #[arg(long = "rpc.max-request-size", alias = "rpc-max-request-size", default_value_t = RPC_DEFAULT_MAX_REQUEST_SIZE_MB.into())]
+    #[arg(long = "rpc.max-request-size", alias = "rpc-max-request-size", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_request_size)]
    pub rpc_max_request_size: MaxU32,

    /// Set the maximum RPC response payload size for both HTTP and WS in megabytes.
-    #[arg(long = "rpc.max-response-size", alias = "rpc-max-response-size", visible_alias = "rpc.returndata.limit", default_value_t = RPC_DEFAULT_MAX_RESPONSE_SIZE_MB.into())]
+    #[arg(long = "rpc.max-response-size", alias = "rpc-max-response-size", visible_alias = "rpc.returndata.limit", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_response_size)]
    pub rpc_max_response_size: MaxU32,

    /// Set the maximum concurrent subscriptions per connection.
-    #[arg(long = "rpc.max-subscriptions-per-connection", alias = "rpc-max-subscriptions-per-connection", default_value_t = RPC_DEFAULT_MAX_SUBS_PER_CONN.into())]
+    #[arg(long = "rpc.max-subscriptions-per-connection", alias = "rpc-max-subscriptions-per-connection", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_subscriptions_per_connection)]
    pub rpc_max_subscriptions_per_connection: MaxU32,

    /// Maximum number of RPC server connections.
-    #[arg(long = "rpc.max-connections", alias = "rpc-max-connections", value_name = "COUNT", default_value_t = RPC_DEFAULT_MAX_CONNECTIONS.into())]
+    #[arg(long = "rpc.max-connections", alias = "rpc-max-connections", value_name = "COUNT", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_connections)]
    pub rpc_max_connections: MaxU32,

    /// Maximum number of concurrent tracing requests.
@@ -163,19 +533,27 @@ pub struct RpcServerArgs {
    /// Tracing requests are generally CPU bound.
    /// Choosing a value that is higher than the available CPU cores can have a negative impact on
    /// the performance of the node and affect the node's ability to maintain sync.
-    #[arg(long = "rpc.max-tracing-requests", alias = "rpc-max-tracing-requests", value_name = "COUNT", default_value_t = constants::default_max_tracing_requests())]
+    #[arg(long = "rpc.max-tracing-requests", alias = "rpc-max-tracing-requests", value_name = "COUNT", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_tracing_requests)]
    pub rpc_max_tracing_requests: usize,

+    /// Maximum number of concurrent blocking IO requests.
+    ///
+    /// Blocking IO requests include `eth_call`, `eth_estimateGas`, and similar methods that
+    /// require EVM execution. These are spawned as blocking tasks to avoid blocking the async
+    /// runtime.
+    #[arg(long = "rpc.max-blocking-io-requests", alias = "rpc-max-blocking-io-requests", value_name = "COUNT", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_blocking_io_requests)]
+    pub rpc_max_blocking_io_requests: usize,
+
    /// Maximum number of blocks for `trace_filter` requests.
-    #[arg(long = "rpc.max-trace-filter-blocks", alias = "rpc-max-trace-filter-blocks", value_name = "COUNT", default_value_t = constants::DEFAULT_MAX_TRACE_FILTER_BLOCKS)]
+    #[arg(long = "rpc.max-trace-filter-blocks", alias = "rpc-max-trace-filter-blocks", value_name = "COUNT", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_trace_filter_blocks)]
    pub rpc_max_trace_filter_blocks: u64,

    /// Maximum number of blocks that could be scanned per filter request. (0 = entire chain)
-    #[arg(long = "rpc.max-blocks-per-filter", alias = "rpc-max-blocks-per-filter", value_name = "COUNT", default_value_t = ZeroAsNoneU64::new(constants::DEFAULT_MAX_BLOCKS_PER_FILTER))]
+    #[arg(long = "rpc.max-blocks-per-filter", alias = "rpc-max-blocks-per-filter", value_name = "COUNT", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_blocks_per_filter)]
    pub rpc_max_blocks_per_filter: ZeroAsNoneU64,

    /// Maximum number of logs that can be returned in a single response. (0 = no limit)
-    #[arg(long = "rpc.max-logs-per-response", alias = "rpc-max-logs-per-response", value_name = "COUNT", default_value_t = ZeroAsNoneU64::new(constants::DEFAULT_MAX_LOGS_PER_RESPONSE as u64))]
+    #[arg(long = "rpc.max-logs-per-response", alias = "rpc-max-logs-per-response", value_name = "COUNT", default_value_t = DefaultRpcServerArgs::get_global().rpc_max_logs_per_response)]
    pub rpc_max_logs_per_response: ZeroAsNoneU64,

    /// Maximum gas limit for `eth_call` and call tracing RPC methods.
@@ -184,7 +562,7 @@ pub struct RpcServerArgs {
        alias = "rpc-gascap",
        value_name = "GAS_CAP",
        value_parser = MaxOr::new(RangedU64ValueParser::<u64>::new().range(1..)),
-        default_value_t = constants::gas_oracle::RPC_DEFAULT_GAS_CAP
+        default_value_t = DefaultRpcServerArgs::get_global().rpc_gas_cap
    )]
    pub rpc_gas_cap: u64,

@@ -194,7 +572,7 @@ pub struct RpcServerArgs {
        alias = "rpc-evm-memory-limit",
        value_name = "MEMORY_LIMIT",
        value_parser = MaxOr::new(RangedU64ValueParser::<u64>::new().range(1..)),
-        default_value_t = (1 << 32) - 1
+        default_value_t = DefaultRpcServerArgs::get_global().rpc_evm_memory_limit
    )]
    pub rpc_evm_memory_limit: u64,

@@ -212,7 +590,7 @@ pub struct RpcServerArgs {
    #[arg(
        long = "rpc.max-simulate-blocks",
        value_name = "BLOCKS_COUNT",
-        default_value_t = constants::DEFAULT_MAX_SIMULATE_BLOCKS
+        default_value_t = DefaultRpcServerArgs::get_global().rpc_max_simulate_blocks
    )]
    pub rpc_max_simulate_blocks: u64,

@@ -221,7 +599,7 @@ pub struct RpcServerArgs {
    /// configured number of blocks from current tip (up to `tip - window`).
    #[arg(
        long = "rpc.eth-proof-window",
-        default_value_t = constants::DEFAULT_ETH_PROOF_WINDOW,
+        default_value_t = DefaultRpcServerArgs::get_global().rpc_eth_proof_window,
        value_parser = RangedU64ValueParser::<u64>::new().range(..=constants::MAX_ETH_PROOF_WINDOW)
    )]
    pub rpc_eth_proof_window: u64,
@@ -243,7 +621,7 @@ pub struct RpcServerArgs {

    /// Path to file containing disallowed addresses, json-encoded list of strings. Block
    /// validation API will reject blocks containing transactions from these addresses.
-    #[arg(long = "builder.disallow", value_name = "PATH", value_parser = reth_cli_util::parsers::read_json_from_file::<HashSet<Address>>)]
+    #[arg(long = "builder.disallow", value_name = "PATH", value_parser = reth_cli_util::parsers::read_json_from_file::<HashSet<Address>>, default_value = Resettable::from(DefaultRpcServerArgs::get_global().builder_disallow.as_ref().map(|v| format!("{:?}", v).into())))]
    pub builder_disallow: Option<HashSet<Address>>,

    /// State cache configuration.
@@ -387,49 +765,93 @@ impl RpcServerArgs {

 impl Default for RpcServerArgs {
    fn default() -> Self {
+        let DefaultRpcServerArgs {
+            http,
+            http_addr,
+            http_port,
+            http_disable_compression,
+            http_api,
+            http_corsdomain,
+            ws,
+            ws_addr,
+            ws_port,
+            ws_allowed_origins,
+            ws_api,
+            ipcdisable,
+            ipcpath,
+            ipc_socket_permissions,
+            auth_addr,
+            auth_port,
+            auth_jwtsecret,
+            auth_ipc,
+            auth_ipc_path,
+            disable_auth_server,
+            rpc_jwtsecret,
+            rpc_max_request_size,
+            rpc_max_response_size,
+            rpc_max_subscriptions_per_connection,
+            rpc_max_connections,
+            rpc_max_tracing_requests,
+            rpc_max_blocking_io_requests,
+            rpc_max_trace_filter_blocks,
+            rpc_max_blocks_per_filter,
+            rpc_max_logs_per_response,
+            rpc_gas_cap,
+            rpc_evm_memory_limit,
+            rpc_tx_fee_cap,
+            rpc_max_simulate_blocks,
+            rpc_eth_proof_window,
+            rpc_proof_permits,
+            rpc_pending_block,
+            rpc_forwarder,
+            builder_disallow,
+            rpc_state_cache,
+            gas_price_oracle,
+            rpc_send_raw_transaction_sync_timeout,
+        } = DefaultRpcServerArgs::get_global().clone();
        Self {
-            http: false,
-            http_addr: Ipv4Addr::LOCALHOST.into(),
-            http_port: constants::DEFAULT_HTTP_RPC_PORT,
-            http_disable_compression: false,
-            http_api: None,
-            http_corsdomain: None,
-            ws: false,
-            ws_addr: Ipv4Addr::LOCALHOST.into(),
-            ws_port: constants::DEFAULT_WS_RPC_PORT,
-            ws_allowed_origins: None,
-            ws_api: None,
-            ipcdisable: false,
-            ipcpath: constants::DEFAULT_IPC_ENDPOINT.to_string(),
-            ipc_socket_permissions: None,
-            auth_addr: Ipv4Addr::LOCALHOST.into(),
-            auth_port: constants::DEFAULT_AUTH_PORT,
-            auth_jwtsecret: None,
-            auth_ipc: false,
-            auth_ipc_path: constants::DEFAULT_ENGINE_API_IPC_ENDPOINT.to_string(),
-            disable_auth_server: false,
-            rpc_jwtsecret: None,
-            rpc_max_request_size: RPC_DEFAULT_MAX_REQUEST_SIZE_MB.into(),
-            rpc_max_response_size: RPC_DEFAULT_MAX_RESPONSE_SIZE_MB.into(),
-            rpc_max_subscriptions_per_connection: RPC_DEFAULT_MAX_SUBS_PER_CONN.into(),
-            rpc_max_connections: RPC_DEFAULT_MAX_CONNECTIONS.into(),
-            rpc_max_tracing_requests: constants::default_max_tracing_requests(),
-            rpc_max_trace_filter_blocks: constants::DEFAULT_MAX_TRACE_FILTER_BLOCKS,
-            rpc_max_blocks_per_filter: constants::DEFAULT_MAX_BLOCKS_PER_FILTER.into(),
-            rpc_max_logs_per_response: (constants::DEFAULT_MAX_LOGS_PER_RESPONSE as u64).into(),
-            rpc_gas_cap: constants::gas_oracle::RPC_DEFAULT_GAS_CAP,
-            rpc_evm_memory_limit: (1 << 32) - 1,
-            rpc_tx_fee_cap: constants::DEFAULT_TX_FEE_CAP_WEI,
-            rpc_max_simulate_blocks: constants::DEFAULT_MAX_SIMULATE_BLOCKS,
-            rpc_eth_proof_window: constants::DEFAULT_ETH_PROOF_WINDOW,
-            rpc_pending_block: PendingBlockKind::Full,
-            gas_price_oracle: GasPriceOracleArgs::default(),
-            rpc_state_cache: RpcStateCacheArgs::default(),
-            rpc_proof_permits: constants::DEFAULT_PROOF_PERMITS,
-            rpc_forwarder: None,
-            builder_disallow: Default::default(),
-            rpc_send_raw_transaction_sync_timeout:
-                constants::RPC_DEFAULT_SEND_RAW_TX_SYNC_TIMEOUT_SECS,
+            http,
+            http_addr,
+            http_port,
+            http_disable_compression,
+            http_api,
+            http_corsdomain,
+            ws,
+            ws_addr,
+            ws_port,
+            ws_allowed_origins,
+            ws_api,
+            ipcdisable,
+            ipcpath,
+            ipc_socket_permissions,
+            auth_addr,
+            auth_port,
+            auth_jwtsecret,
+            auth_ipc,
+            auth_ipc_path,
+            disable_auth_server,
+            rpc_jwtsecret,
+            rpc_max_request_size,
+            rpc_max_response_size,
+            rpc_max_subscriptions_per_connection,
+            rpc_max_connections,
+            rpc_max_tracing_requests,
+            rpc_max_blocking_io_requests,
+            rpc_max_trace_filter_blocks,
+            rpc_max_blocks_per_filter,
+            rpc_max_logs_per_response,
+            rpc_gas_cap,
+            rpc_evm_memory_limit,
+            rpc_tx_fee_cap,
+            rpc_max_simulate_blocks,
+            rpc_eth_proof_window,
+            rpc_proof_permits,
+            rpc_pending_block,
+            rpc_forwarder,
+            builder_disallow,
+            rpc_state_cache,
+            gas_price_oracle,
+            rpc_send_raw_transaction_sync_timeout,
        }
    }
 }
@@ -542,4 +964,159 @@ mod tests {
        let expected = 1_000_000_000_000_000_000u128;
        assert_eq!(args.rpc_tx_fee_cap, expected); // 1 ETH default cap
    }
+
+    #[test]
+    fn test_rpc_server_args() {
+        let args = RpcServerArgs {
+            http: true,
+            http_addr: "127.0.0.1".parse().unwrap(),
+            http_port: 8545,
+            http_disable_compression: false,
+            http_api: Some(RpcModuleSelection::try_from_selection(["eth", "admin"]).unwrap()),
+            http_corsdomain: Some("*".to_string()),
+            ws: true,
+            ws_addr: "127.0.0.1".parse().unwrap(),
+            ws_port: 8546,
+            ws_allowed_origins: Some("*".to_string()),
+            ws_api: Some(RpcModuleSelection::try_from_selection(["eth", "admin"]).unwrap()),
+            ipcdisable: false,
+            ipcpath: "reth.ipc".to_string(),
+            ipc_socket_permissions: Some("0o666".to_string()),
+            auth_addr: "127.0.0.1".parse().unwrap(),
+            auth_port: 8551,
+            auth_jwtsecret: Some(std::path::PathBuf::from("/tmp/jwt.hex")),
+            auth_ipc: false,
+            auth_ipc_path: "engine.ipc".to_string(),
+            disable_auth_server: false,
+            rpc_jwtsecret: Some(
+                JwtSecret::from_hex(
+                    "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+                )
+                .unwrap(),
+            ),
+            rpc_max_request_size: 15u32.into(),
+            rpc_max_response_size: 160u32.into(),
+            rpc_max_subscriptions_per_connection: 1024u32.into(),
+            rpc_max_connections: 500u32.into(),
+            rpc_max_tracing_requests: 16,
+            rpc_max_blocking_io_requests: 256,
+            rpc_max_trace_filter_blocks: 4000,
+            rpc_max_blocks_per_filter: 1000u64.into(),
+            rpc_max_logs_per_response: 10000u64.into(),
+            rpc_gas_cap: 50_000_000,
+            rpc_evm_memory_limit: 256,
+            rpc_tx_fee_cap: 2_000_000_000_000_000_000u128,
+            rpc_max_simulate_blocks: 256,
+            rpc_eth_proof_window: 100_000,
+            rpc_proof_permits: 16,
+            rpc_pending_block: PendingBlockKind::Full,
+            rpc_forwarder: Some("http://localhost:8545".parse().unwrap()),
+            builder_disallow: None,
+            rpc_state_cache: RpcStateCacheArgs {
+                max_blocks: 5000,
+                max_receipts: 2000,
+                max_headers: 1000,
+                max_concurrent_db_requests: 512,
+            },
+            gas_price_oracle: GasPriceOracleArgs {
+                blocks: 20,
+                ignore_price: 2,
+                max_price: 500_000_000_000,
+                percentile: 60,
+                default_suggested_fee: None,
+            },
+            rpc_send_raw_transaction_sync_timeout: std::time::Duration::from_secs(30),
+        };
+
+        let parsed_args = CommandParser::<RpcServerArgs>::parse_from([
+            "reth",
+            "--http",
+            "--http.addr",
+            "127.0.0.1",
+            "--http.port",
+            "8545",
+            "--http.api",
+            "eth,admin",
+            "--http.corsdomain",
+            "*",
+            "--ws",
+            "--ws.addr",
+            "127.0.0.1",
+            "--ws.port",
+            "8546",
+            "--ws.origins",
+            "*",
+            "--ws.api",
+            "eth,admin",
+            "--ipcpath",
+            "reth.ipc",
+            "--ipc.permissions",
+            "0o666",
+            "--authrpc.addr",
+            "127.0.0.1",
+            "--authrpc.port",
+            "8551",
+            "--authrpc.jwtsecret",
+            "/tmp/jwt.hex",
+            "--auth-ipc.path",
+            "engine.ipc",
+            "--rpc.jwtsecret",
+            "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+            "--rpc.max-request-size",
+            "15",
+            "--rpc.max-response-size",
+            "160",
+            "--rpc.max-subscriptions-per-connection",
+            "1024",
+            "--rpc.max-connections",
+            "500",
+            "--rpc.max-tracing-requests",
+            "16",
+            "--rpc.max-blocking-io-requests",
+            "256",
+            "--rpc.max-trace-filter-blocks",
+            "4000",
+            "--rpc.max-blocks-per-filter",
+            "1000",
+            "--rpc.max-logs-per-response",
+            "10000",
+            "--rpc.gascap",
+            "50000000",
+            "--rpc.evm-memory-limit",
+            "256",
+            "--rpc.txfeecap",
+            "2.0",
+            "--rpc.max-simulate-blocks",
+            "256",
+            "--rpc.eth-proof-window",
+            "100000",
+            "--rpc.proof-permits",
+            "16",
+            "--rpc.pending-block",
+            "full",
+            "--rpc.forwarder",
+            "http://localhost:8545",
+            "--rpc-cache.max-blocks",
+            "5000",
+            "--rpc-cache.max-receipts",
+            "2000",
+            "--rpc-cache.max-headers",
+            "1000",
+            "--rpc-cache.max-concurrent-db-requests",
+            "512",
+            "--gpo.blocks",
+            "20",
+            "--gpo.ignoreprice",
+            "2",
+            "--gpo.maxprice",
+            "500000000000",
+            "--gpo.percentile",
+            "60",
+            "--rpc.send-raw-transaction-sync-timeout",
+            "30s",
+        ])
+        .args;
+
+        assert_eq!(parsed_args, args);
+    }
 }
--- a/crates/optimism/chainspec/src/lib.rs
+++ b/crates/optimism/chainspec/src/lib.rs
@@ -70,7 +70,7 @@ use reth_chainspec::{
 };
 use reth_ethereum_forks::{ChainHardforks, EthereumHardfork, ForkCondition};
 use reth_network_peers::NodeRecord;
-use reth_optimism_primitives::ADDRESS_L2_TO_L1_MESSAGE_PASSER;
+use reth_optimism_primitives::L2_TO_L1_MESSAGE_PASSER_ADDRESS;
 use reth_primitives_traits::{sync::LazyLock, SealedHeader};

 /// Chain spec builder for a OP stack chain.
@@ -499,7 +499,7 @@ pub fn make_op_genesis_header(genesis: &Genesis, hardforks: &ChainHardforks) ->
    // If Isthmus is active, overwrite the withdrawals root with the storage root of predeploy
    // `L2ToL1MessagePasser.sol`
    if hardforks.fork(OpHardfork::Isthmus).active_at_timestamp(header.timestamp) &&
-        let Some(predeploy) = genesis.alloc.get(&ADDRESS_L2_TO_L1_MESSAGE_PASSER) &&
+        let Some(predeploy) = genesis.alloc.get(&L2_TO_L1_MESSAGE_PASSER_ADDRESS) &&
        let Some(storage) = &predeploy.storage
    {
        header.withdrawals_root =
--- a/crates/optimism/chainspec/src/superchain/configs.rs
+++ b/crates/optimism/chainspec/src/superchain/configs.rs
@@ -98,7 +98,7 @@ mod tests {
        OP_SEPOLIA_CANYON_TIMESTAMP, OP_SEPOLIA_ECOTONE_TIMESTAMP, OP_SEPOLIA_ISTHMUS_TIMESTAMP,
        OP_SEPOLIA_JOVIAN_TIMESTAMP,
    };
-    use reth_optimism_primitives::ADDRESS_L2_TO_L1_MESSAGE_PASSER;
+    use reth_optimism_primitives::L2_TO_L1_MESSAGE_PASSER_ADDRESS;
    use tar_no_std::TarArchiveRef;

    #[test]
@@ -106,7 +106,7 @@ mod tests {
        let genesis = read_superchain_genesis("unichain", "mainnet").unwrap();
        assert_eq!(genesis.config.chain_id, 130);
        assert_eq!(genesis.timestamp, 1730748359);
-        assert!(genesis.alloc.contains_key(&ADDRESS_L2_TO_L1_MESSAGE_PASSER));
+        assert!(genesis.alloc.contains_key(&L2_TO_L1_MESSAGE_PASSER_ADDRESS));
    }

    #[test]
@@ -114,7 +114,7 @@ mod tests {
        let genesis = read_superchain_genesis("funki", "mainnet").unwrap();
        assert_eq!(genesis.config.chain_id, 33979);
        assert_eq!(genesis.timestamp, 1721211095);
-        assert!(genesis.alloc.contains_key(&ADDRESS_L2_TO_L1_MESSAGE_PASSER));
+        assert!(genesis.alloc.contains_key(&L2_TO_L1_MESSAGE_PASSER_ADDRESS));
    }

    #[test]
--- a/crates/optimism/consensus/src/lib.rs
+++ b/crates/optimism/consensus/src/lib.rs
@@ -241,7 +241,7 @@ mod tests {

    use alloy_consensus::{BlockBody, Eip658Value, Header, Receipt, TxEip7702, TxReceipt};
    use alloy_eips::{eip4895::Withdrawals, eip7685::Requests};
-    use alloy_primitives::{Address, Bytes, Signature, U256};
+    use alloy_primitives::{Address, Bytes, Log, Signature, U256};
    use op_alloy_consensus::{
        encode_holocene_extra_data, encode_jovian_extra_data, OpTypedTransaction,
    };
@@ -300,7 +300,6 @@ mod tests {
            transactions: vec![transaction],
            ommers: vec![],
            withdrawals: Some(Withdrawals::default()),
-            block_access_list: None,
        };

        let block = SealedBlock::seal_slow(alloy_consensus::Block { header, body });
@@ -338,7 +337,6 @@ mod tests {
            transactions: vec![transaction],
            ommers: vec![],
            withdrawals: Some(Withdrawals::default()),
-            block_access_list: None,
        };

        let block = SealedBlock::seal_slow(alloy_consensus::Block { header, body });
@@ -369,7 +367,7 @@ mod tests {

        let beacon_consensus = OpBeaconConsensus::new(Arc::new(chain_spec));

-        let receipt = OpReceipt::Eip7702(Receipt {
+        let receipt = OpReceipt::Eip7702(Receipt::<Log> {
            status: Eip658Value::success(),
            cumulative_gas_used: GAS_USED,
            logs: vec![],
@@ -394,7 +392,6 @@ mod tests {
            transactions: vec![transaction],
            ommers: vec![],
            withdrawals: Some(Withdrawals::default()),
-            block_access_list: None,
        };

        let block = SealedBlock::seal_slow(alloy_consensus::Block { header, body });
@@ -404,7 +401,6 @@ mod tests {
            receipts: vec![receipt],
            requests: Requests::default(),
            gas_used: GAS_USED,
-            block_access_list: None,
        };

        // validate blob, it should pass blob gas used validation
@@ -440,7 +436,7 @@ mod tests {

        let beacon_consensus = OpBeaconConsensus::new(Arc::new(chain_spec));

-        let receipt = OpReceipt::Eip7702(Receipt {
+        let receipt = OpReceipt::Eip7702(Receipt::<Log> {
            status: Eip658Value::success(),
            cumulative_gas_used: GAS_USED,
            logs: vec![],
@@ -455,7 +451,9 @@ mod tests {
            )),
            gas_used: GAS_USED,
            timestamp: u64::MAX,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            ..Default::default()
        };
@@ -463,7 +461,6 @@ mod tests {
            transactions: vec![transaction],
            ommers: vec![],
            withdrawals: Some(Withdrawals::default()),
-            block_access_list: None,
        };

        let block = SealedBlock::seal_slow(alloy_consensus::Block { header, body });
@@ -473,7 +470,6 @@ mod tests {
            receipts: vec![receipt],
            requests: Requests::default(),
            gas_used: GAS_USED,
-            block_access_list: None,
        };

        // validate blob, it should pass blob gas used validation
@@ -515,7 +511,7 @@ mod tests {

        let beacon_consensus = OpBeaconConsensus::new(Arc::new(chain_spec));

-        let receipt = OpReceipt::Eip7702(Receipt {
+        let receipt = OpReceipt::Eip7702(Receipt::<Log> {
            status: Eip658Value::success(),
            cumulative_gas_used: 0,
            logs: vec![],
@@ -532,7 +528,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX - 1,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            extra_data: encode_jovian_extra_data(
                Default::default(),
@@ -555,7 +553,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            parent_hash: parent.hash(),
            ..Default::default()
@@ -582,7 +582,7 @@ mod tests {

        let beacon_consensus = OpBeaconConsensus::new(Arc::new(chain_spec));

-        let receipt = OpReceipt::Eip7702(Receipt {
+        let receipt = OpReceipt::Eip7702(Receipt::<Log> {
            status: Eip658Value::success(),
            cumulative_gas_used: 0,
            logs: vec![],
@@ -599,7 +599,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX - 1,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            extra_data: encode_jovian_extra_data(
                Default::default(),
@@ -622,7 +624,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            parent_hash: parent.hash(),
            ..Default::default()
@@ -658,7 +662,7 @@ mod tests {

        let beacon_consensus = OpBeaconConsensus::new(Arc::new(chain_spec));

-        let receipt = OpReceipt::Eip7702(Receipt {
+        let receipt = OpReceipt::Eip7702(Receipt::<Log> {
            status: Eip658Value::success(),
            cumulative_gas_used: 0,
            logs: vec![],
@@ -675,7 +679,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX - 1,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            extra_data: encode_jovian_extra_data(
                Default::default(),
@@ -699,7 +705,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            parent_hash: parent.hash(),
            ..Default::default()
@@ -728,7 +736,7 @@ mod tests {

        let beacon_consensus = OpBeaconConsensus::new(Arc::new(chain_spec));

-        let receipt = OpReceipt::Eip7702(Receipt {
+        let receipt = OpReceipt::Eip7702(Receipt::<Log> {
            status: Eip658Value::success(),
            cumulative_gas_used: 0,
            logs: vec![],
@@ -745,7 +753,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX - 1,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            extra_data: encode_holocene_extra_data(Default::default(), BaseFeeParams::optimism())
                .unwrap(),
@@ -765,7 +775,9 @@ mod tests {
            )),
            gas_used: 0,
            timestamp: u64::MAX,
-            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(&receipt)),
+            receipts_root: proofs::calculate_receipt_root(std::slice::from_ref(
+                &receipt.with_bloom_ref(),
+            )),
            logs_bloom: receipt.bloom(),
            parent_hash: parent.hash(),
            ..Default::default()
--- a/crates/optimism/consensus/src/validation/isthmus.rs
+++ b/crates/optimism/consensus/src/validation/isthmus.rs
@@ -4,7 +4,7 @@ use crate::OpConsensusError;
 use alloy_consensus::BlockHeader;
 use alloy_primitives::B256;
 use alloy_trie::EMPTY_ROOT_HASH;
-use reth_optimism_primitives::ADDRESS_L2_TO_L1_MESSAGE_PASSER;
+use reth_optimism_primitives::L2_TO_L1_MESSAGE_PASSER_ADDRESS;
 use reth_storage_api::{errors::ProviderResult, StorageRootProvider};
 use reth_trie_common::HashedStorage;
 use revm::database::BundleState;
@@ -32,7 +32,7 @@ pub fn withdrawals_root<DB: StorageRootProvider>(
    withdrawals_root_prehashed(
        state_updates
            .state()
-            .get(&ADDRESS_L2_TO_L1_MESSAGE_PASSER)
+            .get(&L2_TO_L1_MESSAGE_PASSER_ADDRESS)
            .map(|acc| {
                HashedStorage::from_plain_storage(
                    acc.status,
@@ -52,7 +52,7 @@ pub fn withdrawals_root_prehashed<DB: StorageRootProvider>(
    hashed_storage_updates: HashedStorage,
    state: DB,
 ) -> ProviderResult<B256> {
-    state.storage_root(ADDRESS_L2_TO_L1_MESSAGE_PASSER, hashed_storage_updates)
+    state.storage_root(L2_TO_L1_MESSAGE_PASSER_ADDRESS, hashed_storage_updates)
 }

 /// Verifies block header field `withdrawals_root` against storage root of
@@ -146,7 +146,7 @@ mod test {

    #[test]
    fn l2tol1_message_passer_no_withdrawals() {
-        let hashed_address = keccak256(ADDRESS_L2_TO_L1_MESSAGE_PASSER);
+        let hashed_address = keccak256(L2_TO_L1_MESSAGE_PASSER_ADDRESS);

        // create account storage
        let init_storage = HashedStorage::from_iter(
--- a/crates/optimism/consensus/src/validation/mod.rs
+++ b/crates/optimism/consensus/src/validation/mod.rs
@@ -518,7 +518,6 @@ mod tests {
            transactions: vec![],
            ommers: vec![],
            withdrawals: Some(Default::default()),
-            ..Default::default()
        };
        validate_body_against_header_op(&chainspec, &body, &header).unwrap();

@@ -543,7 +542,6 @@ mod tests {
            receipts: vec![],
            requests: Requests::default(),
            gas_used: GAS_USED,
-            block_access_list: None,
        };
        validate_block_post_execution(&header, &chainspec, &result).unwrap();
    }
@@ -565,7 +563,6 @@ mod tests {
            receipts: vec![],
            requests: Requests::default(),
            gas_used: GAS_USED,
-            block_access_list: None,
        };
        assert_eq!(
            validate_block_post_execution(&header, &chainspec, &result),
--- a/crates/optimism/evm/src/build.rs
+++ b/crates/optimism/evm/src/build.rs
@@ -46,14 +46,7 @@ impl<ChainSpec: OpHardforks> OpBlockAssembler<ChainSpec> {
            evm_env,
            execution_ctx: ctx,
            transactions,
-            output:
-                BlockExecutionResult {
-                    receipts,
-                    gas_used,
-                    blob_gas_used,
-                    requests: _,
-                    block_access_list: _,
-                },
+            output: BlockExecutionResult { receipts, gas_used, blob_gas_used, requests: _ },
            bundle_state,
            state_root,
            state_provider,
@@ -77,7 +70,7 @@ impl<ChainSpec: OpHardforks> OpBlockAssembler<ChainSpec> {
            // withdrawals root field in block header is used for storage root of L2 predeploy
            // `l2tol1-message-passer`
            Some(
-                isthmus::withdrawals_root(&bundle_state, state_provider)
+                isthmus::withdrawals_root(bundle_state, state_provider)
                    .map_err(BlockExecutionError::other)?,
            )
        } else if self.chain_spec.is_canyon_active_at_timestamp(timestamp) {
@@ -119,7 +112,6 @@ impl<ChainSpec: OpHardforks> OpBlockAssembler<ChainSpec> {
            blob_gas_used,
            excess_blob_gas,
            requests_hash,
-            block_access_list_hash: None,
        };

        Ok(Block::new(
@@ -131,7 +123,6 @@ impl<ChainSpec: OpHardforks> OpBlockAssembler<ChainSpec> {
                    .chain_spec
                    .is_canyon_active_at_timestamp(timestamp)
                    .then(Default::default),
-                block_access_list: None,
            },
        ))
    }
--- a/crates/optimism/evm/src/lib.rs
+++ b/crates/optimism/evm/src/lib.rs
@@ -486,14 +486,14 @@ mod tests {
        block2.set_hash(block2_hash);

        // Create a random receipt object, receipt1
-        let receipt1 = OpReceipt::Legacy(Receipt {
+        let receipt1 = OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![],
            status: true.into(),
        });

        // Create another random receipt object, receipt2
-        let receipt2 = OpReceipt::Legacy(Receipt {
+        let receipt2 = OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 1325345,
            logs: vec![],
            status: true.into(),
@@ -544,7 +544,7 @@ mod tests {
        );

        // Create a Receipts object with a vector of receipt vectors
-        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt {
+        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![],
            status: true.into(),
@@ -602,7 +602,7 @@ mod tests {
    #[test]
    fn test_block_number_to_index() {
        // Create a Receipts object with a vector of receipt vectors
-        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt {
+        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![],
            status: true.into(),
@@ -633,7 +633,7 @@ mod tests {
    #[test]
    fn test_get_logs() {
        // Create a Receipts object with a vector of receipt vectors
-        let receipts = vec![vec![OpReceipt::Legacy(Receipt {
+        let receipts = vec![vec![OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![Log::<LogData>::default()],
            status: true.into(),
@@ -661,7 +661,7 @@ mod tests {
    #[test]
    fn test_receipts_by_block() {
        // Create a Receipts object with a vector of receipt vectors
-        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt {
+        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![Log::<LogData>::default()],
            status: true.into(),
@@ -685,7 +685,7 @@ mod tests {
        // Assert that the receipts for block number 123 match the expected receipts
        assert_eq!(
            receipts_by_block,
-            vec![&Some(OpReceipt::Legacy(Receipt {
+            vec![&Some(OpReceipt::Legacy(Receipt::<Log> {
                cumulative_gas_used: 46913,
                logs: vec![Log::<LogData>::default()],
                status: true.into(),
@@ -696,7 +696,7 @@ mod tests {
    #[test]
    fn test_receipts_len() {
        // Create a Receipts object with a vector of receipt vectors
-        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt {
+        let receipts = vec![vec![Some(OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![Log::<LogData>::default()],
            status: true.into(),
@@ -741,7 +741,7 @@ mod tests {
    #[test]
    fn test_revert_to() {
        // Create a random receipt object
-        let receipt = OpReceipt::Legacy(Receipt {
+        let receipt = OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![],
            status: true.into(),
@@ -786,7 +786,7 @@ mod tests {
    #[test]
    fn test_extend_execution_outcome() {
        // Create a Receipt object with specific attributes.
-        let receipt = OpReceipt::Legacy(Receipt {
+        let receipt = OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![],
            status: true.into(),
@@ -826,7 +826,7 @@ mod tests {
    #[test]
    fn test_split_at_execution_outcome() {
        // Create a random receipt object
-        let receipt = OpReceipt::Legacy(Receipt {
+        let receipt = OpReceipt::Legacy(Receipt::<Log> {
            cumulative_gas_used: 46913,
            logs: vec![],
            status: true.into(),
--- a/crates/optimism/evm/src/receipts.rs
+++ b/crates/optimism/evm/src/receipts.rs
@@ -1,7 +1,7 @@
 use alloy_consensus::{Eip658Value, Receipt};
 use alloy_evm::eth::receipt_builder::ReceiptBuilderCtx;
 use alloy_op_evm::block::receipt_builder::OpReceiptBuilder;
-use op_alloy_consensus::OpTxType;
+use op_alloy_consensus::{OpDepositReceipt, OpTxType};
 use reth_evm::Evm;
 use reth_optimism_primitives::{OpReceipt, OpTransactionSigned};

@@ -41,7 +41,7 @@ impl OpReceiptBuilder for OpRethReceiptBuilder {
        }
    }

-    fn build_deposit_receipt(&self, inner: op_alloy_consensus::OpDepositReceipt) -> Self::Receipt {
+    fn build_deposit_receipt(&self, inner: OpDepositReceipt) -> Self::Receipt {
        OpReceipt::Deposit(inner)
    }
 }
--- a/crates/optimism/node/src/engine.rs
+++ b/crates/optimism/node/src/engine.rs
@@ -18,7 +18,7 @@ use reth_node_api::{
 use reth_optimism_consensus::isthmus;
 use reth_optimism_forks::OpHardforks;
 use reth_optimism_payload_builder::{OpExecutionPayloadValidator, OpPayloadTypes};
-use reth_optimism_primitives::{OpBlock, ADDRESS_L2_TO_L1_MESSAGE_PASSER};
+use reth_optimism_primitives::{OpBlock, L2_TO_L1_MESSAGE_PASSER_ADDRESS};
 use reth_primitives_traits::{Block, RecoveredBlock, SealedBlock, SignedTransaction};
 use reth_provider::StateProviderFactory;
 use reth_trie_common::{HashedPostState, KeyHasher};
@@ -62,7 +62,6 @@ where
    type ExecutionPayloadEnvelopeV3 = OpExecutionPayloadEnvelopeV3;
    type ExecutionPayloadEnvelopeV4 = OpExecutionPayloadEnvelopeV4;
    type ExecutionPayloadEnvelopeV5 = OpExecutionPayloadEnvelopeV4;
-    type ExecutionPayloadEnvelopeV6 = OpExecutionPayloadEnvelopeV4;
 }

 /// Validator for Optimism engine API.
@@ -77,7 +76,7 @@ pub struct OpEngineValidator<P, Tx, ChainSpec> {
 impl<P, Tx, ChainSpec> OpEngineValidator<P, Tx, ChainSpec> {
    /// Instantiates a new validator.
    pub fn new<KH: KeyHasher>(chain_spec: Arc<ChainSpec>, provider: P) -> Self {
-        let hashed_addr_l2tol1_msg_passer = KH::hash_key(ADDRESS_L2_TO_L1_MESSAGE_PASSER);
+        let hashed_addr_l2tol1_msg_passer = KH::hash_key(L2_TO_L1_MESSAGE_PASSER_ADDRESS);
        Self {
            inner: OpExecutionPayloadValidator::new(chain_spec),
            provider,
@@ -280,8 +279,7 @@ pub fn validate_withdrawals_presence(
        EngineApiMessageVersion::V2 |
        EngineApiMessageVersion::V3 |
        EngineApiMessageVersion::V4 |
-        EngineApiMessageVersion::V5 |
-        EngineApiMessageVersion::V6 => {
+        EngineApiMessageVersion::V5 => {
            if is_shanghai && !has_withdrawals {
                return Err(message_validation_kind
                    .to_error(VersionSpecificValidationError::NoWithdrawalsPostShanghai));
--- a/crates/optimism/payload/src/builder.rs
+++ b/crates/optimism/payload/src/builder.rs
@@ -4,7 +4,7 @@ use crate::{
    OpPayloadBuilderAttributes, OpPayloadPrimitives,
 };
 use alloy_consensus::{BlockHeader, Transaction, Typed2718};
-use alloy_evm::{block::StateDB, Evm as AlloyEvm};
+use alloy_evm::Evm as AlloyEvm;
 use alloy_primitives::{B256, U256};
 use alloy_rpc_types_debug::ExecutionWitness;
 use alloy_rpc_types_engine::PayloadId;
@@ -20,7 +20,7 @@ use reth_evm::{
 };
 use reth_execution_types::ExecutionOutcome;
 use reth_optimism_forks::OpHardforks;
-use reth_optimism_primitives::{transaction::OpTransaction, ADDRESS_L2_TO_L1_MESSAGE_PASSER};
+use reth_optimism_primitives::{transaction::OpTransaction, L2_TO_L1_MESSAGE_PASSER_ADDRESS};
 use reth_optimism_txpool::{
    estimated_da_size::DataAvailabilitySized,
    interop::{is_valid_interop, MaybeInteropTransaction},
@@ -38,10 +38,7 @@ use reth_revm::{
 };
 use reth_storage_api::{errors::ProviderError, StateProvider, StateProviderFactory};
 use reth_transaction_pool::{BestTransactionsAttributes, PoolTransaction, TransactionPool};
-use revm::{
-    context::{Block, BlockEnv},
-    DatabaseCommit,
-};
+use revm::context::{Block, BlockEnv};
 use std::{marker::PhantomData, sync::Arc};
 use tracing::{debug, trace, warn};

@@ -438,7 +435,7 @@ impl<Txs> OpBuilder<'_, Txs> {
        if ctx.chain_spec.is_isthmus_active_at_timestamp(ctx.attributes().timestamp()) {
            // force load `L2ToL1MessagePasser.sol` so l2 withdrawals root can be computed even if
            // no l2 withdrawals in block
-            _ = db.load_cache_account(ADDRESS_L2_TO_L1_MESSAGE_PASSER)?;
+            _ = db.load_cache_account(L2_TO_L1_MESSAGE_PASSER_ADDRESS)?;
        }

        let ExecutionWitnessRecord { hashed_state, codes, keys, lowest_block_number: _ } =
@@ -601,9 +598,9 @@ where
    }

    /// Prepares a [`BlockBuilder`] for the next block.
-    pub fn block_builder<'a, DB: StateDB + DatabaseCommit + Database + 'a>(
+    pub fn block_builder<'a, DB: Database>(
        &'a self,
-        db: DB,
+        db: &'a mut State<DB>,
    ) -> Result<
        impl BlockBuilder<
                Primitives = Evm::Primitives,
--- a/crates/optimism/primitives/src/bedrock.rs
+++ b/crates/optimism/primitives/src/bedrock.rs
@@ -91,7 +91,6 @@ pub const BEDROCK_HEADER: Header = Header {
    excess_blob_gas: None,
    parent_beacon_block_root: None,
    requests_hash: None,
-    block_access_list_hash:None
 };

 /// Bedrock total difficulty on Optimism Mainnet.
--- a/crates/optimism/primitives/src/lib.rs
+++ b/crates/optimism/primitives/src/lib.rs
@@ -13,8 +13,8 @@ extern crate alloc;

 pub mod bedrock;

-pub mod predeploys;
-pub use predeploys::ADDRESS_L2_TO_L1_MESSAGE_PASSER;
+// Re-export predeploys from op-alloy-consensus
+pub use op_alloy_consensus::L2_TO_L1_MESSAGE_PASSER_ADDRESS;

 pub mod transaction;
 pub use transaction::*;
--- a/crates/optimism/primitives/src/predeploys.rs
+++ b/crates/optimism/primitives/src/predeploys.rs
@@ -1,8 +0,0 @@
-//! Addresses of OP pre-deploys.
-// todo: move to op-alloy
-
-use alloy_primitives::{address, Address};
-
-/// The L2 contract `L2ToL1MessagePasser`, stores commitments to withdrawal transactions.
-pub const ADDRESS_L2_TO_L1_MESSAGE_PASSER: Address =
-    address!("0x4200000000000000000000000000000000000016");
--- a/crates/optimism/primitives/src/receipt.rs
+++ b/crates/optimism/primitives/src/receipt.rs
@@ -176,7 +176,7 @@ mod tests {

        let mut data = Vec::with_capacity(expected.length());
        let receipt = ReceiptWithBloom {
-            receipt: OpReceipt::Legacy(Receipt {
+            receipt: OpReceipt::Legacy(Receipt::<Log> {
                status: Eip658Value::Eip658(false),
                cumulative_gas_used: 0x1,
                logs: vec![Log::new_unchecked(
@@ -207,7 +207,7 @@ mod tests {

        // EIP658Receipt
        let expected = ReceiptWithBloom {
-            receipt: OpReceipt::Legacy(Receipt {
+            receipt: OpReceipt::Legacy(Receipt::<Log> {
                status: Eip658Value::Eip658(false),
                cumulative_gas_used: 0x1,
                logs: vec![Log::new_unchecked(
@@ -235,7 +235,7 @@ mod tests {
        // Deposit Receipt (post-regolith)
        let expected = ReceiptWithBloom {
            receipt: OpReceipt::Deposit(OpDepositReceipt {
-                inner: Receipt {
+                inner: Receipt::<Log> {
                    status: Eip658Value::Eip658(true),
                    cumulative_gas_used: 46913,
                    logs: vec![],
@@ -260,10 +260,10 @@ mod tests {
            "b901117ef9010d0182b741b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0833d3bbf01"
        );

-        // Deposit Receipt (post-regolith)
+        // Deposit Receipt (post-canyon)
        let expected = ReceiptWithBloom {
            receipt: OpReceipt::Deposit(OpDepositReceipt {
-                inner: Receipt {
+                inner: Receipt::<Log> {
                    status: Eip658Value::Eip658(true),
                    cumulative_gas_used: 46913,
                    logs: vec![],
@@ -284,7 +284,7 @@ mod tests {

    #[test]
    fn gigantic_receipt() {
-        let receipt = OpReceipt::Legacy(Receipt {
+        let receipt = OpReceipt::Legacy(Receipt::<Log> {
            status: Eip658Value::Eip658(true),
            cumulative_gas_used: 16747627,
            logs: vec![
@@ -314,7 +314,7 @@ mod tests {
    #[test]
    fn test_encode_2718_length() {
        let receipt = ReceiptWithBloom {
-            receipt: OpReceipt::Eip1559(Receipt {
+            receipt: OpReceipt::Eip1559(Receipt::<Log> {
                status: Eip658Value::Eip658(true),
                cumulative_gas_used: 21000,
                logs: vec![],
@@ -331,7 +331,7 @@ mod tests {

        // Test for legacy receipt as well
        let legacy_receipt = ReceiptWithBloom {
-            receipt: OpReceipt::Legacy(Receipt {
+            receipt: OpReceipt::Legacy(Receipt::<Log> {
                status: Eip658Value::Eip658(true),
                cumulative_gas_used: 21000,
                logs: vec![],
--- a/crates/optimism/rpc/src/eth/mod.rs
+++ b/crates/optimism/rpc/src/eth/mod.rs
@@ -272,6 +272,11 @@ where
    fn tracing_task_guard(&self) -> &BlockingTaskGuard {
        self.inner.eth_api.blocking_task_guard()
    }
+
+    #[inline]
+    fn blocking_io_task_guard(&self) -> &Arc<tokio::sync::Semaphore> {
+        self.inner.eth_api.blocking_io_request_semaphore()
+    }
 }

 impl<N, Rpc> LoadFee for OpEthApi<N, Rpc>
--- a/crates/optimism/rpc/src/eth/receipt.rs
+++ b/crates/optimism/rpc/src/eth/receipt.rs
@@ -1,17 +1,16 @@
 //! Loads and formats OP receipt RPC response.

 use crate::{eth::RpcNodeCore, OpEthApi, OpEthApiError};
-use alloy_consensus::{BlockHeader, Receipt, TxReceipt};
+use alloy_consensus::{BlockHeader, Receipt, ReceiptWithBloom, TxReceipt};
 use alloy_eips::eip2718::Encodable2718;
 use alloy_rpc_types_eth::{Log, TransactionReceipt};
-use op_alloy_consensus::{OpReceiptEnvelope, OpTransaction};
+use op_alloy_consensus::{OpReceipt, OpTransaction};
 use op_alloy_rpc_types::{L1BlockInfo, OpTransactionReceipt, OpTransactionReceiptFields};
 use op_revm::estimate_tx_compressed_size;
 use reth_chainspec::ChainSpecProvider;
 use reth_node_api::NodePrimitives;
 use reth_optimism_evm::RethL1BlockInfo;
 use reth_optimism_forks::OpHardforks;
-use reth_optimism_primitives::OpReceipt;
 use reth_primitives_traits::SealedBlock;
 use reth_rpc_eth_api::{
    helpers::LoadReceipt,
@@ -270,7 +269,7 @@ impl OpReceiptFieldsBuilder {
 #[derive(Debug)]
 pub struct OpReceiptBuilder {
    /// Core receipt, has all the fields of an L1 receipt and is the basis for the OP receipt.
-    pub core_receipt: TransactionReceipt<OpReceiptEnvelope<Log>>,
+    pub core_receipt: TransactionReceipt<ReceiptWithBloom<OpReceipt<Log>>>,
    /// Additional OP receipt fields.
    pub op_receipt_fields: OpTransactionReceiptFields,
 }
@@ -294,24 +293,14 @@ impl OpReceiptBuilder {
                let logs = Log::collect_for_receipt(next_log_index, meta, logs);
                Receipt { status, cumulative_gas_used, logs }
            };
-            match receipt {
-                OpReceipt::Legacy(receipt) => {
-                    OpReceiptEnvelope::Legacy(map_logs(receipt).into_with_bloom())
-                }
-                OpReceipt::Eip2930(receipt) => {
-                    OpReceiptEnvelope::Eip2930(map_logs(receipt).into_with_bloom())
-                }
-                OpReceipt::Eip1559(receipt) => {
-                    OpReceiptEnvelope::Eip1559(map_logs(receipt).into_with_bloom())
-                }
-                OpReceipt::Eip7702(receipt) => {
-                    OpReceiptEnvelope::Eip7702(map_logs(receipt).into_with_bloom())
-                }
-
-                OpReceipt::Deposit(receipt) => {
-                    OpReceiptEnvelope::Deposit(receipt.map_inner(map_logs).into_with_bloom())
-                }
-            }
+            let mapped_receipt: OpReceipt<Log> = match receipt {
+                OpReceipt::Legacy(receipt) => OpReceipt::Legacy(map_logs(receipt)),
+                OpReceipt::Eip2930(receipt) => OpReceipt::Eip2930(map_logs(receipt)),
+                OpReceipt::Eip1559(receipt) => OpReceipt::Eip1559(map_logs(receipt)),
+                OpReceipt::Eip7702(receipt) => OpReceipt::Eip7702(map_logs(receipt)),
+                OpReceipt::Deposit(receipt) => OpReceipt::Deposit(receipt.map_inner(map_logs)),
+            };
+            mapped_receipt.into_with_bloom()
        });

        // In jovian, we're using the blob gas used field to store the current da
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yongkangc	5433e6dd8e	refactor(storage): introduce RocksDBWriteMode for flexible write strategies - Replaced RocksTx with RocksDBWriteMode in EitherWriter to support both transaction and batch writes. - Updated constructors and methods to utilize RocksDBWriteMode, enhancing write flexibility. - Added batch handling capabilities in RocksDBProvider, allowing manual commit of batch operations. - Improved documentation for clarity on usage and commit behavior.	2025-12-15 05:10:02 +00:00
github-actions[bot]	679234f105	chore(deps): weekly `cargo update` (#20359 ) Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>	2025-12-14 20:54:42 +00:00
phrwlk	419c7b489b	fix(rpc): remove dead flashbots module config (#20364 )	2025-12-14 20:54:15 +00:00
Rej Ect	06dac07b5f	ci(hive): bump actions/cache to v5 (#20349 )	2025-12-13 09:04:07 +00:00
YK	5621132b8b	feat: add RocksDB variant to EitherReader and EitherWriter (#20288 )	2025-12-13 04:06:44 +00:00
Matthias Seitz	3380eb69c8	fix: only collect already tracked accounts (#20341 )	2025-12-12 22:09:21 +00:00
Arsenii Kulikov	0366497ada	perf: skip redundant recovery (#20343 )	2025-12-12 22:01:05 +00:00
Alexey Shekhirin	cd71f3d5a4	feat(engine): record total latencies on instrumented state provider drop (#20337 )	2025-12-12 21:14:44 +00:00
Alexey Shekhirin	64909d33e6	feat(engine): cli argument to disable state cache (#20143 )	2025-12-12 17:51:22 +00:00
Alexey Shekhirin	3c9ad31344	chore(engine): make `InstrumentedStateProvider` public (#20335 )	2025-12-12 16:41:42 +00:00
gustavo	f3e14fd061	feat(rpc): handle dedicated eth_simulate errors (#20099 )	2025-12-12 16:40:13 +00:00
Alexey Shekhirin	daf6b88dc6	feat(node): engine args defaults (#20203 )	2025-12-12 15:54:05 +00:00
emmmm	d2d58f9a0e	docs: add missing RPC namespaces to JSON-RPC intro (#20321 )	2025-12-12 15:40:38 +00:00
Matthias Seitz	ace4e515b5	chore: bump inspectors 0.33.2 (#20334 )	2025-12-12 15:39:04 +00:00
Hesham Shabanah	134164954b	feat: add `--max-peers` CLI flag (#20139 ) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>	2025-12-12 13:26:44 +00:00
Lorsmirq Benton	2775dd1f23	docs: correct comments in custom-inspector (#20304 )	2025-12-12 13:21:03 +00:00
Alexey Shekhirin	ac0f9687bd	chore(engine): move noisy multiproof debug logs to trace level (#20331 )	2025-12-12 13:01:01 +00:00
Arsenii Kulikov	a9c21a395d	perf: spawn rpc handlers as blocking (#20330 )	2025-12-12 12:15:02 +00:00
Federico Magnani	df7ad9ae45	chore(ethapi): increase visibility `tx_batch_sender` (#20315 ) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>	2025-12-12 12:14:43 +00:00
sashass1315	5903e42a98	docs: refresh repo layout crate lists (#20319 )	2025-12-12 10:59:57 +00:00
Matthias Seitz	3c41b99599	chore: lower block buffer size (#20324 )	2025-12-12 08:15:54 +00:00
pepes	d70d80fff1	fix(docs): document discv5 discovery port 9200 (#20322 )	2025-12-12 08:12:08 +00:00
gustavo	ed3a8a03d5	feat(node-core): make rpc server args customizable (#20312 )	2025-12-11 23:24:31 +00:00
YK	bfcd46d01d	feat: add `account_history_in_rocksdb` field to `StorageSettings` (#20282 )	2025-12-11 19:37:36 +00:00
Brian Picciano	194d545fae	feat(engine): Add BAL stub methods to ExecutionPayload and BlockOrPayload (#20311 ) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>	2025-12-11 19:07:43 +00:00
sashass1315	97243ec1f4	docs: fix misleading links (#20300 )	2025-12-11 18:49:18 +00:00
DaniPopes	93c1b0f52f	ci: add more sccache (#20316 )	2025-12-11 18:46:11 +00:00
Arsenii Kulikov	474c09095f	feat: bump alloy-evm (#20314 )	2025-12-11 19:46:34 +01:00
Matthias Seitz	24c298133f	feat: allow larger ws frames on client side (#20307 )	2025-12-11 16:43:10 +00:00
Block Wizard	da27336a1e	docs: add architecture diagrams to ExEx documentation (#20193 ) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>	2025-12-11 11:41:15 +00:00
Matthias Seitz	2e567d6658	feat: add semaphore for blocking IO requests (#20289 )	2025-12-11 11:35:50 +00:00
Alexey Shekhirin	28e7c8a7cb	ci: scale down depot runners (#20295 )	2025-12-11 11:33:49 +00:00
Matthias Seitz	a2a5e03cb8	perf: fetch header directly (#20294 )	2025-12-11 11:18:51 +00:00
Sophia Raye	6073aa5b4a	docs(exex): fix DebugApi comment (#20296 )	2025-12-11 10:06:31 +00:00
Karl Yu	e90cfedf3d	feat: add support for testing_ rpc namespace and testing_buildBlockV1 (#20094 ) Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com> Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>	2025-12-11 08:56:46 +00:00
Matthias Seitz	8b27ca6fa2	chore: update engine_getBlobs metric (#20290 )	2025-12-11 08:11:54 +00:00
Tomass	1752d6fb99	chore(optimism): move predeploy constant to op-alloy (#20181 ) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>	2025-12-11 07:04:01 +00:00
emmmm	ac891a780b	docs: fix stages order and add missing EraStage (#20283 )	2025-12-11 06:26:27 +00:00
Adrian	036626b8a7	docs: improve map_add_ons method documentation (#20248 )	2025-12-11 06:03:34 +00:00
josé v	68f0c9812f	feat: add `transaction_hash_numbers_in_rocksdb` field to `StorageSettings` (#20209 )	2025-12-11 01:07:12 +00:00
sashass1315	c9920c9690	docs: clarify network mode, tx gossip and NAT (#20247 )	2025-12-10 21:52:04 +00:00
Karl Yu	af82606ff4	feat: add support for debug_getBadBlock (#20177 ) Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com> Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>	2025-12-10 21:03:53 +00:00
radik878	38331a362e	fix(rpc): avoid signing Optimism deposit transactions (#20254 )	2025-12-10 20:46:43 +00:00
Tomass	e8dae2ae7d	chore(deps): bump op-alloy to 0.23.0 (#20256 ) Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com>	2025-12-10 20:44:54 +00:00
Sophia Raye	ce5f90175b	docs(jsonrpc): add missing debug namespace RPC methods (#20267 )	2025-12-10 17:24:29 +00:00
gustavo	8c361c87c2	feat(txpool): handle more simulated scenarios in test_utils/pool.rs (#20138 )	2025-12-10 17:13:59 +00:00
Block Wizard	4fbbb1fe54	feat: add recover_transactions_unchecked_ref to BlockBody (#20266 )	2025-12-10 17:13:08 +00:00
Brian Picciano	b7d8815104	perf(prune): use delete_current_duplicates for MerkleChangeSets tables (#20230 )	2025-12-10 13:33:11 +00:00
Alexey Shekhirin	b91cd8f451	ci: sccache (#20265 )	2025-12-10 13:05:25 +00:00
Alexey Shekhirin	09aee4e35a	ci: use 16 cores for Hive workflow (#20264 )	2025-12-10 13:02:14 +00:00
Alexey Shekhirin	505a384b10	ci: increase partitions for crate-checks to 3 (#20261 )	2025-12-10 13:02:11 +00:00