wip

.changelog/big-mules-cook.md

@@ -0,0 +1,4 @@
+---
+---
+
+Added site-level meta description for SEO.

.changelog/bold-frogs-run.md

@@ -0,0 +1,5 @@
+---
+reth-transaction-pool: patch
+---
+
+Renamed and documented validation methods for clarity. `validate_one_no_state` and `validate_one_against_state` are now public methods `validate_stateless` and `validate_stateful` with improved documentation explaining their respective validation phases.

.changelog/brave-dogs-fly.md

@@ -0,0 +1,10 @@
+---
+reth-engine-primitives: patch
+reth-engine-tree: patch
+reth-node-core: patch
+reth-trie-parallel: minor
+---
+
+Removed legacy proof calculation system and V2-specific configuration flags.
+
+Removed the legacy (non-V2) proof calculation code paths, simplified multiproof task architecture by removing the dual-mode system, and cleaned up V2-specific CLI flags (`--engine.disable-proof-v2`, `--engine.disable-trie-cache`) that are no longer needed. The codebase now exclusively uses V2 proofs with the sparse trie cache.

.changelog/calm-clams-buzz.md

@@ -0,0 +1,5 @@
+---
+reth-trie-sparse: patch
+---
+
+Refactored sparse trie node state tracking to use RLP nodes instead of hashes. Replaced `Option<B256>` hash fields with `SparseNodeState` enum that tracks either dirty nodes or cached RLP nodes with optional database storage flags. Added debug assertions to validate leaf path lengths and improved pruning logic to use node paths directly instead of path-hash tuples.

.changelog/config.toml

@@ -0,0 +1,20 @@
+# Changelogs configuration for reth
+# https://github.com/wevm/changelogs
+
+# How to bump packages that depend on changed packages
+dependent_bump = "patch"
+
+[changelog]
+# Generate per-crate changelogs (vs single root changelog)
+format = "per-crate"
+
+# Fixed groups: all always share the same version
+# reth binaries share version
+[[fixed]]
+members = ["reth"]
+
+# Packages to ignore (internal/test-only crates)
+ignore = [
+    "reth-testing-utils",
+    "reth-bench",
+]

.changelog/cool-suns-rest.md

@@ -0,0 +1,5 @@
+---
+reth-transaction-pool: minor
+---
+
+Added support for optional custom stateless and stateful validation hooks in `EthTransactionValidator` via `set_additional_stateless_validation` and `set_additional_stateful_validation` methods. Also implemented a manual `Debug` impl to handle the non-`Debug` function pointer fields.

.changelog/cute-bears-paint.md

@@ -0,0 +1,17 @@
+---
+reth: minor
+reth-cli-commands: minor
+reth-e2e-test-utils: minor
+reth-ethereum-cli: minor
+reth-node-core: minor
+reth-optimism-bin: minor
+reth-optimism-cli: minor
+reth-prune: patch
+reth-stages: patch
+reth-storage-api: minor
+reth-storage-db-api: minor
+reth-storage-db-common: patch
+reth-storage-provider: patch
+---
+
+Introduced `--storage.v2` flag to control storage mode defaults, replacing the `edge` feature flag with `rocksdb` feature. The new flag enables v2 storage settings (static files + RocksDB routing) while individual `--static-files.*` and `--rocksdb.*` flags can still override defaults. Updated feature gates from `edge` to `rocksdb` across all affected crates.

.changelog/dry-ants-bow.md

@@ -0,0 +1,5 @@
+---
+reth: patch
+---
+
+Removed Windows platform support from the codebase, including the Windows cross-compilation Dockerfile, build targets in Cross.toml and Makefile, and Windows-specific options in the bug report template.

.changelog/dry-ducks-write.md

@@ -0,0 +1,5 @@
+---
+reth-network: minor
+---
+
+Added reason label to backed_off_peers metric. The metric now tracks backed off peers by reason (too_many_peers, graceful_close, connection_error) to improve observability.

.changelog/dull-koalas-play.md

@@ -0,0 +1,5 @@
+---
+reth-trie-sparse: patch
+---
+
+Added recording of `SetRoot` operation in `ParallelSparseTrie::set_root` when the `trie-debug` feature is enabled.

.changelog/eager-mules-fold.md

@@ -0,0 +1,5 @@
+---
+reth-trie-sparse-parallel: patch
+---
+
+Fixed parallel sparse trie to skip revealing disconnected leaves by checking parent branch reachability before inserting leaf nodes.

.changelog/easy-clouds-meow.md

@@ -0,0 +1,5 @@
+---
+ef-tests: patch
+---
+
+Removed reth-stateless crate and stateless validation from ef-tests.

.changelog/evil-fish-smile.md

@@ -0,0 +1,6 @@
+---
+reth-rpc-convert: minor
+reth-storage-rpc-provider: minor
+---
+
+Replaced the separate `TryFromBlockResponse`, `TryFromReceiptResponse`, and `TryFromTransactionResponse` traits with a unified `RpcResponseConverter` trait and default `EthRpcConverter` implementation. Removed the `op-alloy-network` dependency and refactored `RpcBlockchainProvider` to store a dynamic converter instance instead of relying on per-type trait bounds.

.changelog/evil-pigs-cry.md

@@ -0,0 +1,6 @@
+---
+reth-engine-tree: patch
+reth-trie-sparse-parallel: patch
+---
+
+Added tracing spans and debug logs to sparse trie operations for better observability during parallel state root computation.

.changelog/fair-winds-growl.md

@@ -0,0 +1,6 @@
+---
+reth-exex: patch
+reth-exex-types: patch
+---
+
+Added configurable backfill thresholds to ExEx notifications stream and added regression tests for state provider parity between pipeline and backfill execution paths.

.changelog/fast-fish-cry.md

@@ -0,0 +1,4 @@
+---
+---
+
+Added WebSocket subscription integration tests for eth_subscribe.

.changelog/fast-seals-play.md

@@ -0,0 +1,5 @@
+---
+reth-transaction-pool: minor
+---
+
+Added `consensus_ref` method to `PoolTransaction` trait for borrowing consensus transactions without cloning.

.changelog/fast-waves-smile.md

@@ -0,0 +1,4 @@
+---
+---
+
+Improved nightly Docker build failure Slack notification with more detailed formatting and context.

.changelog/fix-simulate-revert-code.md

@@ -0,0 +1,5 @@
+---
+reth-rpc-eth-types: patch
+---
+
+Updated `eth_simulateV1` revert error code from `-32000` to `3` to be consistent with `eth_call`, per [execution-apis#748](https://github.com/ethereum/execution-apis/pull/748).

.changelog/gentle-moons-cry.md

@@ -0,0 +1,5 @@
+---
+reth-engine-tree: patch
+---
+
+Reordered cache size calculations in `ExecutionCache::new` to group related operations together.

.changelog/icy-lions-slide.md

@@ -0,0 +1,7 @@
+---
+reth: patch
+reth-cli-commands: patch
+reth-node-core: patch
+---
+
+Removed experimental ress protocol support for stateless Ethereum nodes.

.changelog/keen-geese-bake.md

@@ -0,0 +1,5 @@
+---
+reth-engine-tree: patch
+---
+
+Added sub-phase timing histograms to the sparse trie event loop, tracking channel wait, proof coalescing, multiproof reveal, and trie update durations separately.

.changelog/lazy-lakes-shout.md

@@ -0,0 +1,5 @@
+---
+reth-node-builder: patch
+---
+
+Removed biased select in engine service loop to allow fair scheduling of shutdown requests alongside event processing.

.changelog/lively-clams-drink.md

@@ -0,0 +1,5 @@
+---
+reth-transaction-pool: patch
+---
+
+Fixed swapped arguments in `blob_tx_priority` function calls, correcting the parameter order to match the function signature.

.changelog/lively-clouds-bake.md

@@ -0,0 +1,4 @@
+---
+---
+
+Improved documentation overview page with better structure and clarity.

.changelog/lively-deer-shout.md

@@ -0,0 +1,5 @@
+---
+reth: patch
+---
+
+Re-enabled changelog workflow to run automatically on pull requests.

.changelog/lively-foxes-play.md

@@ -0,0 +1,5 @@
+---
+reth-node-events: patch
+---
+
+Updated consensus engine log message to be more accurate about received updates.

.changelog/merry-koalas-nod.md

@@ -0,0 +1,6 @@
+---
+reth-rpc-eth-api: minor
+reth-rpc-server-types: minor
+---
+
+Added `eth_getStorageValues` RPC method for batch storage slot retrieval across multiple addresses.

.changelog/mild-foxes-bark.md

@@ -0,0 +1,6 @@
+---
+reth-chainspec: minor
+reth-network-peers: minor
+---
+
+Removed OP stack bootnodes from default chain configurations and network peers module.

.changelog/nice-trees-drink.md

@@ -0,0 +1,9 @@
+---
+reth-network-api: minor
+reth-network-types: minor
+reth-network: minor
+reth-node-core: minor
+reth: minor
+---
+
+Added optional ENR fork ID enforcement to filter out peers from incompatible networks during peer discovery, controlled by the `--enforce-enr-fork-id` CLI flag.

.changelog/nice-waves-bow.md

@@ -0,0 +1,5 @@
+---
+reth-primitives: patch
+---
+
+Moved feature-referenced dependencies from dev-dependencies to optional dependencies to ensure they are available when their corresponding features are enabled.

.changelog/odd-donkeys-chirp.md

@@ -0,0 +1,5 @@
+---
+reth-engine-tree: patch
+---
+
+Fixed `compare_trie_updates` to return `bool` indicating whether differences were found, and updated the caller to properly use the return value instead of treating all successful comparisons as having no differences.

.changelog/odd-snails-play.md

@@ -0,0 +1,5 @@
+---
+reth-node-core: minor
+---
+
+Added `with_dev_block_time` helper method to `NodeConfig` for configuring dev miner block production interval.

.changelog/old-dogs-shake.md

@@ -0,0 +1,5 @@
+---
+reth-transaction-pool: minor
+---
+
+Added `IntoIter: Send` bounds to `validate_transactions` and `validate_transactions_with_origin` in the `TransactionValidator` trait, avoiding unnecessary `Vec` collects. Simplified default `validate_transactions_with_origin` to delegate to `validate_transactions`.

.changelog/proud-crabs-bark.md

@@ -0,0 +1,5 @@
+---
+reth-db-api: patch
+---
+
+Changed `StoredNibblesSubKey` encoding to use a stack-allocated `[u8; 65]` array instead of a heap-allocated `Vec<u8>`, avoiding unnecessary heap allocation.

.changelog/proud-wolves-spin.md

@@ -0,0 +1,5 @@
+---
+reth-storage-api: patch
+---
+
+Added `Arc` to `auto_impl` derive for storage-api traits to support automatic `Arc` wrapper implementations.

.changelog/quick-mice-jump.md

@@ -0,0 +1,8 @@
+---
+reth: patch
+reth-engine-tree: patch
+reth-node-builder: patch
+reth-trie-sparse: minor
+---
+
+Added `trie-debug` feature for recording sparse trie mutations to aid in debugging state root mismatches.

.changelog/quiet-foxes-dance.md

@@ -0,0 +1,6 @@
+---
+reth-static-file-types: patch
+reth-provider: patch
+---
+
+Move changeset offsets from segment header to external `.csoff` sidecar file for incremental writes and crash recovery.

.changelog/quiet-frogs-whisper.md

@@ -0,0 +1,5 @@
+---
+reth-provider: patch
+---
+
+Removed unused staging types from ProviderFactoryBuilder.

.changelog/rich-lakes-bark.md

@@ -0,0 +1,5 @@
+---
+reth-provider: patch
+---
+
+Fixed sender pruning during block reorg to skip when sender_recovery is fully pruned, preventing a fatal crash when no sender data exists in static files.

.changelog/safe-waves-read.md

@@ -0,0 +1,7 @@
+---
+reth-network-types: minor
+reth-network: minor
+reth-node-core: patch
+---
+
+Added `PersistedPeerInfo` struct to persist richer peer metadata (kind, fork ID, reputation) to disk. Updated `PeersConfig::with_basic_nodes_from_file` to support both the new `PersistedPeerInfo` format and the legacy `Vec<NodeRecord>` format with automatic conversion, and updated `write_peers_to_file` to exclude backed-off and banned peers.

.changelog/shy-tigers-dry.md

@@ -0,0 +1,5 @@
+---
+reth: patch
+---
+
+Added automated changelog generation infrastructure using wevm/changelogs-rs with Claude Code integration. Configured per-crate changelog format with fixed version groups for reth binaries and exclusions for internal test utilities.

.changelog/swift-owls-fly.md

@@ -0,0 +1,5 @@
+---
+reth-trie-sparse: minor
+---
+
+Removed `SerialSparseTrie` from the workspace, consolidating on `ParallelSparseTrie` as the single sparse trie implementation in `reth-trie-sparse`.

.changelog/tall-stars-shout.md

@@ -0,0 +1,5 @@
+---
+reth-network: minor
+---
+
+Added `fork_id` as a tiebreaker in peer selection when reputations are equal, preferring peers with a discovered `fork_id` as it indicates fork compatibility. Added a test to verify the tiebreaker behavior.

.changelog/tidy-stars-cry.md

@@ -0,0 +1,5 @@
+---
+reth-trie-sparse: patch
+---
+
+Fixed a bug where trie nodes could appear in both `updated_nodes` and `removed_nodes` simultaneously by removing entries from `removed_nodes` when a node is inserted as updated.

.changelog/vain-lakes-cry.md

@@ -0,0 +1,5 @@
+---
+reth: patch
+---
+
+Updated Alloy dependencies from 1.5.2 to 1.6.1.

.changelog/vast-waves-fold.md

@@ -0,0 +1,4 @@
+---
+---
+
+Expanded CLI integration tests with subcommand help coverage, config TOML validation, genesis JSON validation, and send transaction round-trip test for dev mode.

.changelog/warm-donkeys-dry.md

@@ -0,0 +1,6 @@
+---
+reth-engine-local: minor
+reth-node-builder: minor
+---
+
+Added trigger-based `MiningMode` variant that allows blocks to be built on-demand via custom streams, and exposed `with_mining_mode` method on `DebugNodeLauncherFuture` to override default mining configuration.

.changelog/warm-foxes-glow.md

@@ -0,0 +1,5 @@
+---
+reth-network: minor
+---
+
+Added direction labels to `closed_sessions` and `pending_session_failures` metrics. Operators can now distinguish session closures and failures by direction (`active`, `incoming_pending`, `outgoing_pending` for closed sessions; `inbound`, `outbound` for pending session failures).

.changelog/warm-foxes-jump.md

@@ -0,0 +1,4 @@
+---
+---
+
+Moved Kurtosis CI failure notifications to the hive Slack channel.

.changelog/warm-geese-build.md

@@ -0,0 +1,7 @@
+---
+reth-rpc-api: minor
+reth-rpc-builder: patch
+reth-rpc: minor
+---
+
+Added `subscribeFinalizedChainNotifications` RPC endpoint that buffers committed chain notifications and emits them once a new finalized block is received.

.changelog/warm-pandas-cook.md

@@ -0,0 +1,5 @@
+---
+reth-transaction-pool: patch
+---
+
+Fixed a bug where transactions from the same sender were added to the pending subpool out of nonce order. Ensured `process_updates` runs before `add_new_transaction` so that lower-nonce promotions are enqueued before the newly inserted higher-nonce transaction, preserving correct ordering for live `BestTransactions` iterators.

.changelog/zesty-birds-smile.md

@@ -0,0 +1,6 @@
+---
+reth-trie: minor
+reth-trie-parallel: minor
+---
+
+Added `root_node` and `storage_root_node` methods to proof calculators for efficient root-only calculations. These methods directly return the root node without requiring dummy targets, replacing the previous workaround of passing fake targets to proof generation.

.config/zepter.yaml

@@ -12,7 +12,7 @@ workflows:
         # 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,tracy,serde-bincode-compat,serde,test-utils,arbitrary,bench,alloy-compat,min-error-logs,min-warn-logs,min-info-logs,min-debug-logs,min-trace-logs,otlp,otlp-logs,js-tracer,portable,keccak-cache-global,trie-debug",
+        "--features=std,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,tracy,serde-bincode-compat,serde,test-utils,arbitrary,bench,alloy-compat,min-error-logs,min-warn-logs,min-info-logs,min-debug-logs,min-trace-logs,otlp,otlp-logs,js-tracer,portable,keccak-cache-global",
         # 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.

.github/actionlint.yaml

@@ -5,4 +5,3 @@ self-hosted-runner:
     - depot-ubuntu-latest-4
     - depot-ubuntu-latest-8
     - depot-ubuntu-latest-16
-    - available

.github/scripts/bench-job-summary.js

@@ -1,106 +0,0 @@
-// Generates a rich GitHub Actions job summary for reth-bench results.
-//
-// Reads from environment:
-//   BENCH_WORK_DIR       – Directory containing summary.json
-//   BENCH_PR             – PR number (may be empty)
-//   BENCH_ACTOR          – GitHub user who triggered the bench
-//   BENCH_CORES          – CPU core limit (0 = all)
-//   BENCH_WARMUP_BLOCKS  – Number of warmup blocks
-//   BENCH_SAMPLY         – 'true' if samply profiling was enabled
-//   BENCH_ABBA           – 'true' if ABBA interleaved order was used
-//
-// Usage from actions/github-script:
-//   const jobSummary = require('./.github/scripts/bench-job-summary.js');
-//   await jobSummary({ core, context, chartSha, grafanaUrl, runId });
-
-const fs = require('fs');
-const { verdict, loadSamplyUrls, blocksLabel, metricRows, waitTimeRows } = require('./bench-utils');
-
-module.exports = async function ({ core, context, chartSha, grafanaUrl, runId }) {
-  let summary;
-  try {
-    summary = JSON.parse(fs.readFileSync(process.env.BENCH_WORK_DIR + '/summary.json', 'utf8'));
-  } catch (e) {
-    await core.summary.addRaw('⚠️ Benchmark completed but failed to load summary.').write();
-    return;
-  }
-
-  const repo = `${context.repo.owner}/${context.repo.repo}`;
-  const prNumber = process.env.BENCH_PR;
-  const actor = process.env.BENCH_ACTOR;
-  const commitUrl = `https://github.com/${repo}/commit`;
-
-  const { emoji, label } = verdict(summary.changes);
-  const baselineLink = `[\`${summary.baseline.name}\`](${commitUrl}/${summary.baseline.ref})`;
-  const featureLink = `[\`${summary.feature.name}\`](${commitUrl}/${summary.feature.ref})`;
-  const diffUrl = `https://github.com/${repo}/compare/${summary.baseline.ref}...${summary.feature.ref}`;
-
-  // Header & metadata
-  const metaParts = [];
-  if (prNumber) metaParts.push(`**[PR #${prNumber}](https://github.com/${repo}/pull/${prNumber})**`);
-  metaParts.push(`triggered by @${actor}`);
-
-  let md = `# ${emoji} ${label}\n\n`;
-  md += metaParts.join(' · ') + '\n\n';
-  md += `**Baseline:** ${baselineLink}\n`;
-  md += `**Feature:** ${featureLink} ([diff](${diffUrl}))\n`;
-  md += blocksLabel(summary).map(p => `**${p.key}:** ${p.value}`).join(' · ') + '\n\n';
-
-  // Main comparison table
-  const rows = metricRows(summary);
-  md += `| Metric | Baseline | Feature | Change |\n`;
-  md += `|--------|----------|---------|--------|\n`;
-  for (const r of rows) {
-    md += `| ${r.label} | ${r.baseline} | ${r.feature} | ${r.change} |\n`;
-  }
-  md += '\n';
-
-  // Wait time breakdown
-  const wtRows = waitTimeRows(summary);
-  if (wtRows.length > 0) {
-    md += `### Wait Time Breakdown\n\n`;
-    md += `| Metric | Baseline | Feature |\n`;
-    md += `|--------|----------|--------|\n`;
-    for (const r of wtRows) {
-      md += `| ${r.title} | ${r.baseline} | ${r.feature} |\n`;
-    }
-    md += '\n';
-  }
-
-  // Charts
-  if (chartSha) {
-    const prNum = prNumber || '0';
-    const baseUrl = `https://raw.githubusercontent.com/decofe/reth-bench-charts/${chartSha}/pr/${prNum}/${runId}`;
-    const charts = [
-      { file: 'latency_throughput.png', label: 'Latency, Throughput & Diff' },
-      { file: 'wait_breakdown.png', label: 'Wait Time Breakdown' },
-      { file: 'gas_vs_latency.png', label: 'Gas vs Latency' },
-    ];
-    md += `### Charts\n\n`;
-    for (const chart of charts) {
-      md += `<details><summary>${chart.label}</summary>\n\n`;
-      md += `![${chart.label}](${baseUrl}/${chart.file})\n\n`;
-      md += `</details>\n\n`;
-    }
-  }
-
-  // Samply profiles
-  const samplyUrls = loadSamplyUrls(process.env.BENCH_WORK_DIR);
-  const samplyLinks = Object.entries(samplyUrls).map(([run, url]) => `- **${run}**: [Firefox Profiler](${url})`);
-  if (samplyLinks.length > 0) {
-    md += `### Samply Profiles\n\n${samplyLinks.join('\n')}\n\n`;
-  }
-
-  // Grafana
-  if (grafanaUrl) {
-    md += `### Grafana Dashboard\n\n[View real-time metrics](${grafanaUrl})\n\n`;
-  }
-
-  // Node errors
-  try {
-    const errors = fs.readFileSync(process.env.BENCH_WORK_DIR + '/errors.md', 'utf8');
-    if (errors.trim()) md += '\n' + errors + '\n';
-  } catch {}
-
-  await core.summary.addRaw(md).write();
-};

.github/scripts/bench-metrics-proxy.py

@@ -1,276 +0,0 @@
-#!/usr/bin/env python3
-"""
-Prometheus metrics proxy that fetches from a local reth node and
-re-exposes with additional benchmark labels.
-
-Reads labels from a JSON file (updated by local-reth-bench.sh between runs)
-and injects them into every Prometheus metric line.
-
-Returns empty 200 when reth is not running (clean Grafana gaps).
-"""
-import argparse
-import ipaddress
-import json
-import subprocess
-import sys
-import time
-from http.server import HTTPServer, BaseHTTPRequestHandler
-from urllib.request import urlopen
-from urllib.error import URLError
-
-
-def read_labels(path):
-    try:
-        with open(path) as f:
-            return json.load(f)
-    except (FileNotFoundError, json.JSONDecodeError):
-        return {}
-
-
-def inject_labels(metrics_bytes, label_str, label_names):
-    """Inject labels into Prometheus text format.
-
-    Operates on bytes and uses simple string ops instead of regex
-    for speed on large payloads (reth exposes thousands of metrics).
-
-    Skips injecting into lines that already contain any of the label names
-    to avoid duplicate labels (which Prometheus rejects).
-    """
-    if not label_str:
-        return metrics_bytes
-
-    label_bytes = label_str.encode("utf-8")
-    # Pre-encode label names for fast duplicate detection
-    label_name_bytes = [n.encode("utf-8") for n in label_names]
-    out = []
-    for line in metrics_bytes.split(b"\n"):
-        # Skip comments and blank lines
-        if line.startswith(b"#") or not line:
-            out.append(line)
-            continue
-
-        brace = line.find(b"{")
-        space = line.find(b" ")
-
-        if space == -1:
-            # Malformed, pass through
-            out.append(line)
-        elif brace != -1 and brace < space:
-            # Has labels: metric{existing="val"} 123
-            close = line.find(b"}", brace)
-            if close == -1:
-                out.append(line)
-                continue
-
-            # Filter out labels that already exist in this line
-            existing = line[brace + 1:close]
-            inject = label_bytes
-            if existing:
-                for name in label_name_bytes:
-                    if name + b"=" in existing:
-                        # Rebuild inject string excluding this label
-                        inject = _remove_label(inject, name)
-                if not inject:
-                    out.append(line)
-                    continue
-
-            if close == brace + 1:
-                # Empty braces: metric{} 123
-                out.append(line[:close] + inject + line[close:])
-            else:
-                out.append(line[:close] + b"," + inject + line[close:])
-        else:
-            # No labels: metric 123
-            out.append(line[:space] + b"{" + label_bytes + b"}" + line[space:])
-
-    return b"\n".join(out)
-
-
-def _remove_label(label_bytes, name):
-    """Remove a single label (name=\"...\") from a comma-separated label string."""
-    parts = []
-    for part in label_bytes.split(b","):
-        if not part.startswith(name + b"="):
-            parts.append(part)
-    return b",".join(parts)
-
-
-def build_label_str(labels):
-    """Pre-format the label injection string: key1="val1",key2="val2" """
-    if not labels:
-        return ""
-    return ",".join(f'{k}="{v}"' for k, v in sorted(labels.items()))
-
-
-def build_elapsed_gauge(labels):
-    """Build a bench_elapsed_seconds gauge from run_start_epoch in labels."""
-    start = labels.get("run_start_epoch")
-    if not start:
-        return b""
-    try:
-        elapsed = time.time() - float(start)
-    except (ValueError, TypeError):
-        return b""
-    # Build labels excluding internal keys
-    display = {k: v for k, v in labels.items()
-               if k not in ("run_start_epoch", "reference_epoch")}
-    lstr = build_label_str(display)
-    return (
-        f"# HELP bench_elapsed_seconds Seconds since benchmark run started\n"
-        f"# TYPE bench_elapsed_seconds gauge\n"
-        f"bench_elapsed_seconds{{{lstr}}} {elapsed:.1f}\n"
-    ).encode("utf-8")
-
-
-def compute_timestamp_ms(labels):
-    """Compute a synthetic timestamp so all runs share a common time origin.
-
-    Returns the timestamp in milliseconds, or None if not enough info.
-    Uses: reference_epoch + (now - run_start_epoch) → all runs overlay at
-    the same Grafana time range.
-    """
-    ref = labels.get("reference_epoch")
-    start = labels.get("run_start_epoch")
-    if not ref or not start:
-        return None
-    try:
-        elapsed = time.time() - float(start)
-        return int((float(ref) + elapsed) * 1000)
-    except (ValueError, TypeError):
-        return None
-
-
-def inject_timestamps(metrics_bytes, timestamp_ms):
-    """Append a Prometheus timestamp (ms) to every data line.
-
-    Prometheus text format: metric{labels} value [timestamp_ms]
-    Adding timestamps causes Prometheus to store all runs' samples
-    at the same relative time, enabling natural overlay in Grafana.
-    """
-    if timestamp_ms is None:
-        return metrics_bytes
-
-    ts = str(timestamp_ms).encode("utf-8")
-    out = []
-    for line in metrics_bytes.split(b"\n"):
-        if line.startswith(b"#") or not line:
-            out.append(line)
-        else:
-            out.append(line + b" " + ts)
-    return b"\n".join(out)
-
-
-class MetricsHandler(BaseHTTPRequestHandler):
-    # Use HTTP/1.1 so Content-Length is respected and Prometheus
-    # doesn't have to rely on connection close to detect end of body.
-    protocol_version = "HTTP/1.1"
-
-    def do_GET(self):
-        src = self.client_address[0]
-        try:
-            resp = urlopen(self.server.upstream, timeout=2)
-            metrics = resp.read()
-        except (URLError, ConnectionError, OSError):
-            # reth not running — return empty 200
-            self._send(b"")
-            #print(f"  scrape from {src}: empty (reth not running)", flush=True)
-            return
-
-        all_labels = read_labels(self.server.labels_file)
-        # Internal keys — not injected as Prometheus labels
-        internal = ("run_start_epoch", "reference_epoch")
-        labels = {k: v for k, v in all_labels.items() if k not in internal}
-        label_str = build_label_str(labels)
-        label_names = sorted(labels.keys())
-
-        t0 = time.monotonic()
-        result = inject_labels(metrics, label_str, label_names)
-        result += build_elapsed_gauge(all_labels)
-        ts_ms = compute_timestamp_ms(all_labels)
-        result = inject_timestamps(result, ts_ms)
-        dt = time.monotonic() - t0
-
-        self._send(result)
-        print(f"  scrape from {src}: {len(metrics)} -> {len(result)} bytes, "
-              f"inject {dt*1000:.1f}ms", flush=True)
-
-    def _send(self, body):
-        self.send_response(200)
-        self.send_header("Content-Type", "text/plain; version=0.0.4")
-        self.send_header("Content-Length", str(len(body)))
-        self.send_header("Connection", "close")
-        self.end_headers()
-        if body:
-            self.wfile.write(body)
-
-    def log_message(self, format, *args):
-        pass  # suppress per-request logging
-
-
-def resolve_bind_address(subnet_cidr):
-    """Find the local IP address that belongs to the given subnet.
-
-    Uses ``ip -j addr show`` to enumerate interfaces and returns the first
-    address that falls within *subnet_cidr* (e.g. ``10.10.0.0/24``).
-    """
-    network = ipaddress.ip_network(subnet_cidr, strict=False)
-    try:
-        result = subprocess.run(
-            ["ip", "-j", "addr", "show"],
-            capture_output=True, text=True, check=True,
-        )
-        interfaces = json.loads(result.stdout)
-    except (subprocess.CalledProcessError, FileNotFoundError, json.JSONDecodeError) as exc:
-        print(f"Error: cannot enumerate interfaces: {exc}", file=sys.stderr)
-        sys.exit(1)
-
-    for iface in interfaces:
-        for addr_info in iface.get("addr_info", []):
-            try:
-                addr = ipaddress.ip_address(addr_info["local"])
-            except (KeyError, ValueError):
-                continue
-            if addr in network:
-                return str(addr)
-
-    print(f"Error: no interface address found in subnet {subnet_cidr}", file=sys.stderr)
-    sys.exit(1)
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Prometheus metrics proxy with label injection")
-    parser.add_argument("--labels", default="/tmp/bench-metrics-labels.json",
-                        help="Path to JSON file with labels to inject (default: /tmp/bench-metrics-labels.json)")
-    parser.add_argument("--upstream", default="http://127.0.0.1:9100/",
-                        help="Upstream reth metrics URL (default: http://127.0.0.1:9100/)")
-
-    bind_group = parser.add_mutually_exclusive_group()
-    bind_group.add_argument("--bind", default=None,
-                            help="Address to bind the proxy (default: 0.0.0.0)")
-    bind_group.add_argument("--subnet", default=None,
-                            help="Auto-detect bind address from a local interface in this subnet (e.g. 10.10.0.0/24)")
-
-    parser.add_argument("--port", type=int, default=9090,
-                        help="Port to bind the proxy (default: 9090)")
-    args = parser.parse_args()
-
-    if args.subnet:
-        bind_addr = resolve_bind_address(args.subnet)
-    elif args.bind:
-        bind_addr = args.bind
-    else:
-        bind_addr = "0.0.0.0"
-
-    server = HTTPServer((bind_addr, args.port), MetricsHandler)
-    server.upstream = args.upstream
-    server.labels_file = args.labels
-
-    print(f"bench-metrics-proxy listening on {bind_addr}:{args.port}")
-    print(f"  upstream: {args.upstream}")
-    print(f"  labels:   {args.labels}")
-    sys.stdout.flush()
-    server.serve_forever()
-
-
-if __name__ == "__main__":
-    main()

.github/scripts/bench-reth-build.sh

@@ -11,44 +11,17 @@
 #              optional branch-sha is the PR head commit for cache key
 #
 # Outputs:
-#   baseline: <source-dir>/target/profiling/reth (or reth-bb if BENCH_BIG_BLOCKS=true)
-#   feature:  <source-dir>/target/profiling/reth (or reth-bb), reth-bench installed to cargo bin
+#   baseline: <source-dir>/target/profiling/reth
+#   feature:  <source-dir>/target/profiling/reth, reth-bench installed to cargo bin
 #
 # Required: mc (MinIO client) with a configured alias
-# Optional env: BENCH_BIG_BLOCKS (true/false) — build reth-bb instead of reth
-set -euxo pipefail
+set -euo pipefail
 
 MC="mc"
 MODE="$1"
 SOURCE_DIR="$2"
 COMMIT="$3"
 
-BIG_BLOCKS="${BENCH_BIG_BLOCKS:-false}"
-# The node binary to build: reth-bb for big blocks, reth otherwise
-if [ "$BIG_BLOCKS" = "true" ]; then
-  NODE_BIN="reth-bb"
-  NODE_PKG="-p reth-bb"
-else
-  NODE_BIN="reth"
-  NODE_PKG="--bin reth"
-fi
-
-# Tracy support: when BENCH_TRACY is "on" or "full", add Tracy cargo features
-# and frame pointers for accurate stack traces.
-EXTRA_FEATURES=""
-EXTRA_RUSTFLAGS=""
-if [ "${BENCH_TRACY:-off}" != "off" ]; then
-  EXTRA_FEATURES="tracy,tracy-client/ondemand"
-  EXTRA_RUSTFLAGS=" -C force-frame-pointers=yes"
-fi
-
-# Cache suffix: hash of features+rustflags so different build configs get separate cache entries
-if [ -n "$EXTRA_FEATURES" ] || [ -n "$EXTRA_RUSTFLAGS" ]; then
-  BUILD_SUFFIX="-$(echo "${EXTRA_FEATURES}${EXTRA_RUSTFLAGS}" | sha256sum | cut -c1-12)"
-else
-  BUILD_SUFFIX=""
-fi
-
 # Verify a cached reth binary was built from the expected commit.
 # `reth --version` outputs "Commit SHA: <full-sha>" on its own line.
 verify_binary() {
@@ -69,70 +42,52 @@ verify_binary() {
 
 case "$MODE" in
   baseline|main)
-    BUCKET="minio/reth-binaries/${COMMIT}${BUILD_SUFFIX}"
+    BUCKET="minio/reth-binaries/${COMMIT}"
     mkdir -p "${SOURCE_DIR}/target/profiling"
 
     CACHE_VALID=false
-    if $MC stat --no-list "${BUCKET}/${NODE_BIN}" &>/dev/null; then
-      echo "Cache hit for baseline (${COMMIT}), downloading ${NODE_BIN}..."
-      if $MC cp "${BUCKET}/${NODE_BIN}" "${SOURCE_DIR}/target/profiling/${NODE_BIN}" && \
-         chmod +x "${SOURCE_DIR}/target/profiling/${NODE_BIN}" && \
-         verify_binary "${SOURCE_DIR}/target/profiling/${NODE_BIN}" "${COMMIT}"; then
+    if $MC stat "${BUCKET}/reth" &>/dev/null; then
+      echo "Cache hit for baseline (${COMMIT}), downloading binary..."
+      $MC cp "${BUCKET}/reth" "${SOURCE_DIR}/target/profiling/reth"
+      chmod +x "${SOURCE_DIR}/target/profiling/reth"
+      if verify_binary "${SOURCE_DIR}/target/profiling/reth" "${COMMIT}"; then
         CACHE_VALID=true
       else
-        echo "Cached baseline binary is stale or download failed, rebuilding..."
+        echo "Cached baseline binary is stale, rebuilding..."
       fi
     fi
     if [ "$CACHE_VALID" = false ]; then
-      echo "Building baseline ${NODE_BIN} (${COMMIT}) from source..."
+      echo "Building baseline (${COMMIT}) from source..."
       cd "${SOURCE_DIR}"
-      FEATURES_ARG=""
-      WORKSPACE_ARG=""
-      if [ -n "$EXTRA_FEATURES" ]; then
-        # --workspace is needed for cross-package feature syntax (tracy-client/ondemand)
-        FEATURES_ARG="--features ${EXTRA_FEATURES}"
-        WORKSPACE_ARG="--workspace"
-      fi
-      # shellcheck disable=SC2086
-      RUSTFLAGS="-C target-cpu=native${EXTRA_RUSTFLAGS}" \
-        cargo build --profile profiling $NODE_PKG $WORKSPACE_ARG $FEATURES_ARG
-      $MC cp "target/profiling/${NODE_BIN}" "${BUCKET}/${NODE_BIN}"
+      cargo build --profile profiling --bin reth
+      $MC cp target/profiling/reth "${BUCKET}/reth"
     fi
     ;;
 
   feature|branch)
     BRANCH_SHA="${4:-$COMMIT}"
-    BUCKET="minio/reth-binaries/${BRANCH_SHA}${BUILD_SUFFIX}"
+    BUCKET="minio/reth-binaries/${BRANCH_SHA}"
 
     CACHE_VALID=false
-    if $MC stat --no-list "${BUCKET}/${NODE_BIN}" &>/dev/null && $MC stat --no-list "${BUCKET}/reth-bench" &>/dev/null; then
+    if $MC stat "${BUCKET}/reth" &>/dev/null && $MC stat "${BUCKET}/reth-bench" &>/dev/null; then
       echo "Cache hit for ${BRANCH_SHA}, downloading binaries..."
       mkdir -p "${SOURCE_DIR}/target/profiling"
-      if $MC cp "${BUCKET}/${NODE_BIN}" "${SOURCE_DIR}/target/profiling/${NODE_BIN}" && \
-         $MC cp "${BUCKET}/reth-bench" /home/ubuntu/.cargo/bin/reth-bench && \
-         chmod +x "${SOURCE_DIR}/target/profiling/${NODE_BIN}" /home/ubuntu/.cargo/bin/reth-bench && \
-         verify_binary "${SOURCE_DIR}/target/profiling/${NODE_BIN}" "${COMMIT}"; then
+      $MC cp "${BUCKET}/reth" "${SOURCE_DIR}/target/profiling/reth"
+      $MC cp "${BUCKET}/reth-bench" /home/ubuntu/.cargo/bin/reth-bench
+      chmod +x "${SOURCE_DIR}/target/profiling/reth" /home/ubuntu/.cargo/bin/reth-bench
+      if verify_binary "${SOURCE_DIR}/target/profiling/reth" "${COMMIT}"; then
         CACHE_VALID=true
       else
-        echo "Cached feature binary is stale or download failed, rebuilding..."
+        echo "Cached feature binary is stale, rebuilding..."
       fi
     fi
     if [ "$CACHE_VALID" = false ]; then
-      echo "Building feature ${NODE_BIN} (${COMMIT}) from source..."
+      echo "Building feature (${COMMIT}) from source..."
       cd "${SOURCE_DIR}"
       rustup show active-toolchain || rustup default stable
-      if [ -n "$EXTRA_FEATURES" ]; then
-        # Can't use `make profiling` when adding features; build explicitly
-        # --workspace is needed for cross-package feature syntax (tracy-client/ondemand)
-        RUSTFLAGS="-C target-cpu=native${EXTRA_RUSTFLAGS}" \
-          cargo build --profile profiling --workspace $NODE_PKG --features "${EXTRA_FEATURES}"
-      else
-        # shellcheck disable=SC2086
-        RUSTFLAGS="-C target-cpu=native${EXTRA_RUSTFLAGS}" \
-          cargo build --profile profiling $NODE_PKG
-      fi
+      make profiling
       make install-reth-bench
-      $MC cp "target/profiling/${NODE_BIN}" "${BUCKET}/${NODE_BIN}"
+      $MC cp target/profiling/reth "${BUCKET}/reth"
       $MC cp "$(which reth-bench)" "${BUCKET}/reth-bench"
     fi
     ;;

.github/scripts/bench-reth-local.sh

@@ -1,578 +0,0 @@
-#!/usr/bin/env bash
-#
-# local-reth-bench.sh — Run the reth Engine API benchmark locally.
-#
-# Replicates the CI bench.yml workflow (build, snapshot, system tuning,
-# interleaved B-F-F-B execution, summary, charts) without any GitHub
-# Actions glue (no PR comments, no artifact upload, no Slack).
-#
-# Usage:
-#   local-reth-bench.sh <baseline-ref> <feature-ref> [options]
-#
-# Options:
-#   --blocks N      Number of blocks to benchmark (default: 500)
-#   --warmup N      Number of warmup blocks (default: 100)
-#   --cores N       Limit reth to N CPU cores, 0 = all available (default: 0)
-#   --samply        Enable samply profiling
-#   --tracy MODE    Tracy profiling: off, on, full (default: off)
-#   --tracy-filter F Tracy tracing filter (default: debug)
-#   --no-tune       Skip system tuning (useful on dev machines / macOS)
-#
-# Requires: the reth repo at RETH_REPO (default: ~/reth)
-#
-# Dependencies (install before first run):
-#   mc (MinIO client), schelk, cpupower, taskset, stdbuf, python3, curl,
-#   make, uv, pzstd, jq, Rust toolchain (cargo/rustup)
-#
-# The script delegates to the existing bench-reth-*.sh scripts in the reth
-# repo for the actual build, snapshot, and run steps.
-set -euxo pipefail
-
-# ── PATH ──────────────────────────────────────────────────────────────
-# Ensure cargo and user-local bins (mc, uv) are visible
-export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
-
-# ── Defaults ──────────────────────────────────────────────────────────
-RETH_REPO="${RETH_REPO:-$HOME/reth}"
-BLOCKS=500
-WARMUP=100
-CORES=0
-SAMPLY=false
-TRACY="off"
-TRACY_FILTER="debug"
-TUNE=true
-BASELINE_REF=""
-FEATURE_REF=""
-
-# ── Parse arguments ──────────────────────────────────────────────────
-usage() {
-  cat <<EOF
-Usage: $(basename "$0") <baseline-ref> <feature-ref> [options]
-
-Options:
-  --blocks N         Number of blocks to benchmark (default: 500)
-  --warmup N         Number of warmup blocks (default: 100)
-  --cores N          Limit reth to N CPU cores (default: 0 = all)
-  --samply           Enable samply profiling
-  --tracy MODE       Tracy profiling: off, on, full (default: off)
-                       on   = tracing only (lower overhead)
-                       full = tracing + CPU sampling (higher overhead)
-  --tracy-filter F   Tracy tracing filter (default: debug)
-  --no-tune          Skip system tuning
-EOF
-  exit 1
-}
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --blocks)       BLOCKS="$2"; shift 2 ;;
-    --warmup)       WARMUP="$2"; shift 2 ;;
-    --cores)        CORES="$2"; shift 2 ;;
-    --samply)       SAMPLY=true; shift ;;
-    --tracy)        TRACY="$2"; shift 2 ;;
-    --tracy-filter) TRACY_FILTER="$2"; shift 2 ;;
-    --no-tune)      TUNE=false; shift ;;
-    --help|-h)  usage ;;
-    -*)         echo "Unknown option: $1"; usage ;;
-    *)
-      if [ -z "$BASELINE_REF" ]; then
-        BASELINE_REF="$1"
-      elif [ -z "$FEATURE_REF" ]; then
-        FEATURE_REF="$1"
-      else
-        echo "Unexpected argument: $1"; usage
-      fi
-      shift
-      ;;
-  esac
-done
-
-if [ -z "$BASELINE_REF" ] || [ -z "$FEATURE_REF" ]; then
-  echo "Error: both <baseline-ref> and <feature-ref> are required."
-  usage
-fi
-
-# Validate --tracy value
-case "$TRACY" in
-  off|on|full) ;;
-  *) echo "Error: --tracy must be off, on, or full (got: $TRACY)"; usage ;;
-esac
-
-# Samply + tracy=full are mutually exclusive (both use perf sampling)
-if [ "$SAMPLY" = "true" ] && [ "$TRACY" = "full" ]; then
-  echo "Warning: samply and tracy=full both use perf sampling; downgrading tracy to 'on'."
-  TRACY="on"
-fi
-
-# ── Check dependencies ───────────────────────────────────────────────
-missing=()
-for cmd in mc schelk cpupower taskset stdbuf python3 curl make uv pzstd jq cargo; do
-  command -v "$cmd" &>/dev/null || missing+=("$cmd")
-done
-if [ ${#missing[@]} -gt 0 ]; then
-  echo "Error: missing required tools: ${missing[*]}"
-  echo "See the CI 'Install dependencies' step in .github/workflows/bench.yml for install instructions."
-  exit 1
-fi
-
-if [ "$TRACY" != "off" ]; then
-  if ! command -v tracy-capture &>/dev/null; then
-    echo "Error: tracy-capture is required for --tracy $TRACY"
-    exit 1
-  fi
-fi
-
-# Ensure tools that run via sudo are in a sudo-visible path.
-# The bench scripts use `sudo schelk` / `sudo samply` but cargo installs
-# them to ~/.cargo/bin which sudo's secure_path doesn't include.
-for cmd in schelk samply; do
-  if command -v "$cmd" &>/dev/null && ! sudo sh -c "command -v $cmd" &>/dev/null; then
-    echo "Installing $cmd to /usr/local/bin (needed for sudo)..."
-    sudo install "$(command -v "$cmd")" /usr/local/bin/
-  fi
-done
-
-if [ ! -d "$RETH_REPO/.git" ]; then
-  echo "Error: RETH_REPO=$RETH_REPO is not a git repository."
-  echo "Set RETH_REPO or clone reth to ~/reth"
-  exit 1
-fi
-
-# ── Resolve paths ────────────────────────────────────────────────────
-SELF_DIR="$(cd "$(dirname "$0")" && pwd)"
-SCRIPTS_DIR="${RETH_REPO}/.github/scripts"
-BENCH_WORK_DIR="${RETH_REPO}/../bench-work-$(date +%Y%m%d-%H%M%S)"
-BASELINE_SRC="${RETH_REPO}/../reth-baseline"
-FEATURE_SRC="${RETH_REPO}/../reth-feature"
-
-mkdir -p "$BENCH_WORK_DIR"
-BENCH_WORK_DIR="$(cd "$BENCH_WORK_DIR" && pwd)"
-
-# ── Global cleanup trap (restores system tuning on any exit) ─────────
-TUNING_APPLIED=false
-CSTATE_PID=
-METRICS_PROXY_PID=
-cleanup_global() {
-  [ -n "$METRICS_PROXY_PID" ] && kill "$METRICS_PROXY_PID" 2>/dev/null || true
-  if [ "$TUNING_APPLIED" = true ]; then
-    echo
-    echo "▸ Restoring system settings..."
-    [ -n "$CSTATE_PID" ] && kill "$CSTATE_PID" 2>/dev/null || true
-    sudo systemctl start irqbalance cron atd 2>/dev/null || true
-    echo "  System settings restored."
-  fi
-}
-trap cleanup_global EXIT
-
-echo "═══════════════════════════════════════════════════════════"
-echo "  reth local benchmark"
-echo "═══════════════════════════════════════════════════════════"
-echo "  Baseline ref : $BASELINE_REF"
-echo "  Feature ref  : $FEATURE_REF"
-echo "  Blocks       : $BLOCKS"
-echo "  Warmup       : $WARMUP"
-echo "  Cores        : $CORES"
-echo "  Samply       : $SAMPLY"
-echo "  Tracy        : $TRACY"
-echo "  Tracy filter : $TRACY_FILTER"
-echo "  System tune  : $TUNE"
-echo "  Work dir     : $BENCH_WORK_DIR"
-echo "  Reth repo    : $RETH_REPO"
-echo "═══════════════════════════════════════════════════════════"
-echo
-
-# Enable sccache if available (matches CI's RUSTC_WRAPPER=sccache)
-if command -v sccache &>/dev/null; then
-  export RUSTC_WRAPPER="sccache"
-fi
-
-# Export env vars expected by the bench-reth-*.sh scripts
-export BENCH_BLOCKS="$BLOCKS"
-export BENCH_WARMUP_BLOCKS="$WARMUP"
-export BENCH_CORES="$CORES"
-export BENCH_SAMPLY="$SAMPLY"
-export BENCH_TRACY="$TRACY"
-export BENCH_TRACY_FILTER="$TRACY_FILTER"
-export BENCH_WORK_DIR
-export SCHELK_MOUNT="${SCHELK_MOUNT:-/reth-bench}"
-export BENCH_RPC_URL="${BENCH_RPC_URL:-https://ethereum.reth.rs/rpc}"
-export BENCH_METRICS_ADDR="127.0.0.1:9100"
-
-# ── Step 1: Resolve refs to full SHAs ────────────────────────────────
-echo "▸ Resolving git refs..."
-cd "$RETH_REPO"
-
-resolve_ref() {
-  local ref="$1"
-  git fetch origin "$ref" --quiet 2>/dev/null || true
-  git rev-parse "$ref" 2>/dev/null \
-    || git rev-parse "origin/$ref" 2>/dev/null \
-    || { echo "Error: cannot resolve ref '$ref'"; exit 1; }
-}
-
-BASELINE_SHA="$(resolve_ref "$BASELINE_REF")"
-FEATURE_SHA="$(resolve_ref "$FEATURE_REF")"
-echo "  Baseline SHA : $BASELINE_SHA"
-echo "  Feature SHA  : $FEATURE_SHA"
-echo
-
-# ── Step 2: Prepare source directories ───────────────────────────────
-echo "▸ Preparing source directories..."
-
-prepare_source() {
-  local src_dir="$1" ref="$2"
-  if [ -d "$src_dir" ]; then
-    git -C "$src_dir" fetch origin "$ref" 2>/dev/null || true
-  else
-    git clone --recurse-submodules "$RETH_REPO" "$src_dir"
-  fi
-  git -C "$src_dir" checkout "$ref" --force
-  git -C "$src_dir" submodule update --init --recursive
-}
-
-prepare_source "$BASELINE_SRC" "$BASELINE_SHA"
-prepare_source "$FEATURE_SRC" "$FEATURE_SHA"
-BASELINE_SRC="$(cd "$BASELINE_SRC" && pwd)"
-FEATURE_SRC="$(cd "$FEATURE_SRC" && pwd)"
-echo "  Baseline src : $BASELINE_SRC"
-echo "  Feature src  : $FEATURE_SRC"
-echo
-
-# ── Step 3: Check / download snapshot ────────────────────────────────
-echo "▸ Checking snapshot..."
-cd "$RETH_REPO"
-SNAPSHOT_NEEDED=false
-if ! "${SCRIPTS_DIR}/bench-reth-snapshot.sh" --check; then
-  SNAPSHOT_NEEDED=true
-  echo "  Snapshot needs update."
-else
-  echo "  Snapshot is up-to-date."
-fi
-echo
-
-# ── Step 4: Build binaries (+ snapshot download) in parallel ─────────
-echo "▸ Building binaries (parallel)..."
-cd "$RETH_REPO"
-
-FAIL=0
-
-"${SCRIPTS_DIR}/bench-reth-build.sh" baseline "$BASELINE_SRC" "$BASELINE_SHA" &
-PID_BASELINE=$!
-
-"${SCRIPTS_DIR}/bench-reth-build.sh" feature "$FEATURE_SRC" "$FEATURE_SHA" &
-PID_FEATURE=$!
-
-PID_SNAPSHOT=
-if [ "$SNAPSHOT_NEEDED" = "true" ]; then
-  echo "  Also downloading snapshot in parallel..."
-  "${SCRIPTS_DIR}/bench-reth-snapshot.sh" &
-  PID_SNAPSHOT=$!
-fi
-
-wait $PID_BASELINE || FAIL=1
-wait $PID_FEATURE  || FAIL=1
-[ -n "$PID_SNAPSHOT" ] && { wait $PID_SNAPSHOT || FAIL=1; }
-
-if [ $FAIL -ne 0 ]; then
-  echo "Error: one or more parallel tasks failed (builds / snapshot)"
-  exit 1
-fi
-echo "  Binaries built successfully."
-echo
-
-# ── Step 5: System tuning (optional) ────────────────────────────────
-if [ "$TUNE" = "true" ]; then
-  echo "▸ Applying system tuning..."
-
-  sudo cpupower frequency-set -g performance 2>/dev/null || true
-
-  # Disable turbo boost (Intel + AMD)
-  echo 1 | sudo tee /sys/devices/system/cpu/intel_pstate/no_turbo 2>/dev/null || true
-  echo 0 | sudo tee /sys/devices/system/cpu/cpufreq/boost 2>/dev/null || true
-
-  sudo swapoff -a 2>/dev/null || true
-  echo 0 | sudo tee /proc/sys/kernel/randomize_va_space 2>/dev/null || true
-
-  # Disable SMT (hyperthreading)
-  for cpu in /sys/devices/system/cpu/cpu*/topology/thread_siblings_list; do
-    [ -f "$cpu" ] || continue
-    first=$(cut -d, -f1 < "$cpu" | cut -d- -f1)
-    current=$(echo "$cpu" | grep -o 'cpu[0-9]*' | grep -o '[0-9]*')
-    if [ "$current" != "$first" ]; then
-      echo 0 | sudo tee "/sys/devices/system/cpu/cpu${current}/online" 2>/dev/null || true
-    fi
-  done
-  echo "  Online CPUs: $(nproc)"
-
-  # Disable transparent huge pages
-  for p in /sys/kernel/mm/transparent_hugepage /sys/kernel/mm/transparent_hugepages; do
-    if [ -d "$p" ]; then
-      echo never | sudo tee "$p/enabled" 2>/dev/null || true
-      echo never | sudo tee "$p/defrag" 2>/dev/null || true
-      break
-    fi
-  done
-
-  # Prevent deep C-states
-  sudo sh -c 'exec 3<>/dev/cpu_dma_latency; echo -ne "\x00\x00\x00\x00" >&3; sleep infinity' &
-  CSTATE_PID=$!
-
-  # Pin IRQs to core 0
-  for irq in /proc/irq/*/smp_affinity_list; do
-    echo 0 | sudo tee "$irq" 2>/dev/null || true
-  done
-
-  # Stop noisy background services
-  sudo systemctl stop irqbalance cron atd unattended-upgrades snapd 2>/dev/null || true
-
-  TUNING_APPLIED=true
-
-  # Log environment for reproducibility (matches CI)
-  echo "  === Benchmark environment ==="
-  echo "  Kernel : $(uname -r)"
-  lscpu | grep -E 'Model name|CPU\(s\)|MHz|NUMA' | sed 's/^/  /'
-  echo "  Governor : $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor 2>/dev/null || echo unknown)"
-  echo "  Freq     : $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq 2>/dev/null || echo unknown)"
-  echo "  THP      : $(cat /sys/kernel/mm/transparent_hugepage/enabled 2>/dev/null || cat /sys/kernel/mm/transparent_hugepages/enabled 2>/dev/null || echo unknown)"
-  free -h | sed 's/^/  /'
-  echo "  System tuning applied."
-  echo
-fi
-
-# ── Step 5b: Tracefs mount (tracy=full only) ─────────────────────────
-if [ "$TRACY" = "full" ] && [ "$(uname)" = "Linux" ]; then
-  echo "▸ Mounting tracefs for Tracy full mode..."
-  sudo mount -t tracefs tracefs /sys/kernel/tracing -o mode=755 2>/dev/null || true
-fi
-
-# ── Tracy upload & viewer helpers ────────────────────────────────────
-TRACY_VIEWER_BASE="${TRACY_VIEWER_BASE:-}"
-
-tracy_viewer_url() {
-  local profile_url="$1"
-  if [ -z "$TRACY_VIEWER_BASE" ]; then
-    echo ""
-    return
-  fi
-  local encoded
-  encoded=$(python3 -c "import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1], safe=''))" "$profile_url")
-  echo "${TRACY_VIEWER_BASE}?profile_url=${encoded}"
-}
-
-upload_tracy() {
-  local label="$1" output_dir="$2" sha="$3"
-  local tracy_file="$output_dir/tracy-profile.tracy"
-
-  if [ ! -f "$tracy_file" ]; then
-    echo "  Tracy: no profile found, skipping upload."
-    return
-  fi
-
-  local timestamp short_sha remote_name bucket mc_alias
-  timestamp=$(date +%Y%m%d-%H%M%S)
-  short_sha="${sha:0:7}"
-  remote_name="${label}-${short_sha}-${timestamp}.tracy"
-  bucket="${TRACY_BUCKET:-tracy-profiles}"
-  mc_alias="${MC_ALIAS:-minio}"
-  local minio_base="${TRACY_MINIO_URL:-http://minio.minio.svc.cluster.local:9000}"
-
-  echo "  Tracy: uploading profile..."
-  if mc cp "$tracy_file" "${mc_alias}/${bucket}/${remote_name}"; then
-    local url="${minio_base}/${bucket}/${remote_name}"
-    echo "$url" > "$output_dir/tracy_url.txt"
-    local viewer
-    viewer=$(tracy_viewer_url "$url")
-    if [ -n "$viewer" ]; then
-      echo "$viewer" > "$output_dir/tracy_viewer_url.txt"
-      echo "  Tracy: uploaded → $viewer"
-    else
-      echo "  Tracy: uploaded → $url"
-    fi
-  else
-    echo "  Tracy: upload failed (non-fatal)."
-  fi
-
-  # Delete large profile to free disk
-  rm -f "$tracy_file"
-}
-
-# ── Step 6: Pre-flight cleanup ───────────────────────────────────────
-echo "▸ Pre-flight cleanup..."
-pkill -f bench-metrics-proxy 2>/dev/null || true
-sudo systemctl stop "${RETH_SCOPE:-reth-bench.scope}" 2>/dev/null || true
-sudo systemctl reset-failed "${RETH_SCOPE:-reth-bench.scope}" 2>/dev/null || true
-sudo schelk recover -y --kill || sudo schelk full-recover -y || true
-echo
-
-# ── Step 7: Interleaved benchmark runs (B-F-F-B) ────────────────────
-# This ordering reduces systematic bias from thermal drift and cache warming.
-BASELINE_BIN="${BASELINE_SRC}/target/profiling/reth"
-FEATURE_BIN="${FEATURE_SRC}/target/profiling/reth"
-
-# Start metrics proxy (reth → label injection → Prometheus)
-LABELS_FILE="/tmp/bench-metrics-labels.json"
-echo '{}' > "$LABELS_FILE"
-METRICS_SUBNET="${METRICS_SUBNET:-10.10.0.0/24}"
-METRICS_PORT="${METRICS_PORT:-9090}"
-python3 "${SELF_DIR}/bench-metrics-proxy.py" \
-  --labels "$LABELS_FILE" \
-  --upstream "http://${BENCH_METRICS_ADDR}/" \
-  --subnet "$METRICS_SUBNET" \
-  --port "$METRICS_PORT" &
-METRICS_PROXY_PID=$!
-echo "▸ Metrics proxy started (PID $METRICS_PROXY_PID) on subnet ${METRICS_SUBNET}, port ${METRICS_PORT}"
-
-# Unique benchmark ID: local-<timestamp> for local runs, ci-<run_id> for CI
-BENCH_ID="local-$(basename "$BENCH_WORK_DIR" | sed 's/bench-work-//')"
-# Reference epoch: shared time origin so all runs overlay in Grafana.
-# The proxy maps each run's elapsed time onto this common origin.
-BENCH_REFERENCE_EPOCH=$(date +%s)
-
-write_labels() {
-  local run_label="$1" run_type="$2" ref="$3" sha="$4"
-  LAST_RUN_START=$(date +%s)
-  cat > "$LABELS_FILE" <<-EOF
-	{"benchmark_run":"${run_label}","run_type":"${run_type}","git_ref":"${ref}","bench_sha":"${sha}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-	EOF
-}
-
-run_bench() {
-  local label="$1" binary="$2" output_dir="$3"
-  echo "▸ Running benchmark: ${label}..."
-  cd "$RETH_REPO"
-  if command -v taskset &>/dev/null; then
-    taskset -c 0 "${SCRIPTS_DIR}/bench-reth-run.sh" "$label" "$binary" "$output_dir"
-  else
-    "${SCRIPTS_DIR}/bench-reth-run.sh" "$label" "$binary" "$output_dir"
-  fi
-  echo "  ✓ ${label} complete."
-  echo
-}
-
-write_labels "baseline-1" "baseline" "$BASELINE_REF" "$BASELINE_SHA"
-run_bench "baseline-1" "$BASELINE_BIN" "$BENCH_WORK_DIR/baseline-1"
-
-write_labels "feature-1" "feature" "$FEATURE_REF" "$FEATURE_SHA"
-run_bench "feature-1"  "$FEATURE_BIN"  "$BENCH_WORK_DIR/feature-1"
-
-write_labels "feature-2" "feature" "$FEATURE_REF" "$FEATURE_SHA"
-run_bench "feature-2"  "$FEATURE_BIN"  "$BENCH_WORK_DIR/feature-2"
-
-write_labels "baseline-2" "baseline" "$BASELINE_REF" "$BASELINE_SHA"
-run_bench "baseline-2" "$BASELINE_BIN" "$BENCH_WORK_DIR/baseline-2"
-
-# ── Compute Grafana URL ──────────────────────────────────────────────
-GRAFANA_BASE_URL="https://tempoxyz.grafana.net/d/reth-bench-ghr/reth-bench-ghr"
-GRAFANA_DATASOURCE="ef57fux92e9z4e"
-LAST_RUN_DURATION=$(( $(date +%s) - LAST_RUN_START ))
-FROM_MS=$(( BENCH_REFERENCE_EPOCH * 1000 ))
-TO_MS=$(( (BENCH_REFERENCE_EPOCH + LAST_RUN_DURATION) * 1000 ))
-GRAFANA_URL="${GRAFANA_BASE_URL}?orgId=1&from=${FROM_MS}&to=${TO_MS}&timezone=browser&var-datasource=${GRAFANA_DATASOURCE}&var-job=reth-bench&var-benchmark_id=${BENCH_ID}&var-benchmark_run=\$__all"
-
-# ── Step 8: Scan logs for errors ─────────────────────────────────────
-echo "▸ Scanning logs for errors..."
-ERRORS_FILE="$BENCH_WORK_DIR/errors.md"
-found_errors=false
-for run_dir in baseline-1 feature-1 feature-2 baseline-2; do
-  LOG="$BENCH_WORK_DIR/$run_dir/node.log"
-  [ -f "$LOG" ] || continue
-  panics=$(grep -c -E 'panicked at' "$LOG" 2>/dev/null || true)
-  errors=$(grep -c ' ERROR ' "$LOG" 2>/dev/null || true)
-  if [ "$panics" -gt 0 ] || [ "$errors" -gt 0 ]; then
-    if [ "$found_errors" = false ]; then
-      printf '### ⚠️ Node Errors\n\n' >> "$ERRORS_FILE"
-      found_errors=true
-    fi
-    printf '<details><summary><b>%s</b>: %d panic(s), %d error(s)</summary>\n\n' \
-      "$run_dir" "$panics" "$errors" >> "$ERRORS_FILE"
-    if [ "$panics" -gt 0 ]; then
-      printf '**Panics:**\n```\n' >> "$ERRORS_FILE"
-      grep -E 'panicked at' "$LOG" | head -10 >> "$ERRORS_FILE"
-      printf '```\n' >> "$ERRORS_FILE"
-    fi
-    if [ "$errors" -gt 0 ]; then
-      printf '**Errors (first 20):**\n```\n' >> "$ERRORS_FILE"
-      grep ' ERROR ' "$LOG" | head -20 >> "$ERRORS_FILE"
-      printf '```\n' >> "$ERRORS_FILE"
-    fi
-    printf '\n</details>\n\n' >> "$ERRORS_FILE"
-  fi
-done
-if [ "$found_errors" = true ]; then
-  echo "  ⚠ Errors found — see $ERRORS_FILE"
-else
-  echo "  No errors found."
-fi
-echo
-
-# ── Step 9: Parse results ───────────────────────────────────────────
-echo "▸ Parsing results..."
-cd "$RETH_REPO"
-
-SUMMARY_ARGS=(
-  --output-summary "$BENCH_WORK_DIR/summary.json"
-  --output-markdown "$BENCH_WORK_DIR/comment.md"
-  --repo "paradigmxyz/reth"
-  --baseline-ref "$BASELINE_SHA"
-  --baseline-name "$BASELINE_REF"
-  --feature-name "$FEATURE_REF"
-  --feature-ref "$FEATURE_SHA"
-  --baseline-csv "$BENCH_WORK_DIR/baseline-1/combined_latency.csv" "$BENCH_WORK_DIR/baseline-2/combined_latency.csv"
-  --feature-csv "$BENCH_WORK_DIR/feature-1/combined_latency.csv" "$BENCH_WORK_DIR/feature-2/combined_latency.csv"
-  --gas-csv "$BENCH_WORK_DIR/feature-1/total_gas.csv"
-  --grafana-url "$GRAFANA_URL"
-)
-
-python3 "${SCRIPTS_DIR}/bench-reth-summary.py" "${SUMMARY_ARGS[@]}"
-echo
-
-# ── Step 10: Generate charts ─────────────────────────────────────────
-echo "▸ Generating charts..."
-CHART_ARGS=(
-  --output-dir "$BENCH_WORK_DIR/charts"
-  --feature "$BENCH_WORK_DIR/feature-1/combined_latency.csv" "$BENCH_WORK_DIR/feature-2/combined_latency.csv"
-  --baseline "$BENCH_WORK_DIR/baseline-1/combined_latency.csv" "$BENCH_WORK_DIR/baseline-2/combined_latency.csv"
-  --baseline-name "$BASELINE_REF"
-  --feature-name "$FEATURE_REF"
-)
-
-if python3 -c "import matplotlib" 2>/dev/null; then
-  python3 "${SCRIPTS_DIR}/bench-reth-charts.py" "${CHART_ARGS[@]}"
-elif command -v uv &>/dev/null; then
-  uv run --with matplotlib python3 "${SCRIPTS_DIR}/bench-reth-charts.py" "${CHART_ARGS[@]}"
-else
-  echo "  Warning: matplotlib not available, skipping chart generation."
-fi
-echo
-
-# ── Step 11: Upload Tracy profiles ────────────────────────────────────
-if [ "$TRACY" != "off" ]; then
-  echo "▸ Uploading Tracy profiles..."
-  upload_tracy "baseline-1" "$BENCH_WORK_DIR/baseline-1" "$BASELINE_SHA"
-  upload_tracy "feature-1"  "$BENCH_WORK_DIR/feature-1"  "$FEATURE_SHA"
-  upload_tracy "feature-2"  "$BENCH_WORK_DIR/feature-2"  "$FEATURE_SHA"
-  upload_tracy "baseline-2" "$BENCH_WORK_DIR/baseline-2" "$BASELINE_SHA"
-  echo
-fi
-
-# ── Done (system restore happens via EXIT trap) ─────────────────────
-echo "═══════════════════════════════════════════════════════════"
-echo "  Benchmark complete!"
-echo "═══════════════════════════════════════════════════════════"
-echo "  Results  : $BENCH_WORK_DIR/summary.json"
-echo "  Markdown : $BENCH_WORK_DIR/comment.md"
-echo "  Charts   : $BENCH_WORK_DIR/charts/"
-if [ -f "$ERRORS_FILE" ]; then
-  echo "  Errors   : $ERRORS_FILE"
-fi
-echo "  Grafana  : $GRAFANA_URL"
-if [ "$TRACY" != "off" ]; then
-  echo "  ─── Tracy Profiles ───"
-  for run_dir in baseline-1 feature-1 feature-2 baseline-2; do
-    url_file="$BENCH_WORK_DIR/$run_dir/tracy_viewer_url.txt"
-    if [ -f "$url_file" ]; then
-      echo "  $run_dir : $(cat "$url_file")"
-    fi
-  done
-fi
-echo "═══════════════════════════════════════════════════════════"

.github/scripts/bench-reth-run.sh

@@ -6,50 +6,18 @@
 # Usage: bench-reth-run.sh <label> <binary> <output-dir>
 #
 # Required env: SCHELK_MOUNT, BENCH_RPC_URL, BENCH_BLOCKS, BENCH_WARMUP_BLOCKS
-# Optional env: BENCH_BIG_BLOCKS (true/false), BENCH_WORK_DIR (for big blocks path)
-#               BENCH_BAL (false/true/feature/baseline; only used with big blocks)
-#               BENCH_WAIT_TIME (duration like 500ms, default empty)
-#               BENCH_BASELINE_ARGS (extra reth node args for baseline runs)
-#               BENCH_FEATURE_ARGS (extra reth node args for feature runs)
-#               BENCH_OTLP_TRACES_ENDPOINT (OTLP HTTP endpoint for traces, e.g. https://host/insert/opentelemetry/v1/traces)
-#               BENCH_OTLP_LOGS_ENDPOINT (OTLP HTTP endpoint for logs, e.g. https://host/insert/opentelemetry/v1/logs)
-#               BENCH_OTLP_DISABLED (true to skip OTLP export even if endpoints are set)
-set -euxo pipefail
+set -euo pipefail
 
 LABEL="$1"
 BINARY="$2"
 OUTPUT_DIR="$3"
-DATADIR_NAME="datadir"
-if [ "${BENCH_BIG_BLOCKS:-false}" = "true" ]; then
-  DATADIR_NAME="datadir-big-blocks"
-fi
-DATADIR="$SCHELK_MOUNT/$DATADIR_NAME"
+DATADIR="$SCHELK_MOUNT/datadir"
 mkdir -p "$OUTPUT_DIR"
 LOG="${OUTPUT_DIR}/node.log"
 
-RETH_SCOPE="${RETH_SCOPE:-reth-bench.scope}"
-
 cleanup() {
   kill "$TAIL_PID" 2>/dev/null || true
-  # Stop tracy-capture first (SIGINT makes it disconnect and flush to disk)
-  # Must happen before killing reth, otherwise reth keeps streaming data.
-  if [ -n "${TRACY_PID:-}" ] && kill -0 "$TRACY_PID" 2>/dev/null; then
-    echo "Stopping tracy-capture..."
-    kill -INT "$TRACY_PID" 2>/dev/null || true
-    for i in $(seq 1 30); do
-      kill -0 "$TRACY_PID" 2>/dev/null || break
-      if [ $((i % 10)) -eq 0 ]; then
-        echo "Waiting for tracy-capture to finish writing... (${i}s)"
-      fi
-      sleep 1
-    done
-    if kill -0 "$TRACY_PID" 2>/dev/null; then
-      echo "tracy-capture still running after 30s, killing..."
-      kill -9 "$TRACY_PID" 2>/dev/null || true
-    fi
-    wait "$TRACY_PID" 2>/dev/null || true
-  fi
-  if sudo systemctl is-active "$RETH_SCOPE" >/dev/null 2>&1; then
+  if [ -n "${RETH_PID:-}" ] && sudo kill -0 "$RETH_PID" 2>/dev/null; then
     if [ "${BENCH_SAMPLY:-false}" = "true" ]; then
       # Send SIGINT to the inner reth process by exact name (not -f which
       # would also match samply's cmdline containing "reth"). Samply will
@@ -67,29 +35,26 @@ cleanup() {
         echo "Samply still running after 120s, sending SIGTERM..."
         sudo pkill -x samply 2>/dev/null || true
       fi
+    else
+      sudo kill "$RETH_PID"
+      for i in $(seq 1 30); do
+        sudo kill -0 "$RETH_PID" 2>/dev/null || break
+        sleep 1
+      done
     fi
-    # Stop the entire systemd scope — kills all processes in the cgroup.
-    # This is reliable regardless of process reparenting or PID wrapper issues.
-    sudo systemctl stop "$RETH_SCOPE" 2>/dev/null || true
+    sudo kill -9 "$RETH_PID" 2>/dev/null || true
     sleep 1
   fi
-  sudo systemctl reset-failed "$RETH_SCOPE" 2>/dev/null || true
   # Fix ownership of reth-created files (reth runs as root)
   sudo chown -R "$(id -un):$(id -gn)" "$OUTPUT_DIR" 2>/dev/null || true
-  # Let schelk recover the mounted volume in place so dm-era can restore only
-  # the changed blocks and clean up its own state.
-  sudo schelk recover -y --kill || true
+  if mountpoint -q "$SCHELK_MOUNT"; then
+    sudo umount -l "$SCHELK_MOUNT" || true
+    sudo schelk recover -y || true
+  fi
 }
 TAIL_PID=
-TRACY_PID=
 trap cleanup EXIT
 
-# Clean up stale state from a previous cancelled run.
-# Stop any leftover reth process in the scope, then recover schelk state.
-sudo systemctl stop "$RETH_SCOPE" 2>/dev/null || true
-sudo systemctl reset-failed "$RETH_SCOPE" 2>/dev/null || true
-sudo schelk recover -y --kill || true
-
 # Mount
 sudo schelk mount -y
 sync
@@ -108,8 +73,6 @@ if [ "${BENCH_CORES:-0}" -gt 0 ] && [ "$BENCH_CORES" -lt "$MAX_RETH" ]; then
 fi
 RETH_CPUS="1-${MAX_RETH}"
 
-BIG_BLOCKS="${BENCH_BIG_BLOCKS:-false}"
-
 RETH_ARGS=(
   node
   --datadir "$DATADIR"
@@ -124,77 +87,20 @@ RETH_ARGS=(
   --no-persist-peers
 )
 
-# Gate flag on binary support (older baselines may not have it).
-# Uses --help which exits immediately via clap without node init.
-SYNC_STATE_IDLE=false
-if "$BINARY" node --help 2>/dev/null | grep -qF -- '--debug.startup-sync-state-idle'; then
-  RETH_ARGS+=(--debug.startup-sync-state-idle)
-  SYNC_STATE_IDLE=true
-fi
-
-# Append per-label extra node args (baseline or feature)
-EXTRA_NODE_ARGS=""
-case "$LABEL" in
-  baseline*) EXTRA_NODE_ARGS="${BENCH_BASELINE_ARGS:-}" ;;
-  feature*)  EXTRA_NODE_ARGS="${BENCH_FEATURE_ARGS:-}" ;;
-esac
-if [ -n "$EXTRA_NODE_ARGS" ]; then
-  # Word-split the string into individual args
-  # shellcheck disable=SC2206
-  RETH_ARGS+=($EXTRA_NODE_ARGS)
-fi
-
-if [ -n "${BENCH_METRICS_ADDR:-}" ]; then
-  RETH_ARGS+=(--metrics "$BENCH_METRICS_ADDR")
-fi
-
-# OTLP traces and logs export
-if [ "${BENCH_OTLP_DISABLED:-false}" != "true" ]; then
-  if [ -n "${BENCH_OTLP_TRACES_ENDPOINT:-}" ]; then
-    RETH_ARGS+=(--tracing-otlp="${BENCH_OTLP_TRACES_ENDPOINT}" --tracing-otlp.service-name=reth-bench)
-  fi
-  if [ -n "${BENCH_OTLP_LOGS_ENDPOINT:-}" ]; then
-    RETH_ARGS+=(--logs-otlp="${BENCH_OTLP_LOGS_ENDPOINT}" --logs-otlp.filter=debug)
-  fi
-fi
-
-# Tracy profiling: add --log.tracy flags and set environment
-if [ "${BENCH_TRACY:-off}" != "off" ]; then
-  RETH_ARGS+=(--log.tracy --log.tracy.filter "${BENCH_TRACY_FILTER:-debug}")
-  if [ "${BENCH_TRACY}" = "on" ]; then
-    export TRACY_NO_SYS_TRACE=1
-  elif [ "${BENCH_TRACY}" = "full" ]; then
-    export TRACY_SAMPLING_HZ="${BENCH_TRACY_SAMPLING_HZ:-1}"
-  fi
-fi
-
-SUDO_ENV=()
-if [ -n "${OTEL_RESOURCE_ATTRIBUTES:-}" ]; then
-  SUDO_ENV+=("OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES}")
-  SUDO_ENV+=("OTEL_BSP_MAX_QUEUE_SIZE=65536" "OTEL_BLRP_MAX_QUEUE_SIZE=65536")
-fi
-
-# Limit reth memory to 95% of available RAM to prevent OOM kills
-TOTAL_MEM_KB=$(awk '/^MemTotal:/ {print $2}' /proc/meminfo)
-MEM_LIMIT=$(( TOTAL_MEM_KB * 95 / 100 * 1024 ))
-echo "Memory limit: $(( MEM_LIMIT / 1024 / 1024 ))MB (95% of $(( TOTAL_MEM_KB / 1024 ))MB)"
-
 if [ "${BENCH_SAMPLY:-false}" = "true" ]; then
   RETH_ARGS+=(--log.samply)
   SAMPLY="$(which samply)"
-  sudo systemd-run --quiet --scope --collect --unit="$RETH_SCOPE" \
-    -p MemoryMax="$MEM_LIMIT" -p AllowedCPUs="$RETH_CPUS" \
-    env "${SUDO_ENV[@]}" nice -n -20 \
+  sudo taskset -c "$RETH_CPUS" nice -n -20 \
     "$SAMPLY" record --save-only --presymbolicate --rate 10000 \
     --output "$OUTPUT_DIR/samply-profile.json.gz" \
     -- "$BINARY" "${RETH_ARGS[@]}" \
     > "$LOG" 2>&1 &
 else
-  sudo systemd-run --quiet --scope --collect --unit="$RETH_SCOPE" \
-    -p MemoryMax="$MEM_LIMIT" -p AllowedCPUs="$RETH_CPUS" \
-    env "${SUDO_ENV[@]}" nice -n -20 "$BINARY" "${RETH_ARGS[@]}" \
+  sudo taskset -c "$RETH_CPUS" nice -n -20 "$BINARY" "${RETH_ARGS[@]}" \
     > "$LOG" 2>&1 &
 fi
+
+RETH_PID=$!
 stdbuf -oL tail -f "$LOG" | sed -u "s/^/[reth] /" &
 TAIL_PID=$!
 
@@ -203,7 +109,7 @@ for i in $(seq 1 60); do
     -H 'Content-Type: application/json' \
     -d '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
     > /dev/null 2>&1; then
-    echo "reth (${LABEL}) RPC is up after ${i}s"
+    echo "reth (${LABEL}) is ready after ${i}s"
     break
   fi
   if [ "$i" -eq 60 ]; then
@@ -214,133 +120,25 @@ for i in $(seq 1 60); do
   sleep 1
 done
 
-# Wait for the pipeline to finish (eth_syncing returns false) so the
-# engine is in live mode and can accept newPayload calls.
-# Only possible when --debug.startup-sync-state-idle is supported.
-if [ "$SYNC_STATE_IDLE" = "true" ]; then
-  for i in $(seq 1 300); do
-    SYNC_RESULT=$(curl -sf http://127.0.0.1:8545 -X POST \
-      -H 'Content-Type: application/json' \
-      -d '{"jsonrpc":"2.0","method":"eth_syncing","params":[],"id":1}' 2>/dev/null || true)
-    if [ -n "$SYNC_RESULT" ] && jq -e '.result == false' <<< "$SYNC_RESULT" > /dev/null 2>&1; then
-      echo "reth (${LABEL}) pipeline finished after ${i}s, engine is live"
-      break
-    fi
-    if [ "$i" -eq 300 ]; then
-      echo "::error::reth (${LABEL}) pipeline did not finish within 300s"
-      cat "$LOG"
-      exit 1
-    fi
-    sleep 1
-  done
-else
-  echo "reth (${LABEL}) binary does not support --debug.startup-sync-state-idle, skipping sync wait"
-fi
-
 # Run reth-bench with high priority but as the current user so output
 # files are not root-owned (avoids EACCES on next checkout).
 BENCH_NICE="sudo nice -n -20 sudo -u $(id -un)"
 
-# Build optional flags
-EXTRA_BENCH_ARGS=(--reth-new-payload)
-if [ -n "${BENCH_WAIT_TIME:-}" ]; then
-  EXTRA_BENCH_ARGS+=(--wait-time "$BENCH_WAIT_TIME")
-fi
+# Warmup
+$BENCH_NICE "$RETH_BENCH" new-payload-fcu \
+  --rpc-url "$BENCH_RPC_URL" \
+  --engine-rpc-url http://127.0.0.1:8551 \
+  --jwt-secret "$DATADIR/jwt.hex" \
+  --advance "${BENCH_WARMUP_BLOCKS:-50}" \
+  --reth-new-payload 2>&1 | sed -u "s/^/[bench] /"
 
-if [ "$BIG_BLOCKS" = "true" ]; then
-  # Big blocks mode: replay pre-generated payloads
-  BIG_BLOCKS_DIR="${BENCH_BIG_BLOCKS_DIR:-${BENCH_WORK_DIR}/big-blocks}"
-  BENCH_BAL_MODE="${BENCH_BAL:-false}"
-
-  BB_BENCH_ARGS=(--reth-new-payload)
-  if [ -n "${BENCH_WAIT_TIME:-}" ]; then
-    BB_BENCH_ARGS+=(--wait-time "$BENCH_WAIT_TIME")
-  fi
-  case "$BENCH_BAL_MODE" in
-    false)
-      ;;
-    true)
-      BB_BENCH_ARGS+=(--bal)
-      ;;
-    baseline)
-      if [[ "$LABEL" == baseline* ]]; then
-        BB_BENCH_ARGS+=(--bal)
-      fi
-      ;;
-    feature)
-      if [[ "$LABEL" == feature* ]]; then
-        BB_BENCH_ARGS+=(--bal)
-      fi
-      ;;
-    *)
-      echo "::error::Unknown BENCH_BAL value: $BENCH_BAL_MODE"
-      exit 1
-      ;;
-  esac
-
-  # Warmup
-  WARMUP="${BENCH_WARMUP_BLOCKS:-50}"
-  if [ "$WARMUP" -gt 0 ] 2>/dev/null; then
-    echo "Running big blocks warmup (${WARMUP} payloads)..."
-    $BENCH_NICE "$RETH_BENCH" replay-payloads \
-      "${BB_BENCH_ARGS[@]}" \
-      --count "$WARMUP" \
-      --payload-dir "$BIG_BLOCKS_DIR/payloads" \
-      --engine-rpc-url http://127.0.0.1:8551 \
-      --jwt-secret "$DATADIR/jwt.hex" 2>&1 | sed -u "s/^/[bench] /"
-  fi
-
-  # Start tracy-capture after warmup so profile only covers the benchmark
-  if [ "${BENCH_TRACY:-off}" != "off" ]; then
-    echo "Starting tracy-capture..."
-    tracy-capture -f -o "$OUTPUT_DIR/tracy-profile.tracy" &
-    TRACY_PID=$!
-    sleep 0.5  # give tracy-capture time to connect
-  fi
-
-  # Benchmark — skip warmup payloads so they aren't measured
-  BB_SKIP=0
-  if [ "$WARMUP" -gt 0 ] 2>/dev/null; then
-    BB_SKIP="$WARMUP"
-  fi
-  if [ "${BENCH_BLOCKS:-0}" -gt 0 ] 2>/dev/null; then
-    BB_BENCH_ARGS+=(--count "$BENCH_BLOCKS")
-  fi
-
-  echo "Running big blocks benchmark (replay-payloads, skip=${BB_SKIP})..."
-  $BENCH_NICE "$RETH_BENCH" replay-payloads \
-    "${BB_BENCH_ARGS[@]}" \
-    --skip "$BB_SKIP" \
-    --payload-dir "$BIG_BLOCKS_DIR/payloads" \
-    --engine-rpc-url http://127.0.0.1:8551 \
-    --jwt-secret "$DATADIR/jwt.hex" \
-    --output "$OUTPUT_DIR" 2>&1 | sed -u "s/^/[bench] /"
-else
-  # Standard mode: warmup + new-payload-fcu
-  # Warmup
-  $BENCH_NICE "$RETH_BENCH" new-payload-fcu \
-    --rpc-url "$BENCH_RPC_URL" \
-    --engine-rpc-url http://127.0.0.1:8551 \
-    --jwt-secret "$DATADIR/jwt.hex" \
-    --advance "${BENCH_WARMUP_BLOCKS:-50}" \
-    "${EXTRA_BENCH_ARGS[@]}" 2>&1 | sed -u "s/^/[bench] /"
-
-  # Start tracy-capture after warmup so profile only covers the benchmark
-  if [ "${BENCH_TRACY:-off}" != "off" ]; then
-    echo "Starting tracy-capture..."
-    tracy-capture -f -o "$OUTPUT_DIR/tracy-profile.tracy" &
-    TRACY_PID=$!
-    sleep 0.5  # give tracy-capture time to connect
-  fi
-
-  # Benchmark
-  $BENCH_NICE "$RETH_BENCH" new-payload-fcu \
-    --rpc-url "$BENCH_RPC_URL" \
-    --engine-rpc-url http://127.0.0.1:8551 \
-    --jwt-secret "$DATADIR/jwt.hex" \
-    --advance "$BENCH_BLOCKS" \
-    "${EXTRA_BENCH_ARGS[@]}" \
-    --output "$OUTPUT_DIR" 2>&1 | sed -u "s/^/[bench] /"
-fi
+# Benchmark
+$BENCH_NICE "$RETH_BENCH" new-payload-fcu \
+  --rpc-url "$BENCH_RPC_URL" \
+  --engine-rpc-url http://127.0.0.1:8551 \
+  --jwt-secret "$DATADIR/jwt.hex" \
+  --advance "$BENCH_BLOCKS" \
+  --reth-new-payload \
+  --output "$OUTPUT_DIR" 2>&1 | sed -u "s/^/[bench] /"
 
 # cleanup runs via trap

.github/scripts/bench-reth-snapshot.sh

@@ -1,93 +1,69 @@
 #!/usr/bin/env bash
 #
-# Downloads the latest snapshot into the schelk volume using
-# `reth download` with progress reporting to the GitHub PR comment.
+# Downloads the latest nightly snapshot into the schelk volume with
+# progress reporting to the GitHub PR comment.
 #
-# Skips the download if the manifest content hasn't changed since
-# the last successful download (checked via SHA-256 of the manifest).
+# Skips the download if the local ETag marker matches the remote one.
 #
 # Usage: bench-reth-snapshot.sh [--check]
-#   --check   Only check if a download is needed; exits 0 if up-to-date, 10 if not.
+#   --check   Only check if a download is needed; exits 0 if up-to-date, 1 if not.
 #
 # Required env:
 #   SCHELK_MOUNT       – schelk mount point (e.g. /reth-bench)
-#   BENCH_RETH_BINARY  – path to the reth binary
 #   GITHUB_TOKEN       – token for GitHub API calls (only for download)
 #   BENCH_COMMENT_ID   – PR comment ID to update (optional)
 #   BENCH_REPO         – owner/repo (e.g. paradigmxyz/reth)
 #   BENCH_JOB_URL      – link to the Actions job
 #   BENCH_ACTOR        – user who triggered the benchmark
 #   BENCH_CONFIG       – config summary line
-set -euxo pipefail
+set -euo pipefail
 
-MC="mc"
-BUCKET="minio/reth-snapshots"
-# Allow overriding the snapshot name (e.g. for big-blocks mode where the
-# big-blocks manifest specifies which base snapshot to use).
-SNAPSHOT_NAME="${BENCH_SNAPSHOT_NAME:-reth-1-minimal-stable}"
-MANIFEST_PATH="${SNAPSHOT_NAME}/manifest.json"
-DATADIR_NAME="datadir"
-HASH_MODE_SUFFIX=""
-if [ "${BENCH_BIG_BLOCKS:-false}" = "true" ]; then
-  DATADIR_NAME="datadir-big-blocks"
-  HASH_MODE_SUFFIX="-big-blocks"
+BUCKET="minio/reth-snapshots/reth-1-minimal-nightly-previous.tar.zst"
+DATADIR="$SCHELK_MOUNT/datadir"
+ETAG_FILE="$HOME/.reth-bench-snapshot-etag"
+
+# Get remote metadata via JSON for reliable parsing
+MC_STAT=$(mc stat --json "$BUCKET" 2>/dev/null || true)
+REMOTE_ETAG=$(echo "$MC_STAT" | jq -r '.etag // empty')
+if [ -z "$REMOTE_ETAG" ]; then
+  echo "::warning::Failed to get ETag from mc stat, will re-download"
+  REMOTE_ETAG="unknown-$(date +%s)"
 fi
-DATADIR="$SCHELK_MOUNT/$DATADIR_NAME"
-HASH_FILE="$HOME/.reth-bench-snapshot-hash${HASH_MODE_SUFFIX}"
 
-# Fetch manifest and compute content hash for reliable freshness check
-MANIFEST_CONTENT=$($MC cat "${BUCKET}/${MANIFEST_PATH}" 2>/dev/null) || {
-  echo "::error::Failed to fetch snapshot manifest from ${BUCKET}/${MANIFEST_PATH}"
-  exit 2
-}
-REMOTE_HASH=$(echo "$MANIFEST_CONTENT" | sha256sum | awk '{print $1}')
+LOCAL_ETAG=""
+[ -f "$ETAG_FILE" ] && LOCAL_ETAG=$(cat "$ETAG_FILE")
 
-LOCAL_HASH=""
-[ -f "$HASH_FILE" ] && LOCAL_HASH=$(cat "$HASH_FILE")
-
-if [ "$REMOTE_HASH" = "$LOCAL_HASH" ]; then
-  echo "Snapshot is up-to-date (manifest hash: ${REMOTE_HASH:0:16}…)"
+if [ "$REMOTE_ETAG" = "$LOCAL_ETAG" ]; then
+  echo "Snapshot is up-to-date (ETag: ${REMOTE_ETAG})"
+  if [ "${1:-}" = "--check" ]; then
+    exit 0
+  fi
   exit 0
 fi
 
-echo "Snapshot needs update (local: ${LOCAL_HASH:+${LOCAL_HASH:0:16}…}${LOCAL_HASH:-<none>}, remote: ${REMOTE_HASH:0:16}…)"
+echo "Snapshot needs update (local: ${LOCAL_ETAG:-<none>}, remote: ${REMOTE_ETAG})"
 if [ "${1:-}" = "--check" ]; then
-  exit 10
-fi
-
-RETH="${BENCH_RETH_BINARY:?BENCH_RETH_BINARY must be set}"
-if [ ! -x "$RETH" ]; then
-  echo "::error::reth binary not found or not executable at $RETH"
   exit 1
 fi
 
-# Resolve the MinIO HTTP endpoint from the mc alias so reth can
-# fetch archives over HTTP (the manifest's embedded base_url points
-# to the cluster-internal address which is unreachable from runners).
-MINIO_ENDPOINT=$($MC alias list minio --json 2>/dev/null | jq -r '.URL // empty') || true
-if [ -z "$MINIO_ENDPOINT" ]; then
-  echo "::error::Failed to resolve MinIO endpoint from mc alias 'minio'"
+# Get compressed size for progress tracking
+TOTAL_BYTES=$(echo "$MC_STAT" | jq -r '.size // empty')
+if [ -z "$TOTAL_BYTES" ] || [ "$TOTAL_BYTES" = "0" ]; then
+  echo "::error::Failed to get snapshot size from mc stat"
   exit 1
 fi
-BASE_URL="${MINIO_ENDPOINT}/reth-snapshots/${SNAPSHOT_NAME}"
+echo "Snapshot size: $TOTAL_BYTES bytes ($(numfmt --to=iec "$TOTAL_BYTES"))"
 
-# Rewrite manifest's base_url with the runner-reachable endpoint
-MANIFEST_TMP=$(mktemp --suffix=.json)
-trap 'rm -f -- "$MANIFEST_TMP"' EXIT
-echo "$MANIFEST_CONTENT" \
-  | jq --arg base "$BASE_URL" '.base_url = $base' > "$MANIFEST_TMP"
-
-# Prepare mount. If a previous run left the volume mounted, recover first.
-sudo schelk recover -y --kill || true
+# Prepare mount
+mountpoint -q "$SCHELK_MOUNT" && sudo schelk recover -y || true
 sudo schelk mount -y
 sudo rm -rf "$DATADIR"
 sudo mkdir -p "$DATADIR"
-# reth download runs as current user (not root), needs write access
-sudo chown -R "$(id -u):$(id -g)" "$DATADIR"
 
 update_comment() {
-  local status="$1"
+  local pct="$1"
   [ -z "${BENCH_COMMENT_ID:-}" ] && return 0
+  local status="Building binaries & downloading snapshot… ${pct}%"
   local body
   body="$(printf 'cc @%s\n\n🚀 Benchmark started! [View job](%s)\n\n⏳ **Status:** %s\n\n%s' \
     "$BENCH_ACTOR" "$BENCH_JOB_URL" "$status" "$BENCH_CONFIG")"
@@ -99,31 +75,53 @@ update_comment() {
     > /dev/null 2>&1 || true
 }
 
-update_comment "Downloading snapshot…"
+# Track compressed bytes flowing through the pipe
+DL_BYTES_FILE=$(mktemp)
+echo 0 > "$DL_BYTES_FILE"
 
-# Download using reth download (manifest-path with rewritten base_url)
-"$RETH" download \
-  --manifest-path "$MANIFEST_TMP" \
-  -y \
-  --minimal \
-  --datadir "$DATADIR"
+# Start progress reporter in background
+(
+  while true; do
+    sleep 10
+    CURRENT=$(cat "$DL_BYTES_FILE" 2>/dev/null || echo 0)
+    if [ "$TOTAL_BYTES" -gt 0 ]; then
+      PCT=$(( CURRENT * 100 / TOTAL_BYTES ))
+      [ "$PCT" -gt 100 ] && PCT=100
+      echo "Snapshot download: $(numfmt --to=iec "$CURRENT") / $(numfmt --to=iec "$TOTAL_BYTES") (${PCT}%)"
+      update_comment "$PCT"
+    fi
+  done
+) &
+PROGRESS_PID=$!
+trap 'kill $PROGRESS_PID 2>/dev/null || true; rm -f "$DL_BYTES_FILE"' EXIT
 
-update_comment "Downloading snapshot… done"
+# Download and extract; python byte counter tracks compressed bytes received
+mc cat "$BUCKET" | python3 -c "
+import sys
+count = 0
+while True:
+    data = sys.stdin.buffer.read(1048576)
+    if not data:
+        break
+    count += len(data)
+    sys.stdout.buffer.write(data)
+    with open('$DL_BYTES_FILE', 'w') as f:
+        f.write(str(count))
+" | pzstd -d -p 6 | sudo tar -xf - -C "$DATADIR"
+
+# Stop progress reporter
+kill $PROGRESS_PID 2>/dev/null || true
+wait $PROGRESS_PID 2>/dev/null || true
+
+update_comment "100"
 echo "Snapshot download complete"
 
-# Sanity check: verify expected directories exist
-if [ ! -d "$DATADIR/db" ] || [ ! -d "$DATADIR/static_files" ]; then
-  echo "::error::Snapshot download did not produce expected directory layout (missing db/ or static_files/)"
-  ls -la "$DATADIR" || true
-  exit 1
-fi
-
 # Promote the new snapshot to become the schelk baseline (virgin volume).
 # This copies changed blocks from scratch → virgin so that future
 # `schelk recover` calls restore to this new state.
 sync
 sudo schelk promote -y
 
-# Save manifest hash
-echo "$REMOTE_HASH" > "$HASH_FILE"
-echo "Snapshot promoted to schelk baseline (manifest hash: ${REMOTE_HASH:0:16}…)"
+# Save ETag marker
+echo "$REMOTE_ETAG" > "$ETAG_FILE"
+echo "Snapshot promoted to schelk baseline (ETag: ${REMOTE_ETAG})"

.github/scripts/bench-reth-summary.py

@@ -107,18 +107,6 @@ def compute_stats(combined: list[dict]) -> dict:
             mgas_s_values.append(r["gas_used"] / lat_s / 1_000_000)
     mean_mgas_s = sum(mgas_s_values) / len(mgas_s_values) if mgas_s_values else 0
 
-    total_latencies_ms = [r["total_latency_us"] / 1_000 for r in combined]
-    wall_clock_s = sum(total_latencies_ms) / 1_000
-    mean_total_lat_ms = sum(total_latencies_ms) / n
-
-    # Persistence wait mean (for main table)
-    persist_values_ms = []
-    for r in combined:
-        v = r.get("persistence_wait_us")
-        if v is not None:
-            persist_values_ms.append(v / 1_000)
-    mean_persist_ms = sum(persist_values_ms) / len(persist_values_ms) if persist_values_ms else 0.0
-
     return {
         "n": n,
         "mean_ms": mean_lat,
@@ -127,9 +115,6 @@ def compute_stats(combined: list[dict]) -> dict:
         "p90_ms": percentile(sorted_lat, 90),
         "p99_ms": percentile(sorted_lat, 99),
         "mean_mgas_s": mean_mgas_s,
-        "wall_clock_s": wall_clock_s,
-        "mean_total_lat_ms": mean_total_lat_ms,
-        "mean_persist_ms": mean_persist_ms,
     }
 
 
@@ -154,15 +139,13 @@ def compute_wait_stats(combined: list[dict], field: str) -> dict:
 
 def _paired_data(
     baseline: list[dict], feature: list[dict]
-) -> tuple[list[tuple[float, float]], list[float], list[float], list[float], list[float]]:
+) -> tuple[list[tuple[float, float]], list[float], list[float]]:
     """Match blocks and return paired latencies and per-block diffs.
 
     Returns:
         pairs: list of (baseline_ms, feature_ms) tuples
         lat_diffs_ms: list of feature − baseline latency diffs in ms
         mgas_diffs: list of feature − baseline Mgas/s diffs
-        total_lat_diffs_ms: list of feature − baseline total latency diffs in ms
-        persist_diffs_ms: list of feature − baseline persistence wait diffs in ms
     """
     baseline_by_block = {r["block_number"]: r for r in baseline}
     feature_by_block = {r["block_number"]: r for r in feature}
@@ -171,8 +154,6 @@ def _paired_data(
     pairs = []
     lat_diffs_ms = []
     mgas_diffs = []
-    total_lat_diffs_ms = []
-    persist_diffs_ms = []
     for bn in common_blocks:
         b = baseline_by_block[bn]
         f = feature_by_block[bn]
@@ -187,13 +168,7 @@ def _paired_data(
                 f["gas_used"] / f_lat_s / 1_000_000
                 - b["gas_used"] / b_lat_s / 1_000_000
             )
-        total_lat_diffs_ms.append(
-            f["total_latency_us"] / 1_000 - b["total_latency_us"] / 1_000
-        )
-        b_persist = (b.get("persistence_wait_us") or 0) / 1_000
-        f_persist = (f.get("persistence_wait_us") or 0) / 1_000
-        persist_diffs_ms.append(f_persist - b_persist)
-    return pairs, lat_diffs_ms, mgas_diffs, total_lat_diffs_ms, persist_diffs_ms
+    return pairs, lat_diffs_ms, mgas_diffs
 
 
 def compute_paired_stats(
@@ -208,16 +183,12 @@ def compute_paired_stats(
     all_pairs = []
     all_lat_diffs = []
     all_mgas_diffs = []
-    all_total_lat_diffs = []
-    all_persist_diffs = []
     blocks_per_pair = []
     for baseline, feature in zip(baseline_runs, feature_runs):
-        pairs, lat_diffs, mgas_diffs, total_lat_diffs, persist_diffs = _paired_data(baseline, feature)
+        pairs, lat_diffs, mgas_diffs = _paired_data(baseline, feature)
         all_pairs.extend(pairs)
         all_lat_diffs.extend(lat_diffs)
         all_mgas_diffs.extend(mgas_diffs)
-        all_total_lat_diffs.extend(total_lat_diffs)
-        all_persist_diffs.extend(persist_diffs)
         blocks_per_pair.append(len(pairs))
 
     if not all_lat_diffs:
@@ -256,16 +227,6 @@ def compute_paired_stats(
     mgas_se = std_mgas_diff / math.sqrt(len(all_mgas_diffs)) if all_mgas_diffs else 0.0
     mgas_ci = T_CRITICAL * mgas_se
 
-    mean_total_diff = sum(all_total_lat_diffs) / len(all_total_lat_diffs) if all_total_lat_diffs else 0.0
-    std_total_diff = stddev(all_total_lat_diffs, mean_total_diff) if len(all_total_lat_diffs) > 1 else 0.0
-    total_se = std_total_diff / math.sqrt(len(all_total_lat_diffs)) if all_total_lat_diffs else 0.0
-    wall_clock_ci_ms = T_CRITICAL * total_se
-
-    mean_persist_diff = sum(all_persist_diffs) / len(all_persist_diffs) if all_persist_diffs else 0.0
-    std_persist_diff = stddev(all_persist_diffs, mean_persist_diff) if len(all_persist_diffs) > 1 else 0.0
-    persist_se = std_persist_diff / math.sqrt(len(all_persist_diffs)) if all_persist_diffs else 0.0
-    persist_ci_ms = T_CRITICAL * persist_se
-
     return {
         "n": n,
         "mean_diff_ms": mean_diff,
@@ -278,8 +239,6 @@ def compute_paired_stats(
         "p99_ci_ms": (p99_boot[hi] - p99_boot[lo]) / 2,
         "mean_mgas_diff": mean_mgas_diff,
         "mgas_ci": mgas_ci,
-        "wall_clock_ci_ms": wall_clock_ci_ms,
-        "persist_ci_ms": persist_ci_ms,
         "blocks": max(blocks_per_pair),
     }
 
@@ -308,18 +267,6 @@ def fmt_mgas(v: float) -> str:
     return f"{v:.2f}"
 
 
-def fmt_s(v: float) -> str:
-    return f"{v:.2f}s"
-
-
-def display_bal_mode(bal_mode: str | None) -> str | None:
-    if not bal_mode or bal_mode == "false":
-        return None
-    if bal_mode == "both":
-        return "true"
-    return bal_mode
-
-
 def significance(pct: float, ci_pct: float, lower_is_better: bool) -> str:
     """Return significance label: 'good', 'bad', or 'neutral'."""
     significant = abs(pct) > ci_pct
@@ -357,8 +304,6 @@ def compute_changes(
         ("p90", "p90_ms", "p90_ci_ms", "p90_ms", True),
         ("p99", "p99_ms", "p99_ci_ms", "p99_ms", True),
         ("mgas_s", "mean_mgas_s", "mgas_ci", "mean_mgas_s", False),
-        ("wall_clock", "wall_clock_s", "wall_clock_ci_ms", "mean_total_lat_ms", True),
-        ("persist_wait", "mean_persist_ms", "persist_ci_ms", "mean_persist_ms", True),
     ]
     changes = {}
     for name, stat_key, ci_key, base_key, lower_is_better in metrics:
@@ -381,10 +326,6 @@ def generate_comparison_table(
     baseline_name: str,
     feature_name: str,
     feature_sha: str,
-    big_blocks: bool = False,
-    warmup_blocks: str | None = None,
-    wait_time: str | None = None,
-    bal_mode: str | None = None,
 ) -> str:
     """Generate a markdown comparison table between baseline and feature."""
     n = paired["blocks"]
@@ -394,14 +335,11 @@ def generate_comparison_table(
 
     mean_pct = pct(run1["mean_ms"], run2["mean_ms"])
     gas_pct = pct(run1["mean_mgas_s"], run2["mean_mgas_s"])
-    wall_pct = pct(run1["wall_clock_s"], run2["wall_clock_s"])
 
     p50_pct = pct(run1["p50_ms"], run2["p50_ms"])
     p90_pct = pct(run1["p90_ms"], run2["p90_ms"])
     p99_pct = pct(run1["p99_ms"], run2["p99_ms"])
 
-    persist_pct = pct(run1["mean_persist_ms"], run2["mean_persist_ms"])
-
     # Bootstrap CIs as % of baseline percentile
     p50_ci_pct = paired["p50_ci_ms"] / run1["p50_ms"] * 100.0 if run1["p50_ms"] > 0 else 0.0
     p90_ci_pct = paired["p90_ci_ms"] / run1["p90_ms"] * 100.0 if run1["p90_ms"] > 0 else 0.0
@@ -410,8 +348,6 @@ def generate_comparison_table(
     # CI as a percentage of baseline mean
     lat_ci_pct = paired["ci_ms"] / run1["mean_ms"] * 100.0 if run1["mean_ms"] > 0 else 0.0
     mgas_ci_pct = paired["mgas_ci"] / run1["mean_mgas_s"] * 100.0 if run1["mean_mgas_s"] > 0 else 0.0
-    wall_ci_pct = paired["wall_clock_ci_ms"] / run1["mean_total_lat_ms"] * 100.0 if run1["mean_total_lat_ms"] > 0 else 0.0
-    persist_ci_pct = paired["persist_ci_ms"] / run1["mean_persist_ms"] * 100.0 if run1["mean_persist_ms"] > 0 else 0.0
 
     base_url = f"https://github.com/{repo}/commit"
     baseline_label = f"[`{baseline_name}`]({base_url}/{baseline_ref})"
@@ -426,19 +362,9 @@ def generate_comparison_table(
         f"| P90 | {fmt_ms(run1['p90_ms'])} | {fmt_ms(run2['p90_ms'])} | {change_str(p90_pct, p90_ci_pct, lower_is_better=True)} |",
         f"| P99 | {fmt_ms(run1['p99_ms'])} | {fmt_ms(run2['p99_ms'])} | {change_str(p99_pct, p99_ci_pct, lower_is_better=True)} |",
         f"| Mgas/s | {fmt_mgas(run1['mean_mgas_s'])} | {fmt_mgas(run2['mean_mgas_s'])} | {change_str(gas_pct, mgas_ci_pct, lower_is_better=False)} |",
-        f"| Wall Clock | {fmt_s(run1['wall_clock_s'])} | {fmt_s(run2['wall_clock_s'])} | {change_str(wall_pct, wall_ci_pct, lower_is_better=True)} |",
-        f"| Persist Wait | {fmt_ms(run1['mean_persist_ms'])} | {fmt_ms(run2['mean_persist_ms'])} | {change_str(persist_pct, persist_ci_pct, lower_is_better=True)} |",
         "",
+        f"*{n} blocks*",
     ]
-    meta_parts = [f"{n} {'big blocks' if big_blocks else 'blocks'}"]
-    if warmup_blocks:
-        meta_parts.append(f"{warmup_blocks} warmup")
-    if wait_time:
-        meta_parts.append(f"wait time: {wait_time}")
-    display_mode = display_bal_mode(bal_mode)
-    if big_blocks and display_mode:
-        meta_parts.append(f"BAL: {display_mode}")
-    lines.append(f"*{', '.join(meta_parts)}*")
     return "\n".join(lines)
 
 
@@ -468,7 +394,6 @@ def generate_markdown(
     summary: dict, comparison_table: str,
     wait_time_tables: list[str] | None = None,
     behind_baseline: int = 0, repo: str = "", baseline_ref: str = "", baseline_name: str = "",
-    grafana_url: str | None = None,
 ) -> str:
     """Generate a markdown comment body."""
     lines = ["## Benchmark Results", ""]
@@ -488,9 +413,6 @@ def generate_markdown(
                 lines.append(table)
                 lines.append("")
         lines.append("</details>")
-    if grafana_url:
-        lines.append("")
-        lines.append(f"**[Grafana Dashboard]({grafana_url})**")
     return "\n".join(lines)
 
 
@@ -517,11 +439,6 @@ def main():
     parser.add_argument("--feature-name", "--branch-name", default=None, help="Feature branch name")
     parser.add_argument("--feature-ref", "--branch-sha", "--feature-sha", default=None, help="Feature commit SHA")
     parser.add_argument("--behind-baseline", "--behind-main", type=int, default=0, help="Commits behind baseline")
-    parser.add_argument("--big-blocks", action="store_true", default=False, help="Big blocks mode")
-    parser.add_argument("--warmup-blocks", default=None, help="Number of warmup blocks")
-    parser.add_argument("--wait-time", default=None, help="Wait time interval used between blocks")
-    parser.add_argument("--bal-mode", default=None, help="BAL mode (true, feature, baseline)")
-    parser.add_argument("--grafana-url", default=None, help="Grafana dashboard URL for this benchmark run")
     args = parser.parse_args()
 
     if len(args.baseline_csv) != len(args.feature_csv):
@@ -560,7 +477,6 @@ def main():
     baseline_name = args.baseline_name or "baseline"
     feature_name = args.feature_name or "feature"
     feature_sha = args.feature_ref or "unknown"
-    bal_mode = display_bal_mode(args.bal_mode)
 
     comparison_table = generate_comparison_table(
         baseline_stats,
@@ -571,10 +487,6 @@ def main():
         baseline_name=baseline_name,
         feature_name=feature_name,
         feature_sha=feature_sha,
-        big_blocks=args.big_blocks,
-        warmup_blocks=args.warmup_blocks,
-        wait_time=args.wait_time,
-        bal_mode=bal_mode,
     )
     print(f"Generated comparison ({paired_stats['n']} paired blocks, "
           f"mean diff {paired_stats['mean_diff_ms']:+.3f}ms ± {paired_stats['ci_ms']:.3f}ms)")
@@ -605,10 +517,6 @@ def main():
 
     summary = {
         "blocks": paired_stats["blocks"],
-        "big_blocks": args.big_blocks,
-        "warmup_blocks": args.warmup_blocks,
-        "wait_time": args.wait_time,
-        "bal_mode": bal_mode,
         "baseline": {
             "name": baseline_name,
             "ref": baseline_ref,
@@ -634,7 +542,6 @@ def main():
         repo=args.repo,
         baseline_ref=baseline_ref,
         baseline_name=baseline_name,
-        grafana_url=args.grafana_url,
     )
 
     with open(args.output_markdown, "w") as f:

.github/scripts/bench-scheduled-refs.sh

@@ -1,336 +0,0 @@
-#!/usr/bin/env bash
-#
-# Resolves baseline and feature refs for scheduled benchmark runs.
-#
-# Supports three modes:
-#   nightly — Queries the latest successful scheduled docker.yml run via
-#             GitHub API to find the nightly Docker image commit. Compares
-#             with the last successful feature ref to detect staleness.
-#   hourly  — Compares origin/main HEAD against the last successfully
-#             benchmarked commit (falls back to HEAD~1 on first run).
-#             Checks for in-progress sibling runs to avoid overlap.
-#   release — Compares the latest GitHub release tag against the current
-#             nightly Docker build. Baseline is the release tag commit,
-#             feature is the nightly commit.
-#
-# Usage: bench-scheduled-refs.sh <force> <mode>
-#   force — "true" to run even if no new commit (bypass skip logic)
-#   mode  — "nightly", "hourly", or "release"
-#
-# Outputs (via GITHUB_OUTPUT):
-#   baseline-ref    — commit SHA for baseline
-#   feature-ref     — commit SHA for feature
-#   should-skip     — "true" if no new commit since last run or sibling in progress
-#   is-stale        — "true" if latest nightly build is >24h old (nightly only)
-#   stale-age-hours — age of the nightly build in hours (nightly only)
-#   nightly-created — ISO timestamp of the nightly build (nightly only)
-#   release-tag     — release tag name (release mode only, e.g. "v2.0.0")
-#
-# Reads:
-#   state/nightly-last-feature-ref  (nightly, from decofe/reth-bench-charts repo)
-#   state/hourly-last-feature-ref   (hourly, from decofe/reth-bench-charts repo)
-#   state/release-last-feature-ref  (release, from decofe/reth-bench-charts repo)
-#
-# Requires: gh (GitHub CLI), jq, date, git (hourly mode), curl, DEREK_TOKEN env
-set -euxo pipefail
-
-FORCE="${1:-false}"
-MODE="${2:-nightly}"
-REPO="${GITHUB_REPOSITORY:-paradigmxyz/reth}"
-
-echo "Mode: $MODE, Force: $FORCE"
-
-# ==========================================================================
-# Hourly mode: compare origin/main HEAD vs HEAD~1
-# ==========================================================================
-if [ "$MODE" = "hourly" ]; then
-
-  # --- Step 1: Resolve feature ref from git ---
-  echo "::group::Resolving hourly refs from git"
-  git fetch origin main --depth=2 --quiet
-  FEATURE_REF=$(git rev-parse origin/main)
-  echo "Feature (HEAD): $FEATURE_REF"
-  echo "::endgroup::"
-
-  # --- Step 2: Check for in-progress sibling runs ---
-  echo "::group::Checking for in-progress sibling runs"
-  CURRENT_RUN_ID="${GITHUB_RUN_ID:-0}"
-  IN_PROGRESS=$(gh run list \
-    -R "$REPO" \
-    --workflow=bench-scheduled.yml \
-    --status=in_progress \
-    --json databaseId \
-    --jq "[.[] | select(.databaseId != $CURRENT_RUN_ID)] | length")
-
-  SHOULD_SKIP="false"
-  if [ "$IN_PROGRESS" -gt 0 ]; then
-    echo "::warning::Previous bench run still in progress ($IN_PROGRESS sibling run(s) found). Skipping."
-    SHOULD_SKIP="true"
-    # Output a flag so the workflow can send a Slack alert
-    echo "long-running=true" >> "$GITHUB_OUTPUT"
-  else
-    echo "No in-progress sibling runs"
-    echo "long-running=false" >> "$GITHUB_OUTPUT"
-  fi
-  echo "::endgroup::"
-
-  # --- Step 3: Read last successful feature ref from charts repo ---
-  echo "::group::Reading persisted state"
-  LAST_FEATURE_REF=""
-  STATE_URL="https://raw.githubusercontent.com/decofe/reth-bench-charts/state/state/hourly-last-feature-ref"
-  if RAW=$(curl -sfL -H "Authorization: token ${DEREK_TOKEN}" "$STATE_URL"); then
-    LAST_FEATURE_REF=$(echo "$RAW" | tr -d '[:space:]')
-    echo "Previous feature ref: $LAST_FEATURE_REF"
-  else
-    echo "No persisted state found (first run)"
-  fi
-  echo "::endgroup::"
-
-  # --- Step 4: Determine baseline and skip logic ---
-  echo "::group::Resolving baseline and skip logic"
-  if [ "$SHOULD_SKIP" = "true" ]; then
-    BASELINE_REF=$(git rev-parse origin/main~1)
-    echo "Already marked skip (sibling in progress)"
-  elif [ -z "$LAST_FEATURE_REF" ]; then
-    # First run: no previous state, fall back to HEAD~1
-    BASELINE_REF=$(git rev-parse origin/main~1)
-    echo "First run — using HEAD~1 as baseline"
-  elif [ "$LAST_FEATURE_REF" = "$FEATURE_REF" ]; then
-    BASELINE_REF="$LAST_FEATURE_REF"
-    if [ "$FORCE" = "true" ] || [ "$FORCE" = "--force" ]; then
-      echo "No new commits on main, but force=true — running anyway"
-    else
-      SHOULD_SKIP="true"
-      echo "No new commits on main since last run — will skip"
-    fi
-  else
-    # Normal case: use last benchmarked commit as baseline
-    BASELINE_REF="$LAST_FEATURE_REF"
-    echo "New commit(s) on main detected — comparing against last benchmarked commit"
-  fi
-
-  echo "Baseline: $BASELINE_REF"
-  echo "Feature:  $FEATURE_REF"
-  echo "Skip:     $SHOULD_SKIP"
-  echo "::endgroup::"
-
-  # --- Step 5: Write outputs ---
-  {
-    echo "baseline-ref=$BASELINE_REF"
-    echo "feature-ref=$FEATURE_REF"
-    echo "should-skip=$SHOULD_SKIP"
-    echo "is-stale=false"
-    echo "stale-age-hours=0"
-    echo "nightly-created="
-  } >> "$GITHUB_OUTPUT"
-  exit 0
-fi
-
-# ==========================================================================
-# Release mode: compare latest GitHub release tag vs current nightly build
-# ==========================================================================
-if [ "$MODE" = "release" ]; then
-
-  # --- Step 1: Resolve feature ref from latest nightly Docker build ---
-  echo "::group::Querying latest nightly docker build"
-  RUNS_JSON=$(gh run list \
-    -R "$REPO" \
-    --workflow=docker.yml \
-    --event=schedule \
-    --status=completed \
-    --limit 5 \
-    --json headSha,createdAt,conclusion)
-
-  LATEST=$(echo "$RUNS_JSON" | jq -r '[.[] | select(.conclusion == "success")] | first // empty')
-  if [ -z "$LATEST" ]; then
-    echo "::error::No successful scheduled docker.yml run found in the last 5 runs"
-    exit 1
-  fi
-
-  FEATURE_REF=$(echo "$LATEST" | jq -r '.headSha')
-  echo "Nightly commit (feature): $FEATURE_REF"
-  echo "::endgroup::"
-
-  # --- Step 2: Resolve baseline ref from latest GitHub release ---
-  echo "::group::Resolving latest release tag"
-  RELEASE_JSON=$(gh release view --repo "$REPO" --json tagName,targetCommitish,publishedAt 2>/dev/null || echo "{}")
-  RELEASE_TAG=$(echo "$RELEASE_JSON" | jq -r '.tagName // empty')
-
-  if [ -z "$RELEASE_TAG" ]; then
-    echo "::error::No release found on $REPO"
-    exit 1
-  fi
-
-  # Resolve the tag to a commit SHA
-  BASELINE_REF=$(gh api "repos/$REPO/git/ref/tags/$RELEASE_TAG" --jq '.object.sha' 2>/dev/null || true)
-
-  # If tag points to an annotated tag object, dereference to the commit
-  if [ -n "$BASELINE_REF" ]; then
-    OBJ_TYPE=$(gh api "repos/$REPO/git/tags/$BASELINE_REF" --jq '.object.type' 2>/dev/null || echo "commit")
-    if [ "$OBJ_TYPE" = "commit" ]; then
-      BASELINE_REF=$(gh api "repos/$REPO/git/tags/$BASELINE_REF" --jq '.object.sha' 2>/dev/null || echo "$BASELINE_REF")
-    fi
-  fi
-
-  if [ -z "$BASELINE_REF" ]; then
-    echo "::error::Could not resolve release tag $RELEASE_TAG to a commit"
-    exit 1
-  fi
-
-  echo "Release tag: $RELEASE_TAG"
-  echo "Release commit (baseline): $BASELINE_REF"
-  echo "::endgroup::"
-
-  # --- Step 3: Read last successful feature ref from charts repo ---
-  echo "::group::Reading persisted state"
-  LAST_FEATURE_REF=""
-  STATE_URL="https://raw.githubusercontent.com/decofe/reth-bench-charts/state/state/release-last-feature-ref"
-  if RAW=$(curl -sfL -H "Authorization: token ${DEREK_TOKEN}" "$STATE_URL"); then
-    LAST_FEATURE_REF=$(echo "$RAW" | tr -d '[:space:]')
-    echo "Previous feature ref: $LAST_FEATURE_REF"
-  else
-    echo "No persisted state found (first run)"
-  fi
-  echo "::endgroup::"
-
-  # --- Step 4: Skip logic ---
-  echo "::group::Resolving skip logic"
-  SHOULD_SKIP="false"
-  if [ -n "$LAST_FEATURE_REF" ] && [ "$LAST_FEATURE_REF" = "$FEATURE_REF" ]; then
-    if [ "$FORCE" = "true" ] || [ "$FORCE" = "--force" ]; then
-      echo "No new nightly, but force=true — running anyway"
-    else
-      SHOULD_SKIP="true"
-      echo "No new nightly since last release regression run — will skip"
-    fi
-  else
-    echo "New nightly detected or first run"
-  fi
-
-  echo "Baseline: $BASELINE_REF ($RELEASE_TAG)"
-  echo "Feature:  $FEATURE_REF"
-  echo "Skip:     $SHOULD_SKIP"
-  echo "::endgroup::"
-
-  # --- Step 5: Write outputs ---
-  {
-    echo "baseline-ref=$BASELINE_REF"
-    echo "feature-ref=$FEATURE_REF"
-    echo "should-skip=$SHOULD_SKIP"
-    echo "is-stale=false"
-    echo "stale-age-hours=0"
-    echo "nightly-created="
-    echo "long-running=false"
-    echo "release-tag=$RELEASE_TAG"
-  } >> "$GITHUB_OUTPUT"
-  exit 0
-fi
-
-# ==========================================================================
-# Nightly mode: query latest Docker nightly build (original logic)
-# ==========================================================================
-
-# --- Step 1: Query latest successful scheduled docker.yml run ---
-echo "::group::Querying latest nightly docker build"
-
-RUNS_JSON=$(gh run list \
-  -R "$REPO" \
-  --workflow=docker.yml \
-  --event=schedule \
-  --status=completed \
-  --limit 5 \
-  --json headSha,createdAt,conclusion)
-
-# Find the most recent successful run
-LATEST=$(echo "$RUNS_JSON" | jq -r '[.[] | select(.conclusion == "success")] | first // empty')
-
-if [ -z "$LATEST" ]; then
-  echo "::error::No successful scheduled docker.yml run found in the last 5 runs"
-  echo "Runs found: $RUNS_JSON"
-  exit 1
-fi
-
-FEATURE_REF=$(echo "$LATEST" | jq -r '.headSha')
-CREATED_AT=$(echo "$LATEST" | jq -r '.createdAt')
-echo "Latest nightly commit: $FEATURE_REF"
-echo "Built at: $CREATED_AT"
-echo "::endgroup::"
-
-# --- Step 2: Staleness check ---
-echo "::group::Checking staleness"
-NOW_EPOCH=$(date +%s)
-# Handle both GNU date (-d) and BSD date (-j -f) for cross-platform compat
-CREATED_EPOCH=$(date -d "$CREATED_AT" +%s 2>/dev/null || \
-  date -j -f "%Y-%m-%dT%H:%M:%SZ" "$CREATED_AT" +%s 2>/dev/null || \
-  date -j -f "%Y-%m-%dT%T%z" "$CREATED_AT" +%s 2>/dev/null || \
-  { echo "::error::Cannot parse date: $CREATED_AT"; exit 1; })
-
-AGE_SECONDS=$(( NOW_EPOCH - CREATED_EPOCH ))
-AGE_HOURS=$(( AGE_SECONDS / 3600 ))
-IS_STALE="false"
-
-if [ "$AGE_HOURS" -gt 24 ]; then
-  IS_STALE="true"
-  echo "::warning::STALE NIGHTLY: Build is ${AGE_HOURS}h old (>24h threshold)"
-  echo "This indicates the nightly docker build failed — no new image was produced"
-else
-  echo "Nightly build age: ${AGE_HOURS}h (within 24h threshold)"
-fi
-echo "::endgroup::"
-
-# --- Step 3: Read last successful feature ref from charts repo ---
-echo "::group::Reading persisted state"
-LAST_FEATURE_REF=""
-STATE_URL="https://raw.githubusercontent.com/decofe/reth-bench-charts/state/state/nightly-last-feature-ref"
-if RAW=$(curl -sfL -H "Authorization: token ${DEREK_TOKEN}" "$STATE_URL"); then
-  LAST_FEATURE_REF=$(echo "$RAW" | tr -d '[:space:]')
-  echo "Previous feature ref: $LAST_FEATURE_REF"
-else
-  echo "No persisted state found (first run)"
-fi
-echo "::endgroup::"
-
-# --- Step 4: Determine baseline and skip logic ---
-echo "::group::Resolving refs"
-SHOULD_SKIP="false"
-BASELINE_REF="$FEATURE_REF"  # default for first run
-
-if [ "$IS_STALE" = "true" ]; then
-  # Stale = error path, don't skip (will alert and fail downstream)
-  SHOULD_SKIP="false"
-  BASELINE_REF="${LAST_FEATURE_REF:-$FEATURE_REF}"
-  echo "Stale nightly detected — will alert and fail"
-elif [ -z "$LAST_FEATURE_REF" ]; then
-  # First run: baseline = feature (self-comparison to establish baseline)
-  BASELINE_REF="$FEATURE_REF"
-  echo "First run — will benchmark nightly against itself to establish baseline"
-elif [ "$LAST_FEATURE_REF" = "$FEATURE_REF" ]; then
-  # No new nightly since last successful run
-  if [ "$FORCE" = "true" ] || [ "$FORCE" = "--force" ]; then
-    echo "No new nightly, but force=true — running anyway"
-    BASELINE_REF="$LAST_FEATURE_REF"
-  else
-    SHOULD_SKIP="true"
-    echo "No new nightly since last run — will skip"
-  fi
-else
-  # Normal case: new nightly available
-  BASELINE_REF="$LAST_FEATURE_REF"
-  echo "New nightly detected"
-fi
-
-echo "Baseline: $BASELINE_REF"
-echo "Feature:  $FEATURE_REF"
-echo "Skip:     $SHOULD_SKIP"
-echo "Stale:    $IS_STALE"
-echo "::endgroup::"
-
-# --- Step 5: Write outputs ---
-{
-  echo "baseline-ref=$BASELINE_REF"
-  echo "feature-ref=$FEATURE_REF"
-  echo "should-skip=$SHOULD_SKIP"
-  echo "is-stale=$IS_STALE"
-  echo "stale-age-hours=$AGE_HOURS"
-  echo "nightly-created=$CREATED_AT"
-} >> "$GITHUB_OUTPUT"

.github/scripts/bench-slack-notify.js

@@ -7,8 +7,6 @@
 //   BENCH_PR               – PR number (may be empty)
 //   BENCH_ACTOR            – GitHub user who triggered the bench
 //   BENCH_JOB_URL          – URL to the Actions job page
-//   BENCH_BASELINE_ARGS    – Extra CLI args for the baseline reth node
-//   BENCH_FEATURE_ARGS     – Extra CLI args for the feature reth node
 //   BENCH_SAMPLY           – 'true' if samply profiling was enabled
 //
 // Usage from actions/github-script:
@@ -18,7 +16,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const { fmtChange, fmtMs, verdict, loadSamplyUrls, blocksLabel, metricRows, waitTimeRows } = require('./bench-utils');
 
 const SLACK_API = 'https://slack.com/api/chat.postMessage';
 
@@ -62,17 +59,40 @@ function cell(text) {
   return { type: 'raw_text', text: s || ' ' };
 }
 
-// Slack shortcodes for verdict (Block Kit header doesn't support unicode emoji)
-const SLACK_VERDICT = {
-  '⚠️': ':warning:',
-  '❌': ':x:',
-  '✅': ':white_check_mark:',
-  '⚪': ':white_circle:',
-};
-
 function buildSuccessBlocks({ summary, prNumber, actor, actorSlackId, jobUrl, repo, samplyUrls }) {
-  const { emoji, label } = verdict(summary.changes);
-  const headerEmoji = SLACK_VERDICT[emoji] || emoji;
+  const b = summary.baseline.stats;
+  const f = summary.feature.stats;
+  const c = summary.changes;
+
+  const sigEmoji = { good: '\u2705', bad: '\u274c', neutral: '\u26aa' };
+
+  function fmtMs(v) { return v.toFixed(2) + 'ms'; }
+  function fmtMgas(v) { return v.toFixed(2); }
+  function fmtChange(ch) {
+    if (!ch.pct && !ch.ci_pct) return ' ';
+    const pctStr = `${ch.pct >= 0 ? '+' : ''}${ch.pct.toFixed(2)}%`;
+    const ciStr = ch.ci_pct ? ` (\u00b1${ch.ci_pct.toFixed(2)}%)` : '';
+    return `${pctStr}${ciStr} ${sigEmoji[ch.sig]}`;
+  }
+
+  // Overall result for header
+  const vals = Object.values(c);
+  const hasBad = vals.some(v => v.sig === 'bad');
+  const hasGood = vals.some(v => v.sig === 'good');
+  let headerEmoji, headerResult;
+  if (hasBad && hasGood) {
+    headerEmoji = ':warning:';
+    headerResult = 'Mixed Results';
+  } else if (hasBad) {
+    headerEmoji = ':x:';
+    headerResult = 'Regression';
+  } else if (hasGood) {
+    headerEmoji = ':white_check_mark:';
+    headerResult = 'Improvement';
+  } else {
+    headerEmoji = ':white_circle:';
+    headerResult = 'No Difference';
+  }
 
   const prUrl = prNumber ? `https://github.com/${repo}/pull/${prNumber}` : '';
   const commitUrl = `https://github.com/${repo}/commit`;
@@ -97,15 +117,15 @@ function buildSuccessBlocks({ summary, prNumber, actor, actorSlackId, jobUrl, re
   if (fl1) featureLine += ` | <${fl1}|Samply 1>`;
   if (fl2) featureLine += ` | <${fl2}|Samply 2>`;
 
-  const countsLine = blocksLabel(summary).map(p => `*${p.key}:* ${p.value}`).join(' | ');
+  const warmup = summary.warmup_blocks || process.env.BENCH_WARMUP_BLOCKS || '';
+  const cores = process.env.BENCH_CORES || '0';
+  const countsParts = [];
+  if (warmup) countsParts.push(`*Warmup:* ${warmup}`);
+  countsParts.push(`*Blocks:* ${summary.blocks}`);
+  if (cores !== '0') countsParts.push(`*Cores:* ${cores}`);
+  const countsLine = countsParts.join(' | ');
 
-  const baselineArgs = process.env.BENCH_BASELINE_ARGS || '';
-  const featureArgs = process.env.BENCH_FEATURE_ARGS || '';
-  const argsLines = [];
-  if (baselineArgs) argsLines.push(`*Baseline Args:* \`${baselineArgs}\``);
-  if (featureArgs) argsLines.push(`*Feature Args:* \`${featureArgs}\``);
-
-  const sectionText = [metaParts.join(' | '), '', baselineLine, featureLine, ...argsLines, countsLine].join('\n');
+  const sectionText = [metaParts.join(' | '), '', baselineLine, featureLine, countsLine].join('\n');
 
   // Action buttons
   const diffUrl = `https://github.com/${repo}/compare/${summary.baseline.ref}...${summary.feature.ref}`;
@@ -124,17 +144,10 @@ function buildSuccessBlocks({ summary, prNumber, actor, actorSlackId, jobUrl, re
     },
   ];
 
-  // Build table rows from shared metricRows
-  const rows = metricRows(summary);
-  const tableRows = [
-    [cell('Metric'), cell('Baseline'), cell('Feature'), cell('Change')],
-    ...rows.map(r => [cell(r.label), cell(r.baseline), cell(r.feature), cell(r.change || ' ')]),
-  ];
-
   const blocks = [
     {
       type: 'header',
-      text: { type: 'plain_text', text: `${headerEmoji} ${label}`, emoji: true },
+      text: { type: 'plain_text', text: `${headerEmoji} ${headerResult}`, emoji: true },
     },
     {
       type: 'section',
@@ -148,7 +161,15 @@ function buildSuccessBlocks({ summary, prNumber, actor, actorSlackId, jobUrl, re
         { align: 'right' },
         { align: 'right' },
       ],
-      rows: tableRows,
+      rows: [
+        [cell('Metric'),  cell('Baseline'), cell('Feature'), cell('Change')],
+        [cell('Mean'),     cell(fmtMs(b.mean_ms)),      cell(fmtMs(f.mean_ms)),      cell(fmtChange(c.mean))],
+        [cell('StdDev'),   cell(fmtMs(b.stddev_ms)),    cell(fmtMs(f.stddev_ms)),    cell(' ')],
+        [cell('P50'),      cell(fmtMs(b.p50_ms)),       cell(fmtMs(f.p50_ms)),       cell(fmtChange(c.p50))],
+        [cell('P90'),      cell(fmtMs(b.p90_ms)),       cell(fmtMs(f.p90_ms)),       cell(fmtChange(c.p90))],
+        [cell('P99'),      cell(fmtMs(b.p99_ms)),       cell(fmtMs(f.p99_ms)),       cell(fmtChange(c.p99))],
+        [cell('Mgas/s'),   cell(fmtMgas(b.mean_mgas_s)), cell(fmtMgas(f.mean_mgas_s)), cell(fmtChange(c.mgas_s))],
+      ],
     },
     {
       type: 'actions',
@@ -158,12 +179,16 @@ function buildSuccessBlocks({ summary, prNumber, actor, actorSlackId, jobUrl, re
 
   // Wait times as a separate table block (sent as threaded reply due to Slack one-table limit)
   const threadBlocks = [];
-  const wtRows = waitTimeRows(summary);
-  if (wtRows.length > 0) {
-    const waitTableRows = [
+  const waitTimes = summary.wait_times || {};
+  const waitKeys = Object.keys(waitTimes);
+  if (waitKeys.length > 0) {
+    const waitRows = [
       [cell('Wait Time'), cell('Baseline'), cell('Feature')],
-      ...wtRows.map(r => [cell(r.title), cell(r.baseline), cell(r.feature)]),
     ];
+    for (const key of waitKeys) {
+      const wt = waitTimes[key];
+      waitRows.push([cell(wt.title), cell(fmtMs(wt.baseline.mean_ms)), cell(fmtMs(wt.feature.mean_ms))]);
+    }
     threadBlocks.push({
       type: 'table',
       column_settings: [
@@ -171,7 +196,7 @@ function buildSuccessBlocks({ summary, prNumber, actor, actorSlackId, jobUrl, re
         { align: 'right' },
         { align: 'right' },
       ],
-      rows: waitTableRows,
+      rows: waitRows,
     });
   }
 
@@ -233,7 +258,16 @@ async function success({ core, context }) {
   const jobUrl = process.env.BENCH_JOB_URL ||
     `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
 
-  const samplyUrls = loadSamplyUrls(process.env.BENCH_WORK_DIR);
+  // Load samply profile URLs (files exist when samply profiling was enabled)
+  const samplyUrls = {};
+  for (const run of ['baseline-1', 'baseline-2', 'feature-1', 'feature-2']) {
+    try {
+      const url = fs.readFileSync(
+        path.join(process.env.BENCH_WORK_DIR, run, 'samply-profile-url.txt'), 'utf8'
+      ).trim();
+      if (url) samplyUrls[run] = url;
+    } catch {}
+  }
 
   const slackUsers = loadSlackUsers(process.env.GITHUB_WORKSPACE || '.');
   const actorSlackId = slackUsers[actor];
@@ -250,8 +284,6 @@ async function success({ core, context }) {
     }
   }
 
-  const slackMode = process.env.BENCH_SLACK || 'always';
-
   // Post to public channel if any metric shows significant improvement or regression
   const channel = process.env.SLACK_BENCH_CHANNEL;
   let postedToChannel = false;
@@ -266,14 +298,6 @@ async function success({ core, context }) {
     }
   }
 
-  // In on-win mode, only notify on improvement — skip DM fallback entirely
-  if (slackMode === 'on-win') {
-    if (!postedToChannel) {
-      core.info('on-win mode: no improvement detected, skipping all notifications');
-    }
-    return;
-  }
-
   // DM the actor only when results were not posted to the public channel
   if (!postedToChannel) {
     if (actorSlackId) {

.github/scripts/bench-slack-users.json

@@ -9,17 +9,5 @@
   "gakonst": "U092SEPDM40",
   "Rjected": "U09F6SCKRGT",
   "DaniPopes": "U09FAT8EK2A",
-  "emmajam": "U0A34UN92HW",
-  "onbjerg": "U09FB0UK5AA",
-  "fgimenez": "U09G3GP7CSU",
-  "rakita": "U09FB3Z2M7Y",
-  "jxom": "U09F72MG083",
-  "tmm": "U0AD0U8E88N",
-  "pepyakin": "U0A7HKMGEHJ",
-  "grandizzy": "U09F8DBDDRT",
-  "SuperFluffy": "U095BKHB2Q4",
-  "kamsz": "U0A2563UBRD",
-  "zerosnacks": "U09FARPMN74",
-  "samczsun": "U096R14E4H3",
-  "laibe": "U09FARE0B9Q"
+  "emmajam": "U0A34UN92HW"
 }

.github/scripts/bench-upload-clickhouse.py

@@ -1,150 +0,0 @@
-#!/usr/bin/env python3
-"""Upload bench-scheduled summary.json results to ClickHouse.
-
-Reads the summary JSON produced by bench-reth-summary.py and inserts a row
-into the bench_dual_comparisons table so the PM dashboard can display results.
-
-Usage:
-    bench-upload-clickhouse.py \
-        --summary <summary.json> \
-        --workflow-name <name> \
-        --chain <chain>
-
-Environment variables:
-    CLICKHOUSE_HOST      ClickHouse host URL
-    CLICKHOUSE_USER      ClickHouse username
-    CLICKHOUSE_PASSWORD  ClickHouse password
-    CLICKHOUSE_DATABASE  ClickHouse database (default: "default")
-"""
-
-import argparse
-import json
-import os
-import sys
-import urllib.request
-import urllib.error
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Upload benchmark results to ClickHouse")
-    parser.add_argument("--summary", required=True, help="Path to summary.json")
-    parser.add_argument("--workflow-name", required=True, help="Workflow name for ClickHouse")
-    parser.add_argument("--chain", default="mainnet", help="Chain name")
-    parser.add_argument("--grafana-url", default="", help="Grafana dashboard URL")
-    parser.add_argument("--github-diff-url", default="", help="GitHub diff URL")
-    parser.add_argument("--job-url", default="", help="CI job URL")
-    args = parser.parse_args()
-
-    ch_host = os.environ.get("CLICKHOUSE_HOST", "")
-    ch_user = os.environ.get("CLICKHOUSE_USER", "")
-    ch_password = os.environ.get("CLICKHOUSE_PASSWORD", "")
-    ch_database = os.environ.get("CLICKHOUSE_DATABASE", "default")
-    ch_table = "bench_dual_comparisons"
-
-    if not ch_host or not ch_user or not ch_password:
-        print("Missing ClickHouse credentials, skipping upload", file=sys.stderr)
-        sys.exit(0)
-
-    with open(args.summary) as f:
-        summary = json.load(f)
-
-    baseline = summary["baseline"]
-    feature = summary["feature"]
-    b_stats = baseline["stats"]
-    f_stats = feature["stats"]
-    changes = summary["changes"]
-    blocks = summary["blocks"]
-
-    # Extract wait time data
-    wait_times = summary.get("wait_times", {})
-    def wait_mean(field):
-        wt = wait_times.get(field, {})
-        b = wt.get("baseline", {}).get("mean_ms", 0.0)
-        f = wt.get("feature", {}).get("mean_ms", 0.0)
-        return b, f
-
-    b_persist, f_persist = wait_mean("persistence_wait_us")
-    b_exec_cache, f_exec_cache = wait_mean("execution_cache_wait_us")
-    b_sparse, f_sparse = wait_mean("sparse_trie_wait_us")
-
-    # gas_per_second: summary uses mean_mgas_s (Mgas/s), ClickHouse stores gas/s
-    b_gas_per_second = b_stats["mean_mgas_s"] * 1_000_000
-    f_gas_per_second = f_stats["mean_mgas_s"] * 1_000_000
-
-    mean_change = changes.get("mean", {}).get("pct", 0.0)
-    gas_change = changes.get("mgas_s", {}).get("pct", 0.0)
-    latency_improved = 1 if mean_change < 0 else 0
-    throughput_improved = 1 if gas_change > 0 else 0
-
-    big_blocks = "true" if summary.get("big_blocks", False) else "false"
-    warmup_blocks = summary.get("warmup_blocks", 0) or 0
-
-    def esc(s):
-        return str(s).replace("'", "\\'")
-
-    insert = f"""
-    INSERT INTO {ch_database}.{ch_table} (
-        workflow_name, chain,
-        baseline_ref, baseline_commit,
-        feature_ref, feature_commit,
-        blocks,
-        baseline_total_latency_ms, baseline_gas_per_second,
-        baseline_latency_mean_ms, baseline_latency_median_ms,
-        baseline_latency_p90_ms, baseline_latency_p99_ms,
-        feature_total_latency_ms, feature_gas_per_second,
-        feature_latency_mean_ms, feature_latency_median_ms,
-        feature_latency_p90_ms, feature_latency_p99_ms,
-        mean_latency_change_percent, gas_per_second_change_percent,
-        latency_improved, throughput_improved,
-        warmup_blocks, big_blocks,
-        grafana_benchmark_url, github_diff_url, argo_workflow_url,
-        baseline_persistence_wait_mean_ms, baseline_execution_cache_wait_mean_ms,
-        baseline_sparse_trie_wait_mean_ms,
-        feature_persistence_wait_mean_ms, feature_execution_cache_wait_mean_ms,
-        feature_sparse_trie_wait_mean_ms
-    ) VALUES (
-        '{esc(args.workflow_name)}', '{esc(args.chain)}',
-        '{esc(baseline["ref"])}', '{esc(baseline["ref"])}',
-        '{esc(feature["ref"])}', '{esc(feature["ref"])}',
-        {blocks},
-        {b_stats.get("wall_clock_s", 0) * 1000}, {b_gas_per_second},
-        {b_stats["mean_ms"]}, {b_stats["p50_ms"]},
-        {b_stats["p90_ms"]}, {b_stats["p99_ms"]},
-        {f_stats.get("wall_clock_s", 0) * 1000}, {f_gas_per_second},
-        {f_stats["mean_ms"]}, {f_stats["p50_ms"]},
-        {f_stats["p90_ms"]}, {f_stats["p99_ms"]},
-        {mean_change}, {gas_change},
-        {latency_improved}, {throughput_improved},
-        {warmup_blocks}, '{big_blocks}',
-        '{esc(args.grafana_url)}', '{esc(args.github_diff_url)}', '{esc(args.job_url)}',
-        {b_persist}, {b_exec_cache}, {b_sparse},
-        {f_persist}, {f_exec_cache}, {f_sparse}
-    );
-    """
-
-    # Build ClickHouse HTTP URL (credentials via headers, never in URL)
-    host = ch_host.rstrip("/")
-    if not host.startswith("http"):
-        host = f"https://{host}:8443"
-
-    url = f"{host}/?database={ch_database}"
-
-    req = urllib.request.Request(url, data=insert.encode("utf-8"), method="POST")
-    req.add_header("Content-Type", "text/plain")
-    req.add_header("X-ClickHouse-User", ch_user)
-    req.add_header("X-ClickHouse-Key", ch_password)
-
-    try:
-        with urllib.request.urlopen(req) as resp:
-            body = resp.read().decode("utf-8")
-            if body.strip():
-                print(f"ClickHouse response: {body}")
-        print(f"Successfully uploaded benchmark results to ClickHouse ({args.workflow_name})")
-    except urllib.error.HTTPError as e:
-        body = e.read().decode("utf-8")
-        print(f"ClickHouse upload failed ({e.code}): {body}", file=sys.stderr)
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()

.github/scripts/bench-utils.js

@@ -1,112 +0,0 @@
-// Shared utilities for reth-bench result rendering.
-//
-// Used by bench-job-summary.js and bench-slack-notify.js.
-
-const fs = require('fs');
-const path = require('path');
-
-const SIG_EMOJI = { good: '✅', bad: '❌', neutral: '⚪' };
-
-function fmtMs(v) { return v.toFixed(2) + 'ms'; }
-function fmtMgas(v) { return v.toFixed(2); }
-function fmtS(v) { return v.toFixed(2) + 's'; }
-
-function fmtChange(ch) {
-  if (!ch || (!ch.pct && !ch.ci_pct)) return '';
-  const pctStr = `${ch.pct >= 0 ? '+' : ''}${ch.pct.toFixed(2)}%`;
-  const ciStr = ch.ci_pct ? ` (±${ch.ci_pct.toFixed(2)}%)` : '';
-  return `${pctStr}${ciStr} ${SIG_EMOJI[ch.sig]}`;
-}
-
-function verdict(changes) {
-  const vals = Object.values(changes);
-  const hasBad = vals.some(v => v.sig === 'bad');
-  const hasGood = vals.some(v => v.sig === 'good');
-  if (hasBad && hasGood) return { emoji: '⚠️', label: 'Mixed Results' };
-  if (hasBad) return { emoji: '❌', label: 'Regression' };
-  if (hasGood) return { emoji: '✅', label: 'Improvement' };
-  return { emoji: '⚪', label: 'No Difference' };
-}
-
-function loadSamplyUrls(workDir) {
-  const urls = {};
-  for (const run of ['baseline-1', 'baseline-2', 'feature-1', 'feature-2']) {
-    try {
-      const url = fs.readFileSync(path.join(workDir, run, 'samply-profile-url.txt'), 'utf8').trim();
-      if (url) urls[run] = url;
-    } catch {}
-  }
-  return urls;
-}
-
-function balModeLabel(mode) {
-  switch (mode) {
-    case 'true':
-    case 'feature':
-    case 'baseline':
-      return mode;
-    case 'both':
-      return 'true';
-    default:
-      return '';
-  }
-}
-
-function blocksLabel(summary) {
-  const parts = [];
-  if (summary.big_blocks) {
-    parts.push({ key: 'Big Blocks', value: summary.blocks });
-    const balMode = balModeLabel(summary.bal_mode || summary.bal || process.env.BENCH_BAL || 'false');
-    if (balMode) parts.push({ key: 'BAL', value: balMode });
-  } else {
-    const warmup = summary.warmup_blocks || process.env.BENCH_WARMUP_BLOCKS || '';
-    if (warmup) parts.push({ key: 'Warmup', value: warmup });
-    parts.push({ key: 'Blocks', value: summary.blocks });
-  }
-  const cores = process.env.BENCH_CORES || '0';
-  if (cores !== '0') parts.push({ key: 'Cores', value: cores });
-  if (summary.wait_time) parts.push({ key: 'Wait time', value: summary.wait_time });
-  return parts;
-}
-
-// The 7 metric rows shared by all renderers.
-// Returns an array of { label, baseline, feature, change } objects.
-function metricRows(summary) {
-  const b = summary.baseline.stats;
-  const f = summary.feature.stats;
-  const c = summary.changes;
-  return [
-    { label: 'Mean',       baseline: fmtMs(b.mean_ms),       feature: fmtMs(f.mean_ms),       change: fmtChange(c.mean) },
-    { label: 'StdDev',     baseline: fmtMs(b.stddev_ms),     feature: fmtMs(f.stddev_ms),     change: '' },
-    { label: 'P50',        baseline: fmtMs(b.p50_ms),        feature: fmtMs(f.p50_ms),        change: fmtChange(c.p50) },
-    { label: 'P90',        baseline: fmtMs(b.p90_ms),        feature: fmtMs(f.p90_ms),        change: fmtChange(c.p90) },
-    { label: 'P99',        baseline: fmtMs(b.p99_ms),        feature: fmtMs(f.p99_ms),        change: fmtChange(c.p99) },
-    { label: 'Mgas/s',     baseline: fmtMgas(b.mean_mgas_s), feature: fmtMgas(f.mean_mgas_s), change: fmtChange(c.mgas_s) },
-    { label: 'Wall Clock', baseline: fmtS(b.wall_clock_s),   feature: fmtS(f.wall_clock_s),   change: fmtChange(c.wall_clock) },
-    { label: 'Persist Wait', baseline: fmtMs(b.mean_persist_ms || 0), feature: fmtMs(f.mean_persist_ms || 0), change: fmtChange(c.persist_wait) },
-  ];
-}
-
-// Wait time rows: one row per metric showing mean values.
-function waitTimeRows(summary) {
-  const waitTimes = summary.wait_times || {};
-  const rows = [];
-  for (const key of Object.keys(waitTimes)) {
-    const wt = waitTimes[key];
-    rows.push({ title: wt.title, baseline: fmtMs(wt.baseline.mean_ms), feature: fmtMs(wt.feature.mean_ms) });
-  }
-  return rows;
-}
-
-module.exports = {
-  SIG_EMOJI,
-  fmtMs,
-  fmtMgas,
-  fmtS,
-  fmtChange,
-  verdict,
-  loadSamplyUrls,
-  blocksLabel,
-  metricRows,
-  waitTimeRows,
-};

.github/scripts/check_rv32imac.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-set -uxo pipefail
+set -uo pipefail
 
 crates_to_check=(
+    reth-codecs-derive
+    reth-primitives
+    reth-primitives-traits
     reth-network-peers
     reth-trie-common
     reth-trie-sparse

.github/scripts/check_wasm.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -uxo pipefail
+set -uo pipefail
 
 readarray -t crates < <(
   cargo metadata --format-version=1 --no-deps | jq -r '.packages[].name' | grep '^reth' | sort
@@ -22,7 +22,6 @@ exclude_crates=(
   reth-downloaders
   reth-e2e-test-utils
   reth-engine-service
-  reth-execution-cache
   reth-engine-tree
   reth-engine-util
   reth-eth-wire
@@ -56,7 +55,6 @@ exclude_crates=(
   reth-ress-provider
   # The following are not supposed to be working
   reth # all of the crates below
-  reth-bb # binary-only, uses tokio features unsupported on wasm
   reth-storage-rpc-provider
   reth-invalid-block-hooks # reth-provider
   reth-libmdbx # mdbx

.github/scripts/hive/Dockerfile

@@ -7,7 +7,7 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
 WORKDIR /app
 
 # Install system dependencies
-RUN apt-get update && apt-get install -y libclang-dev pkg-config
+RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config
 
 # 
 # We prepare the build plan

.github/scripts/hive/build_simulators.sh

@@ -11,14 +11,8 @@ go build .
 
 # Run each hive command in the background for each simulator and wait
 echo "Building images"
-./hive -client reth --sim "ethereum/eels/consume-engine" \
-    --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz \
-    --sim.buildarg branch=forks/osaka \
-    --sim.timelimit 1s || true &
-./hive -client reth --sim "ethereum/eels/consume-rlp" \
-    --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz \
-    --sim.buildarg branch=forks/osaka \
-    --sim.timelimit 1s || true &
+# TODO: test code has been moved from https://github.com/ethereum/execution-spec-tests to https://github.com/ethereum/execution-specs  we need to pin eels branch with `--sim.buildarg branch=<release-branch-name>` once we have the fusaka release tagged on the new repo
+./hive -client reth --sim "ethereum/eels" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz -sim.timelimit 1s || true &
 ./hive -client reth --sim "ethereum/engine" -sim.timelimit 1s || true &
 ./hive -client reth --sim "devp2p" -sim.timelimit 1s || true &
 ./hive -client reth --sim "ethereum/rpc-compat" -sim.timelimit 1s || true &

.github/scripts/hive/expected_failures.yaml

@@ -1,6 +1,9 @@
 # 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_getStorageAt/get-storage-invalid-key-too-large (reth)
@@ -13,11 +16,28 @@ rpc-compat:
   # syncing mode, the test expects syncing to be false on start
   - eth_syncing/check-syncing (reth)
 
-engine-withdrawals: [ ]
+# 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)
+  - 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 Canonical Block 8 / Side Block 7 - 10 Block Re-Org (Paris) (reth)
 
 engine-api: [ ]
 
-engine-cancun: [ ]
+# no fix due to https://github.com/paradigmxyz/reth/issues/8732
+engine-cancun:
+  - Invalid PayloadAttributes, Missing BeaconRoot, Syncing=True (Cancun) (reth)
+  # the test fails with older versions of the code for which it passed before, probably related to changes
+  # in hive or its dependencies
+  - Blob Transaction Ordering, Multiple Clients (Cancun) (reth)
 
 sync: [ ]
 
@@ -29,7 +49,7 @@ engine-auth: [ ]
 #   The test artificially creates an empty account with storage, then tests EIP-7610's behavior.
 #   On mainnet, ~25 such accounts exist as contract addresses (derived from keccak(prefix, caller,
 #   nonce/salt), not from public keys). No private key exists for contract addresses. To trigger
-#   this with EIP-7702, you'd need to recover a private key from one of the already deployed contract addresses - mathematically impossible.
+#   this with EIP-7702, you'd need to recover a private key from one of the already deployed contract addresses - mathematically impossible. 
 #
 # tests/paris/eip7610_create_collision/test_initcollision.py::test_init_collision_*
 #   Requires hash collision on create2 address to target already deployed accounts with storage.

.github/scripts/hive/ignored_tests.yaml

@@ -11,6 +11,17 @@
 #
 # When a test should no longer be ignored, remove it from this list.
 
+# flaky
+engine-withdrawals:
+  - Withdrawals Fork on Block 1 - 8 Block Re-Org NewPayload (Paris) (reth)
+  - Withdrawals Fork on Block 8 - 10 Block Re-Org NewPayload (Paris) (reth)
+  - Withdrawals Fork on Canonical Block 8 / Side Block 7 - 10 Block Re-Org (Paris) (reth)
+  # P2P sync timing issue in hive Docker environment: secondary client returns SYNCING but
+  # peer discovery/connection doesn't complete within the timeout when running with
+  # --sim.parallelism 16. Not a correctness bug, purely a CI timing issue.
+  - Sync after 2 blocks - Withdrawals on Block 2 - Multiple Withdrawal Accounts (Paris) (reth)
+  - Sync after 2 blocks - Withdrawals on Block 2 - Multiple Withdrawal Accounts - No Transactions (Paris) (reth)
+  - Sync after 128 blocks - Withdrawals on Block 2 - Multiple Withdrawal Accounts (Paris) (reth)
 engine-cancun:
   - Transaction Re-Org, New Payload on Revert Back (Cancun) (reth)
   - Transaction Re-Org, Re-Org to Different Block (Cancun) (reth)
@@ -21,6 +32,7 @@ engine-cancun:
   # Affects all clients, not just reth. Tracked: https://github.com/ethereum/hive/issues/1382
   - Invalid Missing Ancestor Syncing ReOrg, Timestamp, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Cancun) (reth)
   - Invalid Missing Ancestor Syncing ReOrg, Timestamp, EmptyTxs=False, CanonicalReOrg=True, Invalid P8 (Cancun) (reth)
+  - Multiple New Payloads Extending Canonical Chain, Wait for Canonical Payload (Cancun) (reth)
 engine-api:
   - Transaction Re-Org, Re-Org Out (Paris) (reth)
   - Transaction Re-Org, Re-Org to Different Block (Paris) (reth)
@@ -30,3 +42,5 @@ engine-api:
   - Invalid Missing Ancestor Syncing ReOrg, Transaction Signature, EmptyTxs=False, CanonicalReOrg=True, Invalid P9 (Paris) (reth)
   - Invalid Missing Ancestor Syncing ReOrg, Transaction Signature, EmptyTxs=False, CanonicalReOrg=False, Invalid P9 (Paris) (reth)
   - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P10 (Paris) (reth)
+  - Multiple New Payloads Extending Canonical Chain, Wait for Canonical Payload (Paris) (reth)
+  - Multiple New Payloads Extending Canonical Chain, Set Head to First Payload Received (Paris) (reth)

.github/scripts/hive/run_simulator.sh

@@ -13,13 +13,7 @@ if [[ "${sim}" == *"eels"* ]]; then
 fi
 
 run_hive() {
-    hive \
-  --sim "${sim}" \
-  --sim.limit "${limit}" \
-  --sim.limit.exact=false \
-  --sim.parallelism "${parallelism}" \
-  --client reth \
-  2>&1 | tee /tmp/log || true
+    hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism "${parallelism}" --client reth 2>&1 | tee /tmp/log || true
 }
 
 check_log() {

.github/scripts/install_geth.sh

@@ -2,7 +2,7 @@
 
 # Installs Geth (https://geth.ethereum.org) in $HOME/bin for x86_64 Linux.
 
-set -exo pipefail
+set -eo pipefail
 
 GETH_BUILD=${GETH_BUILD:-"1.13.4-3f907d6a"}
 

.github/scripts/verify_image_arch.sh

@@ -7,7 +7,7 @@
 # Environment:
 #   DRY_RUN=true  - Skip actual verification, just print what would be checked.
 
-set -euxo pipefail
+set -euo pipefail
 
 TARGETS="${1:-}"
 REGISTRY="${2:-}"

.github/workflows/bench.yml

@@ -7,30 +7,19 @@
 # same block range (snapshot recovered between runs) to compare performance.
 
 on:
+  # TODO: Disabled temporarily for https://github.com/CodSpeedHQ/runner/issues/55
+  # merge_group:
+  push:
+    branches: [main]
   issue_comment:
-    types: [created]
+    types: [created, edited]
   workflow_dispatch:
     inputs:
       blocks:
         description: "Number of blocks to benchmark"
         required: false
-        default: "200"
+        default: "500"
         type: string
-      big_blocks:
-        description: "Use big blocks mode (pre-generated merged payloads with reth-bb)"
-        required: false
-        default: "false"
-        type: boolean
-      bal:
-        description: "Replay block access lists during big-block benchmarks"
-        required: false
-        default: "false"
-        type: choice
-        options:
-          - "false"
-          - "true"
-          - "feature"
-          - "baseline"
       warmup:
         description: "Number of warmup blocks"
         required: false
@@ -46,21 +35,6 @@ on:
         required: false
         default: ""
         type: string
-      wait_time:
-        description: "Minimum interval between block submissions (e.g. 500ms, 1s)"
-        required: false
-        default: ""
-        type: string
-      baseline_args:
-        description: "Extra CLI args for the baseline reth node"
-        required: false
-        default: ""
-        type: string
-      feature_args:
-        description: "Extra CLI args for the feature reth node"
-        required: false
-        default: ""
-        type: string
       samply:
         description: "Enable samply profiling"
         required: false
@@ -71,29 +45,11 @@ on:
         required: false
         default: "0"
         type: string
-      slack:
-        description: "Slack notification policy"
-        required: false
-        default: "never"
-        type: choice
-        options:
-          - always
-          - on-win
-          - on-error
-          - never
-      abba:
-        description: "Run ABBA (BFFB) interleaved order; false = single AB pass"
-        required: false
-        default: "true"
-        type: boolean
-      otlp:
-        description: "Export OTLP traces and logs"
-        required: false
-        default: "true"
-        type: boolean
 
 env:
   CARGO_TERM_COLOR: always
+  BASELINE: base
+  SEED: reth
   RUSTC_WRAPPER: "sccache"
   BENCH_RUNNERS: 2
 
@@ -104,6 +60,46 @@ permissions:
   pull-requests: write
 
 jobs:
+  codspeed:
+    if: github.event_name == 'push'
+    runs-on: depot-ubuntu-latest
+    concurrency:
+      group: bench-codspeed-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
+    strategy:
+      matrix:
+        partition: [1, 2]
+        total_partitions: [2]
+        include:
+          - partition: 1
+            crates: "-p reth-primitives -p reth-trie-common -p reth-trie-sparse"
+          - partition: 2
+            crates: "-p reth-trie"
+    name: codspeed (${{ matrix.partition }}/${{ matrix.total_partitions }})
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: true
+          ref: ${{ github.event_name == 'issue_comment' && format('refs/pull/{0}/merge', github.event.issue.number) || '' }}
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: mozilla-actions/sccache-action@v0.0.9
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Install cargo-codspeed
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-codspeed
+      - name: Build the benchmark target(s)
+        run: cargo codspeed build --profile profiling --features test-utils ${{ matrix.crates }}
+      - name: Run the benchmarks
+        uses: CodSpeedHQ/action@v4
+        with:
+          run: cargo codspeed run ${{ matrix.crates }}
+          mode: instrumentation
+          token: ${{ secrets.CODSPEED_TOKEN }}
+
   reth-bench-ack:
     if: |
       (github.event_name == 'issue_comment' && github.event.issue.pull_request && (startsWith(github.event.comment.body, '@decofe bench') || startsWith(github.event.comment.body, 'derek bench'))) ||
@@ -120,15 +116,7 @@ jobs:
       baseline-name: ${{ steps.args.outputs.baseline-name }}
       feature-name: ${{ steps.args.outputs.feature-name }}
       samply: ${{ steps.args.outputs.samply }}
-      slack: ${{ steps.args.outputs.slack }}
       cores: ${{ steps.args.outputs.cores }}
-      big-blocks: ${{ steps.args.outputs.big-blocks }}
-      bal: ${{ steps.args.outputs.bal }}
-      wait-time: ${{ steps.args.outputs.wait-time }}
-      baseline-args: ${{ steps.args.outputs.baseline-args }}
-      feature-args: ${{ steps.args.outputs.feature-args }}
-      abba: ${{ steps.args.outputs.abba }}
-      otlp: ${{ steps.args.outputs.otlp }}
       comment-id: ${{ steps.ack.outputs.comment-id }}
     steps:
       - name: Check org membership
@@ -156,29 +144,16 @@ jobs:
         with:
           github-token: ${{ secrets.DEREK_PAT }}
           script: |
-            const validBalModes = new Set(['false', 'true', 'feature', 'baseline']);
-            const validSlackModes = new Set(['always', 'on-win', 'on-error', 'never']);
-            const usage = '`@decofe bench [blocks=N] [big-blocks[=true|false]] [bal=true|false|feature|baseline] [warmup=N] [baseline=REF] [feature=REF] [samply] [slack=always|on-win|on-error|never] [cores=N] [abba=true|false] [otlp=true|false] [wait-time=DURATION] [baseline-args="..."] [feature-args="..."]`';
-            let pr, actor, blocks, warmup, baseline, feature, samply, cores, bigBlocks, bal;
-            let explicitWarmup = false;
+            let pr, actor, blocks, warmup, baseline, feature, samply, cores;
 
             if (context.eventName === 'workflow_dispatch') {
               actor = '${{ github.actor }}';
-              blocks = '${{ github.event.inputs.blocks }}' || '200';
+              blocks = '${{ github.event.inputs.blocks }}' || '500';
               warmup = '${{ github.event.inputs.warmup }}' || '100';
-              if (warmup !== '100') explicitWarmup = true;
               baseline = '${{ github.event.inputs.baseline }}';
               feature = '${{ github.event.inputs.feature }}';
               samply = '${{ github.event.inputs.samply }}' === 'true' ? 'true' : 'false';
-              var slack = '${{ github.event.inputs.slack }}' || 'never';
               cores = '${{ github.event.inputs.cores }}' || '0';
-              bigBlocks = '${{ github.event.inputs.big_blocks }}' === 'true' ? 'true' : 'false';
-              bal = '${{ github.event.inputs.bal }}' || 'false';
-              var abba = '${{ github.event.inputs.abba }}' !== 'false' ? 'true' : 'false';
-              var otlp = '${{ github.event.inputs.otlp }}' !== 'false' ? 'true' : 'false';
-              var waitTime = '${{ github.event.inputs.wait_time }}' || '';
-              var baselineNodeArgs = '${{ github.event.inputs.baseline_args }}' || '';
-              var featureNodeArgs = '${{ github.event.inputs.feature_args }}' || '';
 
               // Find PR for the selected branch
               const branch = '${{ github.ref_name }}';
@@ -198,64 +173,30 @@ jobs:
               actor = context.payload.comment.user.login;
 
               const body = context.payload.comment.body.trim();
-              const intArgs = new Set(['warmup', 'cores', 'blocks']);
+              const intArgs = new Set(['blocks', 'warmup', 'cores']);
               const refArgs = new Set(['baseline', 'feature']);
-              const boolArgs = new Set(['samply', 'big-blocks']);
-              const boolDefaultTrue = new Set(['abba', 'otlp']);
-              const enumArgs = new Map([['bal', validBalModes], ['slack', validSlackModes]]);
-              const durationArgs = new Set(['wait-time']);
-              const stringArgs = new Set(['baseline-args', 'feature-args']);
-              const defaults = { blocks: '200', warmup: '100', baseline: '', feature: '', samply: 'false', slack: 'always', 'big-blocks': 'false', bal: 'false', cores: '0', abba: 'true', otlp: 'true', 'wait-time': '', 'baseline-args': '', 'feature-args': '' };
+              const boolArgs = new Set(['samply']);
+              const defaults = { blocks: '500', warmup: '100', baseline: '', feature: '', samply: 'false', cores: '0' };
               const unknown = [];
               const invalid = [];
               const args = body.replace(/^(?:@decofe|derek) bench\s*/, '');
-              // Parse args, handling quoted values like key="value with spaces"
-              const parts = [];
-              const argRegex = /(\S+?="[^"]*"|\S+?='[^']*'|\S+)/g;
-              let m;
-              while ((m = argRegex.exec(args)) !== null) parts.push(m[1]);
-              for (const part of parts) {
+              for (const part of args.split(/\s+/).filter(Boolean)) {
                 const eq = part.indexOf('=');
                 if (eq === -1) {
                   if (boolArgs.has(part)) {
                     defaults[part] = 'true';
-                  } else if (boolDefaultTrue.has(part)) {
-                    defaults[part] = 'true';
                   } else {
                     unknown.push(part);
                   }
                   continue;
                 }
                 const key = part.slice(0, eq);
-                let value = part.slice(eq + 1);
-                // Strip surrounding quotes
-                if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
-                  value = value.slice(1, -1);
-                }
-                if (boolArgs.has(key) || boolDefaultTrue.has(key)) {
-                  if (value === 'true' || value === 'false') {
-                    defaults[key] = value;
-                  } else {
-                    invalid.push(`\`${key}=${value}\` (must be true or false)`);
-                  }
-                } else if (durationArgs.has(key)) {
-                  if (/^\d+(ms|s|m)$/.test(value)) {
-                    defaults[key] = value;
-                  } else {
-                    invalid.push(`\`${key}=${value}\` (must be a duration like 500ms, 1s, 2m)`);
-                  }
-                } else if (enumArgs.has(key)) {
-                  if (enumArgs.get(key).has(value)) {
-                    defaults[key] = value;
-                  } else {
-                    invalid.push(`\`${key}=${value}\` (must be true, false, feature, or baseline)`);
-                  }
-                } else if (intArgs.has(key)) {
+                const value = part.slice(eq + 1);
+                if (intArgs.has(key)) {
                   if (!/^\d+$/.test(value)) {
                     invalid.push(`\`${key}=${value}\` (must be a positive integer)`);
                   } else {
                     defaults[key] = value;
-                    if (key === 'warmup') explicitWarmup = true;
                   }
                 } else if (refArgs.has(key)) {
                   if (!value) {
@@ -263,8 +204,6 @@ jobs:
                   } else {
                     defaults[key] = value;
                   }
-                } else if (stringArgs.has(key)) {
-                  defaults[key] = value;
                 } else {
                   unknown.push(key);
                 }
@@ -273,7 +212,7 @@ jobs:
               if (unknown.length) errors.push(`Unknown argument(s): \`${unknown.join('`, `')}\``);
               if (invalid.length) errors.push(`Invalid value(s): ${invalid.join(', ')}`);
               if (errors.length) {
-                const msg = `❌ **Invalid bench command**\n\n${errors.join('\n')}\n\n**Usage:** ${usage}`;
+                const msg = `❌ **Invalid bench command**\n\n${errors.join('\n')}\n\n**Usage:** \`@decofe bench [blocks=N] [warmup=N] [baseline=REF] [feature=REF] [samply] [cores=N]\``;
                 await github.rest.issues.createComment({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
@@ -288,38 +227,7 @@ jobs:
               baseline = defaults.baseline;
               feature = defaults.feature;
               samply = defaults.samply;
-              var slack = defaults.slack;
               cores = defaults.cores;
-              bigBlocks = defaults['big-blocks'];
-              bal = defaults.bal;
-              var abba = defaults.abba;
-              var otlp = defaults.otlp;
-              var waitTime = defaults['wait-time'];
-              var baselineNodeArgs = defaults['baseline-args'];
-              var featureNodeArgs = defaults['feature-args'];
-            }
-
-            // Default warmup to 20 for big-blocks mode unless explicitly set
-            if (bigBlocks === 'true' && !explicitWarmup) {
-              warmup = '20';
-            }
-
-            if (!validBalModes.has(bal)) {
-              core.setFailed(`Invalid bal mode: ${bal}`);
-              return;
-            }
-            if (bal !== 'false' && bigBlocks !== 'true') {
-              const msg = `❌ **Invalid bench command**\n\n\`bal\` requires \`big-blocks=true\`.\n\n**Usage:** ${usage}`;
-              if (context.eventName === 'issue_comment') {
-                await github.rest.issues.createComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: context.issue.number,
-                  body: msg,
-                });
-              }
-              core.setFailed(msg);
-              return;
             }
 
             // Resolve display names for baseline/feature
@@ -347,15 +255,7 @@ jobs:
             core.setOutput('baseline-name', baselineName);
             core.setOutput('feature-name', featureName);
             core.setOutput('samply', samply);
-            core.setOutput('slack', slack);
             core.setOutput('cores', cores);
-            core.setOutput('big-blocks', bigBlocks);
-            core.setOutput('bal', bal);
-            core.setOutput('wait-time', waitTime);
-            core.setOutput('baseline-args', baselineNodeArgs);
-            core.setOutput('feature-args', featureNodeArgs);
-            core.setOutput('abba', abba);
-            core.setOutput('otlp', otlp);
 
       - name: Acknowledge request
         id: ack
@@ -395,6 +295,7 @@ jobs:
                 });
                 allRuns.push(...r);
               }
+              // Only count runs that trigger reth-bench (not push-triggered codspeed runs)
               const benchRuns = allRuns.filter(r => r.event === 'issue_comment' || r.event === 'workflow_dispatch');
               const thisRun = benchRuns.find(r => r.id === context.runId);
               const thisCreatedAt = thisRun ? new Date(thisRun.created_at) : new Date();
@@ -413,26 +314,10 @@ jobs:
             const baseline = '${{ steps.args.outputs.baseline-name }}';
             const feature = '${{ steps.args.outputs.feature-name }}';
             const samply = '${{ steps.args.outputs.samply }}' === 'true';
-            const slack = '${{ steps.args.outputs.slack }}' || 'always';
-            const bigBlocks = '${{ steps.args.outputs.big-blocks }}' === 'true';
-            const bal = '${{ steps.args.outputs.bal }}' || 'false';
             const samplyNote = samply ? ', samply: `enabled`' : '';
-            const slackNote = slack !== 'always' ? `, slack: \`${slack}\`` : '';
-            const balNote = bigBlocks && bal !== 'false' ? `, BAL: \`${bal}\`` : '';
             const cores = '${{ steps.args.outputs.cores }}';
             const coresNote = cores && cores !== '0' ? `, cores: \`${cores}\`` : '';
-            const abbaEnabled = '${{ steps.args.outputs.abba }}' !== 'false';
-            const abbaNote = !abbaEnabled ? ', abba: `disabled`' : '';
-            const otlpEnabled = '${{ steps.args.outputs.otlp }}' !== 'false';
-            const otlpNote = !otlpEnabled ? ', otlp: `disabled`' : '';
-            const waitTimeVal = '${{ steps.args.outputs.wait-time }}';
-            const waitTimeNote = waitTimeVal ? `, wait-time: \`${waitTimeVal}\`` : '';
-            const baselineArgsVal = '${{ steps.args.outputs.baseline-args }}';
-            const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
-            const featureArgsVal = '${{ steps.args.outputs.feature-args }}';
-            const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
-            const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
-            const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
+            const config = `**Config:** ${blocks} blocks, ${warmup} warmup blocks, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${coresNote}`;
 
             const { data: comment } = await github.rest.issues.createComment({
               owner: context.repo.owner,
@@ -457,26 +342,10 @@ jobs:
             const baseline = '${{ steps.args.outputs.baseline-name }}';
             const feature = '${{ steps.args.outputs.feature-name }}';
             const samply = '${{ steps.args.outputs.samply }}' === 'true';
-            const slack = '${{ steps.args.outputs.slack }}' || 'always';
-            const bigBlocks = '${{ steps.args.outputs.big-blocks }}' === 'true';
-            const bal = '${{ steps.args.outputs.bal }}' || 'false';
             const samplyNote = samply ? ', samply: `enabled`' : '';
-            const slackNote = slack !== 'always' ? `, slack: \`${slack}\`` : '';
-            const balNote = bigBlocks && bal !== 'false' ? `, BAL: \`${bal}\`` : '';
             const cores = '${{ steps.args.outputs.cores }}';
             const coresNote = cores && cores !== '0' ? `, cores: \`${cores}\`` : '';
-            const abbaEnabled = '${{ steps.args.outputs.abba }}' !== 'false';
-            const abbaNote = !abbaEnabled ? ', abba: `disabled`' : '';
-            const otlpEnabled = '${{ steps.args.outputs.otlp }}' !== 'false';
-            const otlpNote = !otlpEnabled ? ', otlp: `disabled`' : '';
-            const waitTimeVal = '${{ steps.args.outputs.wait-time }}';
-            const waitTimeNote = waitTimeVal ? `, wait-time: \`${waitTimeVal}\`` : '';
-            const baselineArgsVal = '${{ steps.args.outputs.baseline-args }}';
-            const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
-            const featureArgsVal = '${{ steps.args.outputs.feature-args }}';
-            const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
-            const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
-            const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
+            const config = `**Config:** ${blocks} blocks, ${warmup} warmup blocks, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${coresNote}`;
             const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
 
             const numRunners = parseInt(process.env.BENCH_RUNNERS) || 1;
@@ -528,12 +397,11 @@ jobs:
   reth-bench:
     needs: reth-bench-ack
     name: reth-bench
-    runs-on: [self-hosted, Linux, X64, available]
+    runs-on: [self-hosted, Linux, X64]
     timeout-minutes: 120
     env:
       BENCH_RPC_URL: https://ethereum.reth.rs/rpc
       SCHELK_MOUNT: /reth-bench
-      RETH_SCOPE: reth-bench.scope
       BENCH_WORK_DIR: ${{ github.workspace }}/bench-work
       BENCH_PR: ${{ needs.reth-bench-ack.outputs.pr }}
       BENCH_ACTOR: ${{ needs.reth-bench-ack.outputs.actor }}
@@ -541,23 +409,8 @@ jobs:
       BENCH_WARMUP_BLOCKS: ${{ needs.reth-bench-ack.outputs.warmup }}
       BENCH_SAMPLY: ${{ needs.reth-bench-ack.outputs.samply }}
       BENCH_CORES: ${{ needs.reth-bench-ack.outputs.cores }}
-      BENCH_BIG_BLOCKS: ${{ needs.reth-bench-ack.outputs.big-blocks }}
-      BENCH_BAL: ${{ needs.reth-bench-ack.outputs.bal }}
-      BENCH_WAIT_TIME: ${{ needs.reth-bench-ack.outputs.wait-time }}
-      BENCH_BASELINE_ARGS: ${{ needs.reth-bench-ack.outputs.baseline-args }}
-      BENCH_FEATURE_ARGS: ${{ needs.reth-bench-ack.outputs.feature-args }}
-      BENCH_ABBA: ${{ needs.reth-bench-ack.outputs.abba }}
-      BENCH_OTLP: ${{ needs.reth-bench-ack.outputs.otlp }}
       BENCH_COMMENT_ID: ${{ needs.reth-bench-ack.outputs.comment-id }}
-      BENCH_SLACK: ${{ needs.reth-bench-ack.outputs.slack }}
-      BENCH_NODE_BIN: ${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bb' || 'reth' }}
-      BENCH_METRICS_ADDR: "127.0.0.1:9100"
-      BENCH_OTLP_TRACES_ENDPOINT: ${{ needs.reth-bench-ack.outputs.otlp != 'false' && secrets.BENCH_OTLP_TRACES_ENDPOINT || '' }}
-      BENCH_OTLP_LOGS_ENDPOINT: ${{ needs.reth-bench-ack.outputs.otlp != 'false' && secrets.BENCH_OTLP_LOGS_ENDPOINT || '' }}
     steps:
-      - name: Clean up previous bench-work
-        run: sudo rm -rf "$BENCH_WORK_DIR" 2>/dev/null || true
-
       - name: Resolve checkout ref
         id: checkout-ref
         uses: actions/github-script@v8
@@ -572,11 +425,13 @@ jobs:
               repo: context.repo.repo,
               pull_number: parseInt(process.env.BENCH_PR),
             });
-            // Always use head SHA — the merge ref (refs/pull/N/merge) may not
-            // exist if the PR has conflicts, was force-pushed, or was
-            // merged/closed between this step and checkout.
-            core.info(`PR #${process.env.BENCH_PR} (${pr.state}), using head SHA ${pr.head.sha}`);
-            core.setOutput('ref', pr.head.sha);
+            // For closed/merged PRs, the merge ref doesn't exist — use head SHA
+            if (pr.state !== 'open') {
+              core.info(`PR #${process.env.BENCH_PR} is ${pr.state}, using head SHA ${pr.head.sha}`);
+              core.setOutput('ref', pr.head.sha);
+            } else {
+              core.setOutput('ref', `refs/pull/${process.env.BENCH_PR}/merge`);
+            }
 
       - uses: actions/checkout@v6
         with:
@@ -604,26 +459,10 @@ jobs:
             const baseline = '${{ needs.reth-bench-ack.outputs.baseline-name }}';
             const feature = '${{ needs.reth-bench-ack.outputs.feature-name }}';
             const samply = process.env.BENCH_SAMPLY === 'true';
-            const slack = process.env.BENCH_SLACK || 'always';
-            const bigBlocks = process.env.BENCH_BIG_BLOCKS === 'true';
-            const bal = process.env.BENCH_BAL || 'false';
             const samplyNote = samply ? ', samply: `enabled`' : '';
-            const slackNote = slack !== 'always' ? `, slack: \`${slack}\`` : '';
-            const balNote = bigBlocks && bal !== 'false' ? `, BAL: \`${bal}\`` : '';
             const cores = process.env.BENCH_CORES || '0';
             const coresNote = cores && cores !== '0' ? `, cores: \`${cores}\`` : '';
-            const abbaEnabled = (process.env.BENCH_ABBA || 'true') !== 'false';
-            const abbaNote = !abbaEnabled ? ', abba: `disabled`' : '';
-            const otlpEnabled = (process.env.BENCH_OTLP || 'true') !== 'false';
-            const otlpNote = !otlpEnabled ? ', otlp: `disabled`' : '';
-            const waitTimeVal = process.env.BENCH_WAIT_TIME || '';
-            const waitTimeNote = waitTimeVal ? `, wait-time: \`${waitTimeVal}\`` : '';
-            const baselineArgsVal = process.env.BENCH_BASELINE_ARGS || '';
-            const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
-            const featureArgsVal = process.env.BENCH_FEATURE_ARGS || '';
-            const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
-            const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
-            core.exportVariable('BENCH_CONFIG', `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`);
+            core.exportVariable('BENCH_CONFIG', `**Config:** ${blocks} blocks, ${warmup} warmup blocks, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${coresNote}`);
 
             const { buildBody } = require('./.github/scripts/bench-update-status.js');
             await github.rest.issues.updateComment({
@@ -766,52 +605,14 @@ jobs:
             core.setOutput('feature-ref', featureRef);
             core.setOutput('feature-name', featureName);
 
-      - name: Check big-blocks freshness
-        if: env.BENCH_BIG_BLOCKS == 'true'
-        id: big-blocks-check
-        run: |
-          set -euo pipefail
-          MC="mc --config-dir /home/ubuntu/.mc"
-          MANIFEST="minio/reth-snapshots/reth-1-minimal-stable-big-blocks.json"
-          HASH_FILE="$HOME/.reth-bench-big-blocks-hash"
-          echo "Fetching big-blocks manifest from $MANIFEST..."
-          BB_MANIFEST=$($MC cat "$MANIFEST" 2>/dev/null) || {
-            echo "::error::Failed to fetch big-blocks manifest from $MANIFEST"
-            exit 1
-          }
-          BASE_SNAPSHOT=$(echo "$BB_MANIFEST" | jq -r '.base_snapshot // empty')
-          if [ -z "$BASE_SNAPSHOT" ]; then
-            echo "::error::Big-blocks manifest missing base_snapshot field"
-            exit 1
-          fi
-          echo "Big-blocks base snapshot: $BASE_SNAPSHOT"
-          echo "BENCH_SNAPSHOT_NAME=${BASE_SNAPSHOT}" >> "$GITHUB_ENV"
-
-          REMOTE_HASH=$(echo "$BB_MANIFEST" | sha256sum | awk '{print $1}')
-          LOCAL_HASH=""
-          [ -f "$HASH_FILE" ] && LOCAL_HASH=$(cat "$HASH_FILE")
-          if [ "$REMOTE_HASH" = "$LOCAL_HASH" ]; then
-            echo "Big blocks up-to-date (hash: ${REMOTE_HASH:0:16}…)"
-            echo "needed=false" >> "$GITHUB_OUTPUT"
-          else
-            echo "Big blocks need update (local: ${LOCAL_HASH:+${LOCAL_HASH:0:16}…}${LOCAL_HASH:-<none>}, remote: ${REMOTE_HASH:0:16}…)"
-            echo "needed=true" >> "$GITHUB_OUTPUT"
-            echo "remote-hash=${REMOTE_HASH}" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Check if snapshot needs update
         id: snapshot-check
         run: |
-          set +e
-          .github/scripts/bench-reth-snapshot.sh --check
-          rc=$?
-          set -e
-          case "$rc" in
-            0)  echo "needed=false" >> "$GITHUB_OUTPUT" ;;
-            10) echo "needed=true"  >> "$GITHUB_OUTPUT" ;;
-            *)  echo "::error::Snapshot check failed (exit $rc)"
-                exit "$rc" ;;
-          esac
+          if .github/scripts/bench-reth-snapshot.sh --check; then
+            echo "needed=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "needed=true" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Update status (snapshot needed)
         if: env.BENCH_COMMENT_ID && steps.snapshot-check.outputs.needed == 'true'
@@ -820,7 +621,7 @@ jobs:
           github-token: ${{ secrets.DEREK_PAT }}
           script: |
             const s = require('./.github/scripts/bench-update-status.js');
-            await s({github, context, status: 'Building binaries (snapshot update pending)...'});
+            await s({github, context, status: 'Building binaries & downloading snapshot...'});
 
       - name: Prepare source dirs
         run: |
@@ -840,11 +641,12 @@ jobs:
           fi
           git -C ../reth-feature checkout "$FEATURE_REF"
 
-      - name: Build binaries
+      - name: Build binaries and download snapshot in parallel
         id: build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BENCH_REPO: ${{ github.repository }}
+          SNAPSHOT_NEEDED: ${{ steps.snapshot-check.outputs.needed }}
         run: |
           BASELINE_DIR="$(cd ../reth-baseline && pwd)"
           FEATURE_DIR="$(cd ../reth-feature && pwd)"
@@ -854,47 +656,28 @@ jobs:
           .github/scripts/bench-reth-build.sh feature "${FEATURE_DIR}" "${{ steps.refs.outputs.feature-ref }}" &
           PID_FEATURE=$!
 
+          PID_SNAPSHOT=
+          if [ "$SNAPSHOT_NEEDED" = "true" ]; then
+            .github/scripts/bench-reth-snapshot.sh &
+            PID_SNAPSHOT=$!
+          fi
+
           FAIL=0
           wait $PID_BASELINE || FAIL=1
           wait $PID_FEATURE || FAIL=1
+          [ -n "$PID_SNAPSHOT" ] && { wait $PID_SNAPSHOT || FAIL=1; }
           if [ $FAIL -ne 0 ]; then
-            echo "::error::One or more build tasks failed"
+            echo "::error::One or more parallel tasks failed (builds / snapshot download)"
             exit 1
           fi
 
-      - name: Download snapshot
-        id: snapshot-download
-        if: steps.snapshot-check.outputs.needed == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BENCH_REPO: ${{ github.repository }}
-          BENCH_RETH_BINARY: ${{ github.workspace }}/../reth-feature/target/profiling/${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bb' || 'reth' }}
-        run: .github/scripts/bench-reth-snapshot.sh
-
       # System tuning for reproducible benchmarks
       - name: System setup
         run: |
-          # Switch amd-pstate to passive mode so the kernel governor
-          # controls frequency directly (EPP is ignored in passive).
-          echo passive | sudo tee /sys/devices/system/cpu/amd_pstate/status 2>/dev/null || true
           sudo cpupower frequency-set -g performance || true
-          # Pin all cores to the nominal (base) frequency from CPPC.
-          NOMINAL_KHZ=""
-          if [ -f /sys/devices/system/cpu/cpu0/acpi_cppc/nominal_freq ]; then
-            NOMINAL_MHZ=$(cat /sys/devices/system/cpu/cpu0/acpi_cppc/nominal_freq)
-            NOMINAL_KHZ=$((NOMINAL_MHZ * 1000))
-          elif [ -f /sys/devices/system/cpu/cpu0/cpufreq/base_frequency ]; then
-            NOMINAL_KHZ=$(cat /sys/devices/system/cpu/cpu0/cpufreq/base_frequency)
-          fi
-          if [ -n "$NOMINAL_KHZ" ] && [ "$NOMINAL_KHZ" -gt 0 ] 2>/dev/null; then
-            echo "Pinning all cores to nominal frequency: $((NOMINAL_KHZ / 1000)) MHz"
-            for f in /sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq; do
-              echo "$NOMINAL_KHZ" | sudo tee "$f" > /dev/null
-            done
-            for f in /sys/devices/system/cpu/cpu*/cpufreq/scaling_min_freq; do
-              echo "$NOMINAL_KHZ" | sudo tee "$f" > /dev/null
-            done
-          fi
+          # Disable turbo boost (Intel and AMD paths)
+          echo 1 | sudo tee /sys/devices/system/cpu/intel_pstate/no_turbo 2>/dev/null || true
+          echo 0 | sudo tee /sys/devices/system/cpu/cpufreq/boost 2>/dev/null || true
           sudo swapoff -a || true
           echo 0 | sudo tee /proc/sys/kernel/randomize_va_space || true
           # Disable SMT (hyperthreading)
@@ -924,79 +707,21 @@ jobs:
           lscpu | grep -E 'Model name|CPU\(s\)|MHz|NUMA'
           cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
           cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
-          echo "scaling_min_freq: $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq)"
-          echo "scaling_max_freq: $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq)"
           cat /sys/kernel/mm/transparent_hugepage/enabled 2>/dev/null || cat /sys/kernel/mm/transparent_hugepages/enabled 2>/dev/null || echo "THP: unknown"
           free -h
 
       # Clean up any leftover state
       - name: Pre-flight cleanup
         run: |
-          sudo systemctl stop "$RETH_SCOPE" 2>/dev/null || true
-          sudo systemctl reset-failed "$RETH_SCOPE" 2>/dev/null || true
-          sudo schelk recover -y --kill || sudo schelk full-recover -y || true
+          sudo pkill -9 reth || true
+          sleep 1
+          if mountpoint -q "$SCHELK_MOUNT"; then
+            sudo umount -l "$SCHELK_MOUNT" || true
+            sudo schelk recover -y || true
+          fi
           rm -rf "$BENCH_WORK_DIR"
           mkdir -p "$BENCH_WORK_DIR"
 
-      - name: Download big blocks
-        if: env.BENCH_BIG_BLOCKS == 'true'
-        run: |
-          set -euo pipefail
-          BIG_BLOCKS_DIR="$HOME/.reth-bench-big-blocks"
-          echo "BENCH_BIG_BLOCKS_DIR=${BIG_BLOCKS_DIR}" >> "$GITHUB_ENV"
-          if [ "${{ steps.big-blocks-check.outputs.needed }}" = "false" ]; then
-            echo "Big blocks cached at $BIG_BLOCKS_DIR, skipping download"
-            echo "Payload files: $(find "$BIG_BLOCKS_DIR/payloads" -name '*.json' | wc -l)"
-            exit 0
-          fi
-          MC="mc --config-dir /home/ubuntu/.mc"
-          MANIFEST="minio/reth-snapshots/reth-1-minimal-stable-big-blocks.json"
-          rm -rf "$BIG_BLOCKS_DIR"; mkdir -p "$BIG_BLOCKS_DIR"
-
-          # Download and parse manifest
-          echo "Downloading manifest from $MANIFEST..."
-          $MC cat "$MANIFEST" > "$BIG_BLOCKS_DIR/manifest.json"
-          UPLOAD_PATH=$(jq -r '.upload_path' "$BIG_BLOCKS_DIR/manifest.json")
-          COUNT=$(jq -r '.count' "$BIG_BLOCKS_DIR/manifest.json")
-          TARGET_GAS=$(jq -r '.target_gas' "$BIG_BLOCKS_DIR/manifest.json")
-          echo "Manifest: count=$COUNT, target_gas=$TARGET_GAS, archive=$UPLOAD_PATH"
-
-          # Download and extract archive
-          ARCHIVE="minio/$UPLOAD_PATH"
-          echo "Downloading big blocks from $ARCHIVE..."
-          $MC cat "$ARCHIVE" | pzstd -d -p 6 | tar -xf - -C "$BIG_BLOCKS_DIR"
-          echo "Big blocks downloaded to $BIG_BLOCKS_DIR"
-
-          # Verify expected directory structure
-          if [ ! -d "$BIG_BLOCKS_DIR/payloads" ]; then
-            echo "::error::Big blocks archive missing expected payloads/ directory"
-            ls -laR "$BIG_BLOCKS_DIR"
-            exit 1
-          fi
-          echo "Payload files: $(find "$BIG_BLOCKS_DIR/payloads" -name '*.json' | wc -l)"
-          # Save manifest hash for freshness check on next run
-          echo "${{ steps.big-blocks-check.outputs.remote-hash }}" > "$HOME/.reth-bench-big-blocks-hash"
-
-      - name: Start metrics proxy
-        run: |
-          BENCH_ID="ci-${{ github.run_id }}"
-          BENCH_REFERENCE_EPOCH=$(date +%s)
-          echo "BENCH_ID=${BENCH_ID}" >> "$GITHUB_ENV"
-          echo "BENCH_REFERENCE_EPOCH=${BENCH_REFERENCE_EPOCH}" >> "$GITHUB_ENV"
-
-          LABELS_FILE="/tmp/bench-metrics-labels.json"
-          echo '{}' > "$LABELS_FILE"
-          echo "BENCH_LABELS_FILE=${LABELS_FILE}" >> "$GITHUB_ENV"
-
-          python3 .github/scripts/bench-metrics-proxy.py \
-            --labels "$LABELS_FILE" \
-            --upstream "http://${BENCH_METRICS_ADDR}/" \
-            --subnet 10.10.0.0/24 \
-            --port 9090 &
-          PROXY_PID=$!
-          echo "BENCH_METRICS_PROXY_PID=${PROXY_PID}" >> "$GITHUB_ENV"
-          echo "Metrics proxy started (PID $PROXY_PID)"
-
       - name: Update status (running benchmarks)
         if: success() && env.BENCH_COMMENT_ID
         uses: actions/github-script@v8
@@ -1010,70 +735,19 @@ jobs:
       # thermal drift and cache warming.
       - name: "Run benchmark: baseline (1/2)"
         id: run-baseline-1
-        env:
-          BASELINE_REF: ${{ steps.refs.outputs.baseline-ref }}
-          OTEL_RESOURCE_ATTRIBUTES: "benchmark_id=${{ env.BENCH_ID }},benchmark_run=baseline-1,run_type=baseline,git_ref=${{ steps.refs.outputs.baseline-ref }}"
-        run: |
-          LAST_RUN_START=$(date +%s)
-          echo "BENCH_LAST_RUN_START=${LAST_RUN_START}" >> "$GITHUB_ENV"
-          cat > "$BENCH_LABELS_FILE" <<LABELS
-          {"benchmark_run":"baseline-1","run_type":"baseline","git_ref":"${BASELINE_REF}","bench_sha":"${BASELINE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-          LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh baseline "../reth-baseline/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/baseline-1"
+        run: taskset -c 0 .github/scripts/bench-reth-run.sh baseline ../reth-baseline/target/profiling/reth "$BENCH_WORK_DIR/baseline-1"
 
       - name: "Run benchmark: feature (1/2)"
         id: run-feature-1
-        env:
-          FEATURE_REF: ${{ steps.refs.outputs.feature-ref }}
-          OTEL_RESOURCE_ATTRIBUTES: "benchmark_id=${{ env.BENCH_ID }},benchmark_run=feature-1,run_type=feature,git_ref=${{ steps.refs.outputs.feature-ref }}"
-        run: |
-          LAST_RUN_START=$(date +%s)
-          echo "BENCH_LAST_RUN_START=${LAST_RUN_START}" >> "$GITHUB_ENV"
-          cat > "$BENCH_LABELS_FILE" <<LABELS
-          {"benchmark_run":"feature-1","run_type":"feature","git_ref":"${FEATURE_REF}","bench_sha":"${FEATURE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-          LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh feature "../reth-feature/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/feature-1"
+        run: taskset -c 0 .github/scripts/bench-reth-run.sh feature ../reth-feature/target/profiling/reth "$BENCH_WORK_DIR/feature-1"
 
       - name: "Run benchmark: feature (2/2)"
-        if: env.BENCH_ABBA != 'false'
         id: run-feature-2
-        env:
-          FEATURE_REF: ${{ steps.refs.outputs.feature-ref }}
-          OTEL_RESOURCE_ATTRIBUTES: "benchmark_id=${{ env.BENCH_ID }},benchmark_run=feature-2,run_type=feature,git_ref=${{ steps.refs.outputs.feature-ref }}"
-        run: |
-          LAST_RUN_START=$(date +%s)
-          echo "BENCH_LAST_RUN_START=${LAST_RUN_START}" >> "$GITHUB_ENV"
-          cat > "$BENCH_LABELS_FILE" <<LABELS
-          {"benchmark_run":"feature-2","run_type":"feature","git_ref":"${FEATURE_REF}","bench_sha":"${FEATURE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-          LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh feature "../reth-feature/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/feature-2"
+        run: taskset -c 0 .github/scripts/bench-reth-run.sh feature ../reth-feature/target/profiling/reth "$BENCH_WORK_DIR/feature-2"
 
       - name: "Run benchmark: baseline (2/2)"
-        if: env.BENCH_ABBA != 'false'
         id: run-baseline-2
-        env:
-          BASELINE_REF: ${{ steps.refs.outputs.baseline-ref }}
-          OTEL_RESOURCE_ATTRIBUTES: "benchmark_id=${{ env.BENCH_ID }},benchmark_run=baseline-2,run_type=baseline,git_ref=${{ steps.refs.outputs.baseline-ref }}"
-        run: |
-          LAST_RUN_START=$(date +%s)
-          echo "BENCH_LAST_RUN_START=${LAST_RUN_START}" >> "$GITHUB_ENV"
-          cat > "$BENCH_LABELS_FILE" <<LABELS
-          {"benchmark_run":"baseline-2","run_type":"baseline","git_ref":"${BASELINE_REF}","bench_sha":"${BASELINE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-          LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh baseline "../reth-baseline/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/baseline-2"
-
-      - name: Stop metrics proxy & generate Grafana URL
-        id: metrics
-        if: "!cancelled()"
-        run: |
-          kill "$BENCH_METRICS_PROXY_PID" 2>/dev/null || true
-
-          LAST_RUN_DURATION=$(( $(date +%s) - BENCH_LAST_RUN_START ))
-          FROM_MS=$(( BENCH_REFERENCE_EPOCH * 1000 ))
-          TO_MS=$(( (BENCH_REFERENCE_EPOCH + LAST_RUN_DURATION) * 1000 ))
-          GRAFANA_URL="https://tempoxyz.grafana.net/d/reth-bench-ghr/reth-bench-ghr?orgId=1&from=${FROM_MS}&to=${TO_MS}&timezone=browser&var-datasource=ef57fux92e9z4e&var-job=reth-bench&var-benchmark_id=${BENCH_ID}&var-benchmark_run=\$__all"
-          echo "grafana-url=${GRAFANA_URL}" >> "$GITHUB_OUTPUT"
-          echo "Grafana URL: ${GRAFANA_URL}"
+        run: taskset -c 0 .github/scripts/bench-reth-run.sh baseline ../reth-baseline/target/profiling/reth "$BENCH_WORK_DIR/baseline-2"
 
       - name: Scan logs for errors
         if: "!cancelled()"
@@ -1175,34 +849,12 @@ jobs:
           SUMMARY_ARGS="$SUMMARY_ARGS --baseline-name ${BASELINE_NAME}"
           SUMMARY_ARGS="$SUMMARY_ARGS --feature-name ${FEATURE_NAME}"
           SUMMARY_ARGS="$SUMMARY_ARGS --feature-ref ${FEATURE_REF}"
-          BASELINE_CSVS="$BENCH_WORK_DIR/baseline-1/combined_latency.csv"
-          FEATURE_CSVS="$BENCH_WORK_DIR/feature-1/combined_latency.csv"
-          if [ "${BENCH_ABBA:-true}" = "true" ]; then
-            BASELINE_CSVS="$BASELINE_CSVS $BENCH_WORK_DIR/baseline-2/combined_latency.csv"
-            FEATURE_CSVS="$FEATURE_CSVS $BENCH_WORK_DIR/feature-2/combined_latency.csv"
-          fi
-          SUMMARY_ARGS="$SUMMARY_ARGS --baseline-csv $BASELINE_CSVS"
-          SUMMARY_ARGS="$SUMMARY_ARGS --feature-csv $FEATURE_CSVS"
+          SUMMARY_ARGS="$SUMMARY_ARGS --baseline-csv $BENCH_WORK_DIR/baseline-1/combined_latency.csv $BENCH_WORK_DIR/baseline-2/combined_latency.csv"
+          SUMMARY_ARGS="$SUMMARY_ARGS --feature-csv $BENCH_WORK_DIR/feature-1/combined_latency.csv $BENCH_WORK_DIR/feature-2/combined_latency.csv"
           SUMMARY_ARGS="$SUMMARY_ARGS --gas-csv $BENCH_WORK_DIR/feature-1/total_gas.csv"
           if [ "$BEHIND_BASELINE" -gt 0 ]; then
             SUMMARY_ARGS="$SUMMARY_ARGS --behind-baseline $BEHIND_BASELINE"
           fi
-          if [ "${BENCH_BIG_BLOCKS:-false}" = "true" ]; then
-            SUMMARY_ARGS="$SUMMARY_ARGS --big-blocks"
-          fi
-          if [ -n "${BENCH_WARMUP_BLOCKS:-}" ]; then
-            SUMMARY_ARGS="$SUMMARY_ARGS --warmup-blocks $BENCH_WARMUP_BLOCKS"
-          fi
-          if [ -n "${BENCH_WAIT_TIME:-}" ]; then
-            SUMMARY_ARGS="$SUMMARY_ARGS --wait-time $BENCH_WAIT_TIME"
-          fi
-          if [ -n "${BENCH_BAL:-}" ] && [ "${BENCH_BAL}" != "false" ]; then
-            SUMMARY_ARGS="$SUMMARY_ARGS --bal-mode $BENCH_BAL"
-          fi
-          GRAFANA_URL='${{ steps.metrics.outputs.grafana-url }}'
-          if [ -n "$GRAFANA_URL" ]; then
-            SUMMARY_ARGS="$SUMMARY_ARGS --grafana-url $GRAFANA_URL"
-          fi
           # shellcheck disable=SC2086
           python3 .github/scripts/bench-reth-summary.py $SUMMARY_ARGS
 
@@ -1213,14 +865,8 @@ jobs:
           FEATURE_NAME: ${{ steps.refs.outputs.feature-name }}
         run: |
           CHART_ARGS="--output-dir $BENCH_WORK_DIR/charts"
-          FEATURE_CSVS="$BENCH_WORK_DIR/feature-1/combined_latency.csv"
-          BASELINE_CSVS="$BENCH_WORK_DIR/baseline-1/combined_latency.csv"
-          if [ "${BENCH_ABBA:-true}" = "true" ]; then
-            FEATURE_CSVS="$FEATURE_CSVS $BENCH_WORK_DIR/feature-2/combined_latency.csv"
-            BASELINE_CSVS="$BASELINE_CSVS $BENCH_WORK_DIR/baseline-2/combined_latency.csv"
-          fi
-          CHART_ARGS="$CHART_ARGS --feature $FEATURE_CSVS"
-          CHART_ARGS="$CHART_ARGS --baseline $BASELINE_CSVS"
+          CHART_ARGS="$CHART_ARGS --feature $BENCH_WORK_DIR/feature-1/combined_latency.csv $BENCH_WORK_DIR/feature-2/combined_latency.csv"
+          CHART_ARGS="$CHART_ARGS --baseline $BENCH_WORK_DIR/baseline-1/combined_latency.csv $BENCH_WORK_DIR/baseline-2/combined_latency.csv"
           CHART_ARGS="$CHART_ARGS --baseline-name ${BASELINE_NAME}"
           CHART_ARGS="$CHART_ARGS --feature-name ${FEATURE_NAME}"
           # shellcheck disable=SC2086
@@ -1228,7 +874,7 @@ jobs:
 
       - name: Upload results
         if: "!cancelled()"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: bench-reth-results
           path: ${{ env.BENCH_WORK_DIR }}
@@ -1260,7 +906,7 @@ jobs:
           rm -rf "${TMP_DIR}"
 
       - name: Compare & comment
-        if: success() && env.BENCH_COMMENT_ID
+        if: success()
         uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.DEREK_PAT }}
@@ -1296,8 +942,7 @@ jobs:
 
             // Samply profile links (URLs point directly to Firefox Profiler)
             if (process.env.BENCH_SAMPLY === 'true') {
-              const abba = (process.env.BENCH_ABBA || 'true') !== 'false';
-              const runs = abba ? ['baseline-1', 'feature-1', 'feature-2', 'baseline-2'] : ['baseline-1', 'feature-1'];
+              const runs = ['baseline-1', 'feature-1', 'feature-2', 'baseline-2'];
               const links = [];
               for (const run of runs) {
                 try {
@@ -1312,12 +957,6 @@ jobs:
               }
             }
 
-            // Grafana dashboard link
-            const grafanaUrl = '${{ steps.metrics.outputs.grafana-url }}';
-            if (grafanaUrl) {
-              comment += `\n\n### Grafana Dashboard\n\n[View real-time metrics](${grafanaUrl})\n`;
-            }
-
             // Node errors (panics / ERROR logs)
             try {
               const errors = fs.readFileSync(process.env.BENCH_WORK_DIR + '/errors.md', 'utf8');
@@ -1337,24 +976,13 @@ jobs:
                 comment_id: parseInt(ackCommentId),
                 body,
               });
+            } else {
+              // No PR — write results to job summary
+              await core.summary.addRaw(body).write();
             }
 
-      - name: Write job summary
-        if: success()
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const jobSummary = require('./.github/scripts/bench-job-summary.js');
-            await jobSummary({
-              core,
-              context,
-              chartSha: '${{ steps.push-charts.outputs.sha }}',
-              grafanaUrl: '${{ steps.metrics.outputs.grafana-url }}',
-              runId: '${{ github.run_id }}',
-            });
-
       - name: Send Slack notification (success)
-        if: success() && (env.BENCH_SLACK == 'always' || env.BENCH_SLACK == 'on-win')
+        if: success()
         uses: actions/github-script@v8
         env:
           SLACK_BENCH_BOT_TOKEN: ${{ secrets.SLACK_BENCH_BOT_TOKEN }}
@@ -1370,14 +998,12 @@ jobs:
         with:
           github-token: ${{ secrets.DEREK_PAT }}
           script: |
-            const abba = (process.env.BENCH_ABBA || 'true') !== 'false';
             const steps_status = [
-              ['building binaries', '${{ steps.build.outcome }}'],
-              ['downloading snapshot', '${{ steps.snapshot-download.outcome }}'],
+              ['building binaries${{ steps.snapshot-check.outputs.needed == 'true' && ' & downloading snapshot' || '' }}', '${{ steps.build.outcome }}'],
               ['running baseline benchmark (1/2)', '${{ steps.run-baseline-1.outcome }}'],
               ['running feature benchmark (1/2)', '${{ steps.run-feature-1.outcome }}'],
-              ...(abba ? [['running feature benchmark (2/2)', '${{ steps.run-feature-2.outcome }}']] : []),
-              ...(abba ? [['running baseline benchmark (2/2)', '${{ steps.run-baseline-2.outcome }}']] : []),
+              ['running feature benchmark (2/2)', '${{ steps.run-feature-2.outcome }}'],
+              ['running baseline benchmark (2/2)', '${{ steps.run-baseline-2.outcome }}'],
             ];
             const failed = steps_status.find(([, o]) => o === 'failure');
             const failedStep = failed ? failed[0] : 'unknown step';
@@ -1399,21 +1025,19 @@ jobs:
             });
 
       - name: Send Slack notification (failure)
-        if: failure() && env.BENCH_SLACK != 'never' && env.BENCH_SLACK != 'on-win'
+        if: failure()
         uses: actions/github-script@v8
         env:
           SLACK_BENCH_BOT_TOKEN: ${{ secrets.SLACK_BENCH_BOT_TOKEN }}
           SLACK_BENCH_CHANNEL: ${{ secrets.SLACK_BENCH_CHANNEL }}
         with:
           script: |
-            const abba = (process.env.BENCH_ABBA || 'true') !== 'false';
             const steps_status = [
-              ['building binaries', '${{ steps.build.outcome }}'],
-              ['downloading snapshot', '${{ steps.snapshot-download.outcome }}'],
+              ['building binaries${{ steps.snapshot-check.outputs.needed == 'true' && ' & downloading snapshot' || '' }}', '${{ steps.build.outcome }}'],
               ['running baseline benchmark (1/2)', '${{ steps.run-baseline-1.outcome }}'],
               ['running feature benchmark (1/2)', '${{ steps.run-feature-1.outcome }}'],
-              ...(abba ? [['running feature benchmark (2/2)', '${{ steps.run-feature-2.outcome }}']] : []),
-              ...(abba ? [['running baseline benchmark (2/2)', '${{ steps.run-baseline-2.outcome }}']] : []),
+              ['running feature benchmark (2/2)', '${{ steps.run-feature-2.outcome }}'],
+              ['running baseline benchmark (2/2)', '${{ steps.run-baseline-2.outcome }}'],
             ];
             const failed = steps_status.find(([, o]) => o === 'failure');
             const failedStep = failed ? failed[0] : 'unknown step';
@@ -1436,14 +1060,4 @@ jobs:
       - name: Restore system settings
         if: always()
         run: |
-          # Restore frequency scaling to full range
-          for f in /sys/devices/system/cpu/cpu*/cpufreq/scaling_min_freq; do
-            cat "$(dirname "$f")/cpuinfo_min_freq" | sudo tee "$f" > /dev/null 2>&1 || true
-          done
-          for f in /sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq; do
-            cat "$(dirname "$f")/cpuinfo_max_freq" | sudo tee "$f" > /dev/null 2>&1 || true
-          done
-          # Restore amd-pstate to active (EPP) mode with powersave governor
-          echo active | sudo tee /sys/devices/system/cpu/amd_pstate/status 2>/dev/null || true
-          sudo cpupower frequency-set -g powersave 2>/dev/null || true
           sudo systemctl start irqbalance cron atd 2>/dev/null || true

.github/workflows/book.yml

@@ -47,7 +47,7 @@ jobs:
           echo "Vocs Build Complete"
 
       - name: Setup Pages
-        uses: actions/configure-pages@v6
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v4
@@ -74,4 +74,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v5
+        uses: actions/deploy-pages@v4

.github/workflows/changelog.yml

@@ -0,0 +1,25 @@
+name: Changelog
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  changelog:
+    # Skip for fork PRs since they can't access secrets
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+      - run: npm install -g @anthropic-ai/claude-code
+      - uses: wevm/changelogs/check@master
+        with:
+          ai: 'claude -p'
+        env:
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}

.github/workflows/docker-test.yml

@@ -6,7 +6,7 @@ on:
       hive_target:
         required: true
         type: string
-        description: "Docker bake target to build (e.g. hive)"
+        description: "Docker bake target to build (e.g. hive-stable, hive-edge)"
       artifact_name:
         required: false
         type: string
@@ -76,7 +76,7 @@ jobs:
             *.dockerfile=Dockerfile
 
       - name: Upload reth image
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ inputs.artifact_name }}
           path: ./artifacts

.github/workflows/docker.yml

@@ -45,7 +45,7 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Log in to GHCR
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -138,8 +138,6 @@ jobs:
             *Run:* <https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}|View logs>
 
             *Action required:* Re-run the workflow or investigate the build failure.
-
-            <@U0AAA8F0JEM> investigate and re-run if flaky
           SLACK_FOOTER: "paradigmxyz/reth · docker.yml"
           MSG_MINIMAL: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/e2e.yml

@@ -63,6 +63,6 @@ jobs:
         run: |
           cargo nextest run \
             --no-fail-fast \
-            --locked \
+            --locked --features "edge" \
             -p reth-e2e-test-utils \
             -E 'binary(rocksdb)'

.github/workflows/hive.yml

@@ -15,11 +15,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-reth:
+  build-reth-stable:
     uses: ./.github/workflows/docker-test.yml
     with:
-      hive_target: hive
-      artifact_name: "reth"
+      hive_target: hive-stable
+      artifact_name: "reth-stable"
+    secrets: inherit
+
+  build-reth-edge:
+    uses: ./.github/workflows/docker-test.yml
+    with:
+      hive_target: hive-edge
+      artifact_name: "reth-edge"
     secrets: inherit
 
   prepare-hive:
@@ -68,7 +75,7 @@ jobs:
           chmod +x hive
 
       - name: Upload hive assets
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: hive_assets
           path: ./hive_assets
@@ -77,6 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        storage: [stable, edge]
         # ethereum/rpc to be deprecated:
         # https://github.com/ethereum/hive/pull/1117
         scenario:
@@ -176,9 +184,10 @@ jobs:
           - sim: ethereum/eels/consume-rlp
             limit: .*tests/paris.*
     needs:
-      - build-reth
+      - build-reth-stable
+      - build-reth-edge
       - prepare-hive
-    name: ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
+    name: ${{ matrix.storage }} / ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
     # Use larger runners for eels tests to avoid OOM runner crashes
     runs-on: ${{ github.repository == 'paradigmxyz/reth' && (contains(matrix.scenario.sim, 'eels') && 'depot-ubuntu-latest-8' || 'depot-ubuntu-latest-4') || 'ubuntu-latest' }}
     permissions:
@@ -189,15 +198,15 @@ jobs:
           fetch-depth: 0
 
       - name: Download hive assets
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: hive_assets
           path: /tmp
 
       - name: Download reth image
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
-          name: reth
+          name: reth-${{ matrix.storage }}
           path: /tmp
 
       - name: Load Docker images

.github/workflows/integration.yml

@@ -22,7 +22,7 @@ concurrency:
 
 jobs:
   test:
-    name: test / ${{ matrix.network }}
+    name: test / ${{ matrix.network }} / ${{ matrix.storage }}
     if: github.event_name != 'schedule'
     runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
     env:
@@ -30,6 +30,7 @@ jobs:
     strategy:
       matrix:
         network: ["ethereum"]
+        storage: ["stable", "edge"]
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v6
@@ -46,7 +47,7 @@ jobs:
         run: |
           cargo nextest run \
             --no-fail-fast \
-            --locked --features "asm-keccak ${{ matrix.network }}" \
+            --locked --features "asm-keccak ${{ matrix.network }} ${{ matrix.storage == 'edge' && 'edge' || '' }}" \
             --workspace --exclude ef-tests \
             -E "kind(test) and not binary(e2e_testsuite)"
 

.github/workflows/kurtosis.yml

@@ -40,7 +40,7 @@ jobs:
           fetch-depth: 0
 
       - name: Download reth image
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: artifacts
           path: /tmp

.github/workflows/lint.yml

@@ -117,7 +117,7 @@ jobs:
 
   msrv:
     name: MSRV
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
+    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
@@ -237,6 +237,31 @@ jobs:
       - 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
 
+  # Checks that selected crates can compile with power set of features
+  features:
+    name: features
+    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v6
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@clippy
+      - uses: mozilla-actions/sccache-action@v0.0.9
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: cargo install cargo-hack
+        uses: taiki-e/install-action@cargo-hack
+      - run: |
+          cargo hack check \
+            --package reth-codecs \
+            --package reth-primitives-traits \
+            --package reth-primitives \
+            --feature-powerset \
+            --depth 2
+        env:
+          RUSTFLAGS: -D warnings
+
   # Check crates correctly propagate features
   feature-propagation:
     runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
@@ -272,6 +297,7 @@ jobs:
       - typos
       - grafana
       - no-test-deps
+      - features
       - feature-propagation
       - deny
     timeout-minutes: 30

.github/workflows/pr-audit.yml

@@ -1,30 +0,0 @@
-name: Pull request audit
-
-on:
-  pull_request:
-    types: [labeled]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    if: github.event.label.name == 'cyclops'
-    steps:
-      - name: Publish event
-        run: |
-          set -euo pipefail
-
-          echo "${{ secrets.EVENTS_KEY }}" > ${{ runner.temp }}/key
-          echo "${{ secrets.EVENTS_CERT }}" > ${{ runner.temp }}/cert
-
-          curl -sf -o /dev/null -X POST ${{ secrets.EVENTS_ARGS }} \
-            -H "Content-Type: application/json" \
-            --key ${{ runner.temp }}/key \
-            --cert ${{ runner.temp }}/cert \
-            -d '{
-              "repository": "${{ github.repository }}",
-              "event": "pr_audit",
-              "data": {
-                "pr_number": ${{ github.event.pull_request.number }},
-                "sha": "${{ github.event.pull_request.head.sha }}"
-              }
-            }'

.github/workflows/release-reproducible.yml

@@ -52,7 +52,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Extract version
-        run: echo "VERSION=${GITHUB_REF_NAME//\//-}" >> $GITHUB_OUTPUT
+        run: echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
         id: extract_version
     outputs:
       VERSION: ${{ steps.extract_version.outputs.VERSION }}
@@ -73,24 +73,18 @@ jobs:
             os: ubuntu-24.04
             profile: maxperf
             allow_fail: false
-            rustflags: "-C target-cpu=x86-64-v3 -C target-feature=+pclmulqdq"
-            native: true
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
             profile: maxperf
             allow_fail: false
-            rustflags: ""
-            native: true
           - target: x86_64-apple-darwin
             os: macos-14
             profile: maxperf
             allow_fail: false
-            rustflags: "-C target-cpu=x86-64-v3 -C target-feature=+pclmulqdq"
           - target: aarch64-apple-darwin
             os: macos-14
             profile: maxperf
             allow_fail: false
-            rustflags: ""
         build:
           - command: build
             binary: reth
@@ -102,7 +96,6 @@ jobs:
           target: ${{ matrix.configs.target }}
       - uses: mozilla-actions/sccache-action@v0.0.9
       - name: Install cross main
-        if: ${{ !matrix.configs.native }}
         id: cross_main
         run: |
           cargo install cross --locked --git https://github.com/cross-rs/cross
@@ -117,14 +110,7 @@ jobs:
           echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
 
       - name: Build Reth
-        env:
-          CC: clang
-        run: |
-          if [ "${{ matrix.configs.native }}" = "true" ]; then
-            make PROFILE=${{ matrix.configs.profile }} EXTRA_RUSTFLAGS="${{ matrix.configs.rustflags }}" ${{ matrix.build.command }}-native-${{ matrix.configs.target }}
-          else
-            make PROFILE=${{ matrix.configs.profile }} EXTRA_RUSTFLAGS="${{ matrix.configs.rustflags }}" ${{ matrix.build.command }}-${{ matrix.configs.target }}
-          fi
+        run: make PROFILE=${{ matrix.configs.profile }} ${{ matrix.build.command }}-${{ matrix.configs.target }}
       - name: Move binary
         run: |
           mkdir artifacts
@@ -145,19 +131,18 @@ jobs:
 
       - name: Upload artifact
         if: ${{ github.event.inputs.dry_run != 'true' }}
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         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 != 'true' }}
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.build.binary }}-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.configs.target }}.tar.gz.asc
           path: ${{ matrix.build.binary }}-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.configs.target }}.tar.gz.asc
 
-
   draft-release:
     name: draft release
     runs-on: ubuntu-latest
@@ -175,7 +160,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Download artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
       - name: Generate full changelog
         id: changelog
         run: |

.github/workflows/reproducible-build.yml

@@ -43,7 +43,7 @@ jobs:
           echo "Binaries SHA256 on ${{ matrix.machine }}: $(cat checksum.sha256)"
 
       - name: Upload the hash
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: checksum-${{ matrix.machine }}
           path: |
@@ -56,12 +56,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts from machine-1
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: checksum-machine-1
           path: machine-1/
       - name: Download artifacts from machine-2
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: checksum-machine-2
           path: machine-2/

.github/workflows/stage.yml

@@ -51,12 +51,15 @@ jobs:
       - name: Run execution stage
         run: |
           reth stage run execution --from ${{ env.FROM_BLOCK }} --to ${{ env.TO_BLOCK }} --commit --checkpoints
-      # NOTE: account-hashing, storage-hashing, and hashing stages are omitted.
-      # With storage v2 (now default), these stages are no-ops because the
-      # execution stage writes directly to HashedAccounts/HashedStorages.
-      # Running them here is harmful: `stage run` unwinds before executing,
-      # and the unwind reverts the hashed state that execution wrote, but
-      # the no-op execute never restores it — causing merkle to fail.
+      - name: Run account-hashing stage
+        run: |
+          reth stage run account-hashing --from ${{ env.FROM_BLOCK }} --to ${{ env.TO_BLOCK }} --commit --checkpoints
+      - name: Run storage hashing stage
+        run: |
+          reth stage run storage-hashing --from ${{ env.FROM_BLOCK }} --to ${{ env.TO_BLOCK }} --commit --checkpoints
+      - name: Run hashing stage
+        run: |
+          reth stage run hashing --from ${{ env.FROM_BLOCK }} --to ${{ env.TO_BLOCK }} --commit --checkpoints
       - name: Run merkle stage
         run: |
           reth stage run merkle --from ${{ env.FROM_BLOCK }} --to ${{ env.TO_BLOCK }} --commit --checkpoints

.github/workflows/unit.yml

@@ -19,13 +19,15 @@ concurrency:
 
 jobs:
   test:
-    name: test / ${{ matrix.type }}
+    name: test / ${{ matrix.type }} / ${{ matrix.storage }}
     runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
     env:
       RUST_BACKTRACE: 1
+      EDGE_FEATURES: ${{ matrix.storage == 'edge' && 'edge' || '' }}
     strategy:
       matrix:
         type: [ethereum]
+        storage: [stable, edge]
         include:
           - type: ethereum
             features: asm-keccak ethereum
@@ -48,14 +50,14 @@ jobs:
         run: |
           cargo nextest run \
             --no-fail-fast \
-            --features "${{ matrix.features }}" --locked \
+            --features "${{ matrix.features }} $EDGE_FEATURES" --locked \
             ${{ matrix.exclude_args }} --workspace \
             --exclude ef-tests --no-tests=warn \
             -E "!kind(test) and not binary(e2e_testsuite)"
 
   state:
     name: Ethereum state tests
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
+    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

AGENTS.md

@@ -1,549 +0,0 @@
-# Reth Development Guide for AI Agents
-
-This guide provides comprehensive instructions for AI agents working on the Reth codebase. It covers the architecture, development workflows, and critical guidelines for effective contributions.
-
-## Project Overview
-
-Reth is a high-performance Ethereum execution client written in Rust, focusing on modularity, performance, and contributor-friendliness. The codebase is organized into well-defined crates with clear boundaries and responsibilities.
-
-## Architecture Overview
-
-### Core Components
-
-1. **Consensus (`crates/consensus/`)**: Validates blocks according to Ethereum consensus rules
-2. **Storage (`crates/storage/`)**: Hybrid database using MDBX + static files for optimal performance
-3. **Networking (`crates/net/`)**: P2P networking stack with discovery, sync, and transaction propagation
-4. **RPC (`crates/rpc/`)**: JSON-RPC server supporting all standard Ethereum APIs
-5. **Execution (`crates/evm/`, `crates/ethereum/`)**: Transaction execution and state transitions
-6. **Pipeline (`crates/stages/`)**: Staged sync architecture for blockchain synchronization
-7. **Trie (`crates/trie/`)**: Merkle Patricia Trie implementation with parallel state root computation
-8. **Node Builder (`crates/node/`)**: High-level node orchestration and configuration
-9. **The Consensus Engine (`crates/engine/`)**: Handles processing blocks received from the consensus layer with the Engine API (newPayload, forkchoiceUpdated)
-
-### Key Design Principles
-
-- **Modularity**: Each crate can be used as a standalone library
-- **Performance**: Extensive use of parallelism, memory-mapped I/O, and optimized data structures
-- **Extensibility**: Traits and generic types allow for different chain implementations
-- **Type Safety**: Strong typing throughout with minimal use of dynamic dispatch
-
-## Development Workflow
-
-### Code Style and Standards
-
-1. **Formatting**: Always use nightly rustfmt
-   ```bash
-   cargo +nightly fmt --all
-   ```
-
-2. **Linting**: Run clippy with all features
-   ```bash
-   cargo +nightly clippy --workspace --lib --examples --tests --benches --all-features 
-   ```
-
-3. **Testing**: Use nextest for faster test execution
-   ```bash
-   cargo nextest run --workspace
-   ```
-
-### Common Contribution Types
-
-Based on actual recent PRs, here are typical contribution patterns:
-
-#### 1. Small Bug Fixes (1-10 lines)
-Real example: Fixing beacon block root handling ([#16767](https://github.com/paradigmxyz/reth/pull/16767))
-```rust
-// Changed a single line to fix logic error
-- parent_beacon_block_root: parent.parent_beacon_block_root(),
-+ parent_beacon_block_root: parent.parent_beacon_block_root().map(|_| B256::ZERO),
-```
-
-#### 2. Integration with Upstream Changes
-Real example: Integrating revm updates ([#16752](https://github.com/paradigmxyz/reth/pull/16752))
-```rust
-// Update code to use new APIs from dependencies
-- if self.fork_tracker.is_shanghai_activated() {
--     if let Err(err) = transaction.ensure_max_init_code_size(MAX_INIT_CODE_BYTE_SIZE) {
-+ if let Some(init_code_size_limit) = self.fork_tracker.max_initcode_size() {
-+     if let Err(err) = transaction.ensure_max_init_code_size(init_code_size_limit) {
-```
-
-#### 3. Adding Comprehensive Tests
-Real example: ETH69 protocol tests ([#16759](https://github.com/paradigmxyz/reth/pull/16759))
-```rust
-#[tokio::test(flavor = "multi_thread")]
-async fn test_eth69_peers_can_connect() {
-    // Create test network with specific protocol versions
-    let p0 = PeerConfig::with_protocols(NoopProvider::default(), Some(EthVersion::Eth69.into()));
-    // Test connection and version negotiation
-}
-```
-
-#### 4. Making Components Generic
-Real example: Making EthEvmConfig generic over chainspec ([#16758](https://github.com/paradigmxyz/reth/pull/16758))
-```rust
-// Before: Hardcoded to ChainSpec
-- pub struct EthEvmConfig<EvmFactory = EthEvmFactory> {
--     pub executor_factory: EthBlockExecutorFactory<RethReceiptBuilder, Arc<ChainSpec>, EvmFactory>,
-
-// After: Generic over any chain spec type
-+ pub struct EthEvmConfig<C = ChainSpec, EvmFactory = EthEvmFactory>
-+ where
-+     C: EthereumHardforks,
-+ {
-+     pub executor_factory: EthBlockExecutorFactory<RethReceiptBuilder, Arc<C>, EvmFactory>,
-```
-
-#### 5. Resource Management Improvements
-Real example: ETL directory cleanup ([#16770](https://github.com/paradigmxyz/reth/pull/16770))
-```rust
-// Add cleanup logic on startup
-+ if let Err(err) = fs::remove_dir_all(&etl_path) {
-+     warn!(target: "reth::cli", ?etl_path, %err, "Failed to remove ETL path on launch");
-+ }
-```
-
-#### 6. Feature Additions
-Real example: Sharded mempool support ([#16756](https://github.com/paradigmxyz/reth/pull/16756))
-```rust
-// Add new filtering policies for transaction announcements
-pub struct ShardedMempoolAnnouncementFilter<T> {
-    pub inner: T,
-    pub shard_bits: u8,
-    pub node_id: Option<B256>,
-}
-```
-
-### Testing Guidelines
-
-1. **Unit Tests**: Test individual functions and components
-2. **Integration Tests**: Test interactions between components
-3. **Benchmarks**: For performance-critical code
-4. **Fuzz Tests**: For parsing and serialization code
-5. **Property Tests**: For checking component correctness on a wide variety of inputs
-
-Example test structure:
-```rust
-#[cfg(test)]
-mod tests {
-    use super::*;
-    
-    #[test]
-    fn test_component_behavior() {
-        // Arrange
-        let component = Component::new();
-        
-        // Act
-        let result = component.operation();
-        
-        // Assert
-        assert_eq!(result, expected);
-    }
-}
-```
-
-### Performance Considerations
-
-1. **Avoid Allocations in Hot Paths**: Use references and borrowing
-2. **Parallel Processing**: Use rayon for CPU-bound parallel work
-3. **Async/Await**: Use tokio for I/O-bound operations
-4. **File Operations**: Use `reth_fs_util` instead of `std::fs` for better error handling
-
-### Common Pitfalls
-
-1. **Don't Block Async Tasks**: Use `spawn_blocking` for CPU-intensive work or work with lots of blocking I/O
-2. **Handle Errors Properly**: Use `?` operator and proper error types
-
-### What to Avoid
-
-Based on PR patterns, avoid:
-
-1. **Large, sweeping changes**: Keep PRs focused and reviewable
-2. **Mixing unrelated changes**: One logical change per PR
-3. **Ignoring CI failures**: All checks must pass
-4. **Incomplete implementations**: Finish features before submitting
-5. **Modifying libmdbx sources**: Never modify files in `crates/storage/libmdbx-rs/mdbx-sys/libmdbx/` - this is vendored third-party code
-
-### CI Requirements
-
-Before submitting changes, ensure:
-
-1. **Format Check**: `cargo +nightly fmt --all --check`
-2. **Clippy**: No warnings
-3. **Tests Pass**: All unit and integration tests
-4. **Documentation**: Update relevant docs and add doc comments with `cargo docs --document-private-items`
-5. **CLI Docs** (if CLI changed): Run `make update-book-cli` (see below)
-6. **Commit Messages**: Follow conventional format (feat:, fix:, chore:, etc.)
-
-### CLI Reference Docs (`book` CI Job)
-
-The CLI reference pages under `docs/vocs/docs/pages/cli/` are **auto-generated** from the `reth` binary's `--help` output. **Do not edit these files manually** — any hand edits will be overwritten and CI will fail regardless.
-
-When you add, remove, or modify CLI commands, subcommands, or flags, regenerate the CLI docs by running:
-
-```bash
-make update-book-cli
-```
-
-This builds `reth` in debug mode and runs `docs/cli/update.sh` to regenerate all CLI pages. Commit the resulting changes.
-
-The `book` CI job (`.github/workflows/lint.yml`) enforces this by regenerating the docs and running `git diff --exit-code`. If the committed docs don't match the generated output, CI fails. Manually editing these pages is never productive — always use `make update-book-cli`.
-
-### Opening PRs against <https://github.com/paradigmxyz/reth>
-
-#### Titles
-
-Use [Conventional Commits](https://www.conventionalcommits.org/) with an optional scope:
-
-```
-<type>(<scope>): <short description>
-```
-
-**Types**: `feat`, `fix`, `perf`, `refactor`, `docs`, `test`, `chore`
-
-**Scope** (optional): crate or area, e.g. `evm`, `trie`, `rpc`, `engine`, `net`
-
-Examples:
-- `fix(rpc): correct gas estimation for ERC-20 transfers`
-- `perf: batch trie updates to reduce cursor overhead`
-- `feat(engine): add new_payload_interval metric`
-
-#### Descriptions
-
-Keep it short. Say what changed and why — nothing more.
-
-**Do:**
-- Write 1–3 sentences summarizing the change
-- Explain _why_ if the diff doesn't make it obvious
-- Link related issues or EIPs
-- Include benchmark numbers for perf changes
-
-**Don't:**
-- List every file changed — that's what the diff is for
-- Repeat the title in the body
-- Add "Files changed" or "Changes" sections
-- Write walls of text that go stale when the diff is updated
-- Use filler like "This PR introduces...", "comprehensive", "robust", "enhance", "leverage"
-
-**Template:**
-
-```
-Closes #<issue>
-
-<what changed, 1-3 sentences>
-
-<why, if not obvious from the diff>
-```
-
-**Good example:**
-
-```
-Closes #16800
-
-Adds fallback for external IP resolution so node startup doesn't fail
-when STUN is unreachable. Falls back to the configured default.
-```
-
-**Bad example:**
-
-```
-## Summary
-This PR introduces comprehensive improvements to the IP resolution system.
-
-## Changes
-- Modified `crates/net/discv4/src/lib.rs` to add fallback
-- Modified `crates/net/discv4/src/config.rs` to add default IP
-- Added tests in `crates/net/discv4/src/tests/ip.rs`
-
-## Files Changed
-- crates/net/discv4/src/lib.rs
-- crates/net/discv4/src/config.rs
-- crates/net/discv4/src/tests/ip.rs
-```
-
-#### Labels and CI
-
-Label PRs appropriately, first check the available labels and then apply the relevant ones:
-* when changes are RPC related, add A-rpc label
-* when changes are docs related, add C-docs label
-* ... and so on, check the available labels for more options.
-* if being tasked to open a pr, ensure that all changes are properly formatted: `cargo +nightly fmt --all`
-
-If changes in reth include changes to dependencies, run commands `zepter` and `make lint-toml` before finalizing the pr. Assume `zepter` binary is installed.
-
-### Debugging Tips
-
-1. **Logging**: Use `tracing` crate with appropriate levels
-   ```rust
-   tracing::debug!(target: "reth::component", ?value, "description");
-   ```
-
-2. **Metrics**: Add metrics for monitoring
-   ```rust
-   metrics::counter!("reth_component_operations").increment(1);
-   ```
-
-3. **Test Isolation**: Use separate test databases/directories
-
-### Finding Where to Contribute
-
-1. **Check Issues**: Look for issues labeled `good-first-issue` or `help-wanted`
-2. **Review TODOs**: Search for `TODO` comments in the codebase
-3. **Improve Tests**: Areas with low test coverage are good targets
-4. **Documentation**: Improve code comments and documentation
-5. **Performance**: Profile and optimize hot paths (with benchmarks)
-
-### Common PR Patterns
-
-#### Small, Focused Changes
-Most PRs change only 1-5 files. Examples:
-- Single-line bug fixes
-- Adding a missing trait implementation
-- Updating error messages
-- Adding test cases for edge conditions
-
-#### Integration Work
-When dependencies update (especially revm), code needs updating:
-- Check for breaking API changes
-- Update to use new features (like EIP implementations)
-- Ensure compatibility with new versions
-
-#### Test Improvements
-Tests often need expansion for:
-- New protocol versions (ETH68, ETH69)
-- Edge cases in state transitions
-- Network behavior under specific conditions
-- Concurrent operations
-
-#### Making Code More Generic
-Common refactoring pattern:
-- Replace concrete types with generics
-- Add trait bounds for flexibility
-- Enable reuse across different chain types
-
-#### When to Comment
-
-Write comments that remain valuable after the PR is merged. Future readers won't have PR context - they only see the current code.
-
-##### ✅ DO: Add Value
-
-**Explain WHY and non-obvious behavior:**
-```rust
-// Process must handle allocations atomically to prevent race conditions
-// between dealloc on drop and concurrent limit checks
-unsafe impl GlobalAlloc for LimitedAllocator { ... }
-
-// Binary search requires sorted input. Panics on unsorted slices.
-fn find_index(items: &[Item], target: &Item) -> Option<usize>
-
-// Timeout set to 5s to match EVM block processing limits
-const TRACER_TIMEOUT: Duration = Duration::from_secs(5);
-```
-
-**Document constraints and assumptions:**
-```rust
-/// Returns heap size estimate.
-/// 
-/// Note: May undercount shared references (Rc/Arc). For precise
-/// accounting, combine with an allocator-based approach.
-fn deep_size_of(&self) -> usize
-```
-
-**Explain complex logic:**
-```rust
-// We reset limits at task start because tokio reuses threads in
-// spawn_blocking pool. Without reset, second task inherits first
-// task's allocation count and immediately hits limit.
-THREAD_ALLOCATED.with(|allocated| allocated.set(0));
-```
-
-##### ❌ DON'T: Describe Changes
-```rust
-// ❌ BAD - Describes the change, not the code
-// Changed from Vec to HashMap for O(1) lookups
-
-// ✅ GOOD - Explains the decision
-// HashMap provides O(1) symbol lookups during trace replay
-```
-```rust
-// ❌ BAD - PR-specific context
-// Fix for issue #234 where memory wasn't freed
-
-// ✅ GOOD - Documents the actual behavior
-// Explicitly drop allocations before limit check to ensure
-// accurate accounting
-```
-```rust
-// ❌ BAD - States the obvious
-// Increment counter
-counter += 1;
-
-// ✅ GOOD - Explains non-obvious purpose
-// Track allocations across all threads for global limit enforcement
-GLOBAL_COUNTER.fetch_add(1, Ordering::SeqCst);
-```
-
-✅ **Comment when:**
-- Non-obvious behavior or edge cases
-- Performance trade-offs
-- Safety requirements (unsafe blocks must always be documented)
-- Limitations or gotchas
-- Why simpler alternatives don't work
-
-❌ **Don't comment when:**
-- Code is self-explanatory
-- Just restating the code in English
-- Describing what changed in this PR
-
-##### The Test: "Will this make sense in 6 months?"
-
-Before adding a comment, ask: Would someone reading just the current code (no PR, no history) find this helpful?
-
-
-#### Rust Style Guides
-
-##### Type Ordering in Files
-
-When defining structs, traits, and functions in a file, follow this ordering convention. The file's primary type (matching the file name) comes first, followed by supporting public types, then private types and helpers.
-
-```rust
-use ...;
-
-/// The primary type of this file (matches filename).
-pub struct PayloadProcessor { ... }
-
-impl PayloadProcessor { ... }
-
-// Followed by public auxiliary types that support the primary type
-
-/// Configuration for the processor.
-pub struct PayloadProcessorConfig { ... }
-
-/// Result type returned by processor operations.
-pub struct ProcessorResult { ... }
-
-// Followed by public traits related to the primary type
-
-pub trait ProcessorExt { ... }
-
-// Followed by private helper types
-
-struct InternalState { ... }
-
-// Followed by private helper functions
-
-fn validate_input() { ... }
-```
-
-❌ **Bad**: Adding new traits and auxiliary types **above** the file's primary type (see [#22133](https://github.com/paradigmxyz/reth/pull/22133)):
-
-```rust
-use ...;
-
-// ❌ BAD - new auxiliary struct added before the file's main type
-pub struct CacheWaitDurations { ... }
-
-// ❌ BAD - new trait added before the file's main type  
-pub trait WaitForCaches { ... }
-
-// The file's primary type is buried below unrelated additions
-pub struct PayloadProcessor { ... }
-```
-
-✅ **Good**: New types go **after** the primary type:
-
-```rust
-use ...;
-
-// ✅ The file's primary type stays at the top
-pub struct PayloadProcessor { ... }
-
-impl PayloadProcessor { ... }
-
-// ✅ Auxiliary types follow the primary type
-pub struct CacheWaitDurations { ... }
-
-pub trait WaitForCaches { ... }
-
-impl WaitForCaches for PayloadProcessor { ... }
-```
-
-### Example Contribution Workflow
-
-Let's say you want to fix a bug where external IP resolution fails on startup:
-
-1. **Create a branch**:
-   ```bash
-   git checkout -b fix-external-ip-resolution
-   ```
-
-2. **Find the relevant code**:
-   ```bash
-   # Search for IP resolution code
-   rg "external.*ip" --type rust
-   ```
-
-3. **Reason about the problem, when the problem is identified, make the fix**:
-   ```rust
-   // In crates/net/discv4/src/lib.rs
-   pub fn resolve_external_ip() -> Option<IpAddr> {
-       // Add fallback mechanism
-       nat::external_ip()
-           .or_else(|| nat::external_ip_from_stun())
-           .or_else(|| Some(DEFAULT_IP))
-   }
-   ```
-
-4. **Add a test**:
-   ```rust
-   #[test]
-   fn test_external_ip_fallback() {
-       // Test that resolution has proper fallbacks
-   }
-   ```
-
-5. **Run checks** (IMPORTANT!):
-   ```bash
-   cargo +nightly fmt --all
-   cargo clippy --workspace --all-features # Make sure WHOLE WORKSPACE compiles!
-   cargo nextest run -p reth-discv4
-   ```
-
-6. **Commit with clear message**:
-   ```bash
-   git commit -m "fix: add fallback for external IP resolution
-
-   Previously, node startup could fail if external IP resolution
-   failed. This adds fallback mechanisms to ensure the node can
-   always start with a reasonable default."
-   ```
-
-## Quick Reference
-
-### Essential Commands
-
-```bash
-# Format code
-cargo +nightly fmt --all
-
-# Run lints
-cargo +nightly clippy --workspace --all-features
-
-# Run tests
-cargo nextest run --workspace
-
-# Run specific benchmark
-cargo bench --bench bench_name
-
-# Build optimized binary
-cargo build --release
-
-# Check compilation for all features
-cargo check --workspace --all-features
-
-# Check documentation
-cargo docs --document-private-items
-
-# Regenerate CLI reference docs (after CLI changes)
-make update-book-cli
-```

CLAUDE.md

@@ -1 +0,0 @@
-AGENTS.md

CLAUDE.md

@@ -0,0 +1,549 @@
+# Reth Development Guide for AI Agents
+
+This guide provides comprehensive instructions for AI agents working on the Reth codebase. It covers the architecture, development workflows, and critical guidelines for effective contributions.
+
+## Project Overview
+
+Reth is a high-performance Ethereum execution client written in Rust, focusing on modularity, performance, and contributor-friendliness. The codebase is organized into well-defined crates with clear boundaries and responsibilities.
+
+## Architecture Overview
+
+### Core Components
+
+1. **Consensus (`crates/consensus/`)**: Validates blocks according to Ethereum consensus rules
+2. **Storage (`crates/storage/`)**: Hybrid database using MDBX + static files for optimal performance
+3. **Networking (`crates/net/`)**: P2P networking stack with discovery, sync, and transaction propagation
+4. **RPC (`crates/rpc/`)**: JSON-RPC server supporting all standard Ethereum APIs
+5. **Execution (`crates/evm/`, `crates/ethereum/`)**: Transaction execution and state transitions
+6. **Pipeline (`crates/stages/`)**: Staged sync architecture for blockchain synchronization
+7. **Trie (`crates/trie/`)**: Merkle Patricia Trie implementation with parallel state root computation
+8. **Node Builder (`crates/node/`)**: High-level node orchestration and configuration
+9. **The Consensus Engine (`crates/engine/`)**: Handles processing blocks received from the consensus layer with the Engine API (newPayload, forkchoiceUpdated)
+
+### Key Design Principles
+
+- **Modularity**: Each crate can be used as a standalone library
+- **Performance**: Extensive use of parallelism, memory-mapped I/O, and optimized data structures
+- **Extensibility**: Traits and generic types allow for different chain implementations
+- **Type Safety**: Strong typing throughout with minimal use of dynamic dispatch
+
+## Development Workflow
+
+### Code Style and Standards
+
+1. **Formatting**: Always use nightly rustfmt
+   ```bash
+   cargo +nightly fmt --all
+   ```
+
+2. **Linting**: Run clippy with all features
+   ```bash
+   cargo +nightly clippy --workspace --lib --examples --tests --benches --all-features 
+   ```
+
+3. **Testing**: Use nextest for faster test execution
+   ```bash
+   cargo nextest run --workspace
+   ```
+
+### Common Contribution Types
+
+Based on actual recent PRs, here are typical contribution patterns:
+
+#### 1. Small Bug Fixes (1-10 lines)
+Real example: Fixing beacon block root handling ([#16767](https://github.com/paradigmxyz/reth/pull/16767))
+```rust
+// Changed a single line to fix logic error
+- parent_beacon_block_root: parent.parent_beacon_block_root(),
++ parent_beacon_block_root: parent.parent_beacon_block_root().map(|_| B256::ZERO),
+```
+
+#### 2. Integration with Upstream Changes
+Real example: Integrating revm updates ([#16752](https://github.com/paradigmxyz/reth/pull/16752))
+```rust
+// Update code to use new APIs from dependencies
+- if self.fork_tracker.is_shanghai_activated() {
+-     if let Err(err) = transaction.ensure_max_init_code_size(MAX_INIT_CODE_BYTE_SIZE) {
++ if let Some(init_code_size_limit) = self.fork_tracker.max_initcode_size() {
++     if let Err(err) = transaction.ensure_max_init_code_size(init_code_size_limit) {
+```
+
+#### 3. Adding Comprehensive Tests
+Real example: ETH69 protocol tests ([#16759](https://github.com/paradigmxyz/reth/pull/16759))
+```rust
+#[tokio::test(flavor = "multi_thread")]
+async fn test_eth69_peers_can_connect() {
+    // Create test network with specific protocol versions
+    let p0 = PeerConfig::with_protocols(NoopProvider::default(), Some(EthVersion::Eth69.into()));
+    // Test connection and version negotiation
+}
+```
+
+#### 4. Making Components Generic
+Real example: Making EthEvmConfig generic over chainspec ([#16758](https://github.com/paradigmxyz/reth/pull/16758))
+```rust
+// Before: Hardcoded to ChainSpec
+- pub struct EthEvmConfig<EvmFactory = EthEvmFactory> {
+-     pub executor_factory: EthBlockExecutorFactory<RethReceiptBuilder, Arc<ChainSpec>, EvmFactory>,
+
+// After: Generic over any chain spec type
++ pub struct EthEvmConfig<C = ChainSpec, EvmFactory = EthEvmFactory>
++ where
++     C: EthereumHardforks,
++ {
++     pub executor_factory: EthBlockExecutorFactory<RethReceiptBuilder, Arc<C>, EvmFactory>,
+```
+
+#### 5. Resource Management Improvements
+Real example: ETL directory cleanup ([#16770](https://github.com/paradigmxyz/reth/pull/16770))
+```rust
+// Add cleanup logic on startup
++ if let Err(err) = fs::remove_dir_all(&etl_path) {
++     warn!(target: "reth::cli", ?etl_path, %err, "Failed to remove ETL path on launch");
++ }
+```
+
+#### 6. Feature Additions
+Real example: Sharded mempool support ([#16756](https://github.com/paradigmxyz/reth/pull/16756))
+```rust
+// Add new filtering policies for transaction announcements
+pub struct ShardedMempoolAnnouncementFilter<T> {
+    pub inner: T,
+    pub shard_bits: u8,
+    pub node_id: Option<B256>,
+}
+```
+
+### Testing Guidelines
+
+1. **Unit Tests**: Test individual functions and components
+2. **Integration Tests**: Test interactions between components
+3. **Benchmarks**: For performance-critical code
+4. **Fuzz Tests**: For parsing and serialization code
+5. **Property Tests**: For checking component correctness on a wide variety of inputs
+
+Example test structure:
+```rust
+#[cfg(test)]
+mod tests {
+    use super::*;
+    
+    #[test]
+    fn test_component_behavior() {
+        // Arrange
+        let component = Component::new();
+        
+        // Act
+        let result = component.operation();
+        
+        // Assert
+        assert_eq!(result, expected);
+    }
+}
+```
+
+### Performance Considerations
+
+1. **Avoid Allocations in Hot Paths**: Use references and borrowing
+2. **Parallel Processing**: Use rayon for CPU-bound parallel work
+3. **Async/Await**: Use tokio for I/O-bound operations
+4. **File Operations**: Use `reth_fs_util` instead of `std::fs` for better error handling
+
+### Common Pitfalls
+
+1. **Don't Block Async Tasks**: Use `spawn_blocking` for CPU-intensive work or work with lots of blocking I/O
+2. **Handle Errors Properly**: Use `?` operator and proper error types
+
+### What to Avoid
+
+Based on PR patterns, avoid:
+
+1. **Large, sweeping changes**: Keep PRs focused and reviewable
+2. **Mixing unrelated changes**: One logical change per PR
+3. **Ignoring CI failures**: All checks must pass
+4. **Incomplete implementations**: Finish features before submitting
+5. **Modifying libmdbx sources**: Never modify files in `crates/storage/libmdbx-rs/mdbx-sys/libmdbx/` - this is vendored third-party code
+
+### CI Requirements
+
+Before submitting changes, ensure:
+
+1. **Format Check**: `cargo +nightly fmt --all --check`
+2. **Clippy**: No warnings
+3. **Tests Pass**: All unit and integration tests
+4. **Documentation**: Update relevant docs and add doc comments with `cargo docs --document-private-items`
+5. **CLI Docs** (if CLI changed): Run `make update-book-cli` (see below)
+6. **Commit Messages**: Follow conventional format (feat:, fix:, chore:, etc.)
+
+### CLI Reference Docs (`book` CI Job)
+
+The CLI reference pages under `docs/vocs/docs/pages/cli/` are **auto-generated** from the `reth` binary's `--help` output. **Do not edit these files manually** — any hand edits will be overwritten and CI will fail regardless.
+
+When you add, remove, or modify CLI commands, subcommands, or flags, regenerate the CLI docs by running:
+
+```bash
+make update-book-cli
+```
+
+This builds `reth` in debug mode and runs `docs/cli/update.sh` to regenerate all CLI pages. Commit the resulting changes.
+
+The `book` CI job (`.github/workflows/lint.yml`) enforces this by regenerating the docs and running `git diff --exit-code`. If the committed docs don't match the generated output, CI fails. Manually editing these pages is never productive — always use `make update-book-cli`.
+
+### Opening PRs against <https://github.com/paradigmxyz/reth>
+
+#### Titles
+
+Use [Conventional Commits](https://www.conventionalcommits.org/) with an optional scope:
+
+```
+<type>(<scope>): <short description>
+```
+
+**Types**: `feat`, `fix`, `perf`, `refactor`, `docs`, `test`, `chore`
+
+**Scope** (optional): crate or area, e.g. `evm`, `trie`, `rpc`, `engine`, `net`
+
+Examples:
+- `fix(rpc): correct gas estimation for ERC-20 transfers`
+- `perf: batch trie updates to reduce cursor overhead`
+- `feat(engine): add new_payload_interval metric`
+
+#### Descriptions
+
+Keep it short. Say what changed and why — nothing more.
+
+**Do:**
+- Write 1–3 sentences summarizing the change
+- Explain _why_ if the diff doesn't make it obvious
+- Link related issues or EIPs
+- Include benchmark numbers for perf changes
+
+**Don't:**
+- List every file changed — that's what the diff is for
+- Repeat the title in the body
+- Add "Files changed" or "Changes" sections
+- Write walls of text that go stale when the diff is updated
+- Use filler like "This PR introduces...", "comprehensive", "robust", "enhance", "leverage"
+
+**Template:**
+
+```
+Closes #<issue>
+
+<what changed, 1-3 sentences>
+
+<why, if not obvious from the diff>
+```
+
+**Good example:**
+
+```
+Closes #16800
+
+Adds fallback for external IP resolution so node startup doesn't fail
+when STUN is unreachable. Falls back to the configured default.
+```
+
+**Bad example:**
+
+```
+## Summary
+This PR introduces comprehensive improvements to the IP resolution system.
+
+## Changes
+- Modified `crates/net/discv4/src/lib.rs` to add fallback
+- Modified `crates/net/discv4/src/config.rs` to add default IP
+- Added tests in `crates/net/discv4/src/tests/ip.rs`
+
+## Files Changed
+- crates/net/discv4/src/lib.rs
+- crates/net/discv4/src/config.rs
+- crates/net/discv4/src/tests/ip.rs
+```
+
+#### Labels and CI
+
+Label PRs appropriately, first check the available labels and then apply the relevant ones:
+* when changes are RPC related, add A-rpc label
+* when changes are docs related, add C-docs label
+* ... and so on, check the available labels for more options.
+* if being tasked to open a pr, ensure that all changes are properly formatted: `cargo +nightly fmt --all`
+
+If changes in reth include changes to dependencies, run commands `zepter` and `make lint-toml` before finalizing the pr. Assume `zepter` binary is installed.
+
+### Debugging Tips
+
+1. **Logging**: Use `tracing` crate with appropriate levels
+   ```rust
+   tracing::debug!(target: "reth::component", ?value, "description");
+   ```
+
+2. **Metrics**: Add metrics for monitoring
+   ```rust
+   metrics::counter!("reth_component_operations").increment(1);
+   ```
+
+3. **Test Isolation**: Use separate test databases/directories
+
+### Finding Where to Contribute
+
+1. **Check Issues**: Look for issues labeled `good-first-issue` or `help-wanted`
+2. **Review TODOs**: Search for `TODO` comments in the codebase
+3. **Improve Tests**: Areas with low test coverage are good targets
+4. **Documentation**: Improve code comments and documentation
+5. **Performance**: Profile and optimize hot paths (with benchmarks)
+
+### Common PR Patterns
+
+#### Small, Focused Changes
+Most PRs change only 1-5 files. Examples:
+- Single-line bug fixes
+- Adding a missing trait implementation
+- Updating error messages
+- Adding test cases for edge conditions
+
+#### Integration Work
+When dependencies update (especially revm), code needs updating:
+- Check for breaking API changes
+- Update to use new features (like EIP implementations)
+- Ensure compatibility with new versions
+
+#### Test Improvements
+Tests often need expansion for:
+- New protocol versions (ETH68, ETH69)
+- Edge cases in state transitions
+- Network behavior under specific conditions
+- Concurrent operations
+
+#### Making Code More Generic
+Common refactoring pattern:
+- Replace concrete types with generics
+- Add trait bounds for flexibility
+- Enable reuse across different chain types
+
+#### When to Comment
+
+Write comments that remain valuable after the PR is merged. Future readers won't have PR context - they only see the current code.
+
+##### ✅ DO: Add Value
+
+**Explain WHY and non-obvious behavior:**
+```rust
+// Process must handle allocations atomically to prevent race conditions
+// between dealloc on drop and concurrent limit checks
+unsafe impl GlobalAlloc for LimitedAllocator { ... }
+
+// Binary search requires sorted input. Panics on unsorted slices.
+fn find_index(items: &[Item], target: &Item) -> Option<usize>
+
+// Timeout set to 5s to match EVM block processing limits
+const TRACER_TIMEOUT: Duration = Duration::from_secs(5);
+```
+
+**Document constraints and assumptions:**
+```rust
+/// Returns heap size estimate.
+/// 
+/// Note: May undercount shared references (Rc/Arc). For precise
+/// accounting, combine with an allocator-based approach.
+fn deep_size_of(&self) -> usize
+```
+
+**Explain complex logic:**
+```rust
+// We reset limits at task start because tokio reuses threads in
+// spawn_blocking pool. Without reset, second task inherits first
+// task's allocation count and immediately hits limit.
+THREAD_ALLOCATED.with(|allocated| allocated.set(0));
+```
+
+##### ❌ DON'T: Describe Changes
+```rust
+// ❌ BAD - Describes the change, not the code
+// Changed from Vec to HashMap for O(1) lookups
+
+// ✅ GOOD - Explains the decision
+// HashMap provides O(1) symbol lookups during trace replay
+```
+```rust
+// ❌ BAD - PR-specific context
+// Fix for issue #234 where memory wasn't freed
+
+// ✅ GOOD - Documents the actual behavior
+// Explicitly drop allocations before limit check to ensure
+// accurate accounting
+```
+```rust
+// ❌ BAD - States the obvious
+// Increment counter
+counter += 1;
+
+// ✅ GOOD - Explains non-obvious purpose
+// Track allocations across all threads for global limit enforcement
+GLOBAL_COUNTER.fetch_add(1, Ordering::SeqCst);
+```
+
+✅ **Comment when:**
+- Non-obvious behavior or edge cases
+- Performance trade-offs
+- Safety requirements (unsafe blocks must always be documented)
+- Limitations or gotchas
+- Why simpler alternatives don't work
+
+❌ **Don't comment when:**
+- Code is self-explanatory
+- Just restating the code in English
+- Describing what changed in this PR
+
+##### The Test: "Will this make sense in 6 months?"
+
+Before adding a comment, ask: Would someone reading just the current code (no PR, no history) find this helpful?
+
+
+#### Rust Style Guides
+
+##### Type Ordering in Files
+
+When defining structs, traits, and functions in a file, follow this ordering convention. The file's primary type (matching the file name) comes first, followed by supporting public types, then private types and helpers.
+
+```rust
+use ...;
+
+/// The primary type of this file (matches filename).
+pub struct PayloadProcessor { ... }
+
+impl PayloadProcessor { ... }
+
+// Followed by public auxiliary types that support the primary type
+
+/// Configuration for the processor.
+pub struct PayloadProcessorConfig { ... }
+
+/// Result type returned by processor operations.
+pub struct ProcessorResult { ... }
+
+// Followed by public traits related to the primary type
+
+pub trait ProcessorExt { ... }
+
+// Followed by private helper types
+
+struct InternalState { ... }
+
+// Followed by private helper functions
+
+fn validate_input() { ... }
+```
+
+❌ **Bad**: Adding new traits and auxiliary types **above** the file's primary type (see [#22133](https://github.com/paradigmxyz/reth/pull/22133)):
+
+```rust
+use ...;
+
+// ❌ BAD - new auxiliary struct added before the file's main type
+pub struct CacheWaitDurations { ... }
+
+// ❌ BAD - new trait added before the file's main type  
+pub trait WaitForCaches { ... }
+
+// The file's primary type is buried below unrelated additions
+pub struct PayloadProcessor { ... }
+```
+
+✅ **Good**: New types go **after** the primary type:
+
+```rust
+use ...;
+
+// ✅ The file's primary type stays at the top
+pub struct PayloadProcessor { ... }
+
+impl PayloadProcessor { ... }
+
+// ✅ Auxiliary types follow the primary type
+pub struct CacheWaitDurations { ... }
+
+pub trait WaitForCaches { ... }
+
+impl WaitForCaches for PayloadProcessor { ... }
+```
+
+### Example Contribution Workflow
+
+Let's say you want to fix a bug where external IP resolution fails on startup:
+
+1. **Create a branch**:
+   ```bash
+   git checkout -b fix-external-ip-resolution
+   ```
+
+2. **Find the relevant code**:
+   ```bash
+   # Search for IP resolution code
+   rg "external.*ip" --type rust
+   ```
+
+3. **Reason about the problem, when the problem is identified, make the fix**:
+   ```rust
+   // In crates/net/discv4/src/lib.rs
+   pub fn resolve_external_ip() -> Option<IpAddr> {
+       // Add fallback mechanism
+       nat::external_ip()
+           .or_else(|| nat::external_ip_from_stun())
+           .or_else(|| Some(DEFAULT_IP))
+   }
+   ```
+
+4. **Add a test**:
+   ```rust
+   #[test]
+   fn test_external_ip_fallback() {
+       // Test that resolution has proper fallbacks
+   }
+   ```
+
+5. **Run checks** (IMPORTANT!):
+   ```bash
+   cargo +nightly fmt --all
+   cargo clippy --workspace --all-features # Make sure WHOLE WORKSPACE compiles!
+   cargo nextest run -p reth-discv4
+   ```
+
+6. **Commit with clear message**:
+   ```bash
+   git commit -m "fix: add fallback for external IP resolution
+
+   Previously, node startup could fail if external IP resolution
+   failed. This adds fallback mechanisms to ensure the node can
+   always start with a reasonable default."
+   ```
+
+## Quick Reference
+
+### Essential Commands
+
+```bash
+# Format code
+cargo +nightly fmt --all
+
+# Run lints
+cargo +nightly clippy --workspace --all-features
+
+# Run tests
+cargo nextest run --workspace
+
+# Run specific benchmark
+cargo bench --bench bench_name
+
+# Build optimized binary
+cargo build --release
+
+# Check compilation for all features
+cargo check --workspace --all-features
+
+# Check documentation
+cargo docs --document-private-items
+
+# Regenerate CLI reference docs (after CLI changes)
+make update-book-cli
+```

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "2.0.0"
+version = "1.11.1"
 edition = "2024"
 rust-version = "1.93"
 license = "MIT OR Apache-2.0"
@@ -9,8 +9,8 @@ exclude = [".github/"]
 
 [workspace]
 members = [
-    "bin/reth-bb/",
     "bin/reth-bench/",
+    "bin/reth-bench-compare/",
     "bin/reth/",
     "crates/storage/rpc-provider/",
     "crates/chain-state/",
@@ -27,7 +27,6 @@ members = [
     "crates/engine/invalid-block-hooks/",
     "crates/engine/local",
     "crates/engine/primitives/",
-    "crates/engine/execution-cache/",
     "crates/engine/tree/",
     "crates/engine/util/",
     "crates/era",
@@ -78,6 +77,8 @@ members = [
     "crates/payload/primitives/",
     "crates/payload/validator/",
     "crates/payload/util/",
+    "crates/primitives-traits/",
+    "crates/primitives/",
     "crates/prune/db",
     "crates/prune/prune",
     "crates/prune/types",
@@ -99,6 +100,8 @@ members = [
     "crates/stages/types/",
     "crates/static-file/static-file",
     "crates/static-file/types/",
+    "crates/storage/codecs/",
+    "crates/storage/codecs/derive/",
     "crates/storage/db-api/",
     "crates/storage/db-common",
     "crates/storage/db-models/",
@@ -109,6 +112,7 @@ members = [
     "crates/storage/nippy-jar/",
     "crates/storage/provider/",
     "crates/storage/storage-api/",
+    "crates/storage/zstd-compressors/",
     "crates/tasks/",
     "crates/tokio-util/",
     "crates/tracing/",
@@ -134,6 +138,7 @@ members = [
     "examples/exex-subscription",
     "examples/exex-test",
     "examples/full-contract-state",
+    "examples/migrate-trie-to-packed",
     "examples/manual-p2p/",
     "examples/network-txpool/",
     "examples/network/",
@@ -165,7 +170,6 @@ rust.rust_2018_idioms = { level = "deny", priority = -1 }
 rust.unreachable_pub = "warn"
 rust.unused_must_use = "deny"
 rust.rust_2024_incompatible_pat = "warn"
-rust.unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
 rustdoc.all = "warn"
 # rust.unnameable-types = "warn"
 
@@ -319,14 +323,15 @@ reth = { path = "bin/reth" }
 reth-storage-rpc-provider = { path = "crates/storage/rpc-provider" }
 reth-basic-payload-builder = { path = "crates/payload/basic" }
 reth-bench = { path = "bin/reth-bench" }
+reth-bench-compare = { path = "bin/reth-bench-compare" }
 reth-chain-state = { path = "crates/chain-state" }
 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 = { version = "0.3.0", default-features = false }
-reth-codecs-derive = "0.3.0"
+reth-codecs = { path = "crates/storage/codecs" }
+reth-codecs-derive = { path = "crates/storage/codecs/derive" }
 reth-config = { path = "crates/config", default-features = false }
 reth-consensus = { path = "crates/consensus/consensus", default-features = false }
 reth-consensus-common = { path = "crates/consensus/common", default-features = false }
@@ -342,7 +347,6 @@ reth-downloaders = { path = "crates/net/downloaders" }
 reth-e2e-test-utils = { path = "crates/e2e-test-utils" }
 reth-ecies = { path = "crates/net/ecies" }
 reth-engine-local = { path = "crates/engine/local" }
-reth-execution-cache = { path = "crates/engine/execution-cache" }
 reth-engine-primitives = { path = "crates/engine/primitives", default-features = false }
 reth-engine-tree = { path = "crates/engine/tree" }
 reth-engine-util = { path = "crates/engine/util" }
@@ -394,7 +398,8 @@ reth-payload-builder-primitives = { path = "crates/payload/builder-primitives" }
 reth-payload-primitives = { path = "crates/payload/primitives" }
 reth-payload-validator = { path = "crates/payload/validator" }
 reth-payload-util = { path = "crates/payload/util" }
-reth-primitives-traits = { version = "0.3.0", default-features = false }
+reth-primitives = { path = "crates/primitives", default-features = false, features = ["__internal"] }
+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", default-features = false }
@@ -410,7 +415,6 @@ reth-rpc-eth-types = { path = "crates/rpc/rpc-eth-types", default-features = fal
 reth-rpc-layer = { path = "crates/rpc/rpc-layer" }
 reth-rpc-server-types = { path = "crates/rpc/rpc-server-types" }
 reth-rpc-convert = { path = "crates/rpc/rpc-convert" }
-reth-rpc-traits = { version = "0.3.0", default-features = false }
 reth-stages = { path = "crates/stages/stages" }
 reth-stages-api = { path = "crates/stages/api" }
 reth-stages-types = { path = "crates/stages/types", default-features = false }
@@ -429,59 +433,70 @@ 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 = { version = "0.3.0", default-features = false }
+reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-features = false }
 
 # revm
-revm = { version = "37.0.0", default-features = false }
-revm-bytecode = { version = "10.0.0", default-features = false }
-revm-database = { version = "13.0.0", default-features = false }
-revm-state = { version = "11.0.0", default-features = false }
-revm-primitives = { version = "23.0.0", default-features = false }
-revm-interpreter = { version = "35.0.0", default-features = false }
-revm-database-interface = { version = "11.0.0", default-features = false }
-revm-inspectors = "0.38.0"
+revm = { version = "34.0.0", default-features = false }
+revm-bytecode = { version = "8.0.0", default-features = false }
+revm-database = { version = "10.0.0", default-features = false }
+revm-state = { version = "9.0.0", default-features = false }
+revm-primitives = { version = "22.0.0", default-features = false }
+revm-interpreter = { version = "32.0.0", default-features = false }
+revm-database-interface = { version = "9.0.0", default-features = false }
+op-revm = { version = "15.0.0", default-features = false }
+revm-inspectors = "0.34.2"
 
 # eth
 alloy-dyn-abi = "1.5.6"
 alloy-primitives = { version = "1.5.6", default-features = false, features = ["map-foldhash"] }
 alloy-sol-types = { version = "1.5.6", default-features = false }
 
-alloy-chains = { version = "0.2.33", default-features = false }
+alloy-chains = { version = "0.2.5", default-features = false }
 alloy-eip2124 = { version = "0.2.0", default-features = false }
 alloy-eip7928 = { version = "0.3.0", default-features = false }
-alloy-evm = { version = "0.32.0", default-features = false }
+alloy-evm = { version = "0.27.2", default-features = false }
 alloy-rlp = { version = "0.3.13", default-features = false, features = ["core-net"] }
 alloy-trie = { version = "0.9.4", default-features = false }
 
-alloy-hardforks = "0.4.7"
+alloy-hardforks = "0.4.5"
 
-alloy-consensus = { version = "2.0.0", default-features = false }
-alloy-contract = { version = "2.0.0", default-features = false }
-alloy-eips = { version = "2.0.0", default-features = false }
-alloy-genesis = { version = "2.0.0", default-features = false }
-alloy-json-rpc = { version = "2.0.0", default-features = false }
-alloy-network = { version = "2.0.0", default-features = false }
-alloy-network-primitives = { version = "2.0.0", default-features = false }
-alloy-provider = { version = "2.0.0", features = ["reqwest", "debug-api"], default-features = false }
-alloy-pubsub = { version = "2.0.0", default-features = false }
-alloy-rpc-client = { version = "2.0.0", default-features = false }
-alloy-rpc-types = { version = "2.0.0", features = ["eth"], default-features = false }
-alloy-rpc-types-admin = { version = "2.0.0", default-features = false }
-alloy-rpc-types-anvil = { version = "2.0.0", default-features = false }
-alloy-rpc-types-beacon = { version = "2.0.0", default-features = false }
-alloy-rpc-types-debug = { version = "2.0.0", default-features = false }
-alloy-rpc-types-engine = { version = "2.0.0", default-features = false }
-alloy-rpc-types-eth = { version = "2.0.0", default-features = false }
-alloy-rpc-types-mev = { version = "2.0.0", default-features = false }
-alloy-rpc-types-trace = { version = "2.0.0", default-features = false }
-alloy-rpc-types-txpool = { version = "2.0.0", default-features = false }
-alloy-serde = { version = "2.0.0", default-features = false }
-alloy-signer = { version = "2.0.0", default-features = false }
-alloy-signer-local = { version = "2.0.0", default-features = false }
-alloy-transport = { version = "2.0.0" }
-alloy-transport-http = { version = "2.0.0", features = ["reqwest-rustls-tls"], default-features = false }
-alloy-transport-ipc = { version = "2.0.0", default-features = false }
-alloy-transport-ws = { version = "2.0.0", default-features = false }
+alloy-consensus = { version = "1.7.3", default-features = false }
+alloy-contract = { version = "1.7.3", default-features = false }
+alloy-eips = { version = "1.7.3", default-features = false }
+alloy-genesis = { version = "1.7.3", default-features = false }
+alloy-json-rpc = { version = "1.7.3", default-features = false }
+alloy-network = { version = "1.7.3", default-features = false }
+alloy-network-primitives = { version = "1.7.3", default-features = false }
+alloy-provider = { version = "1.7.3", features = ["reqwest", "debug-api"], default-features = false }
+alloy-pubsub = { version = "1.7.3", default-features = false }
+alloy-rpc-client = { version = "1.7.3", default-features = false }
+alloy-rpc-types = { version = "1.7.3", features = ["eth"], default-features = false }
+alloy-rpc-types-admin = { version = "1.7.3", default-features = false }
+alloy-rpc-types-anvil = { version = "1.7.3", default-features = false }
+alloy-rpc-types-beacon = { version = "1.7.3", default-features = false }
+alloy-rpc-types-debug = { version = "1.7.3", default-features = false }
+alloy-rpc-types-engine = { version = "1.7.3", default-features = false }
+alloy-rpc-types-eth = { version = "1.7.3", default-features = false }
+alloy-rpc-types-mev = { version = "1.7.3", default-features = false }
+alloy-rpc-types-trace = { version = "1.7.3", default-features = false }
+alloy-rpc-types-txpool = { version = "1.7.3", default-features = false }
+alloy-serde = { version = "1.7.3", default-features = false }
+alloy-signer = { version = "1.7.3", default-features = false }
+alloy-signer-local = { version = "1.7.3", default-features = false }
+alloy-transport = { version = "1.7.3" }
+alloy-transport-http = { version = "1.7.3", features = ["reqwest-rustls-tls"], default-features = false }
+alloy-transport-ipc = { version = "1.7.3", default-features = false }
+alloy-transport-ws = { version = "1.7.3", default-features = false }
+
+# op
+alloy-op-evm = { version = "0.27.2", default-features = false }
+alloy-op-hardforks = "0.4.4"
+op-alloy-rpc-types = { version = "0.23.1", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.23.1", default-features = false }
+op-alloy-network = { version = "0.23.1", default-features = false }
+op-alloy-consensus = { version = "0.23.1", default-features = false }
+op-alloy-rpc-jsonrpsee = { version = "0.23.1", default-features = false }
+op-alloy-flz = { version = "0.13.1", default-features = false }
 
 # misc
 either = { version = "1.15.0", default-features = false }
@@ -493,7 +508,6 @@ bincode = "1.3"
 bitflags = "2.4"
 boyer-moore-magiclen = "0.2.16"
 bytes = { version = "1.11.1", default-features = false }
-blake3 = "1.8"
 brotli = "8"
 cfg-if = "1.0"
 clap = "4"
@@ -509,7 +523,6 @@ humantime = "2.1"
 humantime-serde = "1.1"
 itertools = { version = "0.14", default-features = false }
 linked_hash_set = "0.1"
-libc = "0.2"
 lz4 = "1.28.1"
 modular-bitfield = "0.13.1"
 notify = { version = "8.0.0", default-features = false, features = ["macos_fsevent"] }
@@ -528,7 +541,6 @@ 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 }
 shlex = "1.3"
-slotmap = "1"
 smallvec = "1"
 strum = { version = "0.27", default-features = false }
 strum_macros = "0.27"
@@ -558,7 +570,7 @@ proc-macro2 = "1.0"
 quote = "1.0"
 
 # tokio
-tokio = { version = "1.51.1", default-features = false }
+tokio = { version = "1.44.2", default-features = false }
 tokio-stream = "0.1.11"
 tokio-tungstenite = "0.28.0"
 tokio-util = { version = "0.7.4", features = ["codec"] }
@@ -570,10 +582,10 @@ async-trait = "0.1.68"
 futures = "0.3"
 futures-core = "0.3"
 futures-util = { version = "0.3", default-features = false }
-hyper = "1.9"
+hyper = "1.3"
 hyper-util = "0.1.5"
 pin-project = "1.0.12"
-reqwest = { version = "0.13", default-features = false, features = ["rustls", "stream"] }
+reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "rustls-tls-native-roots", "stream"] }
 tracing-futures = "0.2"
 tower = "0.5"
 tower-http = "0.6"
@@ -623,7 +635,7 @@ tracing-opentelemetry = "0.32"
 arbitrary = "1.3"
 assert_matches = "1.5.0"
 criterion = { package = "codspeed-criterion-compat", version = "4.3" }
-insta = "1.47"
+insta = "1.41"
 proptest = "1.7"
 proptest-derive = "0.7"
 similar-asserts = { version = "1.5.0", features = ["serde"] }
@@ -639,7 +651,6 @@ ethereum_ssz_derive = "0.10.1"
 # allocators
 jemalloc_pprof = { version = "0.8", default-features = false }
 tikv-jemalloc-ctl = "0.6"
-tikv-jemalloc-sys = "0.6"
 tikv-jemallocator = "0.6"
 tracy-client = { version = "0.18.0", features = ["demangle"] }
 snmalloc-rs = { version = "0.3.7", features = ["build_cc"] }
@@ -654,7 +665,6 @@ cipher = "0.4.3"
 comfy-table = "7.0"
 concat-kdf = "0.1.0"
 crossbeam-channel = "0.5.13"
-crossbeam-queue = "0.3"
 crossbeam-utils = "0.8"
 crossterm = "0.29.0"
 csv = "1.3.0"
@@ -671,8 +681,10 @@ indexmap = "2"
 interprocess = "2.2.0"
 lz4_flex = { version = "0.12", 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.30", default-features = false }
@@ -685,7 +697,7 @@ snap = "1.1.1"
 socket2 = { version = "0.6", default-features = false }
 sysinfo = { version = "0.38", default-features = false }
 tracing-journald = "0.3"
-tracing-logfmt = "0.3.7"
+tracing-logfmt = "=0.3.5"
 tracing-samply = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false }
 tracing-tracy = "0.11"
@@ -700,17 +712,52 @@ vergen-git2 = "9.1.0"
 ipnet = "2.11"
 
 [patch.crates-io]
-revm = { git = "https://github.com/bluealloy/revm", rev = "89ecb25dbe49e1c3a10d99529e42f027d0bd2386" }
-revm-bytecode = { git = "https://github.com/bluealloy/revm", rev = "89ecb25dbe49e1c3a10d99529e42f027d0bd2386" }
-revm-database = { git = "https://github.com/bluealloy/revm", rev = "89ecb25dbe49e1c3a10d99529e42f027d0bd2386" }
-revm-state = { git = "https://github.com/bluealloy/revm", rev = "89ecb25dbe49e1c3a10d99529e42f027d0bd2386" }
-revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "89ecb25dbe49e1c3a10d99529e42f027d0bd2386" }
-revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "89ecb25dbe49e1c3a10d99529e42f027d0bd2386" }
-revm-database-interface = { git = "https://github.com/bluealloy/revm", rev = "89ecb25dbe49e1c3a10d99529e42f027d0bd2386" }
-revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "c6f88bbe7186d863f4667dd43c42608eb7a8ba5c" }
-alloy-evm = { git = "https://github.com/alloy-rs/evm", rev = "ff0bbec9ccaa818155e25003a77f4d73d350bbd7" }
-reth-codecs = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498871bc1b1d42c6dcf28968c271660de8c0" }
-reth-codecs-derive = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498871bc1b1d42c6dcf28968c271660de8c0" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498871bc1b1d42c6dcf28968c271660de8c0" }
-reth-rpc-traits = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498871bc1b1d42c6dcf28968c271660de8c0" }
-reth-zstd-compressors = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498871bc1b1d42c6dcf28968c271660de8c0" }
+# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
+
+# op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
+# op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
+# op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
+# op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
+# op-alloy-rpc-jsonrpsee = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
+#
+# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "1207e33" }
+#
+# 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" }
+
+# alloy-evm = { git = "https://github.com/alloy-rs/evm", rev = "df124c0" }
+# alloy-op-evm = { git = "https://github.com/alloy-rs/evm", rev = "df124c0" }
+
+# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "3020ea8" }
+
+# alloy-evm = { git = "https://github.com/alloy-rs/evm", rev = "072c248" }
+# alloy-op-evm = { git = "https://github.com/alloy-rs/evm", rev = "072c248" }

Makefile

@@ -17,9 +17,6 @@ FEATURES ?=
 # Cargo profile for builds. Default is for local builds, CI uses an override.
 PROFILE ?= release
 
-# Extra RUSTFLAGS to append to build targets (e.g., "-C target-cpu=x86-64-v3")
-EXTRA_RUSTFLAGS ?=
-
 # Extra flags for Cargo
 CARGO_INSTALL_EXTRA_FLAGS ?=
 
@@ -70,14 +67,14 @@ build-%-reproducible:
 	LC_ALL=C \
 	TZ=UTC \
 	JEMALLOC_OVERRIDE=/usr/lib/x86_64-linux-gnu/libjemalloc.a \
-	cargo build --bin reth --features "$(FEATURES)" --profile "reproducible" --locked --target x86_64-unknown-linux-gnu
+	cargo build --bin reth --features "$(FEATURES) jemalloc-unprefixed" --profile "reproducible" --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)"
 # Builds the reth binary natively.
 build-native-%:
-	$(if $(EXTRA_RUSTFLAGS),RUSTFLAGS="$(EXTRA_RUSTFLAGS)") cargo build --bin reth --target $* --features "$(FEATURES)" --profile "$(PROFILE)"
+	cargo build --bin reth --target $* --features "$(FEATURES)" --profile "$(PROFILE)"
 
 # The following commands use `cross` to build a cross-compile.
 #
@@ -95,12 +92,11 @@ build-native-%:
 # on other systems. JEMALLOC_SYS_WITH_LG_PAGE=16 tells jemalloc to use 64-KiB
 # pages. See: https://github.com/paradigmxyz/reth/issues/6742
 build-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16
-build-native-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16
 
 # Note: The additional rustc compiler flags are for intrinsics needed by MDBX.
 # See: https://github.com/cross-rs/cross/wiki/FAQ#undefined-reference-with-build-std
 build-%:
-	RUSTFLAGS="-C link-arg=-lgcc -Clink-arg=-static-libgcc $(EXTRA_RUSTFLAGS)" \
+	RUSTFLAGS="-C link-arg=-lgcc -Clink-arg=-static-libgcc" \
 		cross build --bin reth --target $* --features "$(FEATURES)" --profile "$(PROFILE)"
 
 # Unfortunately we can't easily use cross to build for Darwin because of licensing issues.

README.md

@@ -7,9 +7,9 @@
 
 **Modular, contributor-friendly and blazing-fast implementation of the Ethereum protocol**
 
-![](./assets/reth-2.png)
+![](./assets/reth-prod.png)
 
-**[Install](https://reth.rs/installation/installation)**
+**[Install](https://paradigmxyz.github.io/reth/installation/installation.html)**
 | [User Docs](https://reth.rs)
 | [Developer Docs](./docs)
 | [Crate Docs](https://reth.rs/docs)
@@ -18,43 +18,51 @@
 [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
 
+> **Note: OP-Reth has moved**
+>
+> The Optimism (op-reth) crates have been moved to [ethereum-optimism/optimism](https://github.com/ethereum-optimism/optimism).
+> Git contribution history has been preserved. If you are looking for op-reth, please see the new repository.
+
 ## What is Reth?
 
-Reth (short for Rust Ethereum, [pronunciation](https://x.com/kelvinfichter/status/1597653609411268608)) is a production-ready Ethereum execution layer client focused on modularity, performance, and user-friendliness. Reth is compatible with all Ethereum Consensus Layer (CL) implementations that support the [Engine API](https://github.com/ethereum/execution-apis/tree/a0d03086564ab1838b462befbc083f873dcf0c0f/src/engine). It is built and driven forward by [Paradigm](https://paradigm.xyz/), and is licensed under the Apache and MIT licenses.
-
-> **Note:** OP-Reth has moved to [ethereum-optimism/optimism](https://github.com/ethereum-optimism/optimism). Git history has been preserved.
+Reth (short for Rust Ethereum, [pronunciation](https://x.com/kelvinfichter/status/1597653609411268608)) is a new Ethereum full node implementation that is focused on being user-friendly, highly modular, as well as being fast and efficient. Reth is an Execution Layer (EL) and is compatible with all Ethereum Consensus Layer (CL) implementations that support the [Engine API](https://github.com/ethereum/execution-apis/tree/a0d03086564ab1838b462befbc083f873dcf0c0f/src/engine). It is originally built and driven forward by [Paradigm](https://paradigm.xyz/), and is licensed under the Apache and MIT licenses.
 
 ## Goals
 
-1. **Modularity**: Every component is built to be used as a library: well-tested, documented and benchmarked. Import crates, mix and match, and innovate on top of them. Learn more about the project's components [here](./docs/repo/layout.md).
-2. **Performance**: Built with Rust, [Alloy](https://github.com/alloy-rs/alloy/), [revm](https://github.com/bluealloy/revm/), and [Foundry](https://github.com/foundry-rs/foundry/) — battle-tested and optimized for speed. Check the [ethPandaOps Lab Dashboard](https://lab.ethpandaops.io/ethereum/execution/timings) for a third-party comparison against other Ethereum clients.
-Here's what that looks like in practice, measured with [reth-bench](https://github.com/paradigmxyz/reth/tree/main/bin/reth-bench) on Ethereum Mainnet:
+As a full Ethereum node, Reth allows users to connect to the Ethereum network and interact with the Ethereum blockchain. This includes sending and receiving transactions/logs/traces, as well as accessing and interacting with smart contracts. Building a successful Ethereum node requires creating a high-quality implementation that is both secure and efficient, as well as being easy to use on consumer hardware. It also requires building a strong community of contributors who can help support and improve the software.
 
-![](./assets/reth-perf.png)
+More concretely, our goals are:
 
-3. **Free for anyone to use any way they want**: Apache/MIT licensed, no business license restrictions.
-4. **Client Diversity**: More client implementations make Ethereum more antifragile.
-5. **Support as many EVM chains as possible**: Reth can sync Ethereum and other EVM chains. If you're building one, reach out.
-6. **Configurability**: Profiles for different use cases — from high-performance RPC operators to hobbyists on consumer hardware.
+1. **Modularity**: Every component of Reth is built to be used as a library: well-tested, heavily documented and benchmarked. We envision that developers will import the node's crates, mix and match, and innovate on top of them. Examples of such usage include but are not limited to spinning up standalone P2P networks, talking directly to a node's database, or "unbundling" the node into the components you need. To achieve that, we are licensing Reth under the Apache/MIT permissive license. You can learn more about the project's components [here](./docs/repo/layout.md).
+2. **Performance**: Reth aims to be fast, so we use Rust and the [Erigon staged-sync](https://erigon.substack.com/p/erigon-stage-sync-and-control-flows) node architecture. We also use our Ethereum libraries (including [Alloy](https://github.com/alloy-rs/alloy/) and [revm](https://github.com/bluealloy/revm/)) which we've battle-tested and optimized via [Foundry](https://github.com/foundry-rs/foundry/).
+3. **Free for anyone to use any way they want**: Reth is free open source software, built for the community, by the community. By licensing the software under the Apache/MIT license, we want developers to use it without being bound by business licenses, or having to think about the implications of GPL-like licenses.
+4. **Client Diversity**: The Ethereum protocol becomes more antifragile when no node implementation dominates. This ensures that if there's a software bug, the network does not finalize a bad block. By building a new client, we hope to contribute to Ethereum's antifragility.
+5. **Support as many EVM chains as possible**: We aspire that Reth can full-sync not only Ethereum, but also other chains like Optimism, Polygon, BNB Smart Chain, and more. If you're working on any of these projects, please reach out. Note: OP-Reth has moved to [ethereum-optimism/optimism](https://github.com/ethereum-optimism/optimism).
+6. **Configurability**: We want to solve for node operators that care about fast historical queries, but also for hobbyists who cannot operate on large hardware. We also want to support teams and individuals who want both sync from genesis and via "fast sync". We envision that Reth will be configurable enough and provide configurable "profiles" for the tradeoffs that each team faces.
 
 ## Status
 
 Reth is production ready, and suitable for usage in mission-critical environments such as staking or high-uptime services. We also actively recommend professional node operators to switch to Reth in production for performance and cost reasons in use cases where high performance with great margins is required such as RPC, MEV, Indexing, Simulations, and P2P activities.
 
-- We released **Reth 2.0** in April 2026. See the [release notes](https://github.com/paradigmxyz/reth/releases/tag/v2.0.0) and [blog post](https://www.paradigm.xyz/2026/04/releasing-reth-2-0).
+More historical context below:
+
 - We released 1.0 "production-ready" stable Reth in June 2024.
   - Reth completed an audit with [Sigma Prime](https://sigmaprime.io/), the developers of [Lighthouse](https://github.com/sigp/lighthouse), the Rust Consensus Layer implementation. Find it [here](./audit/sigma_prime_audit_v2.pdf).
-  - Revm (the EVM used in Reth) underwent an audit with [Guido Vranken](https://x.com/guidovranken) (#1 [Ethereum Bug Bounty](https://ethereum.org/en/bug-bounty)).
+  - Revm (the EVM used in Reth) underwent an audit with [Guido Vranken](https://x.com/guidovranken) (#1 [Ethereum Bug Bounty](https://ethereum.org/en/bug-bounty)). We will publish the results soon.
 - We released multiple iterative beta versions, up to [beta.9](https://github.com/paradigmxyz/reth/releases/tag/v0.2.0-beta.9) on Monday June 3, 2024, the last beta release.
 - We released [beta](https://github.com/paradigmxyz/reth/releases/tag/v0.2.0-beta.1) on Monday March 4, 2024, our first breaking change to the database model, providing faster query speed, smaller database footprint, and allowing "history" to be mounted on separate drives.
 - We shipped iterative improvements until the last alpha release on February 28, 2024, [0.1.0-alpha.21](https://github.com/paradigmxyz/reth/releases/tag/v0.1.0-alpha.21).
 - We [initially announced](https://www.paradigm.xyz/2023/06/reth-alpha) [0.1.0-alpha.1](https://github.com/paradigmxyz/reth/releases/tag/v0.1.0-alpha.1) on June 20, 2023.
 
-### Storage compatibility
+### Database compatibility
 
-Storage V2 is the default for new nodes in Reth 2.0. Existing V1 nodes continue to work, but V1 support will be removed in a future release — all users are encouraged to migrate. V2 snapshots are available at [snapshots.reth.rs](https://snapshots.reth.rs/).
+We do not have any breaking database changes since beta.1, and we do not plan any in the near future.
 
-![](./assets/reth-storage.png)
+Reth [v0.2.0-beta.1](https://github.com/paradigmxyz/reth/releases/tag/v0.2.0-beta.1) includes
+a [set of breaking database changes](https://github.com/paradigmxyz/reth/pull/5191) that makes it impossible to use database files produced by earlier versions.
+
+If you had a database produced by alpha versions of Reth, you need to drop it with `reth db drop`
+(using the same arguments such as `--config` or `--datadir` that you passed to `reth node`), and resync using the same `reth node` command you've used before.
 
 ## For Users