chore: bump version 1.4.2 (#16357)

Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com>

.config/zepter.yaml

@@ -0,0 +1,41 @@
+version:
+  format: 1
+  # Minimum zepter version that is expected to work. This is just for printing a nice error
+  # message when someone tries to use an older version.
+  binary: 0.13.2
+
+# The examples in the following comments assume crate `A` to have a dependency on crate `B`.
+workflows:
+  check:
+    - [
+        "lint",
+        # Check that `A` activates the features of `B`.
+        "propagate-feature",
+        # These are the features to check:
+        "--features=std,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench,alloy-compat",
+        # Do not try to add a new section to `[features]` of `A` only because `B` exposes that feature. There are edge-cases where this is still needed, but we can add them manually.
+        "--left-side-feature-missing=ignore",
+        # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
+
+        "--left-side-outside-workspace=ignore",
+        # Auxiliary flags:
+        "--offline",
+        "--locked",
+        "--show-path",
+        "--quiet",
+      ]
+  default:
+    # Running `zepter` with no subcommand will check & fix.
+    - [$check.0, "--fix"]
+
+# Will be displayed when any workflow fails:
+help:
+  text: |
+    Reth uses the Zepter CLI to detect abnormalities in Cargo features, e.g. missing propagation.
+
+    It looks like one more checks failed; please check the console output.
+
+    You can try to automatically address them by installing zepter (`cargo install zepter --locked`) and simply running `zepter` in the workspace root.
+  links:
+    - "https://github.com/paradigmxyz/reth/pull/11888"
+    - "https://github.com/ggwpez/zepter"

.gitattributes

@@ -1,4 +1,4 @@
 book/cli/**/*.md linguist-vendored
 book/cli/cli.md -linguist-vendored
 
-crates/storage/libmdbx-rs/mdbx-sys/** linguist-vendored
+crates/storage/libmdbx-rs/mdbx-sys/libmdbx/** linguist-vendored

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 bin/                        @onbjerg
 crates/blockchain-tree/     @rakita @rkrasiuk @mattsse @Rjected
 crates/blockchain-tree-api/ @rakita @rkrasiuk @mattsse @Rjected
-crates/chainspec/           @Rjected @joshieDo @mattsse @emhane
+crates/chainspec/           @Rjected @joshieDo @mattsse
 crates/chain-state/         @fgimenez @mattsse @rkrasiuk
 crates/cli/                 @onbjerg @mattsse
 crates/config/              @onbjerg
@@ -11,23 +11,24 @@ crates/engine               @rkrasiuk @mattsse @Rjected
 crates/e2e-test-utils/      @mattsse @Rjected
 crates/engine/              @rkrasiuk @mattsse @Rjected @fgimenez
 crates/errors/              @mattsse
+crates/era/                 @mattsse
 crates/ethereum/            @mattsse @Rjected
 crates/ethereum-forks/      @mattsse @Rjected
 crates/etl/                 @joshieDo @shekhirin
 crates/evm/                 @rakita @mattsse @Rjected
 crates/exex/                @onbjerg @shekhirin
-crates/fs-util/             @onbjerg @emhane
+crates/fs-util/             @onbjerg
 crates/metrics/             @onbjerg
-crates/net/                 @emhane @mattsse @Rjected
-crates/net/downloaders/     @onbjerg @rkrasiuk @emhane
-crates/node/                @mattsse @Rjected @onbjerg
-crates/optimism/            @mattsse @Rjected @fgimenez @emhane
+crates/net/                 @mattsse @Rjected
+crates/net/downloaders/     @onbjerg @rkrasiuk
+crates/node/                @mattsse @Rjected @onbjerg @klkvr
+crates/optimism/            @mattsse @Rjected @fgimenez
 crates/payload/             @mattsse @Rjected
-crates/primitives/          @Rjected
-crates/primitives-traits/   @Rjected @joshieDo
+crates/primitives/          @Rjected @mattsse @klkvr
+crates/primitives-traits/   @Rjected @joshieDo @mattsse @klkvr
 crates/prune/               @shekhirin @joshieDo
 crates/revm/                @mattsse @rakita
-crates/rpc/                 @mattsse @Rjected @emhane
+crates/rpc/                 @mattsse @Rjected
 crates/stages/              @onbjerg @rkrasiuk @shekhirin
 crates/static-file/         @joshieDo @shekhirin
 crates/storage/codecs/      @joshieDo
@@ -40,8 +41,10 @@ crates/storage/nippy-jar/   @joshieDo @shekhirin
 crates/storage/provider/    @rakita @joshieDo @shekhirin
 crates/storage/storage-api/ @joshieDo @rkrasiuk
 crates/tasks/               @mattsse
-crates/tokio-util/          @fgimenez @emhane
+crates/tokio-util/          @fgimenez
 crates/tracing/             @onbjerg
 crates/transaction-pool/    @mattsse
-crates/trie/                @rkrasiuk @Rjected
+crates/trie/                @rkrasiuk @Rjected @shekhirin
+crates/ress                 @rkrasiuk
+etc/                        @Rjected @onbjerg @shekhirin
 .github/                    @onbjerg @gakonst @DaniPopes

.github/ISSUE_TEMPLATE/bug.yml

@@ -60,6 +60,18 @@ body:
         - Mac (Apple Silicon)
         - Windows (x86)
         - Windows (ARM)
+  - type: dropdown
+    id: container_type
+    attributes:
+      label: Container Type
+      description: Were you running it in a container?
+      multiple: true
+      options:
+        - Not running in a container
+        - Docker
+        - Kubernetes
+        - LXC/LXD
+        - Other
     validations:
       required: true
   - type: textarea

.github/assets/check_rv32imac.sh

@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+set +e  # Disable immediate exit on error
+
+# Array of crates to check
+crates_to_check=(
+    reth-codecs-derive
+    reth-primitives
+    reth-primitives-traits
+    reth-network-peers
+    reth-trie-common
+    reth-trie-sparse
+    reth-chainspec
+    reth-consensus
+    reth-consensus-common
+    reth-prune-types
+    reth-static-file-types
+    reth-storage-errors
+    reth-execution-errors
+    reth-errors
+    reth-execution-types
+    reth-db-models
+    reth-evm
+    reth-revm
+    reth-storage-api
+
+    ## ethereum
+    reth-evm-ethereum
+    reth-ethereum-forks
+    reth-ethereum-primitives
+    reth-ethereum-consensus
+    reth-stateless
+
+    ## optimism
+    reth-optimism-chainspec
+    reth-optimism-forks
+    reth-optimism-consensus
+    reth-optimism-primitives
+    reth-optimism-evm
+)
+
+# Array to hold the results
+results=()
+# Flag to track if any command fails
+any_failed=0
+
+for crate in "${crates_to_check[@]}"; do
+  cmd="cargo +stable build -p $crate --target riscv32imac-unknown-none-elf --no-default-features"
+
+  if [ -n "$CI" ]; then
+    echo "::group::$cmd"
+  else
+    printf "\n%s:\n  %s\n" "$crate" "$cmd"
+  fi
+
+  set +e  # Disable immediate exit on error
+  # Run the command and capture the return code
+  $cmd
+  ret_code=$?
+  set -e  # Re-enable immediate exit on error
+
+  # Store the result in the dictionary
+  if [ $ret_code -eq 0 ]; then
+    results+=("1:✅:$crate")
+  else
+    results+=("2:❌:$crate")
+    any_failed=1
+  fi
+
+  if [ -n "$CI" ]; then
+    echo "::endgroup::"
+  fi
+done
+
+# Sort the results by status and then by crate name
+IFS=$'\n' sorted_results=($(sort <<<"${results[*]}"))
+unset IFS
+
+# Print summary
+echo -e "\nSummary of build results:"
+for result in "${sorted_results[@]}"; do
+  status="${result#*:}"
+  status="${status%%:*}"
+  crate="${result##*:}"
+  echo "$status $crate"
+done
+
+# Exit with a non-zero status if any command fails
+exit $any_failed

.github/assets/check_wasm.sh

@@ -3,17 +3,14 @@ set +e  # Disable immediate exit on error
 
 # Array of crates to compile
 crates=($(cargo metadata --format-version=1 --no-deps | jq -r '.packages[].name' | grep '^reth' | sort))
+
 # Array of crates to exclude
+# Used with the `contains` function.
+# shellcheck disable=SC2034
 exclude_crates=(
-  # The following are not working yet, but known to be fixable
-  reth-exex-types # https://github.com/paradigmxyz/reth/issues/9946
   # The following require investigation if they can be fixed
-  reth-auto-seal-consensus
   reth-basic-payload-builder
-  reth-beacon-consensus
   reth-bench
-  reth-blockchain-tree
-  reth-chain-state
   reth-cli
   reth-cli-commands
   reth-cli-runner
@@ -24,19 +21,13 @@ exclude_crates=(
   reth-dns-discovery
   reth-downloaders
   reth-e2e-test-utils
-  reth-engine-primitives
   reth-engine-service
   reth-engine-tree
   reth-engine-util
   reth-eth-wire
   reth-ethereum-cli
-  reth-ethereum-engine
-  reth-ethereum-engine-primitives
   reth-ethereum-payload-builder
   reth-etl
-  reth-evm-ethereum
-  reth-evm-optimism
-  reth-execution-errors
   reth-exex
   reth-exex-test-utils
   reth-ipc
@@ -48,12 +39,11 @@ exclude_crates=(
   reth-node-ethereum
   reth-node-events
   reth-node-metrics
-  reth-node-optimism
   reth-optimism-cli
+  reth-optimism-node
   reth-optimism-payload-builder
   reth-optimism-rpc
-  reth-payload-builder
-  reth-payload-primitives
+  reth-optimism-storage
   reth-rpc
   reth-rpc-api
   reth-rpc-api-testing-util
@@ -62,22 +52,27 @@ exclude_crates=(
   reth-rpc-eth-api
   reth-rpc-eth-types
   reth-rpc-layer
-  reth-rpc-types
   reth-stages
-  reth-storage-errors
+  reth-engine-local
+  reth-ress-protocol
+  reth-ress-provider
   # The following are not supposed to be working
-  reth # all of the crates below 
-  reth-db # mdbx
+  reth # all of the crates below
+  reth-invalid-block-hooks # reth-provider
   reth-libmdbx # mdbx
   reth-mdbx-sys # mdbx
-  reth-nippy-jar # sucds
-  reth-provider # reth-db, reth-nippy-jar
-  reth-prune # reth-db
+  reth-payload-builder # reth-metrics
+  reth-provider # tokio
+  reth-prune # tokio
   reth-stages-api # reth-provider, reth-prune
-  reth-static-file # reth-nippy-jar 
+  reth-static-file # tokio
   reth-transaction-pool # c-kzg
-  reth-trie-db # reth-db 
-  reth-trie-parallel # reth-db
+  reth-payload-util # reth-transaction-pool
+  reth-trie-parallel # tokio
+  reth-testing-utils
+  reth-optimism-txpool # reth-transaction-pool
+  reth-era-downloader # tokio
+  reth-era-utils # tokio
 )
 
 # Array to hold the results

.github/assets/hive/Dockerfile

@@ -1,8 +1,62 @@
-FROM ubuntu
+# syntax=docker.io/docker/dockerfile:1.7-labs
 
-COPY dist/reth /usr/local/bin
+# 
+# We'll use cargo-chef to speed up the build
+# 
+FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
+WORKDIR /app
 
+# Install system dependencies
+RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config
+
+# 
+# We prepare the build plan
+# 
+FROM chef AS planner
+
+ARG CARGO_BIN
+
+COPY --exclude=.git --exclude=dist . .
+RUN cargo chef prepare --recipe-path recipe.json --bin ${CARGO_BIN}
+
+# 
+# And build the app
+# 
+FROM chef AS builder
+WORKDIR /app
+
+ARG CARGO_BIN
+ARG BUILD_PROFILE=hivetests
+ARG FEATURES=""
+ARG MANIFEST_PATH=""
+
+COPY --from=planner /app/recipe.json recipe.json
+
+RUN cargo chef cook \
+    --profile $BUILD_PROFILE \
+    --bin $CARGO_BIN \
+    ${FEATURES:+--features "$FEATURES"}  \
+    ${MANIFEST_PATH:+--manifest-path $MANIFEST_PATH}  \
+    --recipe-path recipe.json
+
+COPY --exclude=.git --exclude=dist . .
+RUN cargo build \
+    --profile $BUILD_PROFILE \
+    --bin $CARGO_BIN \
+    ${FEATURES:+--features "$FEATURES"}  \
+    ${MANIFEST_PATH:+--manifest-path $MANIFEST_PATH}  \
+    --locked
+
+# 
+# The runtime will then just use the build artifact without building anything
+# 
+FROM ubuntu AS runtime
+
+ARG CARGO_BIN
+
+COPY --from=builder /app/target/hivetests/$CARGO_BIN /usr/local/bin/reth
 COPY LICENSE-* ./
 
 EXPOSE 30303 30303/udp 9001 8545 8546
-ENTRYPOINT ["/usr/local/bin/reth"]
+ENV RUST_LOG=debug
+ENTRYPOINT ["/usr/local/bin/reth"]

.github/assets/hive/build_simulators.sh

@@ -11,7 +11,7 @@ go build .
 
 # Run each hive command in the background for each simulator and wait
 echo "Building images"
-./hive -client reth --sim "pyspec" -sim.timelimit 1s || true &
+./hive -client reth --sim "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v4.4.0/fixtures_develop.tar.gz --sim.buildarg branch=v4.4.0 -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 &
@@ -20,17 +20,21 @@ echo "Building images"
 ./hive -client reth --sim "ethereum/sync" -sim.timelimit 1s || true &
 wait
 
-# Run docker save in parallel and wait
+# Run docker save in parallel, wait and exit on error
 echo "Saving images"
-docker save hive/hiveproxy:latest -o ../hive_assets/hiveproxy.tar &
-docker save hive/simulators/devp2p:latest -o ../hive_assets/devp2p.tar &
-docker save hive/simulators/ethereum/engine:latest -o ../hive_assets/engine.tar &
-docker save hive/simulators/ethereum/rpc-compat:latest -o ../hive_assets/rpc_compat.tar &
-docker save hive/simulators/ethereum/pyspec:latest -o ../hive_assets/pyspec.tar &
-docker save hive/simulators/smoke/genesis:latest -o ../hive_assets/smoke_genesis.tar &
-docker save hive/simulators/smoke/network:latest -o ../hive_assets/smoke_network.tar &
-docker save hive/simulators/ethereum/sync:latest -o ../hive_assets/ethereum_sync.tar &
-wait
+saving_pids=( )
+docker save hive/hiveproxy:latest -o ../hive_assets/hiveproxy.tar & saving_pids+=( $! )
+docker save hive/simulators/devp2p:latest -o ../hive_assets/devp2p.tar & saving_pids+=( $! )
+docker save hive/simulators/ethereum/engine:latest -o ../hive_assets/engine.tar & saving_pids+=( $! )
+docker save hive/simulators/ethereum/rpc-compat:latest -o ../hive_assets/rpc_compat.tar & saving_pids+=( $! )
+docker save hive/simulators/ethereum/eest/consume-engine:latest -o ../hive_assets/eest_engine.tar & saving_pids+=( $! )
+docker save hive/simulators/ethereum/eest/consume-rlp:latest -o ../hive_assets/eest_rlp.tar & saving_pids+=( $! )
+docker save hive/simulators/smoke/genesis:latest -o ../hive_assets/smoke_genesis.tar & saving_pids+=( $! )
+docker save hive/simulators/smoke/network:latest -o ../hive_assets/smoke_network.tar & saving_pids+=( $! )
+docker save hive/simulators/ethereum/sync:latest -o ../hive_assets/ethereum_sync.tar & saving_pids+=( $! )
+for pid in "${saving_pids[@]}"; do
+    wait "$pid" || exit
+done
 
 # Make sure we don't rebuild images on the CI jobs
 git apply ../.github/assets/hive/no_sim_build.diff

.github/assets/hive/expected_failures.yaml

@@ -1,20 +1,22 @@
-# https://github.com/paradigmxyz/reth/issues/7015
-# https://github.com/paradigmxyz/reth/issues/6332
+# tracked by https://github.com/paradigmxyz/reth/issues/13879
 rpc-compat:
   - debug_getRawBlock/get-invalid-number (reth)
   - debug_getRawHeader/get-invalid-number (reth)
   - debug_getRawReceipts/get-invalid-number (reth)
+  - debug_getRawReceipts/get-block-n (reth)
   - debug_getRawTransaction/get-invalid-hash (reth)
 
   - eth_call/call-callenv (reth)
-  - eth_feeHistory/fee-history (reth)
   - eth_getStorageAt/get-storage-invalid-key-too-large (reth)
   - eth_getStorageAt/get-storage-invalid-key (reth)
   - eth_getTransactionReceipt/get-access-list (reth)
   - eth_getTransactionReceipt/get-blob-tx (reth)
   - eth_getTransactionReceipt/get-dynamic-fee (reth)
+  - eth_getTransactionReceipt/get-legacy-contract (reth)
+  - eth_getTransactionReceipt/get-legacy-input (reth)
+  - eth_getTransactionReceipt/get-legacy-receipt (reth)
 
-# https://github.com/paradigmxyz/reth/issues/8732
+# no fix due to https://github.com/paradigmxyz/reth/issues/8732
 engine-withdrawals:
   - Withdrawals Fork On Genesis (Paris) (reth)
   - Withdrawals Fork on Block 1 (Paris) (reth)
@@ -27,46 +29,76 @@ engine-withdrawals:
   - Empty Withdrawals (Paris) (reth)
   - Corrupted Block Hash Payload (INVALID) (Paris) (reth)
   - Withdrawals Fork on Block 1 - 8 Block Re-Org NewPayload (Paris) (reth)
-  - Withdrawals Fork on Block 1 - 8 Block Re-Org, Sync (Paris) (reth)
-  - Withdrawals Fork on Block 8 - 10 Block Re-Org NewPayload (Paris) (reth)
-  - Withdrawals Fork on Block 8 - 10 Block Re-Org Sync (Paris) (reth)
   - Withdrawals Fork on Canonical Block 8 / Side Block 7 - 10 Block Re-Org (Paris) (reth)
-  - Withdrawals Fork on Canonical Block 8 / Side Block 7 - 10 Block Re-Org Sync (Paris) (reth)
-  - Withdrawals Fork on Canonical Block 8 / Side Block 9 - 10 Block Re-Org (Paris) (reth)
-  - Withdrawals Fork on Canonical Block 8 / Side Block 9 - 10 Block Re-Org Sync (Paris) (reth)
 
-# https://github.com/paradigmxyz/reth/issues/8305
-# https://github.com/paradigmxyz/reth/issues/6217
-engine-api:
-  - Inconsistent Head in ForkchoiceState (Paris) (reth)
-  - Invalid NewPayload, StateRoot, Syncing=True, EmptyTxs=True, DynFeeTxs=False (Paris) (reth)
-  - Invalid NewPayload, StateRoot, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Paris) (reth)
-  - Invalid NewPayload, PrevRandao, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Paris) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=True, CanonicalReOrg=False, Invalid P9 (Paris) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=False, Invalid P9 (Paris) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=True, CanonicalReOrg=True, Invalid P9 (Paris) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=True, Invalid P9 (Paris) (reth)
+engine-api: []
 
-# https://github.com/paradigmxyz/reth/issues/8305
-# https://github.com/paradigmxyz/reth/issues/6217
-# https://github.com/paradigmxyz/reth/issues/8306
-# https://github.com/paradigmxyz/reth/issues/7144
+# no fix due to https://github.com/paradigmxyz/reth/issues/8732
 engine-cancun:
-  - Blob Transaction Ordering, Multiple Clients (Cancun) (reth)
-  - Inconsistent Head in ForkchoiceState (Cancun) (reth)
-  - Invalid NewPayload, StateRoot, Syncing=True, EmptyTxs=True, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, StateRoot, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, PrevRandao, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=True, CanonicalReOrg=False, Invalid P9 (Cancun) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=False, Invalid P9 (Cancun) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=True, CanonicalReOrg=True, Invalid P9 (Cancun) (reth)
-  - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=True, Invalid P9 (Cancun) (reth)
   - Invalid PayloadAttributes, Missing BeaconRoot, Syncing=True (Cancun) (reth)
-  - Invalid NewPayload, ParentBeaconBlockRoot, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, Blob Count on BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
   - Invalid NewPayload, ExcessBlobGas, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
 
-# https://github.com/paradigmxyz/reth/issues/8579
-sync:
-  - sync reth -> reth
+sync: []
+
+# https://github.com/ethereum/hive/issues/1277
+engine-auth:
+  - "JWT Authentication: No time drift, correct secret (Paris) (reth)"
+  - "JWT Authentication: Negative time drift, within limit, correct secret (Paris) (reth)"
+  - "JWT Authentication: Positive time drift, within limit, correct secret (Paris) (reth)"
+
+# 7702 test - no fix: it’s too expensive to check whether the storage is empty on each creation
+# 6110 related tests - may start passing when fixtures improve
+# 7002 related tests - post-fork test, should fix for spec compliance but not
+# realistic on mainnet
+# 7251 related tests - modified contract, not necessarily practical on mainnet,
+# worth re-visiting when more of these related tests are passing
+eest/consume-engine:
+  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test_engine-zero_nonce]-reth
+  - tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py::test_system_contract_errors[fork_Prague-blockchain_test_engine-system_contract_reaches_gas_limit-system_contract_0x0000bbddc7ce488642fb579f8b00f3a590007251]-reth
+  - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-nonzero_balance]-reth
+  - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-zero_balance]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_amount_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_amount_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_index_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_index_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_pubkey_offset-value_zero]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py::test_system_contract_errors[fork_Prague-blockchain_test_engine-system_contract_reaches_gas_limit-system_contract_0x00000961ef480eb55e80d19ad83579a64c007002]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_pubkey_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_signature_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_signature_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_withdrawal_credentials_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_withdrawal_credentials_size-value_zero]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-nonzero_balance]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-zero_balance]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_False]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_True]-reth
+  # the next test expects a concrete new format in the error message, there is no spec for this message, so it is ok to ignore
+  - tests/cancun/eip4844_blobs/test_blob_txs.py::test_blob_type_tx_pre_fork[fork_ShanghaiToCancunAtTime15k-blockchain_test_engine_from_state_test-one_blob_tx]-reth
+# 7702 test - no fix: it’s too expensive to check whether the storage is empty on each creation
+# rest of tests - see above
+eest/consume-rlp:
+  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test-zero_nonce]-reth
+  - tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py::test_system_contract_errors[fork_Prague-blockchain_test_engine-system_contract_reaches_gas_limit-system_contract_0x0000bbddc7ce488642fb579f8b00f3a590007251]-reth
+  - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-nonzero_balance]-reth
+  - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-zero_balance]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_amount_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_amount_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_index_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_index_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_pubkey_offset-value_zero]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py::test_system_contract_errors[fork_Prague-blockchain_test_engine-system_contract_reaches_gas_limit-system_contract_0x00000961ef480eb55e80d19ad83579a64c007002]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_pubkey_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_signature_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_signature_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_withdrawal_credentials_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_withdrawal_credentials_size-value_zero]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-nonzero_balance]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-zero_balance]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_False]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_True]-reth
+  - tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py::test_system_contract_errors[fork_Prague-blockchain_test-system_contract_reaches_gas_limit-system_contract_0x0000bbddc7ce488642fb579f8b00f3a590007251]-reth
+  - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test-deploy_after_fork-nonzero_balance]-reth
+  - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test-deploy_after_fork-zero_balance]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py::test_system_contract_errors[fork_Prague-blockchain_test-system_contract_reaches_gas_limit-system_contract_0x00000961ef480eb55e80d19ad83579a64c007002]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test-deploy_after_fork-nonzero_balance]-reth
+  - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test-deploy_after_fork-zero_balance]-reth

.github/assets/hive/expected_failures_experimental.yaml

@@ -1,65 +0,0 @@
-# https://github.com/paradigmxyz/reth/issues/7015
-# https://github.com/paradigmxyz/reth/issues/6332
-rpc-compat:
-  - debug_getRawBlock/get-invalid-number (reth)
-  - debug_getRawHeader/get-invalid-number (reth)
-  - debug_getRawReceipts/get-invalid-number (reth)
-  - debug_getRawTransaction/get-invalid-hash (reth)
-
-  - eth_call/call-callenv (reth)
-  - eth_feeHistory/fee-history (reth)
-  - eth_getStorageAt/get-storage-invalid-key-too-large (reth)
-  - eth_getStorageAt/get-storage-invalid-key (reth)
-  - eth_getTransactionReceipt/get-access-list (reth)
-  - eth_getTransactionReceipt/get-blob-tx (reth)
-  - eth_getTransactionReceipt/get-dynamic-fee (reth)
-
-# https://github.com/paradigmxyz/reth/issues/8732
-engine-withdrawals:
-  - Withdrawals Fork On Genesis (Paris) (reth)
-  - Withdrawals Fork on Block 1 (Paris) (reth)
-  - Withdrawals Fork on Block 2 (Paris) (reth)
-  - Withdrawals Fork on Block 3 (Paris) (reth)
-  - Withdraw to a single account (Paris) (reth)
-  - Withdraw to two accounts (Paris) (reth)
-  - Withdraw many accounts (Paris) (reth)
-  - Withdraw zero amount (Paris) (reth)
-  - Empty Withdrawals (Paris) (reth)
-  - Corrupted Block Hash Payload (INVALID) (Paris) (reth)
-  - Withdrawals Fork on Block 1 - 8 Block Re-Org NewPayload (Paris) (reth)
-  - Withdrawals Fork on Block 1 - 8 Block Re-Org, Sync (Paris) (reth)
-  - Withdrawals Fork on Block 8 - 10 Block Re-Org NewPayload (Paris) (reth)
-  - Withdrawals Fork on Block 8 - 10 Block Re-Org Sync (Paris) (reth)
-  - Withdrawals Fork on Canonical Block 8 / Side Block 7 - 10 Block Re-Org (Paris) (reth)
-  - Withdrawals Fork on Canonical Block 8 / Side Block 7 - 10 Block Re-Org Sync (Paris) (reth)
-  - Withdrawals Fork on Canonical Block 8 / Side Block 9 - 10 Block Re-Org (Paris) (reth)
-  - Withdrawals Fork on Canonical Block 8 / Side Block 9 - 10 Block Re-Org Sync (Paris) (reth)
-
-# https://github.com/paradigmxyz/reth/issues/8305
-# https://github.com/paradigmxyz/reth/issues/6217
-engine-api:
-  - Re-org to Previously Validated Sidechain Payload (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P9 (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P9 (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P10 (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P10 (Paris) (reth)
-
-# https://github.com/paradigmxyz/reth/issues/8305
-# https://github.com/paradigmxyz/reth/issues/6217
-# https://github.com/paradigmxyz/reth/issues/8306
-# https://github.com/paradigmxyz/reth/issues/7144
-engine-cancun:
-  - Blob Transaction Ordering, Multiple Clients (Cancun) (reth)
-  - Invalid PayloadAttributes, Missing BeaconRoot, Syncing=True (Cancun) (reth)
-  - Invalid NewPayload, BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, Blob Count on BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, ExcessBlobGas, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Re-org to Previously Validated Sidechain Payload (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P9 (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P9 (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P10 (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P10 (Cancun) (reth)
-
-# https://github.com/paradigmxyz/reth/issues/8579
-sync:
-  - sync reth -> reth

.github/assets/hive/load_images.sh

@@ -11,6 +11,8 @@ IMAGES=(
     "/tmp/smoke_genesis.tar"
     "/tmp/smoke_network.tar"
     "/tmp/ethereum_sync.tar"
+    "/tmp/eest_engine.tar"
+    "/tmp/eest_rlp.tar"
     "/tmp/reth_image.tar"
 )
 
@@ -22,4 +24,4 @@ done
 
 wait
 
-docker image ls -a
+docker image ls -a

.github/assets/hive/no_sim_build.diff

@@ -1,24 +1,23 @@
 diff --git a/internal/libdocker/builder.go b/internal/libdocker/builder.go
-index 4731c9d..d717f52 100644
+index e4bf99b6..2023f7e2 100644
 --- a/internal/libdocker/builder.go
 +++ b/internal/libdocker/builder.go
-@@ -7,9 +7,7 @@ import (
- 	"fmt"
+@@ -8,7 +8,6 @@ import (
  	"io"
  	"io/fs"
+ 	"log/slog"
 -	"os"
  	"path/filepath"
--	"strings"
- 
- 	"github.com/ethereum/hive/internal/libhive"
- 	docker "github.com/fsouza/go-dockerclient"
-@@ -53,24 +51,8 @@ func (b *Builder) BuildClientImage(ctx context.Context, client libhive.ClientDes
+ 	"slices"
+ 	"strings"
+@@ -49,25 +48,8 @@ func (b *Builder) BuildClientImage(ctx context.Context, client libhive.ClientDes
  
  // BuildSimulatorImage builds a docker image of a simulator.
- func (b *Builder) BuildSimulatorImage(ctx context.Context, name string) (string, error) {
+ func (b *Builder) BuildSimulatorImage(ctx context.Context, name string, buildArgs map[string]string) (string, error) {
 -	dir := b.config.Inventory.SimulatorDirectory(name)
 -	buildContextPath := dir
 -	buildDockerfile := "Dockerfile"
+-
 -	// build context dir of simulator can be overridden with "hive_context.txt" file containing the desired build path
 -	if contextPathBytes, err := os.ReadFile(filepath.Join(filepath.FromSlash(dir), "hive_context.txt")); err == nil {
 -		buildContextPath = filepath.Join(dir, strings.TrimSpace(string(contextPathBytes)))
@@ -32,14 +31,14 @@ index 4731c9d..d717f52 100644
 -		}
 -	}
  	tag := fmt.Sprintf("hive/simulators/%s:latest", name)
--	err := b.buildImage(ctx, buildContextPath, buildDockerfile, tag, nil)
+-	err := b.buildImage(ctx, buildContextPath, buildDockerfile, tag, buildArgs)
 -	return tag, err
 +	return tag, nil
  }
  
  // BuildImage creates a container by archiving the given file system,
 diff --git a/internal/libdocker/proxy.go b/internal/libdocker/proxy.go
-index a53e5af..0bb2ea9 100644
+index d3a14ae6..8779671e 100644
 --- a/internal/libdocker/proxy.go
 +++ b/internal/libdocker/proxy.go
 @@ -16,7 +16,7 @@ const hiveproxyTag = "hive/hiveproxy"

.github/assets/hive/parse.py

@@ -35,9 +35,13 @@ for test in report['testCases'].values():
 # Check if there are any unexpected failures or passes and exit with error
 if unexpected_failures or unexpected_passes:
     if unexpected_failures:
-        print("Unexpected Failures:", unexpected_failures)
+        print("Unexpected Failures:")
+        for test in unexpected_failures:
+            print(f"  {test}")
     if unexpected_passes:
-        print("Unexpected Passes:", unexpected_passes)
+        print("Unexpected Passes:")
+        for test in unexpected_passes:
+            print(f"  {test}")
     sys.exit(1)
 
-print("Success.")
+print("Success.")

.github/assets/hive/run_simulator.sh

@@ -7,7 +7,7 @@ sim="${1}"
 limit="${2}"
 
 run_hive() {
-    hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 4 --client reth 2>&1 | tee /tmp/log || true
+    hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 8 --client reth 2>&1 | tee /tmp/log || true
 }
 
 check_log() {

.github/assets/kurtosis_network_params.yaml

@@ -0,0 +1,13 @@
+participants:
+  - el_type: geth
+    cl_type: lighthouse
+  - el_type: reth
+    el_image: "ghcr.io/paradigmxyz/reth:kurtosis-ci"
+    cl_type: teku
+additional_services:
+  - assertoor
+assertoor_params:
+  run_block_proposal_check: true
+  run_transaction_test: true
+  run_blob_transaction_test: true
+  run_opcodes_transaction_test: true

.github/assets/kurtosis_op_network_params.yaml

@@ -0,0 +1,30 @@
+ethereum_package:
+  participants:
+    - el_type: reth
+      el_extra_params:
+        - "--rpc.eth-proof-window=100"
+      cl_type: teku
+      cl_image: "consensys/teku:25.4.0"
+  network_params:
+    preset: minimal
+    genesis_delay: 5
+    additional_preloaded_contracts: '
+      {
+        "0x4e59b44847b379578588920cA78FbF26c0B4956C": {
+          "balance": "0ETH",
+          "code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3",
+          "storage": {},
+          "nonce": "1"
+        }
+      }'
+optimism_package:
+  chains:
+    - participants:
+      - el_type: op-geth
+        cl_type: op-node
+      - el_type: op-reth
+        cl_type: op-node
+        el_image: "ghcr.io/paradigmxyz/op-reth:kurtosis-ci"
+      network_params:
+        holocene_time_offset: 0
+        isthmus_time_offset: 0

.github/scripts/codspeed-build.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# TODO: Benchmarks run WAY too slow due to excessive amount of iterations.
+
+cmd=(cargo codspeed build --profile profiling)
+crates=(
+    -p reth-primitives
+    -p reth-trie
+    -p reth-trie-common
+    -p reth-trie-sparse
+)
+
+"${cmd[@]}" --features test-utils "${crates[@]}"

.github/workflows/assertoor.yml

@@ -1,230 +0,0 @@
-name: Assertoor Tests
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  get_tests:
-    name: "Run assertoor tests on reth pairs"
-    runs-on: ubuntu-latest
-    outputs:
-      test_result: ${{ steps.test_result.outputs.test_result }}
-      test_status: ${{ steps.test_result.outputs.test_status }}
-      failed_test_status: ${{ steps.test_result.outputs.failed_test_status }}
-    if: github.repository == 'paradigmxyz/reth'
-    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v4
-    - name: Setup Kurtosis
-      shell: bash
-      run: |
-        echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
-        sudo apt update
-        sudo apt install kurtosis-cli
-        kurtosis analytics disable
-
-    - name: Run Kurtosis
-      shell: bash
-      id: services
-      run: |
-        export github_sha=${{ github.sha }}
-        export github_repository=${{ github.repository }}
-
-        cat etc/assertoor/assertoor-template.yaml | envsubst > etc/assertoor/assertoor.yaml
-
-        kurtosis run github.com/ethpandaops/ethereum-package --enclave assertoor-${{ github.run_id }} --args-file etc/assertoor/assertoor.yaml
-
-        enclave_dump=$(kurtosis enclave inspect assertoor-${{ github.run_id }})
-
-        assertoor_url=$(echo "$enclave_dump" | grep assertoor | grep http | sed 's/.*\(http:\/\/[0-9.:]\+\).*/\1/')
-        echo "assertoor_url: ${assertoor_url}"
-        echo "assertoor_url=${assertoor_url}" >> $GITHUB_OUTPUT
-
-    - name: Await test completion
-      shell: bash
-      id: test_result
-      run: |
-        assertoor_url="${{ steps.services.outputs.assertoor_url }}"
-
-        YELLOW='\033[1;33m'
-        GRAY='\033[0;37m'
-        GREEN='\033[0;32m'
-        RED='\033[0;31m'
-        NC='\033[0m'
-
-        # print assertor logs
-        assertoor_container=$(docker container list | grep assertoor | sed 's/^\([^ ]\+\) .*$/\1/')
-        docker logs -f $assertoor_container &
-
-        # helper to fetch task status for specific test id
-        get_tasks_status() {
-          tasks=$(curl -s ${assertoor_url}/api/v1/test_run/$1 | jq -c ".data.tasks[] | {index, parent_index, name, title, status, result}")
-          declare -A task_graph_map
-          task_graph_map[0]=""
-
-          while read task; do
-            task_id=$(echo "$task" | jq -r ".index")
-            task_parent=$(echo "$task" | jq -r ".parent_index")
-            task_name=$(echo "$task" | jq -r ".name")
-            task_title=$(echo "$task" | jq -r ".title")
-            task_status=$(echo "$task" | jq -r ".status")
-            task_result=$(echo "$task" | jq -r ".result")
-
-            task_graph="${task_graph_map[$task_parent]}"
-            task_graph_map[$task_id]="$task_graph |"
-            if [ ! -z "$task_graph" ]; then
-              task_graph="${task_graph}- "
-            fi
-
-            if [ "$task_status" == "pending" ]; then
-              task_status="${GRAY}pending ${NC}"
-            elif [ "$task_status" == "running" ]; then
-              task_status="${YELLOW}running ${NC}"
-            elif [ "$task_status" == "complete" ]; then
-              task_status="${GREEN}complete${NC}"
-            fi
-
-            if [ "$task_result" == "none" ]; then
-              task_result="${GRAY}none   ${NC}"
-            elif [ "$task_result" == "success" ]; then
-              task_result="${GREEN}success${NC}"
-            elif [ "$task_result" == "failure" ]; then
-              task_result="${RED}failure${NC}"
-            fi
-
-            echo -e " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title"
-          done <<< $(echo "$tasks")
-        }
-
-        # poll & check test status
-        final_test_result=""
-        failed_test_id=""
-        while true
-        do
-          pending_tests=0
-          failed_tests=0
-          total_tests=0
-          running_test=""
-
-          status_lines=()
-          task_lines=""
-          status_lines+=("$(date +'%Y-%m-%d %H:%M:%S')  Test Status:")
-
-          tests=$(curl -s ${assertoor_url}/api/v1/test_runs | jq -c ".data[] | {run_id, test_id, name, status}")
-          while read test; do
-            if [ -z "$test" ]; then
-              continue
-            fi
-            run_id=$(echo "$test" | jq -r ".run_id")
-            test_id=$(echo "$test" | jq -r ".test_id")
-            test_name=$(echo "$test" | jq -r ".name")
-            test_status=$(echo "$test" | jq -r ".status")
-
-            if [ "$test_status" == "pending" ]; then
-              pending_tests=$(expr $pending_tests + 1)
-              status_name="${GRAY}pending${NC}"
-            elif [ "$test_status" == "running" ]; then
-              pending_tests=$(expr $pending_tests + 1)
-              running_test="$run_id"
-              status_name="${YELLOW}running${NC}"
-
-            elif [ "$test_status" == "success" ]; then
-              status_name="${GREEN}success${NC}"
-            elif [ "$test_status" == "failure" ]; then
-              failed_tests=$(expr $failed_tests + 1)
-              failed_test_id="$run_id"
-              status_name="${RED}failure${NC}"
-            else
-              status_name="$test_status"
-            fi
-            status_lines+=("  $(printf '%-3s' "$test_id") $status_name \t$test_name")
-            total_tests=$(expr $total_tests + 1)
-          done <<< $(echo "$tests")
-
-          for status_line in "${status_lines[@]}"
-          do
-            echo -e "$status_line"
-          done
-
-          if ! [ -z "$running_test" ]; then
-            task_lines=$(get_tasks_status "$running_test")
-            echo "Active Test Task Status:"
-            echo "$task_lines"
-          fi
-
-          if [ $failed_tests -gt 0 ]; then
-            final_test_result="failure"
-            break
-          fi
-          if [ $total_tests -gt 0 ] && [ $pending_tests -le 0 ]; then
-            final_test_result="success"
-            break
-          fi
-
-          sleep 60
-        done
-
-        # save test results & status to github output
-        echo "test_result=$(echo "$final_test_result")" >> $GITHUB_OUTPUT
-        echo "test_status<<EOF" >> $GITHUB_OUTPUT
-        for status_line in "${status_lines[@]}"
-        do
-          echo -e "$status_line" >> $GITHUB_OUTPUT
-        done
-        echo "EOF" >> $GITHUB_OUTPUT
-
-        if ! [ -z "$failed_test_id" ]; then
-          echo "failed_test_status<<EOF" >> $GITHUB_OUTPUT
-          get_tasks_status "$failed_test_id" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        else
-          echo "failed_test_status=" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Generate dump and remove kurtosis enclave
-      shell: bash
-      run: |
-        mkdir -p ./temp/dump
-        cd ./temp/dump
-        cp ../../etc/assertoor/assertoor.yaml ./kurtosis-params.yaml
-
-        kurtosis enclave dump assertoor-${{ github.run_id }}
-        kurtosis enclave rm -f assertoor-${{ github.run_id }}
-
-    - name: Upload dump artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: "kurtosis-enclave-dump-${{ github.run_id }}"
-        path: ./temp/dump
-
-    - name: Return test result
-      shell: bash
-      run: |
-        test_result="${{ steps.test_result.outputs.test_result }}"
-        test_status=$(
-        cat <<"EOF"
-        ${{ steps.test_result.outputs.test_status }}
-        EOF
-        )
-        failed_test_status=$(
-        cat <<"EOF"
-        ${{ steps.test_result.outputs.failed_test_status }}
-        EOF
-        )
-
-        echo "Test Result:  $test_result"
-        echo "$test_status"
-
-        if ! [ "$test_result" == "success" ]; then
-          echo ""
-          echo "Failed Test Task Status:"
-          echo "$failed_test_status"
-
-          echo ""
-          echo "See 'Await test completion' task for detailed logs about this failure!"
-          echo ""
-
-          exit 1 # fail action
-        fi

.github/workflows/bench.yml

@@ -2,14 +2,15 @@
 
 on:
   pull_request:
-  merge_group:
+  # TODO: Disabled temporarily for https://github.com/CodSpeedHQ/runner/issues/55
+  # merge_group:
   push:
     branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
   BASELINE: base
-  IAI_CALLGRIND_RUNNER: iai-callgrind-runner
+  SEED: reth
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -17,44 +18,26 @@ concurrency:
 
 name: bench
 jobs:
-  iai:
+  codspeed:
     runs-on:
       group: Reth
-    # Only run benchmarks in merge groups and on main
-    if: github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v4
-      - name: Install Valgrind
-        run: sudo apt update && sudo apt install valgrind
+        with:
+          submodules: true
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - name: Install cargo-binstall
-        uses: taiki-e/install-action@cargo-binstall
-      - name: Install iai-callgrind-runner
-        run: |
-          echo "::group::Install"
-          version=$(cargo metadata --format-version=1 |\
-            jq '.packages[] | select(.name == "iai-callgrind").version' |\
-            tr -d '"'
-          )
-          cargo binstall iai-callgrind-runner --version $version --no-confirm --no-symlinks --force
-          echo "::endgroup::"
-          echo "::group::Verification"
-          which iai-callgrind-runner
-          echo "::endgroup::"
-      - name: Checkout base
-        uses: actions/checkout@v4
+      - name: Install cargo-codspeed
+        uses: taiki-e/install-action@v2
         with:
-          ref: ${{ github.base_ref || 'main' }}
-      - name: Generate test vectors
-        run: cargo run --bin reth --features dev -- test-vectors tables
-      - name: Save baseline
-        run: cargo bench -p reth-db --bench iai --profile profiling --features test-utils -- --save-baseline=$BASELINE
-      - name: Checkout PR
-        uses: actions/checkout@v4
+          tool: cargo-codspeed
+      - name: Build the benchmark target(s)
+        run: ./.github/scripts/codspeed-build.sh
+      - name: Run the benchmarks
+        uses: CodSpeedHQ/action@v3
         with:
-          clean: false
-      - name: Compare PR benchmarks
-        run: cargo bench -p reth-db --bench iai --profile profiling --features test-utils -- --baseline=$BASELINE
+          run: cargo codspeed run --workspace
+          token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/book.yml

@@ -57,6 +57,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
       - name: Install mdbook
         run: |
@@ -81,9 +82,7 @@ jobs:
         run: cargo docs --exclude "example-*"
         env:
           # Keep in sync with ./ci.yml:jobs.docs
-          RUSTDOCFLAGS:
-            --cfg docsrs --show-type-layout --generate-link-to-definition --enable-index-page
-            -Zunstable-options
+          RUSTDOCFLAGS: --cfg docsrs --show-type-layout --generate-link-to-definition --enable-index-page -Zunstable-options
 
       - name: Move docs to book folder
         run: |

.github/workflows/build-release-binaries.yml

@@ -0,0 +1,57 @@
+name: build release binaries
+
+on:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    name: build release
+    runs-on: ${{ matrix.configs.os }}
+    strategy:
+      matrix:
+        configs:
+          - target: x86_64-unknown-linux-gnu
+            os: ubuntu-24.04
+            profile: maxperf
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-24.04
+            profile: maxperf
+          - target: x86_64-apple-darwin
+            os: macos-13
+            profile: maxperf
+          - target: aarch64-apple-darwin
+            os: macos-14
+            profile: maxperf
+          - target: x86_64-pc-windows-gnu
+            os: ubuntu-24.04
+            profile: maxperf
+        build:
+          - command: build
+            binary: reth
+          - command: op-build
+            binary: op-reth
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          target: ${{ matrix.configs.target }}
+      - name: Install cross main
+        id: cross_main
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+
+      - name: Apple M1 setup
+        if: matrix.configs.target == 'aarch64-apple-darwin'
+        run: |
+          echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
+          echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
+
+      - name: Build Reth
+        run: make PROFILE=${{ matrix.configs.profile }} ${{ matrix.build.command }}-${{ matrix.configs.target }}

.github/workflows/compact.yml

@@ -0,0 +1,47 @@
+# Ensures that `Compact` codec changes are backwards compatible.
+#
+# 1) checkout `main`
+# 2) randomly generate and serialize to disk many different type vectors with `Compact` (eg. Header, Transaction, etc)
+# 3) checkout `pr`
+# 4) deserialize previously generated test vectors
+
+on:
+  pull_request:
+  merge_group:
+  push:
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+
+name: compact-codec
+jobs:
+  compact-codec:
+    runs-on:
+      group: Reth
+    strategy:
+      matrix:
+        bin:
+          - cargo run --bin reth --features "dev"
+          - cargo run --bin op-reth --features "dev" --manifest-path crates/optimism/bin/Cargo.toml
+    steps:
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Checkout base
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.base_ref || 'main' }}
+      # On `main` branch, generates test vectors and serializes them to disk using `Compact`.
+      - name: Generate compact vectors
+        run: |
+          ${{ matrix.bin }} -- test-vectors compact --write
+      - name: Checkout PR
+        uses: actions/checkout@v4
+        with:
+          clean: false
+      # On incoming merge try to read and decode previously generated vectors with `Compact`
+      - name: Read vectors
+        run: ${{ matrix.bin }} -- test-vectors compact --read

.github/workflows/deny.yml

@@ -1,27 +0,0 @@
-# Runs `cargo-deny` when modifying `Cargo.lock`.
-
-name: deny
-
-on:
-  push:
-    branches: [main]
-    paths: [Cargo.lock]
-  pull_request:
-    branches: [main]
-    paths: [Cargo.lock]
-  merge_group:
-
-env:
-  CARGO_TERM_COLOR: always
-
-concurrency: deny-${{ github.head_ref || github.run_id }}
-
-jobs:
-  deny:
-    name: deny
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: EmbarkStudios/cargo-deny-action@v2
-        with:
-          command: check all

.github/workflows/dependencies.yml

@@ -9,53 +9,12 @@ on:
   workflow_dispatch:
     # Needed so we can run it manually
 
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  BRANCH: cargo-update
-  TITLE: "chore(deps): weekly `cargo update`"
-  BODY: |
-    Automation to keep dependencies in `Cargo.lock` current.
-
-    <details><summary><strong>cargo update log</strong></summary>
-    <p>
-
-    ```log
-    $cargo_update_log
-    ```
-
-    </p>
-    </details>
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   update:
-    name: Update
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-
-      - name: cargo update
-        # Remove first line that always just says "Updating crates.io index"
-        run: cargo update --color never 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
-
-      - name: craft commit message and PR body
-        id: msg
-        run: |
-          export cargo_update_log="$(cat cargo_update.log)"
-
-          echo "commit_message<<EOF" >> $GITHUB_OUTPUT
-          printf "$TITLE\n\n$cargo_update_log\n" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-          echo "body<<EOF" >> $GITHUB_OUTPUT
-          echo "$BODY" | envsubst >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          add-paths: ./Cargo.lock
-          commit-message: ${{ steps.msg.outputs.commit_message }}
-          title: ${{ env.TITLE }}
-          body: ${{ steps.msg.outputs.body }}
-          branch: ${{ env.BRANCH }}
+    uses: ithacaxyz/ci/.github/workflows/cargo-update-pr.yml@main
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-git.yml

@@ -0,0 +1,54 @@
+# Publishes the Docker image, only to be used with `workflow_dispatch`. The
+# images from this workflow will be tagged with the git sha of the branch used
+# and will NOT tag it as `latest`.
+
+name: docker-git
+
+on:
+  workflow_dispatch: {}
+
+env:
+  REPO_NAME: ${{ github.repository_owner }}/reth
+  IMAGE_NAME: ${{ github.repository_owner }}/reth
+  OP_IMAGE_NAME: ${{ github.repository_owner }}/op-reth
+  CARGO_TERM_COLOR: always
+  DOCKER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/reth
+  OP_DOCKER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/op-reth
+  DOCKER_USERNAME: ${{ github.actor }}
+  GIT_SHA: ${{ github.sha }}
+
+jobs:
+  build:
+    name: build and push
+    runs-on: ubuntu-24.04
+    permissions:
+      packages: write
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+          - name: 'Build and push the git-sha-tagged reth image'
+            command: 'make PROFILE=maxperf GIT_SHA=$GIT_SHA docker-build-push-git-sha'
+          - name: 'Build and push the git-sha-tagged op-reth image'
+            command: 'make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME GIT_SHA=$GIT_SHA PROFILE=maxperf op-docker-build-push-git-sha'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Install cross main
+        id: cross_main
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross
+      - name: Log in to Docker
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username ${DOCKER_USERNAME} --password-stdin
+      - name: Set up Docker builder
+        run: |
+          docker run --privileged --rm tonistiigi/binfmt --install arm64,amd64
+          docker buildx create --use --name cross-builder
+      - name: Build and push ${{ matrix.build.name }}
+        run: ${{ matrix.build.command }}

.github/workflows/docker-nightly.yml

@@ -0,0 +1,61 @@
+# Publishes the nightly Docker image.
+
+name: docker-nightly
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 1 * * *"
+env:
+  REPO_NAME: ${{ github.repository_owner }}/reth
+  IMAGE_NAME: ${{ github.repository_owner }}/reth
+  OP_IMAGE_NAME: ${{ github.repository_owner }}/op-reth
+  CARGO_TERM_COLOR: always
+  DOCKER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/reth
+  OP_DOCKER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/op-reth
+  DOCKER_USERNAME: ${{ github.actor }}
+
+jobs:
+  build:
+    name: build and push
+    runs-on: ubuntu-24.04
+    permissions:
+      packages: write
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+          - name: 'Build and push the nightly reth image'
+            command: 'make PROFILE=maxperf docker-build-push-nightly'
+          - name: 'Build and push the nightly profiling reth image'
+            command: 'make PROFILE=profiling docker-build-push-nightly-profiling'
+          - name: 'Build and push the nightly op-reth image'
+            command: 'make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=maxperf op-docker-build-push-nightly'
+          - name: 'Build and push the nightly profiling op-reth image'
+            command: 'make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=profiling op-docker-build-push-nightly-profiling'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Remove bloatware
+        uses: laverdet/remove-bloatware@v1.0.0
+        with:
+          docker: true
+          lang: rust
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Install cross main
+        id: cross_main
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross
+      - name: Log in to Docker
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username ${DOCKER_USERNAME} --password-stdin
+      - name: Set up Docker builder
+        run: |
+          docker run --privileged --rm tonistiigi/binfmt --install arm64,amd64
+          docker buildx create --use --name cross-builder
+      - name: Build and push ${{ matrix.build.name }}
+        run: ${{ matrix.build.command }}

.github/workflows/docker.yml

@@ -3,7 +3,6 @@
 name: docker
 
 on:
-  workflow_dispatch: {}
   push:
     tags:
       - v*
@@ -20,17 +19,33 @@ env:
 jobs:
   build:
     name: build and push
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       packages: write
       contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+          - name: 'Build and push reth image'
+            command: 'make PROFILE=maxperf docker-build-push'
+          - name: 'Build and push reth image, tag as "latest"'
+            command: 'make PROFILE=maxperf docker-build-push-latest'
+          - name: 'Build and push op-reth image'
+            command: 'make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=maxperf op-docker-build-push'
+          - name: 'Build and push op-reth image, tag as "latest"'
+            command: 'make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=maxperf op-docker-build-push-latest'
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - uses: taiki-e/install-action@cross
+      - name: Install cross main
+        id: cross_main
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross
       - name: Log in to Docker
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username ${DOCKER_USERNAME} --password-stdin
@@ -38,11 +53,5 @@ jobs:
         run: |
           docker run --privileged --rm tonistiigi/binfmt --install arm64,amd64
           docker buildx create --use --name cross-builder
-      - name: Build and push reth image, tag as "latest"
-        run: make PROFILE=maxperf docker-build-push-latest
-      - name: Build and push reth image
-        run: make PROFILE=maxperf docker-build-push
-      - name: Build and push op-reth image, tag as "latest"
-        run: make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=maxperf op-docker-build-push-latest
-      - name: Build and push op-reth image
-        run: make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=maxperf op-docker-build-push
+      - name: Build and push ${{ matrix.build.name }}
+        run: ${{ matrix.build.command }}

.github/workflows/eth-sync.yml

@@ -1,53 +0,0 @@
-# Runs an ethereum mainnet sync test.
-
-name: eth-sync-test
-
-on:
-  pull_request:
-  merge_group:
-  push:
-    branches: [ main ]
-
-env:
-  CARGO_TERM_COLOR: always
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  sync:
-    name: sync / 100k blocks
-    # Only run sync tests in merge groups
-    if: github.event_name == 'merge_group'
-    runs-on:
-      group: Reth
-    env:
-      RUST_LOG: info,sync=error
-      RUST_BACKTRACE: 1
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-      - name: Build reth
-        run: |
-          cargo install --features asm-keccak,jemalloc --path bin/reth
-      - name: Run sync
-        run: |
-          reth node \
-            --debug.tip 0x91c90676cab257a59cd956d7cb0bceb9b1a71d79755c23c7277a0697ccfaf8c4 \
-            --debug.max-block 100000 \
-            --debug.terminate
-      - name: Verify the target block hash
-        run: |
-          reth db get static-file headers 100000 \
-            | grep 0x91c90676cab257a59cd956d7cb0bceb9b1a71d79755c23c7277a0697ccfaf8c4
-      - name: Run stage unwind for 100 blocks
-        run: |
-          reth stage unwind num-blocks 100
-      - name: Run stage unwind to block hash
-        run: |
-          reth stage unwind to-block 0x52e0509d33a988ef807058e2980099ee3070187f7333aae12b64d4d675f34c5a

.github/workflows/hive.yml

@@ -5,8 +5,8 @@ name: hive
 on:
   workflow_dispatch:
   schedule:
-    # every day
-    - cron: "0 0 * * *"
+    # run every 12 hours
+    - cron: "0 */12 * * *"
 
 env:
   CARGO_TERM_COLOR: always
@@ -17,38 +17,10 @@ concurrency:
 
 jobs:
   prepare-reth:
-    if: github.repository == 'paradigmxyz/reth'
-    timeout-minutes: 45
-    runs-on:
-      group: Reth
-    steps:
-      - uses: actions/checkout@v4
-      - run: mkdir artifacts
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-      - name: Build reth
-        run: |
-          cargo build --features asm-keccak --profile hivetests --bin reth --locked
-          mkdir dist && cp ./target/hivetests/reth ./dist/reth
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and export reth image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: .github/assets/hive/Dockerfile
-          tags: ghcr.io/paradigmxyz/reth:latest
-          outputs: type=docker,dest=./artifacts/reth_image.tar
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Upload reth image
-        uses: actions/upload-artifact@v4
-        with:
-          name: artifacts
-          path: ./artifacts
+    uses: ./.github/workflows/prepare-reth.yml
+    with:
+      image_tag: ghcr.io/paradigmxyz/reth:latest
+      binary_name: reth
 
   prepare-hive:
     if: github.repository == 'paradigmxyz/reth'
@@ -82,7 +54,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        engine: [regular, experimental]
         # ethereum/rpc to be deprecated:
         # https://github.com/ethereum/hive/pull/1117
         scenario:
@@ -91,27 +62,24 @@ jobs:
           - sim: ethereum/sync
           - sim: devp2p
             limit: discv4
+          # started failing after https://github.com/ethereum/go-ethereum/pull/31843, no
+          # action on our side, remove from here when we get unxpected passes on these tests
+          # - sim: devp2p
+          #  limit: eth
+          #  include:
+          #    - MaliciousHandshake
+          #    # failures tracked in https://github.com/paradigmxyz/reth/issues/14825
+          #    - Status
+          #    - GetBlockHeaders
+          #    - ZeroRequestID
+          #    - GetBlockBodies
+          #    - Transaction
+          #    - NewPooledTxs
           - sim: devp2p
-            limit: eth
+            limit: discv5
             include:
-              # status
-              - TestStatus
-              # get block headers
-              - TestGetBlockHeaders
-              - TestSimultaneousRequests
-              - TestSameRequestID
-              - TestZeroRequestID
-              # get block bodies
-              - TestGetBlockBodies
-              # malicious handshakes + status
-              - TestMaliciousHandshake
-              - TestMaliciousStatus
-              # test transactions
-              - TestLargeTxRequest
-              - TestTransaction
-              - TestInvalidTxs
-              - TestNewPooledTxs
-              - TestBlobViolations
+              # failures tracked at https://github.com/paradigmxyz/reth/issues/14825
+              - PingLargeRequestID
           - sim: ethereum/engine
             limit: engine-exchange-capabilities
           - sim: ethereum/engine
@@ -144,44 +112,42 @@ jobs:
               - eth_syncing
               # debug_ rpc methods
               - debug_
-          # Pyspec cancun jobs
-          # TODO: uncomment when https://github.com/ethereum/hive/issues/1147 is fixed
-          #- sim: pyspec
-          #  include: [cancun/eip4844]
-          #- sim: pyspec
-          #  include: [cancun/eip4788]
-          #- sim: pyspec
-          #  include: [cancun/eip6780]
-          #- sim: pyspec
-          #  include: [cancun/eip5656]
-          #- sim: pyspec
-          #  include: [cancun/eip1153]
-          #- sim: pyspec
-          #  include: [cancun/eip7516]
-          # Pyspec shanghai jobs
-          #- sim: pyspec
-          #  include: [shanghai/eip3651]
-          #- sim: pyspec
-          #  include: [shanghai/eip3855]
-          #- sim: pyspec
-          #  include: [shanghai/eip3860]
-          #- sim: pyspec
-          #  include: [shanghai/eip4895]
-          # Pyspec merge and earlier jobs
-          #- sim: pyspec
-          #  include: [merge/]
-          #- sim: pyspec
-          #  include: [berlin/]
-          #- sim: pyspec
-          #  include: [istanbul/]
-          #- sim: pyspec
-          #  include: [homestead/]
-          #- sim: pyspec
-          #  include: [frontier/]
+
+          # consume-engine
+          - sim: ethereum/eest/consume-engine
+            limit: .*tests/prague.*
+          - sim: ethereum/eest/consume-engine
+            limit: .*tests/cancun.*
+          - sim: ethereum/eest/consume-engine
+            limit: .*tests/shanghai.*
+          - sim: ethereum/eest/consume-engine
+            limit: .*tests/berlin.*
+          - sim: ethereum/eest/consume-engine
+            limit: .*tests/istanbul.*
+          - sim: ethereum/eest/consume-engine
+            limit: .*tests/homestead.*
+          - sim: ethereum/eest/consume-engine
+            limit: .*tests/frontier.*
+
+          # consume-rlp
+          - sim: ethereum/eest/consume-rlp
+            limit: .*tests/prague.*
+          - sim: ethereum/eest/consume-rlp
+            limit: .*tests/cancun.*
+          - sim: ethereum/eest/consume-rlp
+            limit: .*tests/shanghai.*
+          - sim: ethereum/eest/consume-rlp
+            limit: .*tests/berlin.*
+          - sim: ethereum/eest/consume-rlp
+            limit: .*tests/istanbul.*
+          - sim: ethereum/eest/consume-rlp
+            limit: .*tests/homestead.*
+          - sim: ethereum/eest/consume-rlp
+            limit: .*tests/frontier.*
     needs:
       - prepare-reth
       - prepare-hive
-    name: run ${{ matrix.engine }} - ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
+    name: run ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
     runs-on:
       group: Reth
     permissions:
@@ -218,11 +184,6 @@ jobs:
           ref: master
           path: hivetests
 
-      - name: Modify client for experimental engine
-        if: matrix.engine == 'experimental'
-        run: |
-          sed -ie 's/RUST_LOG=info $reth node $FLAGS/RUST_LOG=info $reth node --engine.experimental $FLAGS/' hivetests/clients/reth/reth.sh
-
       - name: Run simulator
         run: |
           LIMIT="${{ matrix.scenario.limit }}"
@@ -241,8 +202,7 @@ jobs:
 
       - name: Parse hive output
         run: |
-          FAILURE_FILE="${{ matrix.engine == 'experimental' && '.github/assets/hive/expected_failures_experimental.yaml' || '.github/assets/hive/expected_failures.yaml' }}"
-          find hivetests/workspace/logs -type f -name "*.json" ! -name "hive.json" | xargs -I {} python .github/assets/hive/parse.py {} --exclusion $FAILURE_FILE
+          find hivetests/workspace/logs -type f -name "*.json" ! -name "hive.json" | xargs -I {} python .github/assets/hive/parse.py {} --exclusion .github/assets/hive/expected_failures.yaml
 
       - name: Print simulator output
         if: ${{ failure() }}
@@ -259,8 +219,9 @@ jobs:
     runs-on:
       group: Reth
     steps:
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@v6.0.0
-        with:
-          webhook-url: ${{ secrets.RETH_ALERTS_WEBHOOK }}
-          content: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
+      - name: Slack Webhook Action
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_MESSAGE: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/integration.yml

@@ -7,6 +7,9 @@ on:
   merge_group:
   push:
     branches: [main]
+  schedule:
+  # Run once a day at 3:00 UTC
+  - cron: '0 3 * * *'
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,6 +22,7 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.network }}
+    if: github.event_name != 'schedule'
     runs-on:
       group: Reth
     env:
@@ -29,6 +33,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - name: Install Geth
         run: .github/assets/install_geth.sh
@@ -47,12 +52,12 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-node-optimism --features "optimism"
+            --locked -p reth-optimism-node
 
   integration-success:
     name: integration success
     runs-on: ubuntu-latest
-    if: always()
+    if: always() && github.event_name != 'schedule'
     needs: [test]
     timeout-minutes: 30
     steps:
@@ -60,3 +65,18 @@ jobs:
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}
+
+  era-files: 
+    name: era1 file integration tests once a day
+    if: github.event_name == 'schedule'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: rui314/setup-mold@v1
+    - uses: dtolnay/rust-toolchain@stable
+    - uses: taiki-e/install-action@nextest
+    - uses: Swatinem/rust-cache@v2
+      with:
+        cache-on-failure: true
+    - name: run era1 files integration tests
+      run: cargo nextest run --package reth-era --test it -- --ignored

.github/workflows/kurtosis-op.yml

@@ -0,0 +1,98 @@
+# Runs simple OP stack setup in Kurtosis
+
+name: kurtosis-op
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 */12 * * *"
+
+  push:
+    tags:
+      - '*'
+
+env:
+  CARGO_TERM_COLOR: always
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  prepare-reth:
+    uses: ./.github/workflows/prepare-reth.yml
+    with:
+      image_tag: ghcr.io/paradigmxyz/op-reth:kurtosis-ci
+      binary_name: op-reth
+      cargo_features: asm-keccak
+      cargo_package: crates/optimism/bin/Cargo.toml
+
+  test:
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+    name: run kurtosis
+    runs-on:
+      group: Reth
+    needs:
+      - prepare-reth
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download reth image
+        uses: actions/download-artifact@v4
+        with:
+          name: artifacts
+          path: /tmp
+
+      - name: Load Docker image
+        run: |
+          docker load -i /tmp/reth_image.tar &
+          wait
+          docker image ls -a
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Run kurtosis
+        run: |
+          echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
+          sudo apt update
+          sudo apt install kurtosis-cli
+          kurtosis engine start
+          kurtosis run --enclave op-devnet github.com/ethpandaops/optimism-package --args-file .github/assets/kurtosis_op_network_params.yaml
+          ENCLAVE_ID=$(curl http://127.0.0.1:9779/api/enclaves | jq --raw-output 'keys[0]')
+          GETH_PORT=$(curl "http://127.0.0.1:9779/api/enclaves/$ENCLAVE_ID/services" | jq '."op-el-2151908-1-op-geth-op-node-op-kurtosis".public_ports.rpc.number')
+          RETH_PORT=$(curl "http://127.0.0.1:9779/api/enclaves/$ENCLAVE_ID/services" | jq '."op-el-2151908-2-op-reth-op-node-op-kurtosis".public_ports.rpc.number')
+          echo "GETH_RPC=http://127.0.0.1:$GETH_PORT" >> $GITHUB_ENV
+          echo "RETH_RPC=http://127.0.0.1:$RETH_PORT" >> $GITHUB_ENV
+
+      - name: Assert that clients advance
+        run: |
+          for i in {1..100}; do
+            sleep 5
+            BLOCK_GETH=$(cast bn --rpc-url $GETH_RPC)
+            BLOCK_RETH=$(cast bn --rpc-url $RETH_RPC)
+
+            if [ $BLOCK_GETH -ge 100 ] && [ $BLOCK_RETH -ge 100 ] ; then exit 0; fi
+            echo "Waiting for clients to advance..., Reth: $BLOCK_RETH Geth: $BLOCK_GETH"
+          done
+          kurtosis service logs -a op-devnet op-el-2151908-2-op-reth-op-node-op-kurtosis
+          kurtosis service logs -a op-devnet op-cl-2151908-2-op-node-op-reth-op-kurtosis
+          exit 1
+
+
+  notify-on-error:
+    needs: test
+    if: failure()
+    runs-on:
+      group: Reth
+    steps:
+      - name: Slack Webhook Action
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_MESSAGE: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/kurtosis.yml

@@ -0,0 +1,70 @@
+# Runs `assertoor` tests on a `kurtosis` testnet.
+
+name: kurtosis
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 */12 * * *"
+
+  push:
+    tags:
+      - '*'
+
+env:
+  CARGO_TERM_COLOR: always
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  prepare-reth:
+    uses: ./.github/workflows/prepare-reth.yml
+    with:
+      image_tag: ghcr.io/paradigmxyz/reth:kurtosis-ci
+      binary_name: reth
+
+  test:
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+    name: run kurtosis
+    runs-on:
+      group: Reth
+    needs:
+      - prepare-reth
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download reth image
+        uses: actions/download-artifact@v4
+        with:
+          name: artifacts
+          path: /tmp
+
+      - name: Load Docker image
+        run: |
+          docker load -i /tmp/reth_image.tar &
+          wait
+          docker image ls -a
+
+      - name: Run kurtosis
+        uses: ethpandaops/kurtosis-assertoor-github-action@v1
+        with:
+          ethereum_package_args: '.github/assets/kurtosis_network_params.yaml'
+
+  notify-on-error:
+    needs: test
+    if: failure()
+    runs-on:
+      group: Reth
+    steps:
+      - name: Slack Webhook Action
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_MESSAGE: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/lint.yml

@@ -11,23 +11,33 @@ env:
 
 jobs:
   clippy-binaries:
-    name: clippy / ${{ matrix.network }}
+    name: clippy binaries / ${{ matrix.type }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       matrix:
         include:
-          - binary: reth
-            network: ethereum
-          - binary: op-reth
-            network: optimism
+          - type: ethereum
+            args: --workspace --lib --examples --tests --benches --locked
+            features: "ethereum asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
+          - type: book
+            args: --manifest-path book/sources/Cargo.toml --workspace --bins
+            features: ""
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@clippy
+        with:
+          components: clippy
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
+      - if: "${{ matrix.type == 'book' }}"
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run clippy on binaries
+        run: cargo clippy ${{ matrix.args }} --features "${{ matrix.features }}"
         env:
           RUSTFLAGS: -D warnings
 
@@ -37,7 +47,10 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@clippy
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: clippy
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
@@ -50,6 +63,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: wasm32-wasip1
@@ -57,42 +71,61 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - uses: dcarbone/install-jq-action@v2
+      - uses: dcarbone/install-jq-action@v3
       - name: Run Wasm checks
-        run: .github/assets/check_wasm.sh
+        run: |
+          sudo apt update && sudo apt install gcc-multilib
+          .github/assets/check_wasm.sh
+
+  riscv:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          target: riscv32imac-unknown-none-elf
+      - uses: taiki-e/install-action@cargo-hack
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - uses: dcarbone/install-jq-action@v3
+      - name: Run RISC-V checks
+        run: .github/assets/check_rv32imac.sh
 
   crate-checks:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@cargo-hack
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo hack check
+      - run: cargo hack check --workspace
 
   msrv:
-    name: MSRV / ${{ matrix.network }}
+    name: MSRV
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       matrix:
         include:
           - binary: reth
-            network: ethereum
           - binary: op-reth
-            network: optimism
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.80" # MSRV
+          toolchain: "1.86" # MSRV
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo build --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }}"
+      - run: cargo build --bin "${{ matrix.binary }}" --workspace
         env:
           RUSTFLAGS: -D warnings
 
@@ -102,6 +135,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
       - uses: Swatinem/rust-cache@v2
         with:
@@ -118,10 +152,28 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
-      - run: cargo fmt --all --check
+      - name: Run fmt
+        run: cargo fmt --all --check
+      - name: Run fmt on book sources
+        run: cargo fmt --manifest-path book/sources/Cargo.toml --all --check
+
+  udeps:
+    name: udeps
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - uses: taiki-e/install-action@cargo-udeps
+      - run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked
 
   book:
     name: book
@@ -129,9 +181,8 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: "1.80" # MSRV
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@nightly
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
@@ -151,6 +202,17 @@ jobs:
         with:
           skip: "*.json"
 
+  check-toml:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run dprint
+        uses: dprint/check@v2.2
+        with:
+          config-path: dprint.json
+
   grafana:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -166,6 +228,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - name: Ensure no arbitrary or proptest dependency on default build
         run: cargo tree --package reth -e=features,no-dev | grep -Eq "arbitrary|proptest" && exit 1 || exit 0
@@ -177,6 +240,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@clippy
       - uses: Swatinem/rust-cache@v2
         with:
@@ -187,6 +251,25 @@ jobs:
         env:
           RUSTFLAGS: -D warnings
 
+  # Check crates correctly propagate features
+  feature-propagation:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v4
+      - name: fetch deps
+        run: |
+          # Eagerly pull dependencies
+          time cargo metadata --format-version=1 --locked > /dev/null
+      - name: run zepter
+        run: |
+          cargo install zepter -f --locked
+          zepter --version
+          time zepter run check
+
+  deny:
+    uses: ithacaxyz/ci/.github/workflows/deny.yml@main
+
   lint-success:
     name: lint success
     runs-on: ubuntu-latest
@@ -198,11 +281,14 @@ jobs:
       - crate-checks
       - docs
       - fmt
+      - udeps
       - book
       - codespell
       - grafana
       - no-test-deps
       - features
+      - feature-propagation
+      - deny
     timeout-minutes: 30
     steps:
       - name: Decide whether the needed jobs succeeded or failed

.github/workflows/op-sync.yml

@@ -1,56 +0,0 @@
-# Runs a base mainnet sync test.
-
-name: op-sync-test
-
-on:
-  pull_request:
-  merge_group:
-  push:
-    branches: [ main ]
-
-env:
-  CARGO_TERM_COLOR: always
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  sync:
-    name: op sync / 10k blocks
-    # Only run sync tests in merge groups
-    if: github.event_name == 'merge_group'
-    runs-on:
-      group: Reth
-    env:
-      RUST_LOG: info,sync=error
-      RUST_BACKTRACE: 1
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-      - name: Build op-reth
-        run: |
-          cargo install --features asm-keccak,jemalloc,optimism --bin op-reth --path bin/reth
-      - name: Run sync
-        # https://basescan.org/block/10000
-        run: |
-          op-reth node \
-            --chain base \
-            --debug.tip 0xbb9b85352c7ebca6ba8efc63bd66cecd038c92ec8ebd02e153a3e0b197e672b7 \
-            --debug.max-block 10000 \
-            --debug.terminate
-      - name: Verify the target block hash
-        run: |
-          op-reth db --chain base get static-file headers 10000 \
-            | grep 0xbb9b85352c7ebca6ba8efc63bd66cecd038c92ec8ebd02e153a3e0b197e672b7
-      - name: Run stage unwind for 100 blocks
-        run: |
-          op-reth stage --chain base unwind num-blocks 100
-      - name: Run stage unwind to block hash
-        run: |
-          op-reth stage --chain base unwind to-block 0x118a6e922a8c6cab221fc5adfe5056d2b72d58c6580e9c5629de55299e2cf8de
-

.github/workflows/pr-title.yml

@@ -0,0 +1,84 @@
+name: Pull Request
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+
+permissions:
+  pull-requests: read
+  contents: read
+
+jobs:
+  conventional-title:
+    name: Validate PR title is Conventional Commit
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Check title
+        id: lint_pr_title
+        uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |
+            feat
+            fix
+            chore
+            test
+            perf
+            refactor
+            docs
+            ci
+            revert
+            deps
+        continue-on-error: true
+      - name: Add PR Comment for Invalid Title
+        if: steps.lint_pr_title.outcome == 'failure'
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: pr-title-lint-error
+          message: |
+            Your PR title doesn't follow the Conventional Commit guidelines.
+
+            **Example of valid titles:**
+            - `feat: add new user login`
+            - `fix: correct button size`
+            - `docs: update README`
+
+            **Usage:**
+            - `feat`: Introduces a new feature
+            - `fix`: Patches a bug
+            - `chore`: General maintenance tasks or updates
+            - `test`: Adding new tests or modifying existing tests
+            - `perf`: Performance improvements
+            - `refactor`: Changes to improve code structure
+            - `docs`: Documentation updates
+            - `ci`: Changes to CI/CD configurations
+            - `revert`: Reverts a previously merged PR
+            - `deps`: Updates dependencies
+            
+            **Breaking Changes**
+
+            Breaking changes are noted by using an exclamation mark. For example:
+            - `feat!: changed the API`
+            - `chore(node)!: Removed unused public function`
+            
+            **Help**
+
+            For more information, follow the guidelines here: https://www.conventionalcommits.org/en/v1.0.0/
+      
+      - name: Remove Comment for Valid Title
+        if: steps.lint_pr_title.outcome == 'success'
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: pr-title-lint-error
+          delete: true
+
+      - name: Fail workflow if title invalid
+        if: steps.lint_pr_title.outcome == 'failure'
+        run: exit 1

.github/workflows/prepare-reth.yml

@@ -0,0 +1,57 @@
+name: Prepare Reth Image
+
+on:
+  workflow_call:
+    inputs:
+      image_tag:
+        required: true
+        type: string
+        description: "Docker image tag to use"
+      binary_name:
+        required: false
+        type: string
+        default: "reth"
+        description: "Binary name to build (reth or op-reth)"
+      cargo_features:
+        required: false
+        type: string
+        default: "asm-keccak"
+        description: "Cargo features to enable"
+      cargo_package:
+        required: false
+        type: string
+        description: "Optional cargo package path"
+
+jobs:
+  prepare-reth:
+    if: github.repository == 'paradigmxyz/reth'
+    timeout-minutes: 45
+    runs-on:
+      group: Reth
+    steps:
+      - uses: actions/checkout@v4
+      - run: mkdir artifacts
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and export reth image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: .github/assets/hive/Dockerfile
+          tags: ${{ inputs.image_tag }}
+          outputs: type=docker,dest=./artifacts/reth_image.tar
+          build-args: |
+            CARGO_BIN=${{ inputs.binary_name }}
+            MANIFEST_PATH=${{ inputs.cargo_package }}
+            FEATURES=${{ inputs.cargo_features }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Upload reth image
+        id: upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts
+          path: ./artifacts

.github/workflows/release-dist.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Update Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v3
+        uses: dawidd6/action-homebrew-bump-formula@v4
         with:
           token: ${{ secrets.HOMEBREW }}
           no_fork: true

.github/workflows/release-reproducible.yml

@@ -0,0 +1,56 @@
+# This workflow is for building and pushing reproducible Docker images for releases.
+
+name: release-reproducible
+
+on:
+  push:
+    tags:
+      - v*
+
+env:
+  DOCKER_REPRODUCIBLE_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/reth-reproducible
+
+jobs:
+  extract-version:
+    name: extract version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract version
+        run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
+        id: extract_version
+    outputs:
+      VERSION: ${{ steps.extract_version.outputs.VERSION }}
+
+  build-reproducible:
+    name: build and push reproducible image
+    runs-on: ubuntu-latest
+    needs: extract-version
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push reproducible image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile.reproducible
+          push: true
+          tags: |
+            ${{ env.DOCKER_REPRODUCIBLE_IMAGE_NAME }}:${{ needs.extract-version.outputs.VERSION }}
+            ${{ env.DOCKER_REPRODUCIBLE_IMAGE_NAME }}:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          provenance: false
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false

.github/workflows/release.yml

@@ -7,12 +7,21 @@ on:
   push:
     tags:
       - v*
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: "Enable dry run mode (builds artifacts but skips uploads and release creation)"
+        type: boolean
+        default: true
 
 env:
   REPO_NAME: ${{ github.repository_owner }}/reth
-  OP_IMAGE_NAME: ${{ github.repository_owner }}/op-reth
   IMAGE_NAME: ${{ github.repository_owner }}/reth
+  OP_IMAGE_NAME: ${{ github.repository_owner }}/op-reth
+  REPRODUCIBLE_IMAGE_NAME: ${{ github.repository_owner }}/reth-reproducible
   CARGO_TERM_COLOR: always
+  DOCKER_IMAGE_NAME_URL: ghcr.io/${{ github.repository_owner }}/reth
+  DOCKER_OP_IMAGE_NAME_URL: ghcr.io/${{ github.repository_owner }}/op-reth
 
 jobs:
   extract-version:
@@ -20,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Extract version
-        run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
+        run: echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
         id: extract_version
     outputs:
       VERSION: ${{ steps.extract_version.outputs.VERSION }}
@@ -33,10 +42,10 @@ jobs:
       matrix:
         configs:
           - target: x86_64-unknown-linux-gnu
-            os: ubuntu-20.04
+            os: ubuntu-24.04
             profile: maxperf
           - target: aarch64-unknown-linux-gnu
-            os: ubuntu-20.04
+            os: ubuntu-24.04
             profile: maxperf
           - target: x86_64-apple-darwin
             os: macos-13
@@ -45,7 +54,7 @@ jobs:
             os: macos-14
             profile: maxperf
           - target: x86_64-pc-windows-gnu
-            os: ubuntu-20.04
+            os: ubuntu-24.04
             profile: maxperf
         build:
           - command: build
@@ -54,10 +63,14 @@ jobs:
             binary: op-reth
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: ${{ matrix.configs.target }}
-      - uses: taiki-e/install-action@cross
+      - name: Install cross main
+        id: cross_main
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
@@ -90,12 +103,14 @@ jobs:
         shell: bash
 
       - name: Upload artifact
+        if: ${{ github.event.inputs.dry_run == 'false' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.build.binary }}-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.configs.target }}.tar.gz
           path: ${{ matrix.build.binary }}-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.configs.target }}.tar.gz
 
       - name: Upload signature
+        if: ${{ github.event.inputs.dry_run == 'false' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.build.binary }}-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.configs.target }}.tar.gz.asc
@@ -105,6 +120,7 @@ jobs:
     name: draft release
     needs: [build, extract-version]
     runs-on: ubuntu-latest
+    if: ${{ github.event.inputs.dry_run == 'false' }}
     env:
       VERSION: ${{ needs.extract-version.outputs.VERSION }}
     permissions:
@@ -118,12 +134,6 @@ jobs:
           fetch-depth: 0
       - name: Download artifacts
         uses: actions/download-artifact@v4
-      - name: Generate full changelog
-        id: changelog
-        run: |
-          echo "CHANGELOG<<EOF" >> $GITHUB_OUTPUT
-          echo "$(git log --pretty=format:"- %s" $(git describe --tags --abbrev=0 ${{ env.VERSION }}^)..${{ env.VERSION }})" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
       - name: Create release draft
         env:
           GITHUB_USER: ${{ github.repository_owner }}
@@ -167,26 +177,33 @@ jobs:
 
           *See [Update Priorities](https://paradigmxyz.github.io/reth/installation/priorities.html) for more information about this table.*
 
-          ## All Changes
-
-          ${{ steps.changelog.outputs.CHANGELOG }}
-
           ## Binaries
 
           [See pre-built binaries documentation.](https://paradigmxyz.github.io/reth/installation/binaries.html)
 
           The binaries are signed with the PGP key: `50FB 7CC5 5B2E 8AFA 59FE 03B7 AA5E D56A 7FBF 253E`
 
+          ### Reth
+
           | System | Architecture | Binary | PGP Signature |
           |:---:|:---:|:---:|:---|
-          | <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | x86_64 | [reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc) |
-          | <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | aarch64 | [reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz.asc) |
-          | <img src="https://simpleicons.org/icons/windows.svg" style="width: 32px;"/> | x86_64 | [reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz.asc) |
-          | <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | x86_64 | [reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz.asc) |
-          | <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | aarch64 | [reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz.asc) |
-          | | | | |
-          | **System** | **Option** | - | **Resource** |
-          | <img src="https://simpleicons.org/icons/docker.svg" style="width: 32px;"/> | Docker | | [${{ env.IMAGE_NAME }}](https://github.com/paradigmxyz/reth/pkgs/container/reth) |
+          | <img src="https://www.svgrepo.com/download/473700/linux.svg" style="width: 32px;"/> | x86_64 | [reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/473700/linux.svg" style="width: 32px;"/> | aarch64 | [reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/513083/windows-174.svg" style="width: 32px;"/> | x86_64 | [reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/511330/apple-173.svg" style="width: 32px;"/> | x86_64 | [reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/511330/apple-173.svg" style="width: 32px;"/> | aarch64 | [reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/473589/docker.svg" style="width: 32px;"/> | Docker | [${{ env.IMAGE_NAME }}](${{ env.DOCKER_IMAGE_NAME_URL }}) | - |
+
+          ### OP-Reth
+
+          | System | Architecture | Binary | PGP Signature |
+          |:---:|:---:|:---:|:---|
+          | <img src="https://www.svgrepo.com/download/473700/linux.svg" style="width: 32px;"/> | x86_64 | [op-reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/473700/linux.svg" style="width: 32px;"/> | aarch64 | [op-reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/513083/windows-174.svg" style="width: 32px;"/> | x86_64 | [op-reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/511330/apple-173.svg" style="width: 32px;"/> | x86_64 | [op-reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/511330/apple-173.svg" style="width: 32px;"/> | aarch64 | [op-reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/op-reth-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz.asc) |
+          | <img src="https://www.svgrepo.com/download/473589/docker.svg" style="width: 32px;"/> | Docker | [${{ env.OP_IMAGE_NAME }}](${{ env.DOCKER_OP_IMAGE_NAME_URL }}) | - |
           ENDBODY
           )
           assets=()
@@ -195,3 +212,25 @@ jobs:
           done
           tag_name="${{ env.VERSION }}"
           echo "$body" | gh release create --draft -t "Reth $tag_name" -F "-" "$tag_name" "${assets[@]}"
+
+  dry-run-summary:
+    name: dry run summary
+    needs: [build, extract-version]
+    runs-on: ubuntu-latest
+    if: ${{ github.event.inputs.dry_run == 'true' }}
+    env:
+      VERSION: ${{ needs.extract-version.outputs.VERSION }}
+    steps:
+      - name: Summarize dry run
+        run: |
+          echo "## 🧪 Release Dry Run Summary"
+          echo ""
+          echo "✅ Successfully completed dry run for commit ${{ github.sha }}"
+          echo ""
+          echo "### What would happen in a real release:"
+          echo "- Binary artifacts would be uploaded to GitHub"
+          echo "- Docker images would be pushed to registry"
+          echo "- A draft release would be created"
+          echo ""
+          echo "### Next Steps"
+          echo "To perform a real release, push a git tag."

.github/workflows/reproducible-build.yml

@@ -0,0 +1,38 @@
+name: reproducible-build
+
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: "0 1 */2 * *"
+
+jobs:
+  build:
+    name: build reproducible binaries
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          target: x86_64-unknown-linux-gnu
+      - name: Install cross main
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross
+      - name: Install cargo-cache
+        run: |
+          cargo install cargo-cache
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Build Reth
+        run: |
+          make build-reproducible
+          mv target/x86_64-unknown-linux-gnu/release/reth reth-build-1
+      - name: Clean cache
+        run: make clean && cargo cache -a
+      - name: Build Reth again
+        run: |
+          make build-reproducible
+          mv target/x86_64-unknown-linux-gnu/release/reth reth-build-2
+      - name: Compare binaries
+        run: cmp reth-build-1 reth-build-2

.github/workflows/stage.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -30,6 +30,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:

.github/workflows/sync.yml

@@ -0,0 +1,64 @@
+# Runs sync tests.
+
+name: sync test
+
+on:
+  merge_group:
+
+env:
+  CARGO_TERM_COLOR: always
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  sync:
+    name: sync (${{ matrix.chain.bin }})
+    runs-on:
+      group: Reth
+    env:
+      RUST_LOG: info,sync=error
+      RUST_BACKTRACE: 1
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        chain:
+          - build: install
+            bin: reth
+            chain: mainnet
+            tip: "0x91c90676cab257a59cd956d7cb0bceb9b1a71d79755c23c7277a0697ccfaf8c4"
+            block: 100000
+            unwind-target: "0x52e0509d33a988ef807058e2980099ee3070187f7333aae12b64d4d675f34c5a"
+          - build: install-op
+            bin: op-reth
+            chain: base
+            tip: "0xbb9b85352c7ebca6ba8efc63bd66cecd038c92ec8ebd02e153a3e0b197e672b7"
+            block: 10000
+            unwind-target: "0x118a6e922a8c6cab221fc5adfe5056d2b72d58c6580e9c5629de55299e2cf8de"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Build ${{ matrix.chain.bin }}
+        run: make ${{ matrix.chain.build }}
+      - name: Run sync
+        run: |
+          ${{ matrix.chain.bin }} node \
+            --chain ${{ matrix.chain.chain }} \
+            --debug.tip ${{ matrix.chain.tip }} \
+            --debug.max-block ${{ matrix.chain.block }} \
+            --debug.terminate
+      - name: Verify the target block hash
+        run: |
+          ${{ matrix.chain.bin }} db --chain ${{ matrix.chain.chain }} get static-file headers ${{ matrix.chain.block }} \
+            | grep ${{ matrix.chain.tip }}
+      - name: Run stage unwind for 100 blocks
+        run: |
+          ${{ matrix.chain.bin }} stage unwind num-blocks 100 --chain ${{ matrix.chain.chain }}
+      - name: Run stage unwind to block hash
+        run: |
+          ${{ matrix.chain.bin }} stage unwind to-block ${{ matrix.chain.unwind-target }} --chain ${{ matrix.chain.chain }} 

.github/workflows/unit.yml

@@ -18,28 +18,52 @@ concurrency:
 
 jobs:
   test:
-    name: test / ${{ matrix.network }} (${{ matrix.partition }}/2)
+    name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }})
     runs-on:
       group: Reth
     env:
       RUST_BACKTRACE: 1
     strategy:
       matrix:
-        partition: [1, 2]
-        network: ["ethereum", "optimism"]
+        include:
+          - type: ethereum
+            args: --features "asm-keccak ethereum" --locked
+            partition: 1
+            total_partitions: 2
+          - type: ethereum
+            args: --features "asm-keccak ethereum" --locked
+            partition: 2
+            total_partitions: 2
+          - type: optimism
+            args: --features "asm-keccak" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
+            partition: 1
+            total_partitions: 2
+          - type: optimism
+            args: --features "asm-keccak" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
+            partition: 2
+            total_partitions: 2
+          - type: book
+            args: --manifest-path book/sources/Cargo.toml
+            partition: 1
+            total_partitions: 1
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
       - uses: taiki-e/install-action@nextest
+      - if: "${{ matrix.type == 'book' }}"
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run tests
         run: |
           cargo nextest run \
-            --locked --features "asm-keccak ${{ matrix.network }}" \
-            --workspace --exclude ef-tests \
+            ${{ matrix.args }} --workspace \
+            --exclude ef-tests --no-tests=warn \
             --partition hash:${{ matrix.partition }}/2 \
             -E "!kind(test)"
 
@@ -57,10 +81,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: ethereum/tests
-          ref: 1c23e3c27ac53b794de0844d2d5e19cd2495b9d8
+          ref: 81862e4848585a438d64f911a19b3825f0f4cd95
           path: testing/ef-tests/ethereum-tests
           submodules: recursive
           fetch-depth: 1
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@nextest
       - uses: Swatinem/rust-cache@v2
@@ -69,23 +94,21 @@ jobs:
       - run: cargo nextest run --release -p ef-tests --features "asm-keccak ef-tests"
 
   doc:
-    name: doc tests (${{ matrix.network }})
+    name: doc tests
     runs-on:
       group: Reth
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 30
-    strategy:
-      matrix:
-        network: ["ethereum", "optimism"]
     steps:
       - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
       - name: Run doctests
-        run: cargo test --doc --workspace --features "${{ matrix.network }}"
+        run: cargo test --doc --workspace --all-features
 
   unit-success:
     name: unit success

.github/workflows/update-superchain.yml

@@ -0,0 +1,36 @@
+name: Update Superchain Config
+
+on:
+  schedule:
+    - cron: '0 3 * * 0'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  update-superchain:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install required tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y jq zstd qpdf yq
+
+      - name: Run fetch_superchain_config.sh
+        run: |
+          chmod +x crates/optimism/chainspec/res/fetch_superchain_config.sh
+          cd crates/optimism/chainspec/res
+          ./fetch_superchain_config.sh
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          commit-message: "chore: update superchain config"
+          title: "chore: update superchain config"
+          body: "This PR updates the superchain configs via scheduled workflow."
+          branch: "ci/update-superchain-config"
+          delete-branch: true

.github/workflows/windows.yml

@@ -0,0 +1,49 @@
+# Windows build
+
+name: windows
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  merge_group:
+
+jobs:
+  check-reth:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          target: x86_64-pc-windows-gnu
+      - uses: taiki-e/install-action@cross
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: mingw-w64
+        run: sudo apt-get install -y mingw-w64
+      - name: Check Reth
+        run: cargo check --target x86_64-pc-windows-gnu
+
+  check-op-reth:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          target: x86_64-pc-windows-gnu
+      - uses: taiki-e/install-action@cross
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: mingw-w64
+        run: sudo apt-get install -y mingw-w64
+      - name: Check OP-Reth
+        run: cargo check -p op-reth --target x86_64-pc-windows-gnu

.gitignore

@@ -19,7 +19,7 @@ target/
 testdata/micro/db
 
 # Generated data for stage benchmarks
-crates/stages/testdata
+crates/stages/stages/testdata
 
 # Prometheus data dir
 data/
@@ -49,4 +49,10 @@ jwttoken/
 crates/storage/libmdbx-rs/mdbx-sys/libmdbx/cmake-build-debug
 
 # Rust bug report
-rustc-ice-*
+rustc-ice-*
+
+# Book sources should be able to build with the latest version
+book/sources/Cargo.lock
+
+# Cargo chef recipe file
+recipe.json

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace.package]
-version = "1.0.6"
+version = "1.4.2"
 edition = "2021"
-rust-version = "1.80"
+rust-version = "1.86"
 license = "MIT OR Apache-2.0"
 homepage = "https://paradigmxyz.github.io/reth"
 repository = "https://github.com/paradigmxyz/reth"
@@ -11,8 +11,6 @@ exclude = [".github/"]
 members = [
     "bin/reth-bench/",
     "bin/reth/",
-    "crates/blockchain-tree-api/",
-    "crates/blockchain-tree/",
     "crates/chain-state/",
     "crates/chainspec/",
     "crates/cli/cli/",
@@ -20,34 +18,37 @@ members = [
     "crates/cli/runner/",
     "crates/cli/util/",
     "crates/config/",
-    "crates/consensus/auto-seal/",
-    "crates/consensus/beacon/",
     "crates/consensus/common/",
     "crates/consensus/consensus/",
     "crates/consensus/debug-client/",
     "crates/e2e-test-utils/",
+    "crates/engine/invalid-block-hooks/",
+    "crates/engine/local",
     "crates/engine/primitives/",
     "crates/engine/service",
     "crates/engine/tree/",
     "crates/engine/util/",
+    "crates/era",
+    "crates/era-downloader",
+    "crates/era-utils",
     "crates/errors/",
-    "crates/ethereum-forks/",
-    "crates/ethereum-forks/",
+    "crates/ethereum/hardforks/",
     "crates/ethereum/cli/",
     "crates/ethereum/consensus/",
     "crates/ethereum/engine-primitives/",
     "crates/ethereum/evm",
     "crates/ethereum/node",
     "crates/ethereum/payload/",
+    "crates/ethereum/primitives/",
+    "crates/ethereum/reth/",
     "crates/etl/",
-    "crates/evm/",
+    "crates/evm/evm",
     "crates/evm/execution-errors",
     "crates/evm/execution-types",
     "crates/exex/exex/",
     "crates/exex/test-utils/",
     "crates/exex/types/",
     "crates/metrics/",
-    "crates/metrics/metrics-derive/",
     "crates/net/banlist/",
     "crates/net/discv4/",
     "crates/net/discv5/",
@@ -67,22 +68,32 @@ members = [
     "crates/node/core/",
     "crates/node/events/",
     "crates/node/metrics",
+    "crates/node/types",
+    "crates/optimism/bin",
     "crates/optimism/chainspec",
     "crates/optimism/cli",
     "crates/optimism/consensus",
     "crates/optimism/evm/",
+    "crates/optimism/hardforks/",
     "crates/optimism/node/",
     "crates/optimism/payload/",
     "crates/optimism/primitives/",
+    "crates/optimism/reth/",
     "crates/optimism/rpc/",
+    "crates/optimism/storage",
+    "crates/optimism/txpool/",
     "crates/payload/basic/",
     "crates/payload/builder/",
+    "crates/payload/builder-primitives/",
     "crates/payload/primitives/",
     "crates/payload/validator/",
+    "crates/payload/util/",
     "crates/primitives-traits/",
     "crates/primitives/",
     "crates/prune/prune",
     "crates/prune/types",
+    "crates/ress/protocol",
+    "crates/ress/provider",
     "crates/revm/",
     "crates/rpc/ipc/",
     "crates/rpc/rpc-api/",
@@ -94,11 +105,11 @@ members = [
     "crates/rpc/rpc-server-types/",
     "crates/rpc/rpc-testing-util/",
     "crates/rpc/rpc-types-compat/",
-    "crates/rpc/rpc-types/",
     "crates/rpc/rpc/",
     "crates/stages/api/",
     "crates/stages/stages/",
     "crates/stages/types/",
+    "crates/stateless",
     "crates/static-file/static-file",
     "crates/static-file/types/",
     "crates/storage/codecs/",
@@ -113,6 +124,7 @@ members = [
     "crates/storage/nippy-jar/",
     "crates/storage/provider/",
     "crates/storage/storage-api/",
+    "crates/storage/zstd-compressors/",
     "crates/tasks/",
     "crates/tokio-util/",
     "crates/tracing/",
@@ -120,31 +132,40 @@ members = [
     "crates/trie/common",
     "crates/trie/db",
     "crates/trie/parallel/",
+    "crates/trie/sparse",
     "crates/trie/trie",
     "examples/beacon-api-sidecar-fetcher/",
     "examples/beacon-api-sse/",
     "examples/bsc-p2p",
     "examples/custom-dev-node/",
+    "examples/custom-node/",
     "examples/custom-engine-types/",
     "examples/custom-evm/",
     "examples/custom-inspector/",
     "examples/custom-node-components/",
     "examples/custom-payload-builder/",
     "examples/custom-rlpx-subprotocol",
+    "examples/custom-node",
     "examples/db-access",
+    "examples/exex-hello-world",
+    "examples/exex-subscription",
+    "examples/exex-test",
     "examples/manual-p2p/",
     "examples/network-txpool/",
     "examples/network/",
+    "examples/network-proxy/",
     "examples/node-custom-rpc/",
     "examples/node-event-hooks/",
     "examples/polygon-p2p/",
     "examples/rpc-db/",
-    "examples/stateful-precompile/",
+    "examples/precompile-cache/",
     "examples/txpool-tracing/",
+    "examples/custom-beacon-withdrawals",
     "testing/ef-tests/",
     "testing/testing-utils",
 ]
 default-members = ["bin/reth"]
+exclude = ["book/sources", "book/cli"]
 
 # Explicitly set the resolver to version 2, which is the default for packages with edition >= 2021
 # https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
@@ -165,9 +186,12 @@ rustdoc.all = "warn"
 # suggestions which we fixed. The others didn't have any findings, so we can
 # assume they don't have that many false positives. Let's enable them to
 # prevent future problems.
+borrow_as_ptr = "warn"
 branches_sharing_code = "warn"
 clear_with_drain = "warn"
 cloned_instead_of_copied = "warn"
+collection_is_never_read = "warn"
+dbg_macro = "warn"
 derive_partial_eq_without_eq = "warn"
 doc_markdown = "warn"
 empty_line_after_doc_comments = "warn"
@@ -177,7 +201,9 @@ equatable_if_let = "warn"
 explicit_into_iter_loop = "warn"
 explicit_iter_loop = "warn"
 flat_map_option = "warn"
+from_iter_instead_of_collect = "warn"
 if_not_else = "warn"
+if_then_some_else_none = "warn"
 implicit_clone = "warn"
 imprecise_flops = "warn"
 iter_on_empty_collections = "warn"
@@ -190,7 +216,7 @@ manual_clamp = "warn"
 manual_is_variant_and = "warn"
 manual_string_new = "warn"
 match_same_arms = "warn"
-missing_const_for_fn = "warn"
+missing-const-for-fn = "warn"
 mutex_integer = "warn"
 naive_bytecount = "warn"
 needless_bitwise_bool = "warn"
@@ -202,10 +228,12 @@ option_as_ref_cloned = "warn"
 or_fun_call = "warn"
 path_buf_push_overwrite = "warn"
 read_zero_byte_vec = "warn"
+result_large_err = "allow"
 redundant_clone = "warn"
 redundant_else = "warn"
 single_char_pattern = "warn"
 string_lit_as_bytes = "warn"
+string_lit_chars_any = "warn"
 suboptimal_flops = "warn"
 suspicious_operation_groupings = "warn"
 trailing_empty_array = "warn"
@@ -215,12 +243,14 @@ trivial_regex = "warn"
 tuple_array_conversions = "warn"
 type_repetition_in_bounds = "warn"
 uninhabited_references = "warn"
+unnecessary_self_imports = "warn"
 unnecessary_struct_initialization = "warn"
 unnested_or_patterns = "warn"
 unused_peekable = "warn"
 unused_rounding = "warn"
 use_self = "warn"
 useless_let_if_seq = "warn"
+while_float = "warn"
 zero_sized_map_values = "warn"
 
 # These are nursery lints which have findings. Allow them for now. Some are not
@@ -228,16 +258,23 @@ zero_sized_map_values = "warn"
 # Explicitly listing should make it easier to fix in the future.
 as_ptr_cast_mut = "allow"
 cognitive_complexity = "allow"
-collection_is_never_read = "allow"
 debug_assert_with_mut_call = "allow"
 fallible_impl_from = "allow"
 future_not_send = "allow"
 needless_collect = "allow"
 non_send_fields_in_send_ty = "allow"
 redundant_pub_crate = "allow"
-too_long_first_doc_paragraph = "allow"
 significant_drop_in_scrutinee = "allow"
 significant_drop_tightening = "allow"
+too_long_first_doc_paragraph = "allow"
+
+# Speed up compilation time for dev builds by reducing emitted debug info.
+# NOTE: Debuggers may provide less useful information with this setting.
+# Uncomment this section if you're using a debugger.
+[profile.dev]
+# https://davidlattimore.github.io/posts/2024/02/04/speeding-up-the-rust-edit-build-run-cycle.html
+debug = "line-tables-only"
+split-debuginfo = "unpacked"
 
 # Speed up tests.
 [profile.dev.package]
@@ -255,8 +292,8 @@ lto = "thin"
 [profile.release]
 opt-level = 3
 lto = "thin"
-debug = "line-tables-only"
-strip = true
+debug = "none"
+strip = "symbols"
 panic = "unwind"
 codegen-units = 16
 
@@ -264,10 +301,10 @@ codegen-units = 16
 # e.g. `cargo build --profile profiling`
 [profile.profiling]
 inherits = "release"
-debug = 2
-strip = false
+debug = "full"
+strip = "none"
 
-# Make sure debug symbols are in the bench profile
+# Include debug info in benchmarks too.
 [profile.bench]
 inherits = "profiling"
 
@@ -278,62 +315,65 @@ codegen-units = 1
 
 [workspace.dependencies]
 # reth
+op-reth = { path = "crates/optimism/bin" }
 reth = { path = "bin/reth" }
-reth-auto-seal-consensus = { path = "crates/consensus/auto-seal" }
 reth-basic-payload-builder = { path = "crates/payload/basic" }
-reth-beacon-consensus = { path = "crates/consensus/beacon" }
 reth-bench = { path = "bin/reth-bench" }
-reth-blockchain-tree = { path = "crates/blockchain-tree" }
-reth-blockchain-tree-api = { path = "crates/blockchain-tree-api" }
 reth-chain-state = { path = "crates/chain-state" }
-reth-chainspec = { path = "crates/chainspec" }
+reth-chainspec = { path = "crates/chainspec", default-features = false }
 reth-cli = { path = "crates/cli/cli" }
 reth-cli-commands = { path = "crates/cli/commands" }
 reth-cli-runner = { path = "crates/cli/runner" }
 reth-cli-util = { path = "crates/cli/util" }
 reth-codecs = { path = "crates/storage/codecs" }
 reth-codecs-derive = { path = "crates/storage/codecs/derive" }
-reth-config = { path = "crates/config" }
+reth-config = { path = "crates/config", default-features = false }
 reth-consensus = { path = "crates/consensus/consensus", default-features = false }
-reth-consensus-common = { path = "crates/consensus/common" }
+reth-consensus-common = { path = "crates/consensus/common", default-features = false }
 reth-consensus-debug-client = { path = "crates/consensus/debug-client" }
 reth-db = { path = "crates/storage/db", default-features = false }
 reth-db-api = { path = "crates/storage/db-api" }
 reth-db-common = { path = "crates/storage/db-common" }
-reth-db-models = { path = "crates/storage/db-models" }
+reth-db-models = { path = "crates/storage/db-models", default-features = false }
 reth-discv4 = { path = "crates/net/discv4" }
 reth-discv5 = { path = "crates/net/discv5" }
 reth-dns-discovery = { path = "crates/net/dns" }
 reth-downloaders = { path = "crates/net/downloaders" }
 reth-e2e-test-utils = { path = "crates/e2e-test-utils" }
 reth-ecies = { path = "crates/net/ecies" }
-reth-engine-primitives = { path = "crates/engine/primitives" }
+reth-engine-local = { path = "crates/engine/local" }
+reth-engine-primitives = { path = "crates/engine/primitives", default-features = false }
 reth-engine-tree = { path = "crates/engine/tree" }
 reth-engine-service = { path = "crates/engine/service" }
 reth-engine-util = { path = "crates/engine/util" }
+reth-era = { path = "crates/era" }
+reth-era-downloader = { path = "crates/era-downloader" }
+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-cli = { path = "crates/ethereum/cli" }
-reth-ethereum-consensus = { path = "crates/ethereum/consensus" }
-reth-ethereum-engine-primitives = { path = "crates/ethereum/engine-primitives" }
-reth-ethereum-forks = { path = "crates/ethereum-forks" }
+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" }
-reth-evm = { path = "crates/evm" }
-reth-evm-ethereum = { path = "crates/ethereum/evm" }
-reth-evm-optimism = { path = "crates/optimism/evm" }
-reth-execution-errors = { path = "crates/evm/execution-errors" }
-reth-execution-types = { path = "crates/evm/execution-types" }
+reth-evm = { path = "crates/evm/evm", default-features = false }
+reth-evm-ethereum = { path = "crates/ethereum/evm", default-features = false }
+reth-optimism-evm = { path = "crates/optimism/evm", default-features = false }
+reth-execution-errors = { path = "crates/evm/execution-errors", default-features = false }
+reth-execution-types = { path = "crates/evm/execution-types", default-features = false }
 reth-exex = { path = "crates/exex/exex" }
 reth-exex-test-utils = { path = "crates/exex/test-utils" }
 reth-exex-types = { path = "crates/exex/types" }
 reth-fs-util = { path = "crates/fs-util" }
+reth-invalid-block-hooks = { path = "crates/engine/invalid-block-hooks" }
 reth-ipc = { path = "crates/rpc/ipc" }
 reth-libmdbx = { path = "crates/storage/libmdbx-rs" }
 reth-mdbx-sys = { path = "crates/storage/libmdbx-rs/mdbx-sys" }
 reth-metrics = { path = "crates/metrics" }
-reth-metrics-derive = { path = "crates/metrics/metrics-derive" }
 reth-net-banlist = { path = "crates/net/banlist" }
 reth-net-nat = { path = "crates/net/nat" }
 reth-network = { path = "crates/net/network" }
@@ -348,24 +388,29 @@ reth-node-core = { path = "crates/node/core" }
 reth-node-ethereum = { path = "crates/ethereum/node" }
 reth-node-events = { path = "crates/node/events" }
 reth-node-metrics = { path = "crates/node/metrics" }
-reth-node-optimism = { path = "crates/optimism/node" }
-reth-optimism-chainspec = { path = "crates/optimism/chainspec" }
+reth-optimism-node = { path = "crates/optimism/node" }
+reth-node-types = { path = "crates/node/types" }
+reth-op = { path = "crates/optimism/reth", default-features = false }
+reth-optimism-chainspec = { path = "crates/optimism/chainspec", default-features = false }
 reth-optimism-cli = { path = "crates/optimism/cli" }
-reth-optimism-consensus = { path = "crates/optimism/consensus" }
+reth-optimism-consensus = { path = "crates/optimism/consensus", default-features = false }
+reth-optimism-forks = { path = "crates/optimism/hardforks", default-features = false }
 reth-optimism-payload-builder = { path = "crates/optimism/payload" }
-reth-optimism-primitives = { path = "crates/optimism/primitives" }
+reth-optimism-primitives = { path = "crates/optimism/primitives", default-features = false }
 reth-optimism-rpc = { path = "crates/optimism/rpc" }
+reth-optimism-storage = { path = "crates/optimism/storage" }
+reth-optimism-txpool = { path = "crates/optimism/txpool" }
 reth-payload-builder = { path = "crates/payload/builder" }
+reth-payload-builder-primitives = { path = "crates/payload/builder-primitives" }
 reth-payload-primitives = { path = "crates/payload/primitives" }
 reth-payload-validator = { path = "crates/payload/validator" }
-reth-primitives = { path = "crates/primitives", default-features = false, features = [
-    "std",
-] }
+reth-payload-util = { path = "crates/payload/util" }
+reth-primitives = { path = "crates/primitives", default-features = false }
 reth-primitives-traits = { path = "crates/primitives-traits", default-features = false }
 reth-provider = { path = "crates/storage/provider" }
 reth-prune = { path = "crates/prune/prune" }
-reth-prune-types = { path = "crates/prune/types" }
-reth-revm = { path = "crates/revm" }
+reth-prune-types = { path = "crates/prune/types", default-features = false }
+reth-revm = { path = "crates/revm", default-features = false }
 reth-rpc = { path = "crates/rpc/rpc" }
 reth-rpc-api = { path = "crates/rpc/rpc-api" }
 reth-rpc-api-testing-util = { path = "crates/rpc/rpc-testing-util" }
@@ -375,136 +420,160 @@ reth-rpc-eth-api = { path = "crates/rpc/rpc-eth-api" }
 reth-rpc-eth-types = { path = "crates/rpc/rpc-eth-types", default-features = false }
 reth-rpc-layer = { path = "crates/rpc/rpc-layer" }
 reth-rpc-server-types = { path = "crates/rpc/rpc-server-types" }
-reth-rpc-types = { path = "crates/rpc/rpc-types" }
 reth-rpc-types-compat = { path = "crates/rpc/rpc-types-compat" }
 reth-stages = { path = "crates/stages/stages" }
 reth-stages-api = { path = "crates/stages/api" }
-reth-stages-types = { path = "crates/stages/types" }
+reth-stages-types = { path = "crates/stages/types", default-features = false }
+reth-stateless = { path = "crates/stateless" }
 reth-static-file = { path = "crates/static-file/static-file" }
-reth-static-file-types = { path = "crates/static-file/types" }
-reth-storage-api = { path = "crates/storage/storage-api" }
-reth-storage-errors = { path = "crates/storage/errors" }
+reth-static-file-types = { path = "crates/static-file/types", default-features = false }
+reth-storage-api = { path = "crates/storage/storage-api", default-features = false }
+reth-storage-errors = { path = "crates/storage/errors", default-features = false }
 reth-tasks = { path = "crates/tasks" }
 reth-testing-utils = { path = "testing/testing-utils" }
 reth-tokio-util = { path = "crates/tokio-util" }
 reth-tracing = { path = "crates/tracing" }
 reth-transaction-pool = { path = "crates/transaction-pool" }
 reth-trie = { path = "crates/trie/trie" }
-reth-trie-common = { path = "crates/trie/common" }
+reth-trie-common = { path = "crates/trie/common", default-features = false }
 reth-trie-db = { path = "crates/trie/db" }
 reth-trie-parallel = { path = "crates/trie/parallel" }
+reth-trie-sparse = { path = "crates/trie/sparse", default-features = false }
+reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-features = false }
+reth-ress-protocol = { path = "crates/ress/protocol" }
+reth-ress-provider = { path = "crates/ress/provider" }
 
 # revm
-revm = { version = "14.0.0", features = [
-    "std",
-    "secp256k1",
-    "blst",
-], default-features = false }
-revm-inspectors = "0.6"
-revm-primitives = { version = "9.0.0", features = [
-    "std",
-], default-features = false }
+revm = { version = "23.1.0", default-features = false }
+revm-bytecode = { version = "4.0.0", default-features = false }
+revm-database = { version = "4.0.0", default-features = false }
+revm-state = { version = "4.0.0", default-features = false }
+revm-primitives = { version = "19.0.0", default-features = false }
+revm-interpreter = { version = "19.0.0", default-features = false }
+revm-inspector = { version = "4.0.0", default-features = false }
+revm-context = { version = "4.0.0", default-features = false }
+revm-context-interface = { version = "4.0.0", default-features = false }
+revm-database-interface = { version = "4.0.0", default-features = false }
+op-revm = { version = "4.0.2", default-features = false }
+revm-inspectors = "0.22.3"
 
 # eth
-alloy-chains = "0.1.18"
-alloy-dyn-abi = "0.8.0"
-alloy-primitives = { version = "0.8.0", default-features = false }
-alloy-rlp = "0.3.4"
-alloy-sol-types = "0.8.0"
-alloy-trie = { version = "0.5", default-features = false }
+alloy-chains = { version = "0.2.0", default-features = false }
+alloy-dyn-abi = "1.1.0"
+alloy-eip2124 = { version = "0.2.0", default-features = false }
+alloy-evm = { version = "0.8.1", default-features = false }
+alloy-primitives = { version = "1.1.0", default-features = false, features = ["map-foldhash"] }
+alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] }
+alloy-sol-macro = "1.1.0"
+alloy-sol-types = { version = "1.1.0", default-features = false }
+alloy-trie = { version = "0.8.1", default-features = false }
 
-alloy-consensus = { version = "0.3.0", default-features = false }
-alloy-eips = { version = "0.3.0", default-features = false }
-alloy-genesis = { version = "0.3.0", default-features = false }
-alloy-json-rpc = { version = "0.3.0", default-features = false }
-alloy-network = { version = "0.3.0", default-features = false }
-alloy-node-bindings = { version = "0.3.0", default-features = false }
-alloy-provider = { version = "0.3.0", features = [
-    "reqwest",
-], default-features = false }
-alloy-pubsub = { version = "0.3.0", default-features = false }
-alloy-rpc-client = { version = "0.3.0", default-features = false }
-alloy-rpc-types = { version = "0.3.0", features = [
-    "eth",
-], default-features = false }
-alloy-rpc-types-admin = { version = "0.3.0", default-features = false }
-alloy-rpc-types-anvil = { version = "0.3.0", default-features = false }
-alloy-rpc-types-beacon = { version = "0.3.0", default-features = false }
-alloy-rpc-types-engine = { version = "0.3.0", default-features = false }
-alloy-rpc-types-eth = { version = "0.3.0", default-features = false }
-alloy-rpc-types-mev = { version = "0.3.0", default-features = false }
-alloy-rpc-types-trace = { version = "0.3.0", default-features = false }
-alloy-rpc-types-txpool = { version = "0.3.0", default-features = false }
-alloy-serde = { version = "0.3.0", default-features = false }
-alloy-signer = { version = "0.3.0", default-features = false }
-alloy-signer-local = { version = "0.3.0", default-features = false }
-alloy-transport = { version = "0.3.0" }
-alloy-transport-http = { version = "0.3.0", features = [
-    "reqwest-rustls-tls",
-], default-features = false }
-alloy-transport-ipc = { version = "0.3.0", default-features = false }
-alloy-transport-ws = { version = "0.3.0", default-features = false }
+alloy-hardforks = "0.2.0"
+
+alloy-consensus = { version = "1.0.5", default-features = false }
+alloy-contract = { version = "1.0.5", default-features = false }
+alloy-eips = { version = "1.0.5", default-features = false }
+alloy-genesis = { version = "1.0.5", default-features = false }
+alloy-json-rpc = { version = "1.0.5", default-features = false }
+alloy-network = { version = "1.0.5", default-features = false }
+alloy-network-primitives = { version = "1.0.5", default-features = false }
+alloy-provider = { version = "1.0.5", features = ["reqwest"], default-features = false }
+alloy-pubsub = { version = "1.0.5", default-features = false }
+alloy-rpc-client = { version = "1.0.5", default-features = false }
+alloy-rpc-types = { version = "1.0.5", features = ["eth"], default-features = false }
+alloy-rpc-types-admin = { version = "1.0.5", default-features = false }
+alloy-rpc-types-anvil = { version = "1.0.5", default-features = false }
+alloy-rpc-types-beacon = { version = "1.0.5", default-features = false }
+alloy-rpc-types-debug = { version = "1.0.5", default-features = false }
+alloy-rpc-types-engine = { version = "1.0.5", default-features = false }
+alloy-rpc-types-eth = { version = "1.0.5", default-features = false }
+alloy-rpc-types-mev = { version = "1.0.5", default-features = false }
+alloy-rpc-types-trace = { version = "1.0.5", default-features = false }
+alloy-rpc-types-txpool = { version = "1.0.5", default-features = false }
+alloy-serde = { version = "1.0.5", default-features = false }
+alloy-signer = { version = "1.0.5", default-features = false }
+alloy-signer-local = { version = "1.0.5", default-features = false }
+alloy-transport = { version = "1.0.5" }
+alloy-transport-http = { version = "1.0.5", features = ["reqwest-rustls-tls"], default-features = false }
+alloy-transport-ipc = { version = "1.0.5", default-features = false }
+alloy-transport-ws = { version = "1.0.5", default-features = false }
 
 # op
-op-alloy-rpc-types = "0.2"
-op-alloy-rpc-types-engine = "0.2"
-op-alloy-network = "0.2"
+alloy-op-evm = { version = "0.8.1", default-features = false }
+alloy-op-hardforks = "0.2.0"
+op-alloy-rpc-types = { version = "0.16.0", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.16.0", default-features = false }
+op-alloy-network = { version = "0.16.0", default-features = false }
+op-alloy-consensus = { version = "0.16.0", default-features = false }
+op-alloy-rpc-jsonrpsee = { version = "0.16.0", default-features = false }
+op-alloy-flz = { version = "0.13.0", default-features = false }
 
 # misc
-aquamarine = "0.5"
+aquamarine = "0.6"
 auto_impl = "1"
-backon = "0.4"
+backon = { version = "1.2", default-features = false, features = ["std-blocking-sleep", "tokio-sleep"] }
+bincode = "1.3"
 bitflags = "2.4"
+blake3 = "1.5.5"
 boyer-moore-magiclen = "0.2.16"
-bytes = "1.5"
+bytes = { version = "1.5", default-features = false }
+cfg-if = "1.0"
 clap = "4"
-const_format = { version = "0.2.32", features = ["rust_1_64"] }
 dashmap = "6.0"
-derive_more = { version = "1", features = ["full"] }
+derive_more = { version = "2", default-features = false, features = ["full"] }
+dirs-next = "2.0.0"
 dyn-clone = "1.0.17"
 eyre = "0.6"
 fdlimit = "0.3.0"
 generic-array = "0.14"
 humantime = "2.1"
 humantime-serde = "1.1"
-itertools = "0.13"
+itertools = { version = "0.14", default-features = false }
 linked_hash_set = "0.1"
+lz4 = "1.28.1"
 modular-bitfield = "0.11.2"
-nybbles = "0.2.1"
-once_cell = "1.19"
+notify = { version = "8.0.0", default-features = false, features = ["macos_fsevent"] }
+nybbles = { version = "0.3.0", default-features = false }
+once_cell = { version = "1.19", default-features = false, features = ["critical-section"] }
 parking_lot = "0.12"
 paste = "1.0"
-rand = "0.8.5"
+rand = "0.9"
 rayon = "1.7"
 rustc-hash = { version = "2.0", default-features = false }
 schnellru = "0.2"
 serde = { version = "1.0", default-features = false }
-serde_json = "1.0.94"
-serde_with = "3.3.0"
+serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
+serde_with = { version = "3", default-features = false, features = ["macros"] }
 sha2 = { version = "0.10", default-features = false }
 shellexpand = "3.0.0"
 smallvec = "1"
-strum = { version = "0.26", default-features = false }
+strum = { version = "0.27", default-features = false }
+strum_macros = "0.27"
 syn = "2.0"
-thiserror = "1.0"
-thiserror-no-std = { version = "2.0.2", default-features = false }
-tracing = "0.1.0"
+thiserror = { version = "2.0.0", default-features = false }
+tar = "0.4.44"
+tracing = { version = "0.1.0", default-features = false }
 tracing-appender = "0.2"
-url = "2.3"
+url = { version = "2.3", default-features = false }
 zstd = "0.13"
+byteorder = "1"
+mini-moka = "0.10"
+tar-no-std = { version = "0.3.2", default-features = false }
+miniz_oxide = { version = "0.8.4", default-features = false }
 
 # metrics
-metrics = "0.23.0"
-metrics-exporter-prometheus = { version = "0.15.0", default-features = false }
+metrics = "0.24.0"
+metrics-derive = "0.1"
+metrics-exporter-prometheus = { version = "0.16.0", default-features = false }
 metrics-process = "2.1.0"
-metrics-util = "0.17.0"
+metrics-util = { default-features = false, version = "0.19.0" }
 
 # proc-macros
 proc-macro2 = "1.0"
 quote = "1.0"
 
 # tokio
-tokio = { version = "1.39", default-features = false }
+tokio = { version = "1.44.2", default-features = false }
 tokio-stream = "0.1.11"
 tokio-util = { version = "0.7.4", features = ["codec"] }
 
@@ -513,39 +582,42 @@ async-stream = "0.3"
 async-trait = "0.1.68"
 futures = "0.3"
 futures-core = "0.3"
-futures-util = "0.3"
+futures-util = { version = "0.3", default-features = false }
 hyper = "1.3"
 hyper-util = "0.1.5"
 pin-project = "1.0.12"
 reqwest = { version = "0.12", default-features = false }
-tower = "0.4"
-tower-http = "0.5"
+tracing-futures = "0.2"
+tower = "0.5"
+tower-http = "0.6"
 
 # p2p
-discv5 = "0.7.0"
+discv5 = "0.9"
+if-addrs = "0.13"
 
 # rpc
-jsonrpsee = "0.24"
-jsonrpsee-core = "0.24"
-jsonrpsee-http-client = "0.24"
-jsonrpsee-types = "0.24"
+jsonrpsee = "0.25.1"
+jsonrpsee-core = "0.25.1"
+jsonrpsee-server = "0.25.1"
+jsonrpsee-http-client = "0.25.1"
+jsonrpsee-types = "0.25.1"
 
 # http
 http = "1.0"
 http-body = "1.0"
+http-body-util = "0.1.2"
 jsonwebtoken = "9"
 proptest-arbitrary-interop = "0.1.0"
 
 # crypto
-enr = { version = "0.12.1", default-features = false }
+enr = { version = "0.13", default-features = false }
 k256 = { version = "0.13", default-features = false, features = ["ecdsa"] }
-secp256k1 = { version = "0.29", default-features = false, features = [
-    "global-context",
-    "recovery",
-] }
+secp256k1 = { version = "0.30", default-features = false, features = ["global-context", "recovery"] }
+# rand 8 for secp256k1
+rand_08 = { package = "rand", version = "0.8" }
 
 # for eip-4844
-c-kzg = "1.0.0"
+c-kzg = "2.1.1"
 
 # config
 toml = "0.8"
@@ -553,12 +625,118 @@ toml = "0.8"
 # misc-testing
 arbitrary = "1.3"
 assert_matches = "1.5.0"
-criterion = "0.5"
-iai-callgrind = "0.11"
-pprof = "0.13"
+criterion = { package = "codspeed-criterion-compat", version = "2.7" }
 proptest = "1.4"
 proptest-derive = "0.5"
-serial_test = "3"
-similar-asserts = "1.5.0"
-tempfile = "3.8"
-test-fuzz = "5"
+similar-asserts = { version = "1.5.0", features = ["serde"] }
+tempfile = "3.20"
+test-fuzz = "7"
+rstest = "0.24.0"
+test-case = "3"
+
+# ssz encoding
+ethereum_ssz = "0.9.0"
+ethereum_ssz_derive = "0.9.0"
+
+# allocators
+tikv-jemalloc-ctl = "0.6"
+tikv-jemallocator = "0.6"
+tracy-client = "0.18.0"
+snmalloc-rs = { version = "0.3.7", features = ["build_cc"] }
+
+# TODO: When we build for a windows target on an ubuntu runner, crunchy tries to
+# get the wrong path, update this when the workflow has been updated
+#
+# See: https://github.com/eira-fransham/crunchy/issues/13
+crunchy = "=0.2.2"
+aes = "0.8.1"
+ahash = "0.8"
+anyhow = "1.0"
+bindgen = { version = "0.70", default-features = false }
+block-padding = "0.3.2"
+cc = "=1.2.15"
+cipher = "0.4.3"
+comfy-table = "7.0"
+concat-kdf = "0.1.0"
+convert_case = "0.7.0"
+crossbeam-channel = "0.5.13"
+crossterm = "0.28.0"
+csv = "1.3.0"
+ctr = "0.9.2"
+data-encoding = "2"
+delegate = "0.13"
+digest = "0.10.5"
+hash-db = "=0.15.2"
+hickory-resolver = "0.25.0"
+hmac = "0.12.1"
+human_bytes = "0.4.1"
+indexmap = "2"
+interprocess = "2.2.0"
+lz4_flex = { version = "0.11", default-features = false }
+memmap2 = "0.9.4"
+mev-share-sse = { version = "0.5.0", default-features = false }
+num-traits = "0.2.15"
+page_size = "0.6.0"
+parity-scale-codec = "3.2.1"
+plain_hasher = "0.2"
+pretty_assertions = "1.4"
+ratatui = { version = "0.29", default-features = false }
+ringbuffer = "0.15.0"
+rmp-serde = "1.3"
+roaring = "0.10.2"
+rolling-file = "0.2.0"
+sha3 = "0.10.5"
+snap = "1.1.1"
+socket2 = { version = "0.5", default-features = false }
+sysinfo = { version = "0.33", default-features = false }
+tracing-journald = "0.3"
+tracing-logfmt = "0.3.3"
+tracing-subscriber = { version = "0.3", default-features = false }
+triehash = "0.8"
+typenum = "1.15.0"
+vergen = "9.0.4"
+visibility = "0.1.1"
+walkdir = "2.3.3"
+vergen-git2 = "1.0.5"
+
+[patch.crates-io]
+# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-contract = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-eips = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-genesis = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-network = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-provider = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-serde = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-signer = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-transport = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", branch = "main" }
+#
+# op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
+# op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
+# op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
+# op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
+#
+# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "1207e33" }
+#
+# 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" }
+# jsonrpsee-server = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
+# jsonrpsee-http-client = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
+# jsonrpsee-types = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }

Cross.toml

@@ -1,10 +1,19 @@
 [build]
 pre-build = [
-    # rust-bindgen dependencies: llvm-dev libclang-dev (>= 5.0) clang (>= 5.0)
-    "apt-get update && apt-get install --assume-yes --no-install-recommends llvm-dev libclang-6.0-dev clang-6.0"
+    # rust-bindgen dependencies: llvm-dev libclang-dev (>= 10) clang (>= 10)
+    # See: https://github.com/cross-rs/cross/wiki/FAQ#using-clang--bindgen for
+    # recommended clang versions for the given cross and bindgen version.
+    "apt-get update && apt-get install --assume-yes --no-install-recommends llvm-dev libclang-dev clang",
 ]
 
+[target.x86_64-pc-windows-gnu]
+# Why do we need a custom Dockerfile on Windows:
+# 1. `reth-libmdbx` stopped working with MinGW 9.3 that cross image comes with.
+# 2. To be able to update the version of MinGW, we need to also update the Ubuntu that the image is based on.
+#
+# Also see https://github.com/cross-rs/cross/issues/1667
+# Inspired by https://github.com/cross-rs/cross/blob/9e2298e17170655342d3248a9c8ac37ef92ba38f/docker/Dockerfile.x86_64-pc-windows-gnu#L51
+dockerfile = "./Dockerfile.x86_64-pc-windows-gnu"
+
 [build.env]
-passthrough = [
-    "JEMALLOC_SYS_WITH_LG_PAGE",
-]
+passthrough = ["JEMALLOC_SYS_WITH_LG_PAGE"]

Dockerfile

@@ -1,3 +1,5 @@
+# syntax=docker.io/docker/dockerfile:1.7-labs
+
 FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
 WORKDIR /app
 
@@ -9,7 +11,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-
 
 # Builds a cargo-chef plan
 FROM chef AS planner
-COPY . .
+COPY --exclude=.git --exclude=dist . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM chef AS builder
@@ -31,7 +33,7 @@ ENV FEATURES=$FEATURES
 RUN cargo chef cook --profile $BUILD_PROFILE --features "$FEATURES" --recipe-path recipe.json
 
 # Build application
-COPY . .
+COPY --exclude=.git --exclude=dist . .
 RUN cargo build --profile $BUILD_PROFILE --features "$FEATURES" --locked --bin reth
 
 # ARG is not resolved in COPY so we have to hack around it by copying the

Dockerfile.reproducible

@@ -0,0 +1,20 @@
+# Use the Rust 1.86 image based on Debian Bookworm
+FROM rust:1.86-bookworm AS builder
+
+# Install specific version of libclang-dev
+RUN apt-get update && apt-get install -y libclang-dev=1:14.0-55.7~deb12u1
+
+# Copy the project to the container
+COPY ./ /app
+WORKDIR /app
+
+# Build the project with the reproducible settings
+RUN make build-reproducible
+
+RUN mv /app/target/x86_64-unknown-linux-gnu/release/reth /reth
+
+# Create a minimal final image with just the binary
+FROM gcr.io/distroless/cc-debian12:nonroot-6755e21ccd99ddead6edc8106ba03888cbeed41a
+COPY --from=builder /reth /reth
+EXPOSE 30303 30303/udp 9001 8545 8546
+ENTRYPOINT [ "/reth" ]

Dockerfile.x86_64-pc-windows-gnu

@@ -0,0 +1,56 @@
+FROM ubuntu:24.04 AS cross-base
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates
+
+RUN git clone https://github.com/cross-rs/cross /cross
+WORKDIR /cross/docker
+RUN git checkout 9e2298e17170655342d3248a9c8ac37ef92ba38f
+
+RUN cp common.sh lib.sh / && /common.sh
+RUN cp cmake.sh / && /cmake.sh
+RUN cp xargo.sh / && /xargo.sh
+
+FROM cross-base AS build
+
+RUN apt-get install --assume-yes --no-install-recommends libz-mingw-w64-dev g++-mingw-w64-x86-64 gfortran-mingw-w64-x86-64
+
+RUN dpkg --add-architecture i386 && \
+    apt-get install --assume-yes --no-install-recommends wget gpg && \
+    mkdir -pm755 /etc/apt/keyrings && wget -O - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key - && \
+    wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/noble/winehq-noble.sources && \
+    apt-get update && apt-get install --assume-yes --install-recommends winehq-stable
+
+# run-detectors are responsible for calling the correct interpreter for exe
+# files. For some reason it does not work inside a docker container (it works
+# fine in the host). So we replace the usual paths of run-detectors to run wine
+# directly. This only affects the guest, we are not messing up with the host.
+#
+# See /usr/share/doc/binfmt-support/detectors
+RUN mkdir -p /usr/lib/binfmt-support/ && \
+    rm -f /usr/lib/binfmt-support/run-detectors /usr/bin/run-detectors && \
+    ln -s /usr/bin/wine /usr/lib/binfmt-support/run-detectors && \
+    ln -s /usr/bin/wine /usr/bin/run-detectors
+
+RUN cp windows-entry.sh /
+ENTRYPOINT ["/windows-entry.sh"]
+
+RUN cp toolchain.cmake /opt/toolchain.cmake
+
+# for why we always link with pthread support, see:
+# https://github.com/cross-rs/cross/pull/1123#issuecomment-1312287148
+ENV CROSS_TOOLCHAIN_PREFIX=x86_64-w64-mingw32-
+ENV CROSS_TOOLCHAIN_SUFFIX=-posix
+ENV CROSS_SYSROOT=/usr/x86_64-w64-mingw32
+ENV CROSS_TARGET_RUNNER="env -u CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER wine"
+ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc"$CROSS_TOOLCHAIN_SUFFIX" \
+    CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER="$CROSS_TARGET_RUNNER" \
+    AR_x86_64_pc_windows_gnu="$CROSS_TOOLCHAIN_PREFIX"ar \
+    CC_x86_64_pc_windows_gnu="$CROSS_TOOLCHAIN_PREFIX"gcc"$CROSS_TOOLCHAIN_SUFFIX" \
+    CXX_x86_64_pc_windows_gnu="$CROSS_TOOLCHAIN_PREFIX"g++"$CROSS_TOOLCHAIN_SUFFIX" \
+    CMAKE_TOOLCHAIN_FILE_x86_64_pc_windows_gnu=/opt/toolchain.cmake \
+    BINDGEN_EXTRA_CLANG_ARGS_x86_64_pc_windows_gnu="--sysroot=$CROSS_SYSROOT -idirafter/usr/include" \
+    CROSS_CMAKE_SYSTEM_NAME=Windows \
+    CROSS_CMAKE_SYSTEM_PROCESSOR=AMD64 \
+    CROSS_CMAKE_CRT=gnu \
+    CROSS_CMAKE_OBJECT_FLAGS="-ffunction-sections -fdata-sections -m64"

DockerfileOp

@@ -0,0 +1,43 @@
+FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
+WORKDIR /app
+
+LABEL org.opencontainers.image.source=https://github.com/paradigmxyz/reth
+LABEL org.opencontainers.image.licenses="MIT OR Apache-2.0"
+
+RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config
+
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+FROM chef AS builder
+COPY --from=planner /app/recipe.json recipe.json
+COPY . .
+
+ARG BUILD_PROFILE=release
+ENV BUILD_PROFILE=$BUILD_PROFILE
+
+ARG RUSTFLAGS=""
+ENV RUSTFLAGS="$RUSTFLAGS"
+
+RUN cargo chef cook --profile $BUILD_PROFILE --recipe-path recipe.json --manifest-path /app/crates/optimism/bin/Cargo.toml
+
+COPY . .
+RUN cargo build --profile $BUILD_PROFILE --bin op-reth --manifest-path /app/crates/optimism/bin/Cargo.toml
+
+RUN ls -la /app/target/$BUILD_PROFILE/op-reth
+RUN cp /app/target/$BUILD_PROFILE/op-reth /app/op-reth
+
+FROM ubuntu:22.04 AS runtime
+
+RUN apt-get update && \
+    apt-get install -y ca-certificates libssl-dev pkg-config strace && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+COPY --from=builder /app/op-reth /usr/local/bin/
+RUN chmod +x /usr/local/bin/op-reth
+COPY LICENSE-* ./
+
+EXPOSE 30303 30303/udp 9001 8545 8546 7545 8551
+ENTRYPOINT ["/usr/local/bin/op-reth"]

HARDFORK-CHECKLIST.md

@@ -0,0 +1,41 @@
+# Non-exhaustive checklist for integrating new changes for an upcoming hard fork/devnet
+
+## Introducing new EIP types or changes to primitive types
+
+- Make required changes to primitive data structures on [alloy](https://github.com/alloy-rs/alloy)
+- All new EIP data structures/constants/helpers etc. go into the `alloy-eips` crate at first.
+- New transaction types go into `alloy-consensus`
+- If there are changes to existing data structures, such as `Header` or `Block`, apply them to the types in
+  `alloy-consensus` (e.g. new `request_hashes` field in Prague)
+
+## Engine API
+
+- If there are changes to the engine API (e.g. a new `engine_newPayloadVx` and `engine_getPayloadVx` pair) add the new
+  types to the `alloy-rpc-types-engine` crate.
+- If there are new parameters to the `engine_newPayloadVx` endpoint, add them to the `ExecutionPayloadSidecar` container
+  type. This types contains all additional parameters that are required to convert an `ExecutionPayload` to an EL block.
+
+## Reth changes
+
+### Updates to the engine API
+
+- Add new endpoints to the `EngineApi` trait and implement endpoints.
+- Update the `ExecutionPayload` + `ExecutionPayloadSidecar` to `Block` conversion if there are any additional
+  parameters.
+- Update version specific validation checks in the `EngineValidator` trait.
+
+## Op-Reth changes
+
+### Updates to the engine API
+
+Opstack tries to be as close to the L1 engine API as much as possible. Isthmus (Prague equivalent) introduced the first
+deviation from the L1 engine API with an additional field in the `ExecutionPayload`. For this reason the op engine API
+has it's own server traits `OpEngineApi`.
+Adding a new versioned endpoint requires the same changes as for L1 just for the dedicated OP types.
+
+### Hardforks
+
+Opstack has dedicated hardkfors (e.g. Isthmus), that can be entirely opstack specific (e.g. Holocene) or can be an L1
+equivalent hardfork. Since opstack sticks to the L1 header primitive, a new L1 equivalent hardfork also requires new
+equivalent consensus checks. For this reason these `OpHardfork` must be mapped to L1 `EthereumHardfork`, for example:
+`OpHardfork::Isthmus` corresponds to `EthereumHardfork::Prague`. These mappings must be defined in the `ChainSpec`.

LICENSE-APACHE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2022-2024 Reth Contributors
+Copyright 2022-2025 Reth Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

LICENSE-MIT

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022-2024 Reth Contributors
+Copyright (c) 2022-2025 Reth Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,6 +1,7 @@
 # Heavily inspired by Lighthouse: https://github.com/sigp/lighthouse/blob/693886b94176faa4cb450f024696cb69cda2fe58/Makefile
 .DEFAULT_GOAL := help
 
+GIT_SHA ?= $(shell git rev-parse HEAD)
 GIT_TAG ?= $(shell git describe --tags --abbrev=0)
 BIN_DIR = "dist/bin"
 
@@ -8,14 +9,14 @@ MDBX_PATH = "crates/storage/libmdbx-rs/mdbx-sys/libmdbx"
 DB_TOOLS_DIR = "db-tools"
 FULL_DB_TOOLS_DIR := $(shell pwd)/$(DB_TOOLS_DIR)/
 
-BUILD_PATH = "target"
+CARGO_TARGET_DIR ?= target
 
 # List of features to use when building. Can be overridden via the environment.
 # No jemalloc on Windows
 ifeq ($(OS),Windows_NT)
-    FEATURES ?= asm-keccak
+    FEATURES ?= asm-keccak min-debug-logs
 else
-    FEATURES ?= jemalloc asm-keccak
+    FEATURES ?= jemalloc asm-keccak min-debug-logs
 endif
 
 # Cargo profile for builds. Default is for local builds, CI uses an override.
@@ -25,16 +26,13 @@ PROFILE ?= release
 CARGO_INSTALL_EXTRA_FLAGS ?=
 
 # The release tag of https://github.com/ethereum/tests to use for EF tests
-EF_TESTS_TAG := v12.2
+EF_TESTS_TAG := v17.0
 EF_TESTS_URL := https://github.com/ethereum/tests/archive/refs/tags/$(EF_TESTS_TAG).tar.gz
 EF_TESTS_DIR := ./testing/ef-tests/ethereum-tests
 
 # The docker image name
 DOCKER_IMAGE_NAME ?= ghcr.io/paradigmxyz/reth
 
-# Features in reth/op-reth binary crate other than "ethereum" and "optimism"
-BIN_OTHER_FEATURES := asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs
-
 ##@ Help
 
 .PHONY: help
@@ -52,8 +50,8 @@ install: ## Build and install the reth binary under `~/.cargo/bin`.
 
 .PHONY: install-op
 install-op: ## Build and install the op-reth binary under `~/.cargo/bin`.
-	cargo install --path bin/reth --bin op-reth --force --locked \
-		--features "optimism,$(FEATURES)" \
+	cargo install --path crates/optimism/bin --bin op-reth --force --locked \
+		--features "$(FEATURES)" \
 		--profile "$(PROFILE)" \
 		$(CARGO_INSTALL_EXTRA_FLAGS)
 
@@ -61,20 +59,49 @@ install-op: ## Build and install the op-reth binary under `~/.cargo/bin`.
 build: ## Build the reth binary into `target` directory.
 	cargo build --bin reth --features "$(FEATURES)" --profile "$(PROFILE)"
 
+# Environment variables for reproducible builds
+# Initialize RUSTFLAGS
+RUST_BUILD_FLAGS =
+# Enable static linking to ensure reproducibility across builds
+RUST_BUILD_FLAGS += --C target-feature=+crt-static
+# Set the linker to use static libgcc to ensure reproducibility across builds
+RUST_BUILD_FLAGS += -C link-arg=-static-libgcc
+# Remove build ID from the binary to ensure reproducibility across builds
+RUST_BUILD_FLAGS += -C link-arg=-Wl,--build-id=none
+# Remove metadata hash from symbol names to ensure reproducible builds
+RUST_BUILD_FLAGS += -C metadata=''
+# Set timestamp from last git commit for reproducible builds
+SOURCE_DATE ?= $(shell git log -1 --pretty=%ct)
+# Disable incremental compilation to avoid non-deterministic artifacts
+CARGO_INCREMENTAL_VAL = 0
+# Set C locale for consistent string handling and sorting
+LOCALE_VAL = C
+# Set UTC timezone for consistent time handling across builds
+TZ_VAL = UTC
+
+.PHONY: build-reproducible
+build-reproducible: ## Build the reth binary into `target` directory with reproducible builds. Only works for x86_64-unknown-linux-gnu currently
+	SOURCE_DATE_EPOCH=$(SOURCE_DATE) \
+	RUSTFLAGS="${RUST_BUILD_FLAGS} --remap-path-prefix $$(pwd)=." \
+	CARGO_INCREMENTAL=${CARGO_INCREMENTAL_VAL} \
+	LC_ALL=${LOCALE_VAL} \
+	TZ=${TZ_VAL} \
+	cargo build --bin reth --features "$(FEATURES)" --profile "release" --locked --target x86_64-unknown-linux-gnu
+
 .PHONY: build-debug
 build-debug: ## Build the reth binary into `target/debug` directory.
 	cargo build --bin reth --features "$(FEATURES)"
 
 .PHONY: build-op
 build-op: ## Build the op-reth binary into `target` directory.
-	cargo build --bin op-reth --features "optimism,$(FEATURES)" --profile "$(PROFILE)"
+	cargo build --bin op-reth --features "$(FEATURES)" --profile "$(PROFILE)" --manifest-path crates/optimism/bin/Cargo.toml
 
 # Builds the reth binary natively.
 build-native-%:
 	cargo build --bin reth --target $* --features "$(FEATURES)" --profile "$(PROFILE)"
 
 op-build-native-%:
-	cargo build --bin op-reth --target $* --features "optimism,$(FEATURES)" --profile "$(PROFILE)"
+	cargo build --bin op-reth --target $* --features "$(FEATURES)" --profile "$(PROFILE)" --manifest-path crates/optimism/bin/Cargo.toml
 
 # The following commands use `cross` to build a cross-compile.
 #
@@ -106,7 +133,7 @@ build-%:
 
 op-build-%:
 	RUSTFLAGS="-C link-arg=-lgcc -Clink-arg=-static-libgcc" \
-		cross build --bin op-reth --target $* --features "optimism,$(FEATURES)" --profile "$(PROFILE)"
+		cross build --bin op-reth --target $* --features "$(FEATURES)" --profile "$(PROFILE)" --manifest-path crates/optimism/bin/Cargo.toml
 
 # Unfortunately we can't easily use cross to build for Darwin because of licensing issues.
 # If we wanted to, we would need to build a custom Docker image with the SDK available.
@@ -125,7 +152,7 @@ op-build-aarch64-apple-darwin:
 
 # Create a `.tar.gz` containing a binary for a specific target.
 define tarball_release_binary
-	cp $(BUILD_PATH)/$(1)/$(PROFILE)/$(2) $(BIN_DIR)/$(2)
+	cp $(CARGO_TARGET_DIR)/$(1)/$(PROFILE)/$(2) $(BIN_DIR)/$(2)
 	cd $(BIN_DIR) && \
 		tar -czf reth-$(GIT_TAG)-$(1)$(3).tar.gz $(2) && \
 		rm $(2)
@@ -148,7 +175,6 @@ build-release-tarballs: ## Create a series of `.tar.gz` files in the BIN_DIR dir
 ##@ Test
 
 UNIT_TEST_ARGS := --locked --workspace --features 'jemalloc-prof' -E 'kind(lib)' -E 'kind(bin)' -E 'kind(proc-macro)'
-UNIT_TEST_ARGS_OP := --locked --workspace --features 'jemalloc-prof,optimism' -E 'kind(lib)' -E 'kind(bin)' -E 'kind(proc-macro)'
 COV_FILE := lcov.info
 
 .PHONY: test-unit
@@ -156,21 +182,12 @@ test-unit: ## Run unit tests.
 	cargo install cargo-nextest --locked
 	cargo nextest run $(UNIT_TEST_ARGS)
 
-.PHONY: test-unit-op
-test-unit-op: ## Run unit tests (with optimism feature flag enabled).
-	cargo install cargo-nextest --locked
-	cargo nextest run $(UNIT_TEST_ARGS_OP)
 
 .PHONY: cov-unit
 cov-unit: ## Run unit tests with coverage.
 	rm -f $(COV_FILE)
 	cargo llvm-cov nextest --lcov --output-path $(COV_FILE) $(UNIT_TEST_ARGS)
 
-.PHONY: cov-unit-op
-cov-unit-op: ## Run unit tests with coverage (with optimism feature flag enabled).
-	rm -f $(COV_FILE)
-	cargo llvm-cov nextest --lcov --output-path $(COV_FILE) $(UNIT_TEST_ARGS_OP)
-
 .PHONY: cov-report-html
 cov-report-html: cov-unit ## Generate a HTML coverage report and open it in the browser.
 	cargo llvm-cov report --html
@@ -199,6 +216,14 @@ ef-tests: $(EF_TESTS_DIR) ## Runs Ethereum Foundation tests.
 docker-build-push: ## Build and push a cross-arch Docker image tagged with the latest git tag.
 	$(call docker_build_push,$(GIT_TAG),$(GIT_TAG))
 
+# Note: This requires a buildx builder with emulation support. For example:
+#
+# `docker run --privileged --rm tonistiigi/binfmt --install amd64,arm64`
+# `docker buildx create --use --driver docker-container --name cross-builder`
+.PHONY: docker-build-push-git-sha
+docker-build-push-git-sha: ## Build and push a cross-arch Docker image tagged with the latest git sha.
+	$(call docker_build_push,$(GIT_SHA),$(GIT_SHA))
+
 # Note: This requires a buildx builder with emulation support. For example:
 #
 # `docker run --privileged --rm tonistiigi/binfmt --install amd64,arm64`
@@ -213,17 +238,17 @@ docker-build-push-latest: ## Build and push a cross-arch Docker image tagged wit
 # `docker buildx create --use --name cross-builder`
 .PHONY: docker-build-push-nightly
 docker-build-push-nightly: ## Build and push cross-arch Docker image tagged with the latest git tag with a `-nightly` suffix, and `latest-nightly`.
-	$(call docker_build_push,$(GIT_TAG)-nightly,latest-nightly)
+	$(call docker_build_push,nightly,nightly)
 
 # Create a cross-arch Docker image with the given tags and push it
 define docker_build_push
 	$(MAKE) build-x86_64-unknown-linux-gnu
 	mkdir -p $(BIN_DIR)/amd64
-	cp $(BUILD_PATH)/x86_64-unknown-linux-gnu/$(PROFILE)/reth $(BIN_DIR)/amd64/reth
+	cp $(CARGO_TARGET_DIR)/x86_64-unknown-linux-gnu/$(PROFILE)/reth $(BIN_DIR)/amd64/reth
 
 	$(MAKE) build-aarch64-unknown-linux-gnu
 	mkdir -p $(BIN_DIR)/arm64
-	cp $(BUILD_PATH)/aarch64-unknown-linux-gnu/$(PROFILE)/reth $(BIN_DIR)/arm64/reth
+	cp $(CARGO_TARGET_DIR)/aarch64-unknown-linux-gnu/$(PROFILE)/reth $(BIN_DIR)/arm64/reth
 
 	docker buildx build --file ./Dockerfile.cross . \
 		--platform linux/amd64,linux/arm64 \
@@ -243,6 +268,14 @@ endef
 op-docker-build-push: ## Build and push a cross-arch Docker image tagged with the latest git tag.
 	$(call op_docker_build_push,$(GIT_TAG),$(GIT_TAG))
 
+# Note: This requires a buildx builder with emulation support. For example:
+#
+# `docker run --privileged --rm tonistiigi/binfmt --install amd64,arm64`
+# `docker buildx create --use --driver docker-container --name cross-builder`
+.PHONY: op-docker-build-push-git-sha
+op-docker-build-push-git-sha: ## Build and push a cross-arch Docker image tagged with the latest git sha.
+	$(call op_docker_build_push,$(GIT_SHA),$(GIT_SHA))
+
 # Note: This requires a buildx builder with emulation support. For example:
 #
 # `docker run --privileged --rm tonistiigi/binfmt --install amd64,arm64`
@@ -257,17 +290,34 @@ op-docker-build-push-latest: ## Build and push a cross-arch Docker image tagged
 # `docker buildx create --use --name cross-builder`
 .PHONY: op-docker-build-push-nightly
 op-docker-build-push-nightly: ## Build and push cross-arch Docker image tagged with the latest git tag with a `-nightly` suffix, and `latest-nightly`.
-	$(call op_docker_build_push,$(GIT_TAG)-nightly,latest-nightly)
+	$(call op_docker_build_push,nightly,nightly)
+
+# Note: This requires a buildx builder with emulation support. For example:
+#
+# `docker run --privileged --rm tonistiigi/binfmt --install amd64,arm64`
+# `docker buildx create --use --name cross-builder`
+.PHONY: docker-build-push-nightly-profiling
+docker-build-push-nightly-profiling: ## Build and push cross-arch Docker image with profiling profile tagged with nightly-profiling.
+	$(call docker_build_push,nightly-profiling,nightly-profiling)
+
+	# Note: This requires a buildx builder with emulation support. For example:
+#
+# `docker run --privileged --rm tonistiigi/binfmt --install amd64,arm64`
+# `docker buildx create --use --name cross-builder`
+.PHONY: op-docker-build-push-nightly-profiling
+op-docker-build-push-nightly-profiling: ## Build and push cross-arch Docker image tagged with the latest git tag with a `-nightly` suffix, and `latest-nightly`.
+	$(call op_docker_build_push,nightly-profiling,nightly-profiling)
+
 
 # Create a cross-arch Docker image with the given tags and push it
 define op_docker_build_push
 	$(MAKE) op-build-x86_64-unknown-linux-gnu
 	mkdir -p $(BIN_DIR)/amd64
-	cp $(BUILD_PATH)/x86_64-unknown-linux-gnu/$(PROFILE)/op-reth $(BIN_DIR)/amd64/op-reth
+	cp $(CARGO_TARGET_DIR)/x86_64-unknown-linux-gnu/$(PROFILE)/op-reth $(BIN_DIR)/amd64/op-reth
 
 	$(MAKE) op-build-aarch64-unknown-linux-gnu
 	mkdir -p $(BIN_DIR)/arm64
-	cp $(BUILD_PATH)/aarch64-unknown-linux-gnu/$(PROFILE)/op-reth $(BIN_DIR)/arm64/op-reth
+	cp $(CARGO_TARGET_DIR)/aarch64-unknown-linux-gnu/$(PROFILE)/op-reth $(BIN_DIR)/arm64/op-reth
 
 	docker buildx build --file ./DockerfileOp.cross . \
 		--platform linux/amd64,linux/arm64 \
@@ -306,7 +356,15 @@ db-tools: ## Compile MDBX debugging tools.
 .PHONY: update-book-cli
 update-book-cli: build-debug ## Update book cli documentation.
 	@echo "Updating book cli doc..."
-	@./book/cli/update.sh $(BUILD_PATH)/debug/reth
+	@./book/cli/update.sh $(CARGO_TARGET_DIR)/debug/reth
+
+.PHONY: profiling
+profiling: ## Builds `reth` with optimisations, but also symbols.
+	RUSTFLAGS="-C target-cpu=native" cargo build --profile profiling --features jemalloc,asm-keccak
+
+.PHONY: profiling-op
+profiling-op: ## Builds `op-reth` with optimisations, but also symbols.
+	RUSTFLAGS="-C target-cpu=native" cargo build --profile profiling --features jemalloc,asm-keccak --bin op-reth --manifest-path crates/optimism/bin/Cargo.toml
 
 .PHONY: maxperf
 maxperf: ## Builds `reth` with the most aggressive optimisations.
@@ -314,7 +372,7 @@ maxperf: ## Builds `reth` with the most aggressive optimisations.
 
 .PHONY: maxperf-op
 maxperf-op: ## Builds `op-reth` with the most aggressive optimisations.
-	RUSTFLAGS="-C target-cpu=native" cargo build --profile maxperf --features jemalloc,asm-keccak,optimism --bin op-reth
+	RUSTFLAGS="-C target-cpu=native" cargo build --profile maxperf --features jemalloc,asm-keccak --bin op-reth --manifest-path crates/optimism/bin/Cargo.toml
 
 .PHONY: maxperf-no-asm
 maxperf-no-asm: ## Builds `reth` with the most aggressive optimisations, minus the "asm-keccak" feature.
@@ -324,29 +382,7 @@ maxperf-no-asm: ## Builds `reth` with the most aggressive optimisations, minus t
 fmt:
 	cargo +nightly fmt
 
-lint-reth:
-	cargo +nightly clippy \
-	--workspace \
-	--bin "reth" \
-	--lib \
-	--examples \
-	--tests \
-	--benches \
-	--features "ethereum $(BIN_OTHER_FEATURES)" \
-	-- -D warnings
-
-lint-op-reth:
-	cargo +nightly clippy \
-	--workspace \
-	--bin "op-reth" \
-	--lib \
-	--examples \
-	--tests \
-	--benches \
-	--features "optimism $(BIN_OTHER_FEATURES)" \
-	-- -D warnings
-
-lint-other-targets:
+clippy:
 	cargo +nightly clippy \
 	--workspace \
 	--lib \
@@ -356,8 +392,19 @@ lint-other-targets:
 	--all-features \
 	-- -D warnings
 
+clippy-op-dev:
+	cargo +nightly clippy \
+	--bin op-reth \
+	--workspace \
+	--lib \
+	--examples \
+	--tests \
+	--benches \
+	--locked \
+	--all-features
+
 lint-codespell: ensure-codespell
-	codespell --skip "*.json"
+	codespell --skip "*.json" --skip "./testing/ef-tests/ethereum-tests"
 
 ensure-codespell:
 	@if ! command -v codespell &> /dev/null; then \
@@ -365,42 +412,32 @@ ensure-codespell:
 		exit 1; \
     fi
 
+# Lint and format all TOML files in the project using dprint.
+# This target ensures that TOML files follow consistent formatting rules,
+# such as using spaces instead of tabs, and enforces other style guidelines
+# defined in the dprint configuration file (e.g., dprint.json).
+#
+# Usage:
+#   make lint-toml
+#
+# Dependencies:
+#   - ensure-dprint: Ensures that dprint is installed and available in the system.
+lint-toml: ensure-dprint
+	dprint fmt
+
+ensure-dprint:
+	@if ! command -v dprint &> /dev/null; then \
+		echo "dprint not found. Please install it by running the command `cargo install --locked dprint` or refer to the following link for more information: https://github.com/dprint/dprint" \
+		exit 1; \
+    fi
+
 lint:
 	make fmt && \
-	make lint-reth && \
-	make lint-op-reth && \
-	make lint-other-targets && \
-	make lint-codespell
+	make clippy && \
+	make lint-codespell && \
+	make lint-toml
 
-fix-lint-reth:
-	cargo +nightly clippy \
-	--workspace \
-	--bin "reth" \
-	--lib \
-	--examples \
-	--tests \
-	--benches \
-	--features "ethereum $(BIN_OTHER_FEATURES)" \
-	--fix \
-	--allow-staged \
-	--allow-dirty \
-	-- -D warnings
-
-fix-lint-op-reth:
-	cargo +nightly clippy \
-	--workspace \
-	--bin "op-reth" \
-	--lib \
-	--examples \
-	--tests \
-	--benches \
-	--features "optimism $(BIN_OTHER_FEATURES)" \
-	--fix \
-	--allow-staged \
-	--allow-dirty \
-	-- -D warnings
-
-fix-lint-other-targets:
+clippy-fix:
 	cargo +nightly clippy \
 	--workspace \
 	--lib \
@@ -414,9 +451,7 @@ fix-lint-other-targets:
 	-- -D warnings
 
 fix-lint:
-	make fix-lint-reth && \
-	make fix-lint-op-reth && \
-	make fix-lint-other-targets && \
+	make clippy-fix && \
 	make fmt
 
 .PHONY: rustdocs
@@ -429,47 +464,26 @@ rustdocs: ## Runs `cargo docs` to generate the Rust documents in the `target/doc
 	cargo +nightly docs \
 	--document-private-items
 
-test-reth:
-	cargo test \
-	--workspace \
-	--bin "reth" \
-	--lib \
-	--examples \
-	--tests \
-	--benches \
-	--features "ethereum $(BIN_OTHER_FEATURES)"
-
-test-op-reth:
+cargo-test:
 	cargo test \
 	--workspace \
 	--bin "op-reth" \
 	--lib --examples \
 	--tests \
 	--benches \
-	--features "optimism $(BIN_OTHER_FEATURES)"
-
-test-other-targets:
-	cargo test \
-	--workspace \
-	--lib \
-	--examples \
-	--tests \
-	--benches \
 	--all-features
 
 test-doc:
-	cargo test --doc --workspace --features "ethereum"
-	cargo test --doc --workspace --features "optimism"
+	cargo test --doc --workspace --all-features
 
 test:
-	make test-reth && \
-	make test-op-reth && \
-	make test-doc && \
-	make test-other-targets
+	make cargo-test && \
+	make test-doc
 
 pr:
 	make lint && \
 	make update-book-cli && \
+	cargo docs --document-private-items && \
 	make test
 
 check-features:
@@ -477,5 +491,4 @@ check-features:
 		--package reth-codecs \
 		--package reth-primitives-traits \
 		--package reth-primitives \
-		--package reth-rpc-types \
-		--feature-powerset
+		--feature-powerset

README.md

@@ -1,7 +1,8 @@
 # reth
 
+[![bench status](https://github.com/paradigmxyz/reth/actions/workflows/bench.yml/badge.svg)](https://github.com/paradigmxyz/reth/actions/workflows/bench.yml)
 [![CI status](https://github.com/paradigmxyz/reth/workflows/unit/badge.svg)][gh-ci]
-[![cargo-deny status](https://github.com/paradigmxyz/reth/workflows/deny/badge.svg)][gh-deny]
+[![cargo-lint status](https://github.com/paradigmxyz/reth/actions/workflows/lint.yml/badge.svg)][gh-lint]
 [![Telegram Chat][tg-badge]][tg-url]
 
 **Modular, contributor-friendly and blazing-fast implementation of the Ethereum protocol**
@@ -14,7 +15,7 @@
 | [Crate Docs](https://reth.rs/docs)
 
 [gh-ci]: https://github.com/paradigmxyz/reth/actions/workflows/unit.yml
-[gh-deny]: https://github.com/paradigmxyz/reth/actions/workflows/deny.yml
+[gh-lint]: https://github.com/paradigmxyz/reth/actions/workflows/lint.yml
 [tg-badge]: https://img.shields.io/endpoint?color=neon&logo=telegram&label=chat&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fparadigm%5Freth
 
 ## What is Reth?
@@ -87,7 +88,7 @@ When updating this, also update:
 - .github/workflows/lint.yml
 -->
 
-The Minimum Supported Rust Version (MSRV) of this project is [1.80.0](https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html).
+The Minimum Supported Rust Version (MSRV) of this project is [1.86.0](https://blog.rust-lang.org/2025/04/03/Rust-1.86.0/).
 
 See the book for detailed instructions on how to [build from source](https://paradigmxyz.github.io/reth/installation/source.html).
 
@@ -103,21 +104,14 @@ cd reth
 Next, run the tests:
 
 ```sh
-# Without Geth
-cargo test --workspace
+cargo nextest run --workspace
 
-# With Geth
-cargo test --workspace --features geth-tests
-
-# With Ethereum Foundation tests
-#
-# Note: Requires cloning https://github.com/ethereum/tests
-#
-#   cd testing/ef-tests && git clone https://github.com/ethereum/tests ethereum-tests
-cargo test -p ef-tests --features ef-tests
+# Run the Ethereum Foundation tests
+make ef-tests
 ```
 
-We recommend using [`cargo nextest`](https://nexte.st/) to speed up testing. With nextest installed, simply substitute `cargo test` with `cargo nextest run`.
+We highly recommend using [`cargo nextest`](https://nexte.st/) to speed up testing.
+Using `cargo test` to run tests may work fine, but this is not tested and does not support more advanced features like retries for spurious failures.
 
 > **Note**
 >

SECURITY.md

@@ -1,5 +1,5 @@
 # Security Policy
 
-## Reporting a Vulnerability
+## Report a Vulnerability
 
-Contact georgios at paradigm.xyz.
+Contact [security@ithaca.xyz](mailto:security@ithaca.xyz).

bin/reth-bench/Cargo.toml

@@ -14,33 +14,30 @@ workspace = true
 
 [dependencies]
 # reth
-reth-provider = { workspace = true }
 reth-cli-runner.workspace = true
-reth-db = { workspace = true, features = ["mdbx"] }
-reth-node-core.workspace = true
+reth-cli-util.workspace = true
+reth-fs-util.workspace = true
 reth-node-api.workspace = true
-reth-rpc-types.workspace = true
-reth-rpc-types-compat.workspace = true
-reth-primitives = { workspace = true, features = ["alloy-compat"] }
+reth-node-core.workspace = true
+reth-primitives-traits.workspace = true
 reth-tracing.workspace = true
 
 # alloy
-alloy-provider = { workspace = true, features = ["engine-api", "reqwest-rustls-tls"], default-features = false }
-alloy-rpc-types-engine.workspace = true
-alloy-transport.workspace = true
-alloy-transport-http.workspace = true
-alloy-transport-ws.workspace = true
-alloy-transport-ipc.workspace = true
-alloy-pubsub.workspace = true
-alloy-json-rpc.workspace = true
-alloy-rpc-client.workspace = true
-alloy-consensus.workspace = true
 alloy-eips.workspace = true
+alloy-json-rpc.workspace = true
+alloy-primitives.workspace = true
+alloy-provider = { workspace = true, features = ["engine-api", "reqwest-rustls-tls"], default-features = false }
+alloy-pubsub.workspace = true
+alloy-rpc-client.workspace = true
+alloy-rpc-types-engine.workspace = true
+alloy-transport-http.workspace = true
+alloy-transport-ipc.workspace = true
+alloy-transport-ws.workspace = true
+alloy-transport.workspace = true
+op-alloy-consensus = { workspace = true, features = ["alloy-compat"] }
 
 # reqwest
-reqwest = { workspace = true, default-features = false, features = [
-    "rustls-tls-native-roots",
-] }
+reqwest = { workspace = true, default-features = false, features = ["rustls-tls-native-roots"] }
 
 # tower
 tower.workspace = true
@@ -48,32 +45,23 @@ tower.workspace = true
 # tracing
 tracing.workspace = true
 
-# io
+# serde
 serde.workspace = true
 serde_json.workspace = true
 
 # async
-tokio = { workspace = true, features = [
-    "sync",
-    "macros",
-    "time",
-    "rt-multi-thread",
-] }
-tokio-util.workspace = true
-futures.workspace = true
 async-trait.workspace = true
+futures.workspace = true
+tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thread"] }
 
 # misc
+clap = { workspace = true, features = ["derive", "env"] }
 eyre.workspace = true
 thiserror.workspace = true
-clap = { workspace = true, features = ["derive", "env"] }
+humantime.workspace = true
 
 # for writing data
-csv = "1.3.0"
-
-[target.'cfg(unix)'.dependencies]
-tikv-jemallocator = { version = "0.5.0", optional = true }
-libc = "0.2"
+csv.workspace = true
 
 [dev-dependencies]
 reth-tracing.workspace = true
@@ -81,10 +69,17 @@ reth-tracing.workspace = true
 [features]
 default = ["jemalloc"]
 
-asm-keccak = ["reth-primitives/asm-keccak"]
+asm-keccak = [
+    "reth-node-core/asm-keccak",
+    "alloy-primitives/asm-keccak",
+]
 
-jemalloc = ["dep:tikv-jemallocator"]
-jemalloc-prof = ["jemalloc", "tikv-jemallocator?/profiling"]
+jemalloc = [
+    "reth-cli-util/jemalloc",
+    "reth-node-core/jemalloc",
+]
+jemalloc-prof = ["reth-cli-util/jemalloc-prof"]
+tracy-allocator = ["reth-cli-util/tracy-allocator"]
 
 min-error-logs = ["tracing/release_max_level_error"]
 min-warn-logs = ["tracing/release_max_level_warn"]
@@ -92,12 +87,6 @@ min-info-logs = ["tracing/release_max_level_info"]
 min-debug-logs = ["tracing/release_max_level_debug"]
 min-trace-logs = ["tracing/release_max_level_trace"]
 
-optimism = [
-    "reth-primitives/optimism",
-    "reth-provider/optimism",
-    "reth-node-core/optimism",
-]
-
 # no-op feature flag for switching between the `optimism` and default functionality in CI matrices
 ethereum = []
 

bin/reth-bench/README.md

@@ -31,29 +31,100 @@ Otherwise, running `make maxperf` at the root of the repo should be sufficient f
 `reth-bench` contains different commands to benchmark different patterns of engine API calls.
 The `reth-bench new-payload-fcu` command is the most representative of ethereum mainnet live sync, alternating between sending `engine_newPayload` calls and `engine_forkchoiceUpdated` calls.
 
-Below is an overview of how to execute a benchmark:
+Below is an overview of how to run a benchmark:
 
- 1. **Setup**: Make sure `reth` is running in the background with the proper configuration. This setup involves ensuring the node is at the correct state, setting up profiling tools, and possibly more depending on the purpose of the benchmark's.
+### Setup
 
- 2. **Run the Benchmark**:
-    ```bash
-    reth-bench new-payload-fcu --rpc-url http://<rpc-url>:8545 --from <start_block> --to <end_block> --jwtsecret <jwt_file_path>
-    ```
+Make sure `reth` is running in the background with the proper configuration. This setup involves ensuring the node is at the correct state, setting up profiling tools, and possibly more depending on the purpose of the benchmark.
 
-    Replace `<rpc-url>`, `<start_block>`, `<end_block>`, and `<jwt_file_path>` with the appropriate values for your testing environment.
-    Note that this assumes that the benchmark node's engine API is running on `http://127.0.0.1:8545`, which is set as a default value in `reth-bench`. To configure this value, use the `--engine-rpc-url` flag.
+Any consensus layer client configured to connect to `reth` should be shut down, as all the engine API interactions during benchmarking will be driven by `reth-bench`.
 
- 3. **Observe Outputs**: Upon running the command, `reth-bench` will output benchmark results, showing processing speeds and gas usage, which are crucial for analyzing the node's performance.
+Depending on the block range you want to use in the benchmark you may need to unwind your node.
+The head of the node should be behind the lowest block in the range.
 
-    Example output:
-    ```
-    2024-05-30T00:45:20.806691Z  INFO Running benchmark using data from RPC URL: http://<rpc-url>:8545
-    // ... logs per block
-    2024-05-30T00:45:34.203172Z  INFO Total Ggas/s: 0.15 total_duration=5.085704882s total_gas_used=741620668.0
-    ```
+Starting with a synced ethereum mainnet node, to run a benchmark starting at block 21,000,000, the node would need to be unwound first:
+```bash
+reth stage unwind to-block 21000000
+```
 
- 4. **Stop and Review**: Once the benchmark completes, terminate the `reth` process and review the logs and performance metrics collected, if any.
- 5. **Repeat**.
+The following `reth-bench` command would then start the benchmark at block 21,000,000:
+```bash
+reth-bench new-payload-fcu --rpc-url <rpc-url> --from 21000000 --to <end_block> --jwtsecret <jwt_file_path>
+```
+
+Finally, make sure that reth is built using a build profile suitable for what you are trying to measure.
+For example, if the purpose of the benchmark is to load test and measure `reth`'s maximum speed, it would be compiled with the `maxperf` profile:
+```bash
+make maxperf
+```
+
+If the purpose of the benchmark is for analyzing flamegraphs for a specific routine using `perf` or `samply`, it should be compiled with the `profiling` profile:
+```bash
+make profiling
+```
+
+If the purpose of the benchmark is to obtain `jemalloc` memory profiles that can then be analyzed by `jeprof`, it should be compiled with the `profiling` profile and the `jemalloc-prof` feature:
+```bash
+RUSTFLAGS="-C target-cpu=native" cargo build --profile profiling --features "jemalloc-prof,asm-keccak"
+```
+
+> [!NOTE]
+> Jemalloc memory profiling currently only works on linux.
+
+Finally, if the purpose of the benchmark is to profile the node when `snmalloc` is configured as the default allocator, it would be built with the following
+command:
+```bash
+RUSTFLAGS="-C target-cpu=native" cargo build --profile profiling --no-default-features --features "snmalloc-native,asm-keccak"
+```
+
+### Run the Benchmark:
+First, start the reth node. Here is an example that runs `reth` compiled with the `profiling` profile, runs `samply`, and configures `reth` to run with metrics enabled:
+```bash
+samply record -p 3001 target/profiling/reth node --metrics localhost:9001 --authrpc.jwtsecret <jwt_file_path>
+```
+
+```bash
+reth-bench new-payload-fcu --rpc-url <rpc-url> --from <start_block> --to <end_block> --jwtsecret <jwt_file_path>
+```
+
+Replace `<start_block>`, `<end_block>`, and `<jwt_file_path>` with the appropriate values for your testing environment. `<rpc-url>` should be the URL of an RPC endpoint that can provide the blocks that will be used during the execution.
+This should NOT be the node that is being used for the benchmark. The node behind `--rpc-url` will be used as a data source for fetching real blocks, so they can be replayed in
+the benchmark. The node being benchmarked will not have these blocks.
+Note that this assumes that the benchmark node's engine API is running on `http://127.0.0.1:8551`, which is set as a default value in `reth-bench`. To configure this value, use the `--engine-rpc-url` flag.
+
+### Observe Outputs
+
+After running the command, `reth-bench` will output benchmark results, showing processing speeds and gas usage, which are useful metrics for analyzing the node's performance.
+Note that the `GGas/s` metric does _not_ include just execution, it currently measures the total `newPayload` latency, over the total gas used in the block.
+
+Example output:
+```
+2024-05-30T00:45:20.806691Z  INFO Running benchmark using data from RPC URL: http://<rpc-url>:8545
+// ... logs per block
+2024-05-30T00:45:34.203172Z  INFO Total Ggas/s: 0.15 total_duration=5.085704882s total_gas_used=741620668.0
+```
+
+### Stop and Review
+
+Once the benchmark completes, terminate the `reth` process and review the logs and performance metrics collected, if any.
+
+If using `samply`, the `reth` node should be stopped (using Ctrl+C or `kill`). The `samply` tool will output the following on the command line:
+```bash
+All tasks terminated.
+Local server listening at http://127.0.0.1:3001
+Press Ctrl+C to stop.
+```
+As long as the `reth` node was compiled using the `profiling` profile, or with any other profile that includes debug symbols, the URL can be used to analyze flamegraphs, stack
+charts, and other formats useful for analyzing the sampled stack data. There should also be an "Upload local profile" button on the `samply` web interface that can be used to
+upload the profile and receive a permalink that can be shared.
+This can be extremely useful for providing data and context to team members to justify an optimization, or to share with others to help diagnose a performance issue.
+
+If `prometheus` is set up and scraping a `reth` node that has `--metrics` enabled, other metrics can be analyzed, like execution latency, state root latency, memory and CPU
+usage over time, and many other metrics that are useful for diagnosing performance issues.
+
+### Repeat
+
+To reproduce the benchmark, first re-set the node to the block that the benchmark started at, using `reth stage unwind` as mentioned above, and repeat all of the above steps.
 
 ## Additional Considerations
 
@@ -62,4 +133,3 @@ Below is an overview of how to execute a benchmark:
 - **Profiling tools**: If you are collecting CPU profiles, tools like [`samply`](https://github.com/mstange/samply) and [`perf`](https://perf.wiki.kernel.org/index.php/Main_Page) can be useful for analyzing node performance.
 - **Benchmark Data**: `reth-bench` additionally contains a `--benchmark.output` flag, which will output gas used benchmarks across the benchmark range in CSV format. This may be useful for further data analysis.
 - **Platform Information**: To ensure accurate and reproducible benchmarking, document the platform details, including hardware specifications, OS version, and any other relevant information before publishing any benchmarks.
-

bin/reth-bench/src/authenticated_transport.rs

@@ -7,7 +7,7 @@ use alloy_json_rpc::{RequestPacket, ResponsePacket};
 use alloy_pubsub::{PubSubConnect, PubSubFrontend};
 use alloy_rpc_types_engine::{Claims, JwtSecret};
 use alloy_transport::{
-    utils::guess_local_url, Authorization, Pbf, TransportConnect, TransportError,
+    utils::guess_local_url, Authorization, BoxTransport, TransportConnect, TransportError,
     TransportErrorKind, TransportFut,
 };
 use alloy_transport_http::{reqwest::Url, Http, ReqwestTransport};
@@ -56,7 +56,7 @@ impl InnerTransport {
             reqwest::Client::builder().tls_built_in_root_certs(url.scheme() == "https");
         let mut headers = reqwest::header::HeaderMap::new();
 
-        // Add the JWT it to the headers if we can decode it.
+        // Add the JWT to the headers if we can decode it.
         let (auth, claims) =
             build_auth(jwt).map_err(|e| AuthenticatedTransportError::InvalidJwt(e.to_string()))?;
 
@@ -80,11 +80,12 @@ impl InnerTransport {
         url: Url,
         jwt: JwtSecret,
     ) -> Result<(Self, Claims), AuthenticatedTransportError> {
-        // Add the JWT it to the headers if we can decode it.
+        // Add the JWT to the headers if we can decode it.
         let (auth, claims) =
             build_auth(jwt).map_err(|e| AuthenticatedTransportError::InvalidJwt(e.to_string()))?;
 
-        let inner = WsConnect { url: url.to_string(), auth: Some(auth) }
+        let inner = WsConnect::new(url.clone())
+            .with_auth(auth)
             .into_service()
             .await
             .map(Self::Ws)
@@ -113,9 +114,9 @@ pub struct AuthenticatedTransport {
     /// Also contains the current claims being used. This is used to determine whether or not we
     /// should create another client.
     inner_and_claims: Arc<RwLock<(InnerTransport, Claims)>>,
-    /// The current jwt being used. This is so we can recreate claims.
+    /// The current jwt is being used. This is so we can recreate claims.
     jwt: JwtSecret,
-    /// The current URL being used. This is so we can recreate the client if needed.
+    /// The current URL is being used. This is so we can recreate the client if needed.
     url: Url,
 }
 
@@ -174,19 +175,9 @@ impl AuthenticatedTransport {
             }
 
             match inner_and_claims.0 {
-                InnerTransport::Http(ref http) => {
-                    let mut http = http;
-                    http.call(req)
-                }
-                InnerTransport::Ws(ref ws) => {
-                    let mut ws = ws;
-                    ws.call(req)
-                }
-                InnerTransport::Ipc(ref ipc) => {
-                    let mut ipc = ipc;
-                    // we don't need to recreate the client for IPC
-                    ipc.call(req)
-                }
+                InnerTransport::Http(ref mut http) => http.call(req),
+                InnerTransport::Ws(ref mut ws) => ws.call(req),
+                InnerTransport::Ipc(ref mut ipc) => ipc.call(req),
             }
             .await
         })
@@ -208,7 +199,7 @@ fn build_auth(secret: JwtSecret) -> eyre::Result<(Authorization, Claims)> {
 pub struct AuthenticatedTransportConnect {
     /// The URL to connect to.
     url: Url,
-    /// The JWT secret used to authenticate the transport.
+    /// The JWT secret is used to authenticate the transport.
     jwt: JwtSecret,
 }
 
@@ -220,21 +211,21 @@ impl AuthenticatedTransportConnect {
 }
 
 impl TransportConnect for AuthenticatedTransportConnect {
-    type Transport = AuthenticatedTransport;
-
     fn is_local(&self) -> bool {
         guess_local_url(&self.url)
     }
 
-    fn get_transport<'a: 'b, 'b>(&'a self) -> Pbf<'b, Self::Transport, TransportError> {
-        AuthenticatedTransport::connect(self.url.clone(), self.jwt)
-            .map(|res| match res {
-                Ok(transport) => Ok(transport),
-                Err(err) => {
-                    Err(TransportError::Transport(TransportErrorKind::Custom(Box::new(err))))
-                }
-            })
-            .boxed()
+    async fn get_transport(&self) -> Result<BoxTransport, TransportError> {
+        Ok(BoxTransport::new(
+            AuthenticatedTransport::connect(self.url.clone(), self.jwt)
+                .map(|res| match res {
+                    Ok(transport) => Ok(transport),
+                    Err(err) => {
+                        Err(TransportError::Transport(TransportErrorKind::Custom(Box::new(err))))
+                    }
+                })
+                .await?,
+        ))
     }
 }
 

bin/reth-bench/src/bench/context.rs

@@ -3,12 +3,10 @@
 
 use crate::{authenticated_transport::AuthenticatedTransportConnect, bench_mode::BenchMode};
 use alloy_eips::BlockNumberOrTag;
-use alloy_provider::{network::AnyNetwork, Provider, ProviderBuilder, RootProvider};
+use alloy_provider::{network::AnyNetwork, Provider, RootProvider};
 use alloy_rpc_client::ClientBuilder;
 use alloy_rpc_types_engine::JwtSecret;
-use alloy_transport::BoxTransport;
-use alloy_transport_http::Http;
-use reqwest::{Client, Url};
+use reqwest::Url;
 use reth_node_core::args::BenchmarkArgs;
 use tracing::info;
 
@@ -18,10 +16,10 @@ use tracing::info;
 /// queries, a [`BenchMode`] to determine whether the benchmark should run for a closed or open
 /// range of blocks, and the next block to fetch.
 pub(crate) struct BenchContext {
-    /// The auth provider used for engine API queries.
-    pub(crate) auth_provider: RootProvider<BoxTransport, AnyNetwork>,
-    /// The block provider used for block queries.
-    pub(crate) block_provider: RootProvider<Http<Client>, AnyNetwork>,
+    /// The auth provider is used for engine API queries.
+    pub(crate) auth_provider: RootProvider<AnyNetwork>,
+    /// The block provider is used for block queries.
+    pub(crate) block_provider: RootProvider<AnyNetwork>,
     /// The benchmark mode, which defines whether the benchmark should run for a closed or open
     /// range of blocks.
     pub(crate) benchmark_mode: BenchMode,
@@ -43,17 +41,18 @@ impl BenchContext {
         }
 
         // set up alloy client for blocks
-        let block_provider =
-            ProviderBuilder::new().network::<AnyNetwork>().on_http(rpc_url.parse()?);
+        let client = ClientBuilder::default().http(rpc_url.parse()?);
+        let block_provider = RootProvider::<AnyNetwork>::new(client);
 
         // If neither `--from` nor `--to` are provided, we will run the benchmark continuously,
         // starting at the latest block.
         let mut benchmark_mode = BenchMode::new(bench_args.from, bench_args.to)?;
 
         // construct the authenticated provider
-        let auth_jwt = bench_args.auth_jwtsecret.clone().ok_or_else(|| {
-            eyre::eyre!("--auth-jwtsecret must be provided for authenticated RPC")
-        })?;
+        let auth_jwt = bench_args
+            .auth_jwtsecret
+            .clone()
+            .ok_or_else(|| eyre::eyre!("--jwtsecret must be provided for authenticated RPC"))?;
 
         // fetch jwt from file
         //
@@ -67,20 +66,21 @@ impl BenchContext {
         // construct the authed transport
         info!("Connecting to Engine RPC at {} for replay", auth_url);
         let auth_transport = AuthenticatedTransportConnect::new(auth_url, jwt);
-        let client = ClientBuilder::default().connect_boxed(auth_transport).await?;
-        let auth_provider = RootProvider::<_, AnyNetwork>::new(client);
+        let client = ClientBuilder::default().connect_with(auth_transport).await?;
+        let auth_provider = RootProvider::<AnyNetwork>::new(client);
 
         let first_block = match benchmark_mode {
             BenchMode::Continuous => {
                 // fetch Latest block
-                block_provider.get_block_by_number(BlockNumberOrTag::Latest, true).await?.unwrap()
+                block_provider.get_block_by_number(BlockNumberOrTag::Latest).full().await?.unwrap()
             }
             BenchMode::Range(ref mut range) => {
                 match range.next() {
                     Some(block_number) => {
                         // fetch first block in range
                         block_provider
-                            .get_block_by_number(block_number.into(), true)
+                            .get_block_by_number(block_number.into())
+                            .full()
                             .await?
                             .unwrap()
                     }

bin/reth-bench/src/bench/mod.rs

@@ -9,6 +9,7 @@ mod context;
 mod new_payload_fcu;
 mod new_payload_only;
 mod output;
+mod send_payload;
 
 /// `reth bench` command
 #[derive(Debug, Parser)]
@@ -28,6 +29,18 @@ pub enum Subcommands {
 
     /// Benchmark which only calls subsequent `newPayload` calls.
     NewPayloadOnly(new_payload_only::Command),
+
+    /// Command for generating and sending an `engine_newPayload` request constructed from an RPC
+    /// block.
+    ///
+    /// This command takes a JSON block input (either from a file or stdin) and generates
+    /// an execution payload that can be used with the `engine_newPayloadV*` API.
+    ///
+    /// One powerful use case is pairing this command with the `cast block` command, for example:
+    ///
+    /// `cast block latest--full --json | reth-bench send-payload --rpc-url localhost:5000
+    /// --jwt-secret $(cat ~/.local/share/reth/mainnet/jwt.hex)`
+    SendPayload(send_payload::Command),
 }
 
 impl BenchmarkCommand {
@@ -39,6 +52,7 @@ impl BenchmarkCommand {
         match self.command {
             Subcommands::NewPayloadFcu(command) => command.execute(ctx).await,
             Subcommands::NewPayloadOnly(command) => command.execute(ctx).await,
+            Subcommands::SendPayload(command) => command.execute(ctx).await,
         }
     }
 

bin/reth-bench/src/bench/new_payload_fcu.rs

@@ -12,14 +12,13 @@ use crate::{
     valid_payload::{call_forkchoice_updated, call_new_payload},
 };
 use alloy_provider::Provider;
-use alloy_rpc_types_engine::ForkchoiceState;
+use alloy_rpc_types_engine::{ExecutionPayload, ForkchoiceState};
 use clap::Parser;
 use csv::Writer;
+use humantime::parse_duration;
 use reth_cli_runner::CliContext;
 use reth_node_core::args::BenchmarkArgs;
-use reth_primitives::{Block, B256};
-use reth_rpc_types_compat::engine::payload::block_to_payload;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 use tracing::{debug, info};
 
 /// `reth benchmark new-payload-fcu` command
@@ -29,6 +28,10 @@ pub struct Command {
     #[arg(long, value_name = "RPC_URL", verbatim_doc_comment)]
     rpc_url: String,
 
+    /// How long to wait after a forkchoice update before sending the next payload.
+    #[arg(long, value_name = "WAIT_TIME", value_parser = parse_duration, verbatim_doc_comment)]
+    wait_time: Option<Duration>,
+
     #[command(flatten)]
     benchmark: BenchmarkArgs,
 }
@@ -36,23 +39,37 @@ pub struct Command {
 impl Command {
     /// Execute `benchmark new-payload-fcu` command
     pub async fn execute(self, _ctx: CliContext) -> eyre::Result<()> {
-        let cloned_args = self.benchmark.clone();
         let BenchContext { benchmark_mode, block_provider, auth_provider, mut next_block } =
-            BenchContext::new(&cloned_args, self.rpc_url).await?;
+            BenchContext::new(&self.benchmark, self.rpc_url).await?;
 
         let (sender, mut receiver) = tokio::sync::mpsc::channel(1000);
         tokio::task::spawn(async move {
             while benchmark_mode.contains(next_block) {
-                let block_res = block_provider.get_block_by_number(next_block.into(), true).await;
+                let block_res = block_provider.get_block_by_number(next_block.into()).full().await;
                 let block = block_res.unwrap().unwrap();
-                let block_hash = block.header.hash;
-                let block = Block::try_from(block.inner).unwrap().seal(block_hash);
-                let head_block_hash = block.hash();
-                let safe_block_hash = block_provider
-                    .get_block_by_number(block.number.saturating_sub(32).into(), false);
 
-                let finalized_block_hash = block_provider
-                    .get_block_by_number(block.number.saturating_sub(64).into(), false);
+                let block = block
+                    .into_inner()
+                    .map_header(|header| header.map(|h| h.into_header_with_defaults()))
+                    .try_map_transactions(|tx| {
+                        // try to convert unknowns into op type so that we can also support optimism
+                        tx.try_into_either::<op_alloy_consensus::OpTxEnvelope>()
+                    })
+                    .unwrap()
+                    .into_consensus();
+
+                let blob_versioned_hashes =
+                    block.body.blob_versioned_hashes_iter().copied().collect::<Vec<_>>();
+
+                // Convert to execution payload
+                let (payload, sidecar) = ExecutionPayload::from_block_slow(&block);
+                let header = block.header;
+                let head_block_hash = payload.block_hash();
+                let safe_block_hash =
+                    block_provider.get_block_by_number(header.number.saturating_sub(32).into());
+
+                let finalized_block_hash =
+                    block_provider.get_block_by_number(header.number.saturating_sub(64).into());
 
                 let (safe, finalized) = tokio::join!(safe_block_hash, finalized_block_hash,);
 
@@ -62,7 +79,15 @@ impl Command {
 
                 next_block += 1;
                 sender
-                    .send((block, head_block_hash, safe_block_hash, finalized_block_hash))
+                    .send((
+                        header,
+                        blob_versioned_hashes,
+                        payload,
+                        sidecar,
+                        head_block_hash,
+                        safe_block_hash,
+                        finalized_block_hash,
+                    ))
                     .await
                     .unwrap();
             }
@@ -71,18 +96,19 @@ impl Command {
         // put results in a summary vec so they can be printed at the end
         let mut results = Vec::new();
         let total_benchmark_duration = Instant::now();
+        let mut total_wait_time = Duration::ZERO;
 
-        while let Some((block, head, safe, finalized)) = receiver.recv().await {
+        while let Some((header, versioned_hashes, payload, sidecar, head, safe, finalized)) = {
+            let wait_start = Instant::now();
+            let result = receiver.recv().await;
+            total_wait_time += wait_start.elapsed();
+            result
+        } {
             // just put gas used here
-            let gas_used = block.header.gas_used;
-            let block_number = block.header.number;
+            let gas_used = header.gas_used;
+            let block_number = header.number;
 
-            let versioned_hashes: Vec<B256> =
-                block.blob_versioned_hashes().into_iter().copied().collect();
-            let parent_beacon_block_root = block.parent_beacon_block_root;
-            let payload = block_to_payload(block);
-
-            debug!(?block_number, "Sending payload",);
+            debug!(target: "reth-bench", ?block_number, "Sending payload",);
 
             // construct fcu to call
             let forkchoice_state = ForkchoiceState {
@@ -95,7 +121,8 @@ impl Command {
             let message_version = call_new_payload(
                 &auth_provider,
                 payload,
-                parent_beacon_block_root,
+                sidecar,
+                header.parent_beacon_block_root,
                 versioned_hashes,
             )
             .await?;
@@ -111,12 +138,18 @@ impl Command {
             let combined_result =
                 CombinedResult { block_number, new_payload_result, fcu_latency, total_latency };
 
-            // current duration since the start of the benchmark
-            let current_duration = total_benchmark_duration.elapsed();
+            // current duration since the start of the benchmark minus the time
+            // waiting for blocks
+            let current_duration = total_benchmark_duration.elapsed() - total_wait_time;
 
             // convert gas used to gigagas, then compute gigagas per second
             info!(%combined_result);
 
+            // wait if we need to
+            if let Some(wait_time) = self.wait_time {
+                tokio::time::sleep(wait_time).await;
+            }
+
             // record the current result
             let gas_row = TotalGasRow { block_number, gas_used, time: current_duration };
             results.push((gas_row, combined_result));

bin/reth-bench/src/bench/new_payload_only.rs

@@ -11,13 +11,12 @@ use crate::{
     valid_payload::call_new_payload,
 };
 use alloy_provider::Provider;
+use alloy_rpc_types_engine::ExecutionPayload;
 use clap::Parser;
 use csv::Writer;
 use reth_cli_runner::CliContext;
 use reth_node_core::args::BenchmarkArgs;
-use reth_primitives::{Block, B256};
-use reth_rpc_types_compat::engine::payload::block_to_payload;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 use tracing::{debug, info};
 
 /// `reth benchmark new-payload-only` command
@@ -34,54 +33,70 @@ pub struct Command {
 impl Command {
     /// Execute `benchmark new-payload-only` command
     pub async fn execute(self, _ctx: CliContext) -> eyre::Result<()> {
-        let cloned_args = self.benchmark.clone();
-        // TODO: this could be just a function I guess, but destructuring makes the code slightly
-        // more readable than a 4 element tuple.
         let BenchContext { benchmark_mode, block_provider, auth_provider, mut next_block } =
-            BenchContext::new(&cloned_args, self.rpc_url).await?;
+            BenchContext::new(&self.benchmark, self.rpc_url).await?;
 
         let (sender, mut receiver) = tokio::sync::mpsc::channel(1000);
         tokio::task::spawn(async move {
             while benchmark_mode.contains(next_block) {
-                let block_res = block_provider.get_block_by_number(next_block.into(), true).await;
+                let block_res = block_provider.get_block_by_number(next_block.into()).full().await;
                 let block = block_res.unwrap().unwrap();
-                let block_hash = block.header.hash;
-                let block = Block::try_from(block.inner).unwrap().seal(block_hash);
+                let block = block
+                    .into_inner()
+                    .map_header(|header| header.map(|h| h.into_header_with_defaults()))
+                    .try_map_transactions(|tx| {
+                        tx.try_into_either::<op_alloy_consensus::OpTxEnvelope>()
+                    })
+                    .unwrap()
+                    .into_consensus();
+
+                let blob_versioned_hashes =
+                    block.body.blob_versioned_hashes_iter().copied().collect::<Vec<_>>();
+                let (payload, sidecar) = ExecutionPayload::from_block_slow(&block);
 
                 next_block += 1;
-                sender.send(block).await.unwrap();
+                sender.send((block.header, blob_versioned_hashes, payload, sidecar)).await.unwrap();
             }
         });
 
         // put results in a summary vec so they can be printed at the end
         let mut results = Vec::new();
         let total_benchmark_duration = Instant::now();
+        let mut total_wait_time = Duration::ZERO;
 
-        while let Some(block) = receiver.recv().await {
+        while let Some((header, versioned_hashes, payload, sidecar)) = {
+            let wait_start = Instant::now();
+            let result = receiver.recv().await;
+            total_wait_time += wait_start.elapsed();
+            result
+        } {
             // just put gas used here
-            let gas_used = block.header.gas_used;
-
-            let versioned_hashes: Vec<B256> =
-                block.blob_versioned_hashes().into_iter().copied().collect();
-            let parent_beacon_block_root = block.parent_beacon_block_root;
-            let payload = block_to_payload(block);
+            let gas_used = header.gas_used;
 
             let block_number = payload.block_number();
 
             debug!(
-                number=?payload.block_number(),
+                target: "reth-bench",
+                number=?header.number,
                 "Sending payload to engine",
             );
 
             let start = Instant::now();
-            call_new_payload(&auth_provider, payload, parent_beacon_block_root, versioned_hashes)
-                .await?;
+            call_new_payload(
+                &auth_provider,
+                payload,
+                sidecar,
+                header.parent_beacon_block_root,
+                versioned_hashes,
+            )
+            .await?;
 
             let new_payload_result = NewPayloadResult { gas_used, latency: start.elapsed() };
             info!(%new_payload_result);
 
-            // current duration since the start of the benchmark
-            let current_duration = total_benchmark_duration.elapsed();
+            // current duration since the start of the benchmark minus the time
+            // waiting for blocks
+            let current_duration = total_benchmark_duration.elapsed() - total_wait_time;
 
             // record the current result
             let row = TotalGasRow { block_number, gas_used, time: current_duration };

bin/reth-bench/src/bench/output.rs

@@ -1,7 +1,7 @@
 //! Contains various benchmark output formats, either for logging or for
 //! serialization to / from files.
 
-use reth_primitives::constants::gas_units::GIGAGAS;
+use reth_primitives_traits::constants::GIGAGAS;
 use serde::{ser::SerializeStruct, Serialize};
 use std::time::Duration;
 
@@ -123,7 +123,6 @@ impl Serialize for CombinedResult {
 #[derive(Debug)]
 pub(crate) struct TotalGasRow {
     /// The block number of the block being processed.
-    #[allow(dead_code)]
     pub(crate) block_number: u64,
     /// The total gas used in the block.
     pub(crate) gas_used: u64,

bin/reth-bench/src/bench/send_payload.rs

@@ -0,0 +1,174 @@
+use alloy_provider::network::AnyRpcBlock;
+use alloy_rpc_types_engine::ExecutionPayload;
+use clap::Parser;
+use eyre::{OptionExt, Result};
+use op_alloy_consensus::OpTxEnvelope;
+use reth_cli_runner::CliContext;
+use std::io::{BufReader, Read, Write};
+
+/// Command for generating and sending an `engine_newPayload` request constructed from an RPC
+/// block.
+#[derive(Debug, Parser)]
+pub struct Command {
+    /// Path to the json file to parse. If not specified, stdin will be used.
+    #[arg(short, long)]
+    path: Option<String>,
+
+    /// The engine RPC url to use.
+    #[arg(
+        short,
+        long,
+        // Required if `mode` is `execute` or `cast`.
+        required_if_eq_any([("mode", "execute"), ("mode", "cast")]),
+        // If `mode` is not specified, then `execute` is used, so we need to require it.
+        required_unless_present("mode")
+    )]
+    rpc_url: Option<String>,
+
+    /// The JWT secret to use. Can be either a path to a file containing the secret or the secret
+    /// itself.
+    #[arg(short, long)]
+    jwt_secret: Option<String>,
+
+    #[arg(long, default_value_t = 3)]
+    new_payload_version: u8,
+
+    /// The mode to use.
+    #[arg(long, value_enum, default_value = "execute")]
+    mode: Mode,
+}
+
+#[derive(Debug, Clone, clap::ValueEnum)]
+enum Mode {
+    /// Execute the `cast` command. This works with blocks of any size, because it pipes the
+    /// payload into the `cast` command.
+    Execute,
+    /// Print the `cast` command. Caution: this may not work with large blocks because of the
+    /// command length limit.
+    Cast,
+    /// Print the JSON payload. Can be piped into `cast` command if the block is small enough.
+    Json,
+}
+
+impl Command {
+    /// Read input from either a file or stdin
+    fn read_input(&self) -> Result<String> {
+        Ok(match &self.path {
+            Some(path) => reth_fs_util::read_to_string(path)?,
+            None => String::from_utf8(
+                BufReader::new(std::io::stdin()).bytes().collect::<Result<Vec<_>, _>>()?,
+            )?,
+        })
+    }
+
+    /// Load JWT secret from either a file or use the provided string directly
+    fn load_jwt_secret(&self) -> Result<Option<String>> {
+        match &self.jwt_secret {
+            Some(secret) => {
+                // Try to read as file first
+                match std::fs::read_to_string(secret) {
+                    Ok(contents) => Ok(Some(contents.trim().to_string())),
+                    // If file read fails, use the string directly
+                    Err(_) => Ok(Some(secret.clone())),
+                }
+            }
+            None => Ok(None),
+        }
+    }
+
+    /// Execute the generate payload command
+    pub async fn execute(self, _ctx: CliContext) -> Result<()> {
+        // Load block
+        let block_json = self.read_input()?;
+
+        // Load JWT secret
+        let jwt_secret = self.load_jwt_secret()?;
+
+        // Parse the block
+        let block = serde_json::from_str::<AnyRpcBlock>(&block_json)?
+            .into_inner()
+            .map_header(|header| header.map(|h| h.into_header_with_defaults()))
+            .try_map_transactions(|tx| {
+                // try to convert unknowns into op type so that we can also support optimism
+                tx.try_into_either::<OpTxEnvelope>()
+            })?
+            .into_consensus();
+
+        // Extract parent beacon block root
+        let parent_beacon_block_root = block.header.parent_beacon_block_root;
+
+        // Extract blob versioned hashes
+        let blob_versioned_hashes =
+            block.body.blob_versioned_hashes_iter().copied().collect::<Vec<_>>();
+
+        // Convert to execution payload
+        let execution_payload = ExecutionPayload::from_block_slow(&block).0;
+
+        let use_v4 = block.header.requests_hash.is_some();
+
+        // Create JSON request data
+        let json_request = if use_v4 {
+            serde_json::to_string(&(
+                execution_payload,
+                blob_versioned_hashes,
+                parent_beacon_block_root,
+                block.header.requests_hash.unwrap_or_default(),
+            ))?
+        } else {
+            serde_json::to_string(&(
+                execution_payload,
+                blob_versioned_hashes,
+                parent_beacon_block_root,
+            ))?
+        };
+
+        // Print output or execute command
+        match self.mode {
+            Mode::Execute => {
+                // Create cast command
+                let mut command = std::process::Command::new("cast");
+                let method = if use_v4 { "engine_newPayloadV4" } else { "engine_newPayloadV3" };
+                command.arg("rpc").arg(method).arg("--raw");
+                if let Some(rpc_url) = self.rpc_url {
+                    command.arg("--rpc-url").arg(rpc_url);
+                }
+                if let Some(secret) = &jwt_secret {
+                    command.arg("--jwt-secret").arg(secret);
+                }
+
+                // Start cast process
+                let mut process = command.stdin(std::process::Stdio::piped()).spawn()?;
+
+                // Write to cast's stdin
+                process
+                    .stdin
+                    .take()
+                    .ok_or_eyre("stdin not available")?
+                    .write_all(json_request.as_bytes())?;
+
+                // Wait for cast to finish
+                process.wait()?;
+            }
+            Mode::Cast => {
+                let mut cmd = format!(
+                    "cast rpc engine_newPayloadV{} --raw '{}'",
+                    self.new_payload_version, json_request
+                );
+
+                if let Some(rpc_url) = self.rpc_url {
+                    cmd += &format!(" --rpc-url {rpc_url}");
+                }
+                if let Some(secret) = &jwt_secret {
+                    cmd += &format!(" --jwt-secret {secret}");
+                }
+
+                println!("{cmd}");
+            }
+            Mode::Json => {
+                println!("{json_request}");
+            }
+        }
+
+        Ok(())
+    }
+}

bin/reth-bench/src/main.rs

@@ -3,10 +3,16 @@
 //! This is a tool that converts existing blocks into a stream of blocks for benchmarking purposes.
 //! These blocks are then fed into reth as a stream of execution payloads.
 
-// We use jemalloc for performance reasons.
-#[cfg(all(feature = "jemalloc", unix))]
+#![doc(
+    html_logo_url = "https://raw.githubusercontent.com/paradigmxyz/reth/main/assets/reth-docs.png",
+    html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
+    issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
+)]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
+#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+
 #[global_allocator]
-static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
 
 pub mod authenticated_transport;
 pub mod bench;
@@ -24,7 +30,7 @@ fn main() {
     }
 
     // Run until either exit or sigint or sigterm
-    let runner = CliRunner::default();
+    let runner = CliRunner::try_default_runtime().unwrap();
     runner
         .run_command_until_exit(|ctx| {
             let command = BenchmarkCommand::parse();

bin/reth-bench/src/valid_payload.rs

@@ -2,19 +2,20 @@
 //! response. This is useful for benchmarking, as it allows us to wait for a payload to be valid
 //! before sending additional calls.
 
-use alloy_provider::{ext::EngineApi, Network};
+use alloy_eips::eip7685::RequestsOrHash;
+use alloy_primitives::B256;
+use alloy_provider::{ext::EngineApi, Network, Provider};
 use alloy_rpc_types_engine::{
-    ExecutionPayloadInputV2, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus,
+    ExecutionPayload, ExecutionPayloadInputV2, ExecutionPayloadSidecar, ExecutionPayloadV1,
+    ExecutionPayloadV3, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus,
 };
-use alloy_transport::{Transport, TransportResult};
+use alloy_transport::TransportResult;
 use reth_node_api::EngineApiMessageVersion;
-use reth_primitives::B256;
-use reth_rpc_types::{ExecutionPayload, ExecutionPayloadV1, ExecutionPayloadV3};
 use tracing::error;
 
 /// An extension trait for providers that implement the engine API, to wait for a VALID response.
 #[async_trait::async_trait]
-pub trait EngineApiValidWaitExt<N, T>: Send + Sync {
+pub trait EngineApiValidWaitExt<N>: Send + Sync {
     /// Calls `engine_newPayloadV1` with the given [ExecutionPayloadV1], and waits until the
     /// response is VALID.
     async fn new_payload_v1_wait(
@@ -38,6 +39,16 @@ pub trait EngineApiValidWaitExt<N, T>: Send + Sync {
         parent_beacon_block_root: B256,
     ) -> TransportResult<PayloadStatus>;
 
+    /// Calls `engine_newPayloadV4` with the given [ExecutionPayloadV3], parent beacon block root,
+    /// versioned hashes, and requests hash, and waits until the response is VALID.
+    async fn new_payload_v4_wait(
+        &self,
+        payload: ExecutionPayloadV3,
+        versioned_hashes: Vec<B256>,
+        parent_beacon_block_root: B256,
+        requests_hash: B256,
+    ) -> TransportResult<PayloadStatus>;
+
     /// Calls `engine_forkChoiceUpdatedV1` with the given [ForkchoiceState] and optional
     /// [PayloadAttributes], and waits until the response is VALID.
     async fn fork_choice_updated_v1_wait(
@@ -64,11 +75,10 @@ pub trait EngineApiValidWaitExt<N, T>: Send + Sync {
 }
 
 #[async_trait::async_trait]
-impl<T, N, P> EngineApiValidWaitExt<N, T> for P
+impl<N, P> EngineApiValidWaitExt<N> for P
 where
     N: Network,
-    T: Transport + Clone,
-    P: EngineApi<N, T>,
+    P: Provider<N> + EngineApi<N>,
 {
     async fn new_payload_v1_wait(
         &self,
@@ -120,6 +130,11 @@ where
                 );
                 panic!("Invalid newPayloadV3: {status:?}");
             }
+            if status.is_syncing() {
+                return Err(alloy_json_rpc::RpcError::UnsupportedFeature(
+                    "invalid range: no canonical state found for parent of requested block",
+                ))
+            }
             status = self
                 .new_payload_v3(payload.clone(), versioned_hashes.clone(), parent_beacon_block_root)
                 .await?;
@@ -127,6 +142,60 @@ where
         Ok(status)
     }
 
+    async fn new_payload_v4_wait(
+        &self,
+        payload: ExecutionPayloadV3,
+        versioned_hashes: Vec<B256>,
+        parent_beacon_block_root: B256,
+        requests_hash: B256,
+    ) -> TransportResult<PayloadStatus> {
+        // We cannot use `self.new_payload_v4` because it does not support sending
+        // `RequestsOrHash::Hash`
+
+        let mut status: PayloadStatus = self
+            .client()
+            .request(
+                "engine_newPayloadV4",
+                (
+                    payload.clone(),
+                    versioned_hashes.clone(),
+                    parent_beacon_block_root,
+                    RequestsOrHash::Hash(requests_hash),
+                ),
+            )
+            .await?;
+        while !status.is_valid() {
+            if status.is_invalid() {
+                error!(
+                    ?status,
+                    ?payload,
+                    ?versioned_hashes,
+                    ?parent_beacon_block_root,
+                    "Invalid newPayloadV4",
+                );
+                panic!("Invalid newPayloadV4: {status:?}");
+            }
+            if status.is_syncing() {
+                return Err(alloy_json_rpc::RpcError::UnsupportedFeature(
+                    "invalid range: no canonical state found for parent of requested block",
+                ))
+            }
+            status = self
+                .client()
+                .request(
+                    "engine_newPayloadV4",
+                    (
+                        payload.clone(),
+                        versioned_hashes.clone(),
+                        parent_beacon_block_root,
+                        RequestsOrHash::Hash(requests_hash),
+                    ),
+                )
+                .await?;
+        }
+        Ok(status)
+    }
+
     async fn fork_choice_updated_v1_wait(
         &self,
         fork_choice_state: ForkchoiceState,
@@ -145,6 +214,11 @@ where
                 );
                 panic!("Invalid forkchoiceUpdatedV1: {status:?}");
             }
+            if status.is_syncing() {
+                return Err(alloy_json_rpc::RpcError::UnsupportedFeature(
+                    "invalid range: no canonical state found for parent of requested block",
+                ))
+            }
             status =
                 self.fork_choice_updated_v1(fork_choice_state, payload_attributes.clone()).await?;
         }
@@ -170,6 +244,11 @@ where
                 );
                 panic!("Invalid forkchoiceUpdatedV2: {status:?}");
             }
+            if status.is_syncing() {
+                return Err(alloy_json_rpc::RpcError::UnsupportedFeature(
+                    "invalid range: no canonical state found for parent of requested block",
+                ))
+            }
             status =
                 self.fork_choice_updated_v2(fork_choice_state, payload_attributes.clone()).await?;
         }
@@ -208,30 +287,35 @@ where
 ///
 /// # Panics
 /// If the given payload is a V3 payload, but a parent beacon block root is provided as `None`.
-pub(crate) async fn call_new_payload<N, T, P: EngineApiValidWaitExt<N, T>>(
+pub(crate) async fn call_new_payload<N, P: EngineApiValidWaitExt<N>>(
     provider: P,
     payload: ExecutionPayload,
+    sidecar: ExecutionPayloadSidecar,
     parent_beacon_block_root: Option<B256>,
     versioned_hashes: Vec<B256>,
 ) -> TransportResult<EngineApiMessageVersion> {
     match payload {
-        ExecutionPayload::V4(_payload) => {
-            todo!("V4 payloads not supported yet");
-            // auth_provider
-            //     .new_payload_v4_wait(payload, versioned_hashes, parent_beacon_block_root, ...)
-            //     .await?;
-            //
-            // Ok(EngineApiMessageVersion::V4)
-        }
         ExecutionPayload::V3(payload) => {
             // We expect the caller
             let parent_beacon_block_root = parent_beacon_block_root
-                .expect("parent_beacon_block_root is required for V3 payloads");
-            provider
-                .new_payload_v3_wait(payload, versioned_hashes, parent_beacon_block_root)
-                .await?;
+                .expect("parent_beacon_block_root is required for V3 payloads and higher");
 
-            Ok(EngineApiMessageVersion::V3)
+            if let Some(requests_hash) = sidecar.requests_hash() {
+                provider
+                    .new_payload_v4_wait(
+                        payload,
+                        versioned_hashes,
+                        parent_beacon_block_root,
+                        requests_hash,
+                    )
+                    .await?;
+                Ok(EngineApiMessageVersion::V4)
+            } else {
+                provider
+                    .new_payload_v3_wait(payload, versioned_hashes, parent_beacon_block_root)
+                    .await?;
+                Ok(EngineApiMessageVersion::V3)
+            }
         }
         ExecutionPayload::V2(payload) => {
             let input = ExecutionPayloadInputV2 {
@@ -254,15 +338,14 @@ pub(crate) async fn call_new_payload<N, T, P: EngineApiValidWaitExt<N, T>>(
 /// Calls the correct `engine_forkchoiceUpdated` method depending on the given
 /// `EngineApiMessageVersion`, using the provided forkchoice state and payload attributes for the
 /// actual engine api message call.
-pub(crate) async fn call_forkchoice_updated<N, T, P: EngineApiValidWaitExt<N, T>>(
+pub(crate) async fn call_forkchoice_updated<N, P: EngineApiValidWaitExt<N>>(
     provider: P,
     message_version: EngineApiMessageVersion,
     forkchoice_state: ForkchoiceState,
     payload_attributes: Option<PayloadAttributes>,
 ) -> TransportResult<ForkchoiceUpdated> {
     match message_version {
-        EngineApiMessageVersion::V4 => todo!("V4 payloads not supported yet"),
-        EngineApiMessageVersion::V3 => {
+        EngineApiMessageVersion::V3 | EngineApiMessageVersion::V4 | EngineApiMessageVersion::V5 => {
             provider.fork_choice_updated_v3_wait(forkchoice_state, payload_attributes).await
         }
         EngineApiMessageVersion::V2 => {

bin/reth/Cargo.toml

@@ -14,145 +14,119 @@ workspace = true
 
 [dependencies]
 # reth
+reth-ethereum-cli.workspace = true
 reth-chainspec.workspace = true
-reth-config.workspace = true
 reth-primitives.workspace = true
-reth-fs-util.workspace = true
 reth-db = { workspace = true, features = ["mdbx"] }
-reth-db-api.workspace = true
-reth-exex.workspace = true
 reth-provider.workspace = true
 reth-evm.workspace = true
 reth-revm.workspace = true
-reth-stages.workspace = true
-reth-execution-types.workspace = true
-reth-errors.workspace = true
 reth-transaction-pool.workspace = true
-reth-beacon-consensus.workspace = true
 reth-cli-runner.workspace = true
-reth-cli-commands.workspace = true
 reth-cli-util.workspace = true
 reth-consensus-common.workspace = true
-reth-blockchain-tree.workspace = true
 reth-rpc-builder.workspace = true
 reth-rpc.workspace = true
-reth-rpc-types.workspace = true
 reth-rpc-types-compat.workspace = true
 reth-rpc-api = { workspace = true, features = ["client"] }
 reth-rpc-eth-types.workspace = true
 reth-rpc-server-types.workspace = true
 reth-network = { workspace = true, features = ["serde"] }
-reth-network-p2p.workspace = true
 reth-network-api.workspace = true
-reth-downloaders.workspace = true
-reth-tracing.workspace = true
 reth-tasks.workspace = true
 reth-payload-builder.workspace = true
 reth-payload-primitives.workspace = true
-reth-payload-validator.workspace = true
-reth-basic-payload-builder.workspace = true
-reth-static-file.workspace = true
-reth-static-file-types = { workspace = true, features = ["clap"] }
-reth-trie = { workspace = true, features = ["metrics"] }
-reth-trie-db = { workspace = true, features = ["metrics"] }
 reth-node-api.workspace = true
-reth-node-optimism = { workspace = true, optional = true, features = [
-    "optimism",
-] }
 reth-node-core.workspace = true
 reth-ethereum-payload-builder.workspace = true
-reth-db-common.workspace = true
-reth-node-ethereum.workspace = true
+reth-ethereum-primitives.workspace = true
+reth-node-ethereum = { workspace = true, features = ["js-tracer"] }
 reth-node-builder.workspace = true
-reth-node-events.workspace = true
 reth-node-metrics.workspace = true
 reth-consensus.workspace = true
-reth-optimism-primitives.workspace = true
-reth-engine-util.workspace = true
-reth-prune.workspace = true
-reth-stages-api.workspace = true
-reth-optimism-cli = { workspace = true, optional = true }
-reth-optimism-rpc.workspace = true
+reth-tokio-util.workspace = true
+reth-ress-protocol.workspace = true
+reth-ress-provider.workspace = true
 
-# crypto
-alloy-rlp.workspace = true
+# alloy
+alloy-rpc-types = { workspace = true, features = ["engine"] }
 
 # tracing
 tracing.workspace = true
 
-# io
-fdlimit.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-toml = { workspace = true, features = ["display"] }
-
-# metrics
-metrics-process.workspace = true
-
 # async
-tokio = { workspace = true, features = [
-    "sync",
-    "macros",
-    "time",
-    "rt-multi-thread",
-] }
-futures.workspace = true
+tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thread"] }
 
 # misc
 aquamarine.workspace = true
-eyre.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
-tempfile.workspace = true
-backon.workspace = true
-similar-asserts.workspace = true
-itertools.workspace = true
-
-# p2p
-discv5.workspace = true
-
-[target.'cfg(unix)'.dependencies]
-tikv-jemallocator = { version = "0.5.0", optional = true }
-libc = "0.2"
+eyre.workspace = true
 
 [dev-dependencies]
-reth-discv4.workspace = true
+backon.workspace = true
+similar-asserts.workspace = true
+tempfile.workspace = true
 
 [features]
-default = ["jemalloc"]
+default = ["jemalloc", "reth-revm/portable"]
 
-dev = ["reth-cli-commands/dev"]
+dev = ["reth-ethereum-cli/dev"]
 
-asm-keccak = ["reth-node-core/asm-keccak", "reth-primitives/asm-keccak"]
-
-jemalloc = ["dep:tikv-jemallocator", "reth-node-core/jemalloc", "reth-node-metrics/jemalloc"]
-jemalloc-prof = ["jemalloc", "tikv-jemallocator?/profiling"]
-
-min-error-logs = ["tracing/release_max_level_error"]
-min-warn-logs = ["tracing/release_max_level_warn"]
-min-info-logs = ["tracing/release_max_level_info"]
-min-debug-logs = ["tracing/release_max_level_debug"]
-min-trace-logs = ["tracing/release_max_level_trace"]
-
-optimism = [
-    "dep:reth-node-optimism",
-    "dep:reth-optimism-cli",
-    "reth-beacon-consensus/optimism",
-    "reth-blockchain-tree/optimism",
-    "reth-node-core/optimism",
-    "reth-optimism-cli?/optimism",
-    "reth-primitives/optimism",
-    "reth-provider/optimism",
-    "reth-rpc/optimism",
+asm-keccak = [
+    "reth-node-core/asm-keccak",
+    "reth-primitives/asm-keccak",
+    "reth-ethereum-cli/asm-keccak",
 ]
 
-# no-op feature flag for switching between the `optimism` and default functionality in CI matrices
-ethereum = []
+jemalloc = [
+    "reth-cli-util/jemalloc",
+    "reth-node-core/jemalloc",
+    "reth-node-metrics/jemalloc",
+    "reth-ethereum-cli/jemalloc",
+]
+jemalloc-prof = [
+    "reth-cli-util/jemalloc",
+    "reth-cli-util/jemalloc-prof",
+    "reth-ethereum-cli/jemalloc-prof",
+]
+tracy-allocator = [
+    "reth-cli-util/tracy-allocator",
+    "reth-ethereum-cli/tracy-allocator",
+]
+
+# Because jemalloc is default and preferred over snmalloc when both features are
+# enabled, `--no-default-features` should be used when enabling snmalloc or
+# snmalloc-native.
+snmalloc = [
+    "reth-cli-util/snmalloc",
+    "reth-ethereum-cli/snmalloc",
+]
+snmalloc-native = [
+    "reth-cli-util/snmalloc-native",
+    "reth-ethereum-cli/snmalloc-native",
+]
+
+min-error-logs = [
+    "tracing/release_max_level_error",
+    "reth-ethereum-cli/min-error-logs",
+]
+min-warn-logs = [
+    "tracing/release_max_level_warn",
+    "reth-ethereum-cli/min-warn-logs",
+]
+min-info-logs = [
+    "tracing/release_max_level_info",
+    "reth-ethereum-cli/min-info-logs",
+]
+min-debug-logs = [
+    "tracing/release_max_level_debug",
+    "reth-ethereum-cli/min-debug-logs",
+]
+min-trace-logs = [
+    "tracing/release_max_level_trace",
+    "reth-ethereum-cli/min-trace-logs",
+]
 
 [[bin]]
 name = "reth"
 path = "src/main.rs"
-
-[[bin]]
-name = "op-reth"
-path = "src/optimism.rs"
-required-features = ["optimism"]

bin/reth/src/cli/mod.rs

@@ -1,310 +1,15 @@
 //! CLI definition and entrypoint to executable
 
-use crate::{
-    args::{
-        utils::{chain_help, chain_value_parser, SUPPORTED_CHAINS},
-        LogArgs,
-    },
-    commands::debug_cmd,
-    macros::block_executor,
-    version::{LONG_VERSION, SHORT_VERSION},
-};
-use clap::{value_parser, Parser, Subcommand};
-use reth_chainspec::ChainSpec;
-use reth_cli_commands::{
-    config_cmd, db, dump_genesis, import, init_cmd, init_state,
-    node::{self, NoArgs},
-    p2p, prune, recover, stage,
-};
-use reth_cli_runner::CliRunner;
-use reth_db::DatabaseEnv;
-use reth_node_builder::{NodeBuilder, WithLaunchContext};
-use reth_tracing::FileWorkerGuard;
-use std::{ffi::OsString, fmt, future::Future, sync::Arc};
-use tracing::info;
-
-/// Re-export of the `reth_node_core` types specifically in the `cli` module.
+/// Re-export of the [`reth_node_core`] types specifically in the `cli` module.
 ///
 /// This is re-exported because the types in `reth_node_core::cli` originally existed in
-/// `reth::cli` but were moved to the `reth_node_core` crate. This re-export avoids a breaking
-/// change.
+/// `reth::cli` but were moved to the [`reth_node_core`] crate. This re-export avoids a
+/// breaking change.
 pub use crate::core::cli::*;
 
-/// The main reth cli interface.
+/// Re-export of the [`reth_ethereum_cli`] types specifically in the `interface` module.
 ///
-/// This is the entrypoint to the executable.
-#[derive(Debug, Parser)]
-#[command(author, version = SHORT_VERSION, long_version = LONG_VERSION, about = "Reth", long_about = None)]
-pub struct Cli<Ext: clap::Args + fmt::Debug = NoArgs> {
-    /// The command to run
-    #[command(subcommand)]
-    command: Commands<Ext>,
-
-    /// The chain this node is running.
-    ///
-    /// Possible values are either a built-in chain or the path to a chain specification file.
-    #[arg(
-        long,
-        value_name = "CHAIN_OR_PATH",
-        long_help = chain_help(),
-        default_value = SUPPORTED_CHAINS[0],
-        value_parser = chain_value_parser,
-        global = true,
-    )]
-    chain: Arc<ChainSpec>,
-
-    /// Add a new instance of a node.
-    ///
-    /// Configures the ports of the node to avoid conflicts with the defaults.
-    /// This is useful for running multiple nodes on the same machine.
-    ///
-    /// Max number of instances is 200. It is chosen in a way so that it's not possible to have
-    /// port numbers that conflict with each other.
-    ///
-    /// Changes to the following port numbers:
-    /// - `DISCOVERY_PORT`: default + `instance` - 1
-    /// - `AUTH_PORT`: default + `instance` * 100 - 100
-    /// - `HTTP_RPC_PORT`: default - `instance` + 1
-    /// - `WS_RPC_PORT`: default + `instance` * 2 - 2
-    #[arg(long, value_name = "INSTANCE", global = true, default_value_t = 1, value_parser = value_parser!(u16).range(..=200))]
-    instance: u16,
-
-    #[command(flatten)]
-    logs: LogArgs,
-}
-
-impl Cli {
-    /// Parsers only the default CLI arguments
-    pub fn parse_args() -> Self {
-        Self::parse()
-    }
-
-    /// Parsers only the default CLI arguments from the given iterator
-    pub fn try_parse_args_from<I, T>(itr: I) -> Result<Self, clap::error::Error>
-    where
-        I: IntoIterator<Item = T>,
-        T: Into<OsString> + Clone,
-    {
-        Self::try_parse_from(itr)
-    }
-}
-
-impl<Ext: clap::Args + fmt::Debug> Cli<Ext> {
-    /// Execute the configured cli command.
-    ///
-    /// This accepts a closure that is used to launch the node via the
-    /// [`NodeCommand`](node::NodeCommand).
-    ///
-    ///
-    /// # Example
-    ///
-    /// ```no_run
-    /// use reth::cli::Cli;
-    /// use reth_node_ethereum::EthereumNode;
-    ///
-    /// Cli::parse_args()
-    ///     .run(|builder, _| async move {
-    ///         let handle = builder.launch_node(EthereumNode::default()).await?;
-    ///
-    ///         handle.wait_for_node_exit().await
-    ///     })
-    ///     .unwrap();
-    /// ```
-    ///
-    /// # Example
-    ///
-    /// Parse additional CLI arguments for the node command and use it to configure the node.
-    ///
-    /// ```no_run
-    /// use clap::Parser;
-    /// use reth::cli::Cli;
-    ///
-    /// #[derive(Debug, Parser)]
-    /// pub struct MyArgs {
-    ///     pub enable: bool,
-    /// }
-    ///
-    /// Cli::parse()
-    ///     .run(|builder, my_args: MyArgs| async move {
-    ///         // launch the node
-    ///
-    ///         Ok(())
-    ///     })
-    ///     .unwrap();
-    /// ````
-    pub fn run<L, Fut>(mut self, launcher: L) -> eyre::Result<()>
-    where
-        L: FnOnce(WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>>>, Ext) -> Fut,
-        Fut: Future<Output = eyre::Result<()>>,
-    {
-        // add network name to logs dir
-        self.logs.log_file_directory =
-            self.logs.log_file_directory.join(self.chain.chain.to_string());
-
-        let _guard = self.init_tracing()?;
-        info!(target: "reth::cli", "Initialized tracing, debug log directory: {}", self.logs.log_file_directory);
-
-        let runner = CliRunner::default();
-        match self.command {
-            Commands::Node(command) => {
-                runner.run_command_until_exit(|ctx| command.execute(ctx, launcher))
-            }
-            Commands::Init(command) => runner.run_blocking_until_ctrl_c(command.execute()),
-            Commands::InitState(command) => runner.run_blocking_until_ctrl_c(command.execute()),
-            Commands::Import(command) => runner.run_blocking_until_ctrl_c(
-                command.execute(|chain_spec| block_executor!(chain_spec)),
-            ),
-            #[cfg(feature = "optimism")]
-            Commands::ImportOp(command) => runner.run_blocking_until_ctrl_c(command.execute()),
-            #[cfg(feature = "optimism")]
-            Commands::ImportReceiptsOp(command) => {
-                runner.run_blocking_until_ctrl_c(command.execute())
-            }
-            Commands::DumpGenesis(command) => runner.run_blocking_until_ctrl_c(command.execute()),
-            Commands::Db(command) => runner.run_blocking_until_ctrl_c(command.execute()),
-            Commands::Stage(command) => runner.run_command_until_exit(|ctx| {
-                command.execute(ctx, |chain_spec| block_executor!(chain_spec))
-            }),
-            Commands::P2P(command) => runner.run_until_ctrl_c(command.execute()),
-            #[cfg(feature = "dev")]
-            Commands::TestVectors(command) => runner.run_until_ctrl_c(command.execute()),
-            Commands::Config(command) => runner.run_until_ctrl_c(command.execute()),
-            Commands::Debug(command) => runner.run_command_until_exit(|ctx| command.execute(ctx)),
-            Commands::Recover(command) => runner.run_command_until_exit(|ctx| command.execute(ctx)),
-            Commands::Prune(command) => runner.run_until_ctrl_c(command.execute()),
-        }
-    }
-
-    /// Initializes tracing with the configured options.
-    ///
-    /// If file logging is enabled, this function returns a guard that must be kept alive to ensure
-    /// that all logs are flushed to disk.
-    pub fn init_tracing(&self) -> eyre::Result<Option<FileWorkerGuard>> {
-        let guard = self.logs.init_tracing()?;
-        Ok(guard)
-    }
-}
-
-/// Commands to be executed
-#[derive(Debug, Subcommand)]
-pub enum Commands<Ext: clap::Args + fmt::Debug = NoArgs> {
-    /// Start the node
-    #[command(name = "node")]
-    Node(node::NodeCommand<Ext>),
-    /// Initialize the database from a genesis file.
-    #[command(name = "init")]
-    Init(init_cmd::InitCommand),
-    /// Initialize the database from a state dump file.
-    #[command(name = "init-state")]
-    InitState(init_state::InitStateCommand),
-    /// This syncs RLP encoded blocks from a file.
-    #[command(name = "import")]
-    Import(import::ImportCommand),
-    /// This syncs RLP encoded OP blocks below Bedrock from a file, without executing.
-    #[cfg(feature = "optimism")]
-    #[command(name = "import-op")]
-    ImportOp(reth_optimism_cli::ImportOpCommand),
-    /// This imports RLP encoded receipts from a file.
-    #[cfg(feature = "optimism")]
-    #[command(name = "import-receipts-op")]
-    ImportReceiptsOp(reth_optimism_cli::ImportReceiptsOpCommand),
-    /// Dumps genesis block JSON configuration to stdout.
-    DumpGenesis(dump_genesis::DumpGenesisCommand),
-    /// Database debugging utilities
-    #[command(name = "db")]
-    Db(db::Command),
-    /// Manipulate individual stages.
-    #[command(name = "stage")]
-    Stage(stage::Command),
-    /// P2P Debugging utilities
-    #[command(name = "p2p")]
-    P2P(p2p::Command),
-    /// Generate Test Vectors
-    #[cfg(feature = "dev")]
-    #[command(name = "test-vectors")]
-    TestVectors(reth_cli_commands::test_vectors::Command),
-    /// Write config to stdout
-    #[command(name = "config")]
-    Config(config_cmd::Command),
-    /// Various debug routines
-    #[command(name = "debug")]
-    Debug(debug_cmd::Command),
-    /// Scripts for node recovery
-    #[command(name = "recover")]
-    Recover(recover::Command),
-    /// Prune according to the configuration without any limits
-    #[command(name = "prune")]
-    Prune(prune::PruneCommand),
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::args::ColorMode;
-    use clap::CommandFactory;
-
-    #[test]
-    fn parse_color_mode() {
-        let reth = Cli::try_parse_args_from(["reth", "node", "--color", "always"]).unwrap();
-        assert_eq!(reth.logs.color, ColorMode::Always);
-    }
-
-    /// Tests that the help message is parsed correctly. This ensures that clap args are configured
-    /// correctly and no conflicts are introduced via attributes that would result in a panic at
-    /// runtime
-    #[test]
-    fn test_parse_help_all_subcommands() {
-        let reth = Cli::<NoArgs>::command();
-        for sub_command in reth.get_subcommands() {
-            let err = Cli::try_parse_args_from(["reth", sub_command.get_name(), "--help"])
-                .err()
-                .unwrap_or_else(|| {
-                    panic!("Failed to parse help message {}", sub_command.get_name())
-                });
-
-            // --help is treated as error, but
-            // > Not a true "error" as it means --help or similar was used. The help message will be sent to stdout.
-            assert_eq!(err.kind(), clap::error::ErrorKind::DisplayHelp);
-        }
-    }
-
-    /// Tests that the log directory is parsed correctly. It's always tied to the specific chain's
-    /// name
-    #[test]
-    fn parse_logs_path() {
-        let mut reth = Cli::try_parse_args_from(["reth", "node"]).unwrap();
-        reth.logs.log_file_directory =
-            reth.logs.log_file_directory.join(reth.chain.chain.to_string());
-        let log_dir = reth.logs.log_file_directory;
-        let end = format!("reth/logs/{}", SUPPORTED_CHAINS[0]);
-        assert!(log_dir.as_ref().ends_with(end), "{log_dir:?}");
-
-        let mut iter = SUPPORTED_CHAINS.iter();
-        iter.next();
-        for chain in iter {
-            let mut reth = Cli::try_parse_args_from(["reth", "node", "--chain", chain]).unwrap();
-            reth.logs.log_file_directory =
-                reth.logs.log_file_directory.join(reth.chain.chain.to_string());
-            let log_dir = reth.logs.log_file_directory;
-            let end = format!("reth/logs/{chain}");
-            assert!(log_dir.as_ref().ends_with(end), "{log_dir:?}");
-        }
-    }
-
-    #[test]
-    fn parse_env_filter_directives() {
-        let temp_dir = tempfile::tempdir().unwrap();
-
-        std::env::set_var("RUST_LOG", "info,evm=debug");
-        let reth = Cli::try_parse_args_from([
-            "reth",
-            "init",
-            "--datadir",
-            temp_dir.path().to_str().unwrap(),
-            "--log.file.filter",
-            "debug,net=trace",
-        ])
-        .unwrap();
-        assert!(reth.run(|_, _| async move { Ok(()) }).is_ok());
-    }
-}
+/// This is re-exported because the types in [`reth_ethereum_cli::interface`] originally
+/// existed in `reth::cli` but were moved to the [`reth_ethereum_cli`] crate. This re-export
+/// avoids a breaking change.
+pub use reth_ethereum_cli::interface::*;

bin/reth/src/commands/debug_cmd/mod.rs

@@ -1,45 +0,0 @@
-//! `reth debug` command. Collection of various debugging routines.
-
-use clap::{Parser, Subcommand};
-use reth_cli_runner::CliContext;
-
-mod build_block;
-mod execution;
-mod in_memory_merkle;
-mod merkle;
-mod replay_engine;
-
-/// `reth debug` command
-#[derive(Debug, Parser)]
-pub struct Command {
-    #[command(subcommand)]
-    command: Subcommands,
-}
-
-/// `reth debug` subcommands
-#[derive(Subcommand, Debug)]
-pub enum Subcommands {
-    /// Debug the roundtrip execution of blocks as well as the generated data.
-    Execution(execution::Command),
-    /// Debug the clean & incremental state root calculations.
-    Merkle(merkle::Command),
-    /// Debug in-memory state root calculation.
-    InMemoryMerkle(in_memory_merkle::Command),
-    /// Debug block building.
-    BuildBlock(build_block::Command),
-    /// Debug engine API by replaying stored messages.
-    ReplayEngine(replay_engine::Command),
-}
-
-impl Command {
-    /// Execute `debug` command
-    pub async fn execute(self, ctx: CliContext) -> eyre::Result<()> {
-        match self.command {
-            Subcommands::Execution(command) => command.execute(ctx).await,
-            Subcommands::Merkle(command) => command.execute(ctx).await,
-            Subcommands::InMemoryMerkle(command) => command.execute(ctx).await,
-            Subcommands::BuildBlock(command) => command.execute(ctx).await,
-            Subcommands::ReplayEngine(command) => command.execute(ctx).await,
-        }
-    }
-}

bin/reth/src/commands/debug_cmd/replay_engine.rs

@@ -1,205 +0,0 @@
-use std::{path::PathBuf, sync::Arc, time::Duration};
-
-use clap::Parser;
-use eyre::Context;
-use reth_basic_payload_builder::{BasicPayloadJobGenerator, BasicPayloadJobGeneratorConfig};
-use reth_beacon_consensus::{hooks::EngineHooks, BeaconConsensusEngine, EthBeaconConsensus};
-use reth_blockchain_tree::{
-    BlockchainTree, BlockchainTreeConfig, ShareableBlockchainTree, TreeExternals,
-};
-use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
-use reth_cli_runner::CliContext;
-use reth_cli_util::get_secret_key;
-use reth_config::Config;
-use reth_consensus::Consensus;
-use reth_db::DatabaseEnv;
-use reth_engine_util::engine_store::{EngineMessageStore, StoredEngineApiMessage};
-use reth_fs_util as fs;
-use reth_network::{BlockDownloaderProvider, NetworkHandle};
-use reth_network_api::NetworkInfo;
-use reth_payload_builder::{PayloadBuilderHandle, PayloadBuilderService};
-use reth_provider::{
-    providers::BlockchainProvider, CanonStateSubscriptions, ChainSpecProvider, ProviderFactory,
-};
-use reth_prune::PruneModes;
-use reth_stages::Pipeline;
-use reth_static_file::StaticFileProducer;
-use reth_tasks::TaskExecutor;
-use reth_transaction_pool::noop::NoopTransactionPool;
-use tokio::sync::oneshot;
-use tracing::*;
-
-use crate::{args::NetworkArgs, macros::block_executor};
-
-/// `reth debug replay-engine` command
-/// This script will read stored engine API messages and replay them by the timestamp.
-/// It does not require
-#[derive(Debug, Parser)]
-pub struct Command {
-    #[command(flatten)]
-    env: EnvironmentArgs,
-
-    #[command(flatten)]
-    network: NetworkArgs,
-
-    /// The path to read engine API messages from.
-    #[arg(long = "engine-api-store", value_name = "PATH")]
-    engine_api_store: PathBuf,
-
-    /// The number of milliseconds between Engine API messages.
-    #[arg(long = "interval", default_value_t = 1_000)]
-    interval: u64,
-}
-
-impl Command {
-    async fn build_network(
-        &self,
-        config: &Config,
-        task_executor: TaskExecutor,
-        provider_factory: ProviderFactory<Arc<DatabaseEnv>>,
-        network_secret_path: PathBuf,
-        default_peers_path: PathBuf,
-    ) -> eyre::Result<NetworkHandle> {
-        let secret_key = get_secret_key(&network_secret_path)?;
-        let network = self
-            .network
-            .network_config(config, provider_factory.chain_spec(), secret_key, default_peers_path)
-            .with_task_executor(Box::new(task_executor))
-            .build(provider_factory)
-            .start_network()
-            .await?;
-        info!(target: "reth::cli", peer_id = %network.peer_id(), local_addr = %network.local_addr(), "Connected to P2P network");
-        debug!(target: "reth::cli", peer_id = ?network.peer_id(), "Full peer ID");
-        Ok(network)
-    }
-
-    /// Execute `debug replay-engine` command
-    pub async fn execute(self, ctx: CliContext) -> eyre::Result<()> {
-        let Environment { provider_factory, config, data_dir } = self.env.init(AccessRights::RW)?;
-
-        let consensus: Arc<dyn Consensus> =
-            Arc::new(EthBeaconConsensus::new(provider_factory.chain_spec()));
-
-        let executor = block_executor!(provider_factory.chain_spec());
-
-        // Configure blockchain tree
-        let tree_externals =
-            TreeExternals::new(provider_factory.clone(), Arc::clone(&consensus), executor);
-        let tree = BlockchainTree::new(
-            tree_externals,
-            BlockchainTreeConfig::default(),
-            PruneModes::none(),
-        )?;
-        let blockchain_tree = Arc::new(ShareableBlockchainTree::new(tree));
-
-        // Set up the blockchain provider
-        let blockchain_db = BlockchainProvider::new(provider_factory.clone(), blockchain_tree)?;
-
-        // Set up network
-        let network_secret_path =
-            self.network.p2p_secret_key.clone().unwrap_or_else(|| data_dir.p2p_secret());
-        let network = self
-            .build_network(
-                &config,
-                ctx.task_executor.clone(),
-                provider_factory.clone(),
-                network_secret_path,
-                data_dir.known_peers(),
-            )
-            .await?;
-
-        // Set up payload builder
-        #[cfg(not(feature = "optimism"))]
-        let payload_builder = reth_ethereum_payload_builder::EthereumPayloadBuilder::default();
-
-        // Optimism's payload builder is implemented on the OptimismPayloadBuilder type.
-        #[cfg(feature = "optimism")]
-        let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new(
-            reth_node_optimism::OptimismEvmConfig::default(),
-        );
-
-        let payload_generator = BasicPayloadJobGenerator::with_builder(
-            blockchain_db.clone(),
-            NoopTransactionPool::default(),
-            ctx.task_executor.clone(),
-            BasicPayloadJobGeneratorConfig::default(),
-            provider_factory.chain_spec(),
-            payload_builder,
-        );
-
-        #[cfg(feature = "optimism")]
-        let (payload_service, payload_builder): (
-            _,
-            PayloadBuilderHandle<reth_node_optimism::OptimismEngineTypes>,
-        ) = PayloadBuilderService::new(payload_generator, blockchain_db.canonical_state_stream());
-
-        #[cfg(not(feature = "optimism"))]
-        let (payload_service, payload_builder): (
-            _,
-            PayloadBuilderHandle<reth_node_ethereum::EthEngineTypes>,
-        ) = PayloadBuilderService::new(payload_generator, blockchain_db.canonical_state_stream());
-
-        ctx.task_executor.spawn_critical("payload builder service", payload_service);
-
-        // Configure the consensus engine
-        let network_client = network.fetch_client().await?;
-        let (beacon_consensus_engine, beacon_engine_handle) = BeaconConsensusEngine::new(
-            network_client,
-            Pipeline::builder().build(
-                provider_factory.clone(),
-                StaticFileProducer::new(provider_factory.clone(), PruneModes::none()),
-            ),
-            blockchain_db.clone(),
-            Box::new(ctx.task_executor.clone()),
-            Box::new(network),
-            None,
-            payload_builder,
-            None,
-            u64::MAX,
-            EngineHooks::new(),
-        )?;
-        info!(target: "reth::cli", "Consensus engine initialized");
-
-        // Run consensus engine to completion
-        let (tx, rx) = oneshot::channel();
-        info!(target: "reth::cli", "Starting consensus engine");
-        ctx.task_executor.spawn_critical_blocking("consensus engine", async move {
-            let res = beacon_consensus_engine.await;
-            let _ = tx.send(res);
-        });
-
-        let engine_api_store = EngineMessageStore::new(self.engine_api_store.clone());
-        for filepath in engine_api_store.engine_messages_iter()? {
-            let contents =
-                fs::read(&filepath).wrap_err(format!("failed to read: {}", filepath.display()))?;
-            let message = serde_json::from_slice(&contents)
-                .wrap_err(format!("failed to parse: {}", filepath.display()))?;
-            debug!(target: "reth::cli", filepath = %filepath.display(), ?message, "Forwarding Engine API message");
-            match message {
-                StoredEngineApiMessage::ForkchoiceUpdated { state, payload_attrs } => {
-                    let response =
-                        beacon_engine_handle.fork_choice_updated(state, payload_attrs).await?;
-                    debug!(target: "reth::cli", ?response, "Received for forkchoice updated");
-                }
-                StoredEngineApiMessage::NewPayload { payload, cancun_fields } => {
-                    let response = beacon_engine_handle.new_payload(payload, cancun_fields).await?;
-                    debug!(target: "reth::cli", ?response, "Received for new payload");
-                }
-            };
-
-            // Pause before next message
-            tokio::time::sleep(Duration::from_millis(self.interval)).await;
-        }
-
-        info!(target: "reth::cli", "Finished replaying engine API messages");
-
-        match rx.await? {
-            Ok(()) => info!("Beacon consensus engine exited successfully"),
-            Err(error) => {
-                error!(target: "reth::cli", %error, "Beacon consensus engine exited with an error")
-            }
-        };
-
-        Ok(())
-    }
-}

bin/reth/src/commands/mod.rs

@@ -1,3 +0,0 @@
-//! This contains all of the `reth` commands
-
-pub mod debug_cmd;

bin/reth/src/lib.rs

@@ -15,23 +15,19 @@
 //! - `min-error-logs`: Disables all logs below `error` level.
 //! - `min-warn-logs`: Disables all logs below `warn` level.
 //! - `min-info-logs`: Disables all logs below `info` level. This can speed up the node, since fewer
-//!   calls to the logging component is made.
+//!   calls to the logging component are made.
 //! - `min-debug-logs`: Disables all logs below `debug` level.
 //! - `min-trace-logs`: Disables all logs below `trace` level.
-//! - `optimism`: Enables [OP-Stack](https://stack.optimism.io/) support for the node. Note that
-//!   this breaks compatibility with the Ethereum mainnet as a new deposit transaction type is
-//!   introduced as well as gas cost changes.
 
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/paradigmxyz/reth/main/assets/reth-docs.png",
     html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
     issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
 )]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 pub mod cli;
-pub mod commands;
-mod macros;
 
 /// Re-exported utils.
 pub mod utils {
@@ -44,9 +40,9 @@ pub mod utils {
 
 /// Re-exported payload related types
 pub mod payload {
+    pub use reth_ethereum_payload_builder::EthereumExecutionPayloadValidator;
     pub use reth_payload_builder::*;
     pub use reth_payload_primitives::*;
-    pub use reth_payload_validator::ExecutionPayloadValidator;
 }
 
 /// Re-exported from `reth_node_api`.
@@ -93,6 +89,7 @@ pub mod dirs {
 /// Re-exported from `reth_chainspec`
 pub mod chainspec {
     pub use reth_chainspec::*;
+    pub use reth_ethereum_cli::chainspec::*;
 }
 
 /// Re-exported from `reth_provider`.
@@ -105,13 +102,14 @@ pub mod primitives {
     pub use reth_primitives::*;
 }
 
-/// Re-exported from `reth_beacon_consensus`.
+/// Re-exported from `reth_ethereum_consensus`.
 pub mod beacon_consensus {
-    pub use reth_beacon_consensus::*;
+    pub use reth_node_ethereum::consensus::*;
 }
-/// Re-exported from `reth_blockchain_tree`.
-pub mod blockchain_tree {
-    pub use reth_blockchain_tree::*;
+
+/// Re-exported from `reth_consensus`.
+pub mod consensus {
+    pub use reth_consensus::*;
 }
 
 /// Re-exported from `reth_consensus_common`.
@@ -144,15 +142,14 @@ pub mod transaction_pool {
 
 /// Re-export of `reth_rpc_*` crates.
 pub mod rpc {
-
     /// Re-exported from `reth_rpc_builder`.
     pub mod builder {
         pub use reth_rpc_builder::*;
     }
 
-    /// Re-exported from `reth_rpc_types`.
+    /// Re-exported from `alloy_rpc_types`.
     pub mod types {
-        pub use reth_rpc_types::*;
+        pub use alloy_rpc_types::*;
     }
 
     /// Re-exported from `reth_rpc_server_types`.
@@ -184,12 +181,16 @@ pub mod rpc {
     }
 }
 
+/// Ress subprotocol installation.
+pub mod ress;
+
 // re-export for convenience
 #[doc(inline)]
 pub use reth_cli_runner::{tokio_runtime, CliContext, CliRunner};
 
-#[cfg(all(feature = "jemalloc", unix))]
-use tikv_jemallocator as _;
-
 // for rendering diagrams
 use aquamarine as _;
+
+// used in main
+use clap as _;
+use reth_cli_util as _;

bin/reth/src/macros.rs

@@ -1,20 +0,0 @@
-//! Helper macros
-
-/// Creates the block executor type based on the configured feature.
-///
-/// Note(mattsse): This is incredibly horrible and will be replaced
-#[cfg(not(feature = "optimism"))]
-macro_rules! block_executor {
-    ($chain_spec:expr) => {
-        reth_node_ethereum::EthExecutorProvider::ethereum($chain_spec)
-    };
-}
-
-#[cfg(feature = "optimism")]
-macro_rules! block_executor {
-    ($chain_spec:expr) => {
-        reth_node_optimism::OpExecutorProvider::optimism($chain_spec)
-    };
-}
-
-pub(crate) use block_executor;

bin/reth/src/main.rs

@@ -1,85 +1,45 @@
 #![allow(missing_docs)]
 
-// We use jemalloc for performance reasons.
-#[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
 
-#[cfg(all(feature = "optimism", not(test)))]
-compile_error!("Cannot build the `reth` binary with the `optimism` feature flag enabled. Did you mean to build `op-reth`?");
+use clap::Parser;
+use reth::{args::RessArgs, cli::Cli, ress::install_ress_subprotocol};
+use reth_ethereum_cli::chainspec::EthereumChainSpecParser;
+use reth_node_builder::NodeHandle;
+use reth_node_ethereum::EthereumNode;
+use tracing::info;
 
-/// clap [Args] for Engine related arguments.
-use clap::Args;
-
-/// Parameters for configuring the engine
-#[derive(Debug, Clone, Args, PartialEq, Eq, Default)]
-#[command(next_help_heading = "Engine")]
-pub struct EngineArgs {
-    /// Enable the engine2 experimental features on reth binary
-    #[arg(long = "engine.experimental", default_value = "false")]
-    pub experimental: bool,
-}
-
-#[cfg(not(feature = "optimism"))]
 fn main() {
-    use clap::Parser;
-    use reth::cli::Cli;
-    use reth_node_builder::EngineNodeLauncher;
-    use reth_node_ethereum::{node::EthereumAddOns, EthereumNode};
-    use reth_provider::providers::BlockchainProvider2;
-
     reth_cli_util::sigsegv_handler::install();
 
     // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided.
     if std::env::var_os("RUST_BACKTRACE").is_none() {
-        std::env::set_var("RUST_BACKTRACE", "1");
+        unsafe { std::env::set_var("RUST_BACKTRACE", "1") };
     }
 
-    if let Err(err) = Cli::<EngineArgs>::parse().run(|builder, engine_args| async move {
-        let enable_engine2 = engine_args.experimental;
-        match enable_engine2 {
-            true => {
-                let handle = builder
-                    .with_types_and_provider::<EthereumNode, BlockchainProvider2<_>>()
-                    .with_components(EthereumNode::components())
-                    .with_add_ons::<EthereumAddOns>()
-                    .launch_with_fn(|builder| {
-                        let launcher = EngineNodeLauncher::new(
-                            builder.task_executor().clone(),
-                            builder.config().datadir(),
-                        );
-                        builder.launch_with(launcher)
-                    })
-                    .await?;
-                handle.node_exit_future.await
+    if let Err(err) =
+        Cli::<EthereumChainSpecParser, RessArgs>::parse().run(async move |builder, ress_args| {
+            info!(target: "reth::cli", "Launching node");
+            let NodeHandle { node, node_exit_future } =
+                builder.node(EthereumNode::default()).launch_with_debug_capabilities().await?;
+
+            // Install ress subprotocol.
+            if ress_args.enabled {
+                install_ress_subprotocol(
+                    ress_args,
+                    node.provider,
+                    node.evm_config,
+                    node.network,
+                    node.task_executor,
+                    node.add_ons_handle.engine_events.new_listener(),
+                )?;
             }
-            false => {
-                let handle = builder.launch_node(EthereumNode::default()).await?;
-                handle.node_exit_future.await
-            }
-        }
-    }) {
+
+            node_exit_future.await
+        })
+    {
         eprintln!("Error: {err:?}");
         std::process::exit(1);
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use clap::Parser;
-
-    /// A helper type to parse Args more easily
-    #[derive(Parser)]
-    struct CommandParser<T: Args> {
-        #[command(flatten)]
-        args: T,
-    }
-
-    #[test]
-    fn test_parse_engine_args() {
-        let default_args = EngineArgs::default();
-        let args = CommandParser::<EngineArgs>::parse_from(["reth"]).args;
-        assert_eq!(args, default_args);
-    }
-}

bin/reth/src/optimism.rs

@@ -1,80 +0,0 @@
-#![allow(missing_docs, rustdoc::missing_crate_level_docs)]
-
-use clap::Parser;
-use reth::cli::Cli;
-use reth_node_builder::EngineNodeLauncher;
-use reth_node_optimism::{args::RollupArgs, node::OptimismAddOns, OptimismNode};
-use reth_optimism_rpc::eth::rpc::SequencerClient;
-use reth_provider::providers::BlockchainProvider2;
-
-// We use jemalloc for performance reasons
-#[cfg(all(feature = "jemalloc", unix))]
-#[global_allocator]
-static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
-
-#[cfg(not(feature = "optimism"))]
-compile_error!("Cannot build the `op-reth` binary with the `optimism` feature flag disabled. Did you mean to build `reth`?");
-
-#[cfg(feature = "optimism")]
-fn main() {
-    reth_cli_util::sigsegv_handler::install();
-
-    // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided.
-    if std::env::var_os("RUST_BACKTRACE").is_none() {
-        std::env::set_var("RUST_BACKTRACE", "1");
-    }
-
-    if let Err(err) = Cli::<RollupArgs>::parse().run(|builder, rollup_args| async move {
-        let enable_engine2 = rollup_args.experimental;
-        let sequencer_http_arg = rollup_args.sequencer_http.clone();
-        match enable_engine2 {
-            true => {
-                let handle = builder
-                    .with_types_and_provider::<OptimismNode, BlockchainProvider2<_>>()
-                    .with_components(OptimismNode::components(rollup_args))
-                    .with_add_ons::<OptimismAddOns>()
-                    .extend_rpc_modules(move |ctx| {
-                        // register sequencer tx forwarder
-                        if let Some(sequencer_http) = sequencer_http_arg {
-                            ctx.registry
-                                .eth_api()
-                                .set_sequencer_client(SequencerClient::new(sequencer_http));
-                        }
-
-                        Ok(())
-                    })
-                    .launch_with_fn(|builder| {
-                        let launcher = EngineNodeLauncher::new(
-                            builder.task_executor().clone(),
-                            builder.config().datadir(),
-                        );
-                        builder.launch_with(launcher)
-                    })
-                    .await?;
-
-                handle.node_exit_future.await
-            }
-            false => {
-                let handle = builder
-                    .node(OptimismNode::new(rollup_args.clone()))
-                    .extend_rpc_modules(move |ctx| {
-                        // register sequencer tx forwarder
-                        if let Some(sequencer_http) = sequencer_http_arg {
-                            ctx.registry
-                                .eth_api()
-                                .set_sequencer_client(SequencerClient::new(sequencer_http));
-                        }
-
-                        Ok(())
-                    })
-                    .launch()
-                    .await?;
-
-                handle.node_exit_future.await
-            }
-        }
-    }) {
-        eprintln!("Error: {err:?}");
-        std::process::exit(1);
-    }
-}

bin/reth/src/ress.rs

@@ -0,0 +1,67 @@
+use reth_ethereum_primitives::EthPrimitives;
+use reth_evm::ConfigureEvm;
+use reth_network::{protocol::IntoRlpxSubProtocol, NetworkProtocols};
+use reth_network_api::FullNetwork;
+use reth_node_api::BeaconConsensusEngineEvent;
+use reth_node_core::args::RessArgs;
+use reth_provider::providers::{BlockchainProvider, ProviderNodeTypes};
+use reth_ress_protocol::{NodeType, ProtocolState, RessProtocolHandler};
+use reth_ress_provider::{maintain_pending_state, PendingState, RethRessProtocolProvider};
+use reth_tasks::TaskExecutor;
+use reth_tokio_util::EventStream;
+use tokio::sync::mpsc;
+use tracing::*;
+
+/// Install `ress` subprotocol if it's enabled.
+pub fn install_ress_subprotocol<P, E, N>(
+    args: RessArgs,
+    provider: BlockchainProvider<P>,
+    evm_config: E,
+    network: N,
+    task_executor: TaskExecutor,
+    engine_events: EventStream<BeaconConsensusEngineEvent<EthPrimitives>>,
+) -> eyre::Result<()>
+where
+    P: ProviderNodeTypes<Primitives = EthPrimitives>,
+    E: ConfigureEvm<Primitives = EthPrimitives> + Clone + 'static,
+    N: FullNetwork + NetworkProtocols,
+{
+    info!(target: "reth::cli", "Installing ress subprotocol");
+    let pending_state = PendingState::default();
+
+    // Spawn maintenance task for pending state.
+    task_executor.spawn(maintain_pending_state(
+        engine_events,
+        provider.clone(),
+        pending_state.clone(),
+    ));
+
+    let (tx, mut rx) = mpsc::unbounded_channel();
+    let provider = RethRessProtocolProvider::new(
+        provider,
+        evm_config,
+        Box::new(task_executor.clone()),
+        args.max_witness_window,
+        args.witness_max_parallel,
+        args.witness_cache_size,
+        pending_state,
+    )?;
+    network.add_rlpx_sub_protocol(
+        RessProtocolHandler {
+            provider,
+            node_type: NodeType::Stateful,
+            peers_handle: network.peers_handle().clone(),
+            max_active_connections: args.max_active_connections,
+            state: ProtocolState::new(tx),
+        }
+        .into_rlpx_sub_protocol(),
+    );
+    info!(target: "reth::cli", "Ress subprotocol support enabled");
+
+    task_executor.spawn(async move {
+        while let Some(event) = rx.recv().await {
+            trace!(target: "reth::ress", ?event, "Received ress event");
+        }
+    });
+    Ok(())
+}

book/SUMMARY.md

@@ -2,37 +2,38 @@
 
 - [Introduction](./intro.md)
 - [Installation](./installation/installation.md)
-   - [Pre-Built Binaries](./installation/binaries.md)
-   - [Docker](./installation/docker.md)
-   - [Build from Source](./installation/source.md)
-   - [Build for ARM devices](./installation/build-for-arm-devices.md)
-   - [Update Priorities](./installation/priorities.md)
+    - [Pre-Built Binaries](./installation/binaries.md)
+    - [Docker](./installation/docker.md)
+    - [Build from Source](./installation/source.md)
+    - [Build for ARM devices](./installation/build-for-arm-devices.md)
+    - [Update Priorities](./installation/priorities.md)
 - [Run a Node](./run/run-a-node.md)
-   - [Mainnet or official testnets](./run/mainnet.md)
-   - [OP Stack](./run/optimism.md)
-   - [Run an OP Mainnet Node](./run/sync-op-mainnet.md)
-   - [Private testnet](./run/private-testnet.md)
-   - [Metrics](./run/observability.md)
-   - [Configuring Reth](./run/config.md)
-   - [Transaction types](./run/transactions.md)
-   - [Pruning & Full Node](./run/pruning.md)
-   - [Ports](./run/ports.md)
-   - [Troubleshooting](./run/troubleshooting.md)
+    - [Mainnet or official testnets](./run/mainnet.md)
+    - [OP Stack](./run/optimism.md)
+    - [Run an OP Mainnet Node](./run/sync-op-mainnet.md)
+    - [Private testnet](./run/private-testnet.md)
+    - [Metrics](./run/observability.md)
+    - [Configuring Reth](./run/config.md)
+    - [Transaction types](./run/transactions.md)
+    - [Pruning & Full Node](./run/pruning.md)
+    - [Ports](./run/ports.md)
+    - [Troubleshooting](./run/troubleshooting.md)
 - [Interacting with Reth over JSON-RPC](./jsonrpc/intro.md)
-   - [eth](./jsonrpc/eth.md)
-   - [web3](./jsonrpc/web3.md)
-   - [net](./jsonrpc/net.md)
-   - [txpool](./jsonrpc/txpool.md)
-   - [debug](./jsonrpc/debug.md)
-   - [trace](./jsonrpc/trace.md)
-   - [admin](./jsonrpc/admin.md)
-   - [rpc](./jsonrpc/rpc.md)
+    - [eth](./jsonrpc/eth.md)
+    - [web3](./jsonrpc/web3.md)
+    - [net](./jsonrpc/net.md)
+    - [txpool](./jsonrpc/txpool.md)
+    - [debug](./jsonrpc/debug.md)
+    - [trace](./jsonrpc/trace.md)
+    - [admin](./jsonrpc/admin.md)
+    - [rpc](./jsonrpc/rpc.md)
 - [CLI Reference](./cli/cli.md) <!-- CLI_REFERENCE START -->
   - [`reth`](./cli/reth.md)
     - [`reth node`](./cli/reth/node.md)
     - [`reth init`](./cli/reth/init.md)
     - [`reth init-state`](./cli/reth/init-state.md)
     - [`reth import`](./cli/reth/import.md)
+    - [`reth import-era`](./cli/reth/import-era.md)
     - [`reth dump-genesis`](./cli/reth/dump-genesis.md)
     - [`reth db`](./cli/reth/db.md)
       - [`reth db stats`](./cli/reth/db/stats.md)
@@ -48,6 +49,7 @@
         - [`reth db clear static-file`](./cli/reth/db/clear/static-file.md)
       - [`reth db version`](./cli/reth/db/version.md)
       - [`reth db path`](./cli/reth/db/path.md)
+    - [`reth download`](./cli/reth/download.md)
     - [`reth stage`](./cli/reth/stage.md)
       - [`reth stage run`](./cli/reth/stage/run.md)
       - [`reth stage drop`](./cli/reth/stage/drop.md)
@@ -70,14 +72,13 @@
       - [`reth debug merkle`](./cli/reth/debug/merkle.md)
       - [`reth debug in-memory-merkle`](./cli/reth/debug/in-memory-merkle.md)
       - [`reth debug build-block`](./cli/reth/debug/build-block.md)
-      - [`reth debug replay-engine`](./cli/reth/debug/replay-engine.md)
     - [`reth recover`](./cli/reth/recover.md)
       - [`reth recover storage-tries`](./cli/reth/recover/storage-tries.md)
     - [`reth prune`](./cli/reth/prune.md)
 - [Developers](./developers/developers.md) <!-- CLI_REFERENCE END -->
-   - [Execution Extensions](./developers/exex/exex.md)
-      - [How do ExExes work?](./developers/exex/how-it-works.md)
-      - [Hello World](./developers/exex/hello-world.md)
-      - [Tracking State](./developers/exex/tracking-state.md)
-      - [Remote](./developers/exex/remote.md)
-   - [Contribute](./developers/contribute.md)
+    - [Execution Extensions](./developers/exex/exex.md)
+        - [How do ExExes work?](./developers/exex/how-it-works.md)
+        - [Hello World](./developers/exex/hello-world.md)
+        - [Tracking State](./developers/exex/tracking-state.md)
+        - [Remote](./developers/exex/remote.md)
+    - [Contribute](./developers/contribute.md)

book/cli/SUMMARY.md

@@ -3,6 +3,7 @@
   - [`reth init`](./reth/init.md)
   - [`reth init-state`](./reth/init-state.md)
   - [`reth import`](./reth/import.md)
+  - [`reth import-era`](./reth/import-era.md)
   - [`reth dump-genesis`](./reth/dump-genesis.md)
   - [`reth db`](./reth/db.md)
     - [`reth db stats`](./reth/db/stats.md)
@@ -18,6 +19,7 @@
       - [`reth db clear static-file`](./reth/db/clear/static-file.md)
     - [`reth db version`](./reth/db/version.md)
     - [`reth db path`](./reth/db/path.md)
+  - [`reth download`](./reth/download.md)
   - [`reth stage`](./reth/stage.md)
     - [`reth stage run`](./reth/stage/run.md)
     - [`reth stage drop`](./reth/stage/drop.md)
@@ -40,8 +42,6 @@
     - [`reth debug merkle`](./reth/debug/merkle.md)
     - [`reth debug in-memory-merkle`](./reth/debug/in-memory-merkle.md)
     - [`reth debug build-block`](./reth/debug/build-block.md)
-    - [`reth debug replay-engine`](./reth/debug/replay-engine.md)
   - [`reth recover`](./reth/recover.md)
     - [`reth recover storage-tries`](./reth/recover/storage-tries.md)
   - [`reth prune`](./reth/prune.md)
-

book/cli/help.py

@@ -1,294 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import re
-import subprocess
-import sys
-from os import makedirs, path
-
-HELP_KEY = "help"
-SECTION_START = "<!-- CLI_REFERENCE START -->"
-SECTION_END = "<!-- CLI_REFERENCE END -->"
-SECTION_RE = rf"\s*{SECTION_START}.*?{SECTION_END}"
-
-README = """\
-# CLI Reference
-
-<!-- Generated by scripts/gen_output/help.py -->
-
-Automatically-generated CLI reference from `--help` output.
-
-{{#include ./SUMMARY.md}}
-"""
-
-
-def write_file(file_path, content):
-    content = "\n".join([line.rstrip() for line in content.split("\n")])
-    with open(file_path, "w") as f:
-        f.write(content)
-
-
-def main():
-    args = parse_args(sys.argv[1:])
-    for cmd in args.commands:
-        if cmd.find(" ") >= 0:
-            raise Exception(f"subcommands are not allowed: {cmd}")
-    makedirs(args.out_dir, exist_ok=True)
-
-    output = {}
-
-    # Iterate over all commands and their subcommands.
-    cmd_iter = [[cmd] for cmd in args.commands]
-    for cmd in cmd_iter:
-        subcmds, stdout = get_entry(cmd)
-        if args.verbose and len(subcmds) > 0:
-            eprint(f"Found subcommands for \"{' '.join(cmd)}\": {subcmds}")
-
-        # Add entry to output map, e.g. `output["cmd"]["subcmd"]["help"] = "..."`.
-        e = output
-        for arg in cmd:
-            tmp = e.get(arg)
-            if not tmp:
-                e[arg] = {}
-                tmp = e[arg]
-            e = tmp
-        e[HELP_KEY] = stdout
-
-        # Append subcommands.
-        for subcmd in subcmds:
-            cmd_iter.append(cmd + [subcmd])
-
-    # Generate markdown files.
-    summary = ""
-    root_summary = ""
-    for cmd, obj in output.items():
-        cmd_markdown(args.out_dir, cmd, obj)
-
-        root_path = path.relpath(args.out_dir, args.root_dir)
-        summary += cmd_summary("", cmd, obj, 0)
-        summary += "\n"
-
-        root_summary += cmd_summary(root_path, cmd, obj, args.root_indentation)
-        root_summary += "\n"
-    write_file(path.join(args.out_dir, "SUMMARY.md"), summary)
-
-    # Generate README.md.
-    if args.readme:
-        write_file(path.join(args.out_dir, "README.md"), README)
-
-    if args.root_summary:
-        update_root_summary(args.root_dir, root_summary)
-
-
-def parse_args(args: list[str]):
-    """Parses command line arguments."""
-    parser = argparse.ArgumentParser(
-        description="Generate markdown files from help output of commands"
-    )
-    parser.add_argument("--root-dir", default=".", help="Root directory")
-    parser.add_argument(
-        "--root-indentation",
-        default=0,
-        type=int,
-        help="Indentation for the root SUMMARY.md file",
-    )
-    parser.add_argument("--out-dir", help="Output directory")
-    parser.add_argument(
-        "--readme",
-        action="store_true",
-        help="Whether to add a README.md file",
-    )
-    parser.add_argument(
-        "--root-summary",
-        action="store_true",
-        help="Whether to update the root SUMMARY.md file",
-    )
-    parser.add_argument(
-        "commands",
-        nargs="+",
-        help="Command to generate markdown for. Can be a subcommand.",
-    )
-    parser.add_argument(
-        "--verbose", "-v", action="store_true", help="Print verbose output"
-    )
-    return parser.parse_known_args(args)[0]
-
-
-def get_entry(cmd: list[str]):
-    """Returns the subcommands and help output for a command."""
-    env = os.environ.copy()
-    env["NO_COLOR"] = "1"
-    env["COLUMNS"] = "100"
-    env["LINES"] = "10000"
-    output = subprocess.run(cmd + ["--help"], capture_output=True, env=env)
-    if output.returncode != 0:
-        stderr = output.stderr.decode("utf-8")
-        raise Exception(f"Command \"{' '.join(cmd)}\" failed:\n{stderr}")
-    stdout = output.stdout.decode("utf-8")
-    subcmds = parse_sub_commands(stdout)
-    return subcmds, stdout
-
-
-def parse_sub_commands(s: str):
-    """Returns a list of subcommands from the help output of a command."""
-    idx = s.find("Commands:")
-    if idx < 0:
-        return []
-    s = s[idx:]
-
-    idx = s.find("Options:")
-    if idx < 0:
-        return []
-    s = s[:idx]
-
-    idx = s.find("Arguments:")
-    if idx >= 0:
-        s = s[:idx]
-
-    subcmds = s.splitlines()[1:]
-    subcmds = filter(
-        lambda x: x.strip() != "" and x.startswith("  ") and x[2] != " ", subcmds
-    )
-    subcmds = map(lambda x: x.strip().split(" ")[0], subcmds)
-    subcmds = filter(lambda x: x != "help", subcmds)
-    return list(subcmds)
-
-
-def cmd_markdown(out_dir: str, cmd: str, obj: object):
-    """Writes the markdown for a command and its subcommands to out_dir."""
-
-    def rec(cmd: list[str], obj: object):
-        out = ""
-        out += f"# {' '.join(cmd)}\n\n"
-        out += help_markdown(cmd, obj[HELP_KEY])
-        out_path = out_dir
-        for arg in cmd:
-            out_path = path.join(out_path, arg)
-        makedirs(path.dirname(out_path), exist_ok=True)
-        write_file(f"{out_path}.md", out)
-
-        for k, v in obj.items():
-            if k == HELP_KEY:
-                continue
-            rec(cmd + [k], v)
-
-    rec([command_name(cmd)], obj)
-
-
-def help_markdown(cmd: list[str], s: str):
-    """Returns the markdown for a command's help output."""
-    cmd[0] = command_name(cmd[0])
-    description, s = parse_description(s)
-    return f"""\
-{description}
-
-```bash
-$ {' '.join(cmd)} --help
-{preprocess_help(s.strip())}
-```"""
-
-
-def parse_description(s: str):
-    """Splits the help output into a description and the rest."""
-    idx = s.find("Usage:")
-    if idx < 0:
-        return "", s
-    return s[:idx].strip().splitlines()[0].strip(), s[idx:]
-
-
-def cmd_summary(md_root: str, cmd: str, obj: object, indent: int):
-    """Returns the summary for a command and its subcommands."""
-
-    def rec(cmd: list[str], obj: object, indent: int):
-        nonlocal out
-        cmd_s = " ".join(cmd)
-        cmd_path = cmd_s.replace(" ", "/")
-        if md_root != "":
-            cmd_path = f"{md_root}/{cmd_path}"
-        out += f"{' ' * indent}- [`{cmd_s}`](./{cmd_path}.md)\n"
-
-        for k, v in obj.items():
-            if k == HELP_KEY:
-                continue
-            rec(cmd + [k], v, indent + 2)
-
-    out = ""
-    rec([command_name(cmd)], obj, indent)
-    return out
-
-
-def update_root_summary(root_dir: str, root_summary: str):
-    """Replaces the CLI_REFERENCE section in the root SUMMARY.md file."""
-    summary_file = path.join(root_dir, "SUMMARY.md")
-
-    with open(summary_file, "r") as f:
-        real_root_summary = f.read()
-
-    if not re.search(SECTION_RE, real_root_summary, flags=re.DOTALL):
-        raise Exception(
-            f"Could not find CLI_REFERENCE section in {summary_file}. "
-            "Please add the following section to the file:\n"
-            f"{SECTION_START}\n{SECTION_END}"
-        )
-
-    last_line = re.findall(f".*{SECTION_END}", real_root_summary)[0]
-    root_summary_s = root_summary.rstrip().replace("\n\n", "\n")
-    replace_with = f" {SECTION_START}\n{root_summary_s}\n{last_line}"
-
-    real_root_summary = re.sub(
-        SECTION_RE, replace_with, real_root_summary, flags=re.DOTALL
-    )
-    root_summary_file = path.join(root_dir, "SUMMARY.md")
-    with open(root_summary_file, "w") as f:
-        f.write(real_root_summary)
-
-
-def eprint(*args, **kwargs):
-    """Prints to stderr."""
-    print(*args, file=sys.stderr, **kwargs)
-
-
-def command_name(cmd: str):
-    """Returns the name of a command."""
-    return cmd.split("/")[-1]
-
-
-def preprocess_help(s: str):
-    """Preprocesses the help output of a command."""
-    # Remove the user-specific paths.
-    s = re.sub(
-        r"default: /.*/reth",
-        "default: <CACHE_DIR>",
-        s,
-    )
-    # Remove the commit SHA and target architecture triple or fourth
-    # rustup available targets:
-    #   aarch64-apple-darwin
-    #   x86_64-unknown-linux-gnu
-    #   x86_64-pc-windows-gnu
-    s = re.sub(
-        r"default: reth/.*-[0-9A-Fa-f]{6,10}/([_\w]+)-(\w+)-(\w+)(-\w+)?",
-        "default: reth/<VERSION>-<SHA>/<ARCH>",
-        s,
-    )
-    # Remove the OS
-    s = re.sub(
-        r"default: reth/.*/\w+",
-        "default: reth/<VERSION>/<OS>",
-        s,
-    )
-
-    # Remove rpc.max-tracing-requests default value
-    s = re.sub(
-        r"(rpc.max-tracing-requests <COUNT>\n.*\n.*\n.*)\[default: \d+\]",
-        r"\1[default: <NUM CPU CORES-2>]",
-        s,
-        flags=re.MULTILINE,
-    )
-
-    return s
-
-
-if __name__ == "__main__":
-    main()

book/cli/help.rs

@@ -0,0 +1,374 @@
+#!/usr/bin/env -S cargo +nightly -Zscript
+---
+[package]
+edition = "2021"
+
+[dependencies]
+clap = { version = "4", features = ["derive"] }
+pathdiff = "0.2"
+regex = "1"
+---
+use clap::Parser;
+use regex::Regex;
+use std::borrow::Cow;
+use std::fs::{self, File};
+use std::io::{self, Write};
+use std::iter::once;
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
+use std::str;
+use std::sync::LazyLock;
+use std::{fmt, process};
+
+const SECTION_START: &str = "<!-- CLI_REFERENCE START -->";
+const SECTION_END: &str = "<!-- CLI_REFERENCE END -->";
+const README: &str = r#"# CLI Reference
+
+<!-- Generated by scripts/gen_output/help.rs -->
+
+Automatically-generated CLI reference from `--help` output.
+
+{{#include ./SUMMARY.md}}
+"#;
+const TRIM_LINE_END_MARKDOWN: bool = true;
+
+/// Lazy static regex to avoid recompiling the same regex pattern multiple times.
+macro_rules! regex {
+    ($re:expr) => {{
+        static RE: LazyLock<Regex> =
+            LazyLock::new(|| Regex::new($re).expect("Failed to compile regex pattern"));
+        &*RE
+    }};
+}
+
+/// Generate markdown files from help output of commands
+#[derive(Parser, Debug)]
+#[command(about, long_about = None)]
+struct Args {
+    /// Root directory
+    #[arg(long, default_value_t = String::from("."))]
+    root_dir: String,
+
+    /// Indentation for the root SUMMARY.md file
+    #[arg(long, default_value_t = 2)]
+    root_indentation: usize,
+
+    /// Output directory
+    #[arg(long)]
+    out_dir: PathBuf,
+
+    /// Whether to add a README.md file
+    #[arg(long)]
+    readme: bool,
+
+    /// Whether to update the root SUMMARY.md file
+    #[arg(long)]
+    root_summary: bool,
+
+    /// Print verbose output
+    #[arg(short, long)]
+    verbose: bool,
+
+    /// Commands to generate markdown for.
+    #[arg(required = true, num_args = 1..)]
+    commands: Vec<PathBuf>,
+}
+
+fn write_file(file_path: &Path, content: &str) -> io::Result<()> {
+    let content = if TRIM_LINE_END_MARKDOWN {
+        content
+            .lines()
+            .map(|line| line.trim_end())
+            .collect::<Vec<_>>()
+            .join("\n")
+    } else {
+        content.to_string()
+    };
+    fs::write(file_path, content)
+}
+
+fn main() -> io::Result<()> {
+    let args = Args::parse();
+    debug_assert!(args.commands.len() >= 1);
+
+    let out_dir = args.out_dir;
+    fs::create_dir_all(&out_dir)?;
+
+    let mut todo_iter: Vec<Cmd> = args
+        .commands
+        .iter()
+        .rev() // reverse to keep the order (pop)
+        .map(Cmd::new)
+        .collect();
+    let mut output = Vec::new();
+
+    // Iterate over all commands and their subcommands.
+    while let Some(cmd) = todo_iter.pop() {
+        let (new_subcmds, stdout) = get_entry(&cmd)?;
+        if args.verbose && !new_subcmds.is_empty() {
+            println!(
+                "Found subcommands for \"{}\": {:?}",
+                cmd.command_name(),
+                new_subcmds
+            );
+        }
+        // Add new subcommands to todo_iter (so that they are processed in the correct order).
+        for subcmd in new_subcmds.into_iter().rev() {
+            let new_subcmds: Vec<_> = cmd
+                .subcommands
+                .iter()
+                .cloned()
+                .chain(once(subcmd))
+                .collect();
+
+            todo_iter.push(Cmd {
+                cmd: cmd.cmd,
+                subcommands: new_subcmds,
+            });
+        }
+        output.push((cmd, stdout));
+    }
+
+    // Generate markdown files.
+    for (cmd, stdout) in &output {
+        cmd_markdown(&out_dir, cmd, stdout)?;
+    }
+
+    // Generate SUMMARY.md.
+    let summary: String = output
+        .iter()
+        .map(|(cmd, _)| cmd_summary(None, cmd, 0))
+        .chain(once("\n".to_string()))
+        .collect();
+
+    write_file(&out_dir.clone().join("SUMMARY.md"), &summary)?;
+
+    // Generate README.md.
+    if args.readme {
+        let path = &out_dir.join("README.md");
+        if args.verbose {
+            println!("Writing README.md to \"{}\"", path.to_string_lossy());
+        }
+        write_file(path, README)?;
+    }
+
+    // Generate root SUMMARY.md.
+    if args.root_summary {
+        let root_summary: String = output
+            .iter()
+            .map(|(cmd, _)| {
+                let root_path = pathdiff::diff_paths(&out_dir, &args.root_dir);
+                cmd_summary(root_path, cmd, args.root_indentation)
+            })
+            .collect();
+
+        let path = Path::new(args.root_dir.as_str());
+        if args.verbose {
+            println!("Updating root summary in \"{}\"", path.to_string_lossy());
+        }
+        update_root_summary(path, &root_summary)?;
+    }
+
+    Ok(())
+}
+
+/// Returns the subcommands and help output for a command.
+fn get_entry(cmd: &Cmd) -> io::Result<(Vec<String>, String)> {
+    let output = Command::new(cmd.cmd)
+        .args(&cmd.subcommands)
+        .arg("--help")
+        .env("NO_COLOR", "1")
+        .env("COLUMNS", "100")
+        .env("LINES", "10000")
+        .stdout(Stdio::piped())
+        .output()?;
+
+    if !output.status.success() {
+        let stderr = str::from_utf8(&output.stderr).unwrap_or("Failed to parse stderr as UTF-8");
+        return Err(io::Error::new(
+            io::ErrorKind::Other,
+            format!("Command \"{}\" failed:\n{}", cmd, stderr),
+        ));
+    }
+
+    let stdout = str::from_utf8(&output.stdout)
+        .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?
+        .to_string();
+
+    // Parse subcommands from the help output
+    let subcmds = parse_sub_commands(&stdout);
+
+    Ok((subcmds, stdout))
+}
+
+/// Returns a list of subcommands from the help output of a command.
+fn parse_sub_commands(s: &str) -> Vec<String> {
+    // This regex matches lines starting with two spaces, followed by the subcommand name.
+    let re = regex!(r"^  (\S+)");
+
+    s.split("Commands:")
+        .nth(1) // Get the part after "Commands:"
+        .map(|commands_section| {
+            commands_section
+                .lines()
+                .take_while(|line| !line.starts_with("Options:") && !line.starts_with("Arguments:"))
+                .filter_map(|line| {
+                    re.captures(line)
+                        .and_then(|cap| cap.get(1).map(|m| m.as_str().to_string()))
+                })
+                .filter(|cmd| cmd != "help")
+                .map(String::from)
+                .collect()
+        })
+        .unwrap_or_default() // Return an empty Vec if "Commands:" was not found
+}
+
+/// Writes the markdown for a command to out_dir.
+fn cmd_markdown(out_dir: &Path, cmd: &Cmd, stdout: &str) -> io::Result<()> {
+    let out = format!("# {}\n\n{}", cmd, help_markdown(cmd, stdout));
+
+    let out_path = out_dir.join(cmd.to_string().replace(" ", "/"));
+    fs::create_dir_all(out_path.parent().unwrap())?;
+    write_file(&out_path.with_extension("md"), &out)?;
+
+    Ok(())
+}
+
+/// Returns the markdown for a command's help output.
+fn help_markdown(cmd: &Cmd, stdout: &str) -> String {
+    let (description, s) = parse_description(stdout);
+    format!(
+        "{}\n\n```bash\n$ {} --help\n```\n```txt\n{}\n```",
+        description,
+        cmd,
+        preprocess_help(s.trim())
+    )
+}
+
+/// Splits the help output into a description and the rest.
+fn parse_description(s: &str) -> (&str, &str) {
+    match s.find("Usage:") {
+        Some(idx) => {
+            let description = s[..idx].trim().lines().next().unwrap_or("");
+            (description, &s[idx..])
+        }
+        None => ("", s),
+    }
+}
+
+/// Returns the summary for a command and its subcommands.
+fn cmd_summary(md_root: Option<PathBuf>, cmd: &Cmd, indent: usize) -> String {
+    let cmd_s = cmd.to_string();
+    let cmd_path = cmd_s.replace(" ", "/");
+    let full_cmd_path = match md_root {
+        None => cmd_path,
+        Some(md_root) => format!("{}/{}", md_root.to_string_lossy(), cmd_path),
+    };
+    let indent_string = " ".repeat(indent + (cmd.subcommands.len() * 2));
+    format!("{}- [`{}`](./{}.md)\n", indent_string, cmd_s, full_cmd_path)
+}
+
+/// Replaces the CLI_REFERENCE section in the root SUMMARY.md file.
+fn update_root_summary(root_dir: &Path, root_summary: &str) -> io::Result<()> {
+    let summary_file = root_dir.join("SUMMARY.md");
+    let original_summary_content = fs::read_to_string(&summary_file)?;
+
+    let section_re = regex!(&format!(r"(?s)\s*{SECTION_START}.*?{SECTION_END}"));
+    if !section_re.is_match(&original_summary_content) {
+        eprintln!(
+            "Could not find CLI_REFERENCE section in {}. Please add the following section to the file:\n{}\n... CLI Reference goes here ...\n\n{}",
+            summary_file.display(),
+            SECTION_START,
+            SECTION_END
+        );
+        process::exit(1);
+    }
+
+    let section_end_re = regex!(&format!(r".*{SECTION_END}"));
+    let last_line = section_end_re
+        .find(&original_summary_content)
+        .map(|m| m.as_str().to_string())
+        .expect("Could not extract last line of CLI_REFERENCE section");
+
+    let root_summary_s = root_summary.trim_end().replace("\n\n", "\n");
+    let replace_with = format!(" {}\n{}\n{}", SECTION_START, root_summary_s, last_line);
+
+    let new_root_summary = section_re
+        .replace(&original_summary_content, replace_with.as_str())
+        .to_string();
+
+    let mut root_summary_file = File::create(&summary_file)?;
+    root_summary_file.write_all(new_root_summary.as_bytes())
+}
+
+/// Preprocesses the help output of a command.
+fn preprocess_help(s: &str) -> Cow<'_, str> {
+    static REPLACEMENTS: LazyLock<Vec<(Regex, &str)>> = LazyLock::new(|| {
+        let patterns: &[(&str, &str)] = &[
+            // Remove the user-specific paths.
+            (r"default: /.*/reth", "default: <CACHE_DIR>"),
+            // Remove the commit SHA and target architecture triple or fourth
+            //  rustup available targets:
+            //    aarch64-apple-darwin
+            //    x86_64-unknown-linux-gnu
+            //    x86_64-pc-windows-gnu
+            (
+                r"default: reth/.*-[0-9A-Fa-f]{6,10}/([_\w]+)-(\w+)-(\w+)(-\w+)?",
+                "default: reth/<VERSION>-<SHA>/<ARCH>",
+            ),
+            // Remove the OS
+            (r"default: reth/.*/\w+", "default: reth/<VERSION>/<OS>"),
+            // Remove rpc.max-tracing-requests default value
+            (
+                r"(rpc.max-tracing-requests <COUNT>\n.*\n.*\n.*\n.*\n.*)\[default: \d+\]",
+                r"$1[default: <NUM CPU CORES-2>]",
+            ),
+        ];
+        patterns
+            .iter()
+            .map(|&(re, replace_with)| (Regex::new(re).expect(re), replace_with))
+            .collect()
+    });
+
+    let mut s = Cow::Borrowed(s);
+    for (re, replacement) in REPLACEMENTS.iter() {
+        if let Cow::Owned(result) = re.replace_all(&s, *replacement) {
+            s = Cow::Owned(result);
+        }
+    }
+    s
+}
+
+#[derive(Hash, Debug, PartialEq, Eq)]
+struct Cmd<'a> {
+    /// path to binary (e.g. ./target/debug/reth)
+    cmd: &'a Path,
+    /// subcommands (e.g. [db, stats])
+    subcommands: Vec<String>,
+}
+
+impl<'a> Cmd<'a> {
+    fn command_name(&self) -> &str {
+        self.cmd
+            .file_name()
+            .and_then(|os_str| os_str.to_str())
+            .expect("Expect valid command")
+    }
+
+    fn new(cmd: &'a PathBuf) -> Self {
+        Self {
+            cmd,
+            subcommands: Vec::new(),
+        }
+    }
+}
+
+impl<'a> fmt::Display for Cmd<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.command_name())?;
+        if !self.subcommands.is_empty() {
+            write!(f, " {}", self.subcommands.join(" "))?;
+        }
+        Ok(())
+    }
+}

book/cli/reth.md

@@ -4,6 +4,8 @@ Reth
 
 ```bash
 $ reth --help
+```
+```txt
 Usage: reth [OPTIONS] <COMMAND>
 
 Commands:
@@ -11,8 +13,10 @@ Commands:
   init          Initialize the database from a genesis file
   init-state    Initialize the database from a state dump file
   import        This syncs RLP encoded blocks from a file
+  import-era    This syncs ERA encoded blocks from a directory
   dump-genesis  Dumps genesis block JSON configuration to stdout
   db            Database debugging utilities
+  download      Download public node snapshots
   stage         Manipulate individual stages
   p2p           P2P Debugging utilities
   config        Write config to stdout
@@ -22,26 +26,6 @@ Commands:
   help          Print this message or the help of the given subcommand(s)
 
 Options:
-      --chain <CHAIN_OR_PATH>
-          The chain this node is running.
-          Possible values are either a built-in chain or the path to a chain specification file.
-
-          Built-in chains:
-              mainnet, sepolia, holesky, dev
-
-          [default: mainnet]
-
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 

book/cli/reth/config.md

@@ -4,6 +4,8 @@ Write config to stdout
 
 ```bash
 $ reth config --help
+```
+```txt
 Usage: reth config [OPTIONS]
 
 Options:
@@ -13,26 +15,6 @@ Options:
       --default
           Show the default config
 
-      --chain <CHAIN_OR_PATH>
-          The chain this node is running.
-          Possible values are either a built-in chain or the path to a chain specification file.
-
-          Built-in chains:
-              mainnet, sepolia, holesky, dev
-
-          [default: mainnet]
-
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 

book/cli/reth/db.md

@@ -4,6 +4,8 @@ Database debugging utilities
 
 ```bash
 $ reth db --help
+```
+```txt
 Usage: reth db [OPTIONS] <COMMAND>
 
 Commands:
@@ -19,17 +21,6 @@ Commands:
   help      Print this message or the help of the given subcommand(s)
 
 Options:
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
@@ -45,7 +36,7 @@ Datadir:
 
           [default: default]
 
-      --datadir.static_files <PATH>
+      --datadir.static-files <PATH>
           The absolute path to store static files in.
 
       --config <FILE>
@@ -56,7 +47,7 @@ Datadir:
           Possible values are either a built-in chain or the path to a chain specification file.
 
           Built-in chains:
-              mainnet, sepolia, holesky, dev
+              mainnet, sepolia, holesky, hoodi, dev
 
           [default: mainnet]
 
@@ -79,6 +70,15 @@ Database:
 
           [possible values: true, false]
 
+      --db.max-size <MAX_SIZE>
+          Maximum database size (e.g., 4TB, 8MB)
+
+      --db.growth-step <GROWTH_STEP>
+          Database growth step (e.g., 4GB, 4KB)
+
+      --db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
+          Read transaction timeout in seconds, 0 means no timeout
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/checksum.md

@@ -4,6 +4,8 @@ Calculates the content checksum of a table
 
 ```bash
 $ reth db checksum --help
+```
+```txt
 Usage: reth db checksum [OPTIONS] <TABLE>
 
 Arguments:
@@ -20,20 +22,19 @@ Options:
       --limit <LIMIT>
           The maximum number of records that are queried and used to compute the checksum
 
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/clear.md

@@ -4,6 +4,8 @@ Deletes all table entries
 
 ```bash
 $ reth db clear --help
+```
+```txt
 Usage: reth db clear [OPTIONS] <COMMAND>
 
 Commands:
@@ -12,20 +14,19 @@ Commands:
   help         Print this message or the help of the given subcommand(s)
 
 Options:
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/clear/mdbx.md

@@ -4,6 +4,8 @@ Deletes all database table entries
 
 ```bash
 $ reth db clear mdbx --help
+```
+```txt
 Usage: reth db clear mdbx [OPTIONS] <TABLE>
 
 Arguments:
@@ -11,20 +13,19 @@ Arguments:
 
 
 Options:
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/clear/static-file.md

@@ -4,6 +4,8 @@ Deletes all static file segment entries
 
 ```bash
 $ reth db clear static-file --help
+```
+```txt
 Usage: reth db clear static-file [OPTIONS] <SEGMENT>
 
 Arguments:
@@ -12,22 +14,22 @@ Arguments:
           - headers:      Static File segment responsible for the `CanonicalHeaders`, `Headers`, `HeaderTerminalDifficulties` tables
           - transactions: Static File segment responsible for the `Transactions` table
           - receipts:     Static File segment responsible for the `Receipts` table
+          - block-meta:   Static File segment responsible for the `BlockBodyIndices`, `BlockOmmers`, `BlockWithdrawals` tables
 
 Options:
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/diff.md

@@ -4,23 +4,14 @@ Create a diff between two database tables or two entire databases
 
 ```bash
 $ reth db diff --help
+```
+```txt
 Usage: reth db diff [OPTIONS] --secondary-datadir <SECONDARY_DATADIR> --output <OUTPUT>
 
 Options:
       --secondary-datadir <SECONDARY_DATADIR>
           The path to the data dir for all reth files and subdirectories.
 
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
@@ -43,12 +34,31 @@ Database:
 
           [possible values: true, false]
 
+      --db.max-size <MAX_SIZE>
+          Maximum database size (e.g., 4TB, 8MB)
+
+      --db.growth-step <GROWTH_STEP>
+          Database growth step (e.g., 4GB, 4KB)
+
+      --db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
+          Read transaction timeout in seconds, 0 means no timeout
+
       --table <TABLE>
           The table name to diff. If not specified, all tables are diffed.
 
       --output <OUTPUT>
           The output directory for the diff report.
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/drop.md

@@ -4,26 +4,27 @@ Deletes all database entries
 
 ```bash
 $ reth db drop --help
+```
+```txt
 Usage: reth db drop [OPTIONS]
 
 Options:
   -f, --force
           Bypasses the interactive confirmation and drops the database directly
 
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/get.md

@@ -4,6 +4,8 @@ Gets the content of a table for the given key
 
 ```bash
 $ reth db get --help
+```
+```txt
 Usage: reth db get [OPTIONS] <COMMAND>
 
 Commands:
@@ -12,20 +14,19 @@ Commands:
   help         Print this message or the help of the given subcommand(s)
 
 Options:
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/get/mdbx.md

@@ -4,6 +4,8 @@ Gets the content of a database table for the given key
 
 ```bash
 $ reth db get mdbx --help
+```
+```txt
 Usage: reth db get mdbx [OPTIONS] <TABLE> <KEY> [SUBKEY]
 
 Arguments:
@@ -20,20 +22,19 @@ Options:
       --raw
           Output bytes instead of human-readable decoded value
 
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/get/static-file.md

@@ -4,6 +4,8 @@ Gets the content of a static file segment for the given key
 
 ```bash
 $ reth db get static-file --help
+```
+```txt
 Usage: reth db get static-file [OPTIONS] <SEGMENT> <KEY>
 
 Arguments:
@@ -12,6 +14,7 @@ Arguments:
           - headers:      Static File segment responsible for the `CanonicalHeaders`, `Headers`, `HeaderTerminalDifficulties` tables
           - transactions: Static File segment responsible for the `Transactions` table
           - receipts:     Static File segment responsible for the `Receipts` table
+          - block-meta:   Static File segment responsible for the `BlockBodyIndices`, `BlockOmmers`, `BlockWithdrawals` tables
 
   <KEY>
           The key to get content for
@@ -20,20 +23,19 @@ Options:
       --raw
           Output bytes instead of human-readable decoded value
 
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/list.md

@@ -4,6 +4,8 @@ Lists the contents of a table
 
 ```bash
 $ reth db list --help
+```
+```txt
 Usage: reth db list [OPTIONS] <TABLE>
 
 Arguments:
@@ -53,20 +55,19 @@ Options:
       --raw
           Output bytes instead of human-readable decoded value
 
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/path.md

@@ -4,23 +4,24 @@ Returns the full database path
 
 ```bash
 $ reth db path --help
+```
+```txt
 Usage: reth db path [OPTIONS]
 
 Options:
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout

book/cli/reth/db/static_file.md

@@ -1,174 +0,0 @@
-# reth db static-file
-
-StaticFiles tables from database
-
-```bash
-$ reth db static-file --help
-Usage: reth db static-file [OPTIONS] [SEGMENTS]...
-
-Arguments:
-  [SEGMENTS]...
-          StaticFile segments to generate
-
-          Possible values:
-          - headers:      StaticFile segment responsible for the `CanonicalHeaders`, `Headers`, `HeaderTerminalDifficulties` tables
-          - transactions: StaticFile segment responsible for the `Transactions` table
-          - receipts:     StaticFile segment responsible for the `Receipts` table
-
-Options:
-      --datadir <DATA_DIR>
-          The path to the data dir for all reth files and subdirectories.
-
-          Defaults to the OS-specific data directory:
-
-          - Linux: `$XDG_DATA_HOME/reth/` or `$HOME/.local/share/reth/`
-          - Windows: `{FOLDERID_RoamingAppData}/reth/`
-          - macOS: `$HOME/Library/Application Support/reth/`
-
-          [default: default]
-
-  -f, --from <FROM>
-          Starting block for the static_file
-
-          [default: 0]
-
-  -b, --block-interval <BLOCK_INTERVAL>
-          Number of blocks in the static_file
-
-          [default: 500000]
-
-      --chain <CHAIN_OR_PATH>
-          The chain this node is running.
-          Possible values are either a built-in chain or the path to a chain specification file.
-
-          Built-in chains:
-              mainnet, sepolia, goerli, holesky, dev
-
-          [default: mainnet]
-
-  -p, --parallel <PARALLEL>
-          Sets the number of static files built in parallel. Note: Each parallel build is memory-intensive
-
-          [default: 1]
-
-      --only-stats
-          Flag to skip static_file creation and print static_file files stats
-
-      --bench
-          Flag to enable database-to-static_file benchmarking
-
-      --only-bench
-          Flag to skip static_file creation and only run benchmarks on existing static files
-
-  -c, --compression <COMPRESSION>
-          Compression algorithms to use
-
-          [default: uncompressed]
-
-          Possible values:
-          - lz4:                  LZ4 compression algorithm
-          - zstd:                 Zstandard (Zstd) compression algorithm
-          - zstd-with-dictionary: Zstandard (Zstd) compression algorithm with a dictionary
-          - uncompressed:         No compression, uncompressed static_file
-
-      --with-filters
-          Flag to enable inclusion list filters and PHFs
-
-      --phf <PHF>
-          Specifies the perfect hashing function to use
-
-          Possible values:
-          - fmph:    Fingerprint-Based Minimal Perfect Hash Function
-          - go-fmph: Fingerprint-Based Minimal Perfect Hash Function with Group Optimization
-
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
-  -h, --help
-          Print help (see a summary with '-h')
-
-Logging:
-      --log.stdout.format <FORMAT>
-          The format to use for logs written to stdout
-
-          [default: terminal]
-
-          Possible values:
-          - json:     Represents JSON formatting for logs. This format outputs log records as JSON objects, making it suitable for structured logging
-          - log-fmt:  Represents logfmt (key=value) formatting for logs. This format is concise and human-readable, typically used in command-line applications
-          - terminal: Represents terminal-friendly formatting for logs
-
-      --log.stdout.filter <FILTER>
-          The filter to use for logs written to stdout
-
-          [default: ]
-
-      --log.file.format <FORMAT>
-          The format to use for logs written to the log file
-
-          [default: terminal]
-
-          Possible values:
-          - json:     Represents JSON formatting for logs. This format outputs log records as JSON objects, making it suitable for structured logging
-          - log-fmt:  Represents logfmt (key=value) formatting for logs. This format is concise and human-readable, typically used in command-line applications
-          - terminal: Represents terminal-friendly formatting for logs
-
-      --log.file.filter <FILTER>
-          The filter to use for logs written to the log file
-
-          [default: debug]
-
-      --log.file.directory <PATH>
-          The path to put log files in
-
-          [default: <CACHE_DIR>/logs]
-
-      --log.file.max-size <SIZE>
-          The maximum size (in MB) of one log file
-
-          [default: 200]
-
-      --log.file.max-files <COUNT>
-          The maximum amount of log files that will be stored. If set to 0, background file logging is disabled
-
-          [default: 5]
-
-      --log.journald
-          Write logs to journald
-
-      --log.journald.filter <FILTER>
-          The filter to use for logs written to journald
-
-          [default: error]
-
-      --color <COLOR>
-          Sets whether or not the formatter emits ANSI terminal escape codes for colors and other text formatting
-
-          [default: always]
-
-          Possible values:
-          - always: Colors on
-          - auto:   Colors on
-          - never:  Colors off
-
-Display:
-  -v, --verbosity...
-          Set the minimum log level.
-
-          -v      Errors
-          -vv     Warnings
-          -vvv    Info
-          -vvvv   Debug
-          -vvvvv  Traces (warning: very verbose!)
-
-  -q, --quiet
-          Silence all log output
-```

book/cli/reth/db/stats.md

@@ -4,6 +4,8 @@ Lists all the tables, their entry count and their size
 
 ```bash
 $ reth db stats --help
+```
+```txt
 Usage: reth db stats [OPTIONS]
 
 Options:
@@ -20,20 +22,19 @@ Options:
 
           For individual table checksums, use the `reth db checksum` command.
 
-      --instance <INSTANCE>
-          Add a new instance of a node.
-
-          Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine.
-
-          Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other.
-
-          Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2
-
-          [default: 1]
-
   -h, --help
           Print help (see a summary with '-h')
 
+Datadir:
+      --chain <CHAIN_OR_PATH>
+          The chain this node is running.
+          Possible values are either a built-in chain or the path to a chain specification file.
+
+          Built-in chains:
+              mainnet, sepolia, holesky, hoodi, dev
+
+          [default: mainnet]
+
 Logging:
       --log.stdout.format <FORMAT>
           The format to use for logs written to stdout