chore: release 1.11.3

Co-authored-by: Amp <amp@ampcode.com>

.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/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/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/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-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-waves-smile.md

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

.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/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/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/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/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/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/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-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/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.

.changelog/zesty-clouds-wave.md

@@ -0,0 +1,5 @@
+---
+reth-trie: patch
+---
+
+Fixed a potential panic in `ProofCalculator` by clearing internal computation state (`branch_stack`, `child_stack`, `branch_path`, etc.) after errors, preventing stale state from causing `usize` underflow panics when the calculator is reused. Added a test verifying correct behavior after simulated mid-computation errors.

.config/nextest.toml

@@ -1,6 +1,6 @@
 [profile.default]
 retries = { backoff = "exponential", count = 2, delay = "2s", jitter = true }
-slow-timeout = { period = "30s", terminate-after = 2 }
+slow-timeout = { period = "30s", terminate-after = 4 }
 
 [[profile.default.overrides]]
 filter = "test(general_state_tests)"

.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.

.dockerignore

@@ -20,11 +20,6 @@
 # include dist directory, where the reth binary is located after compilation
 !/dist
 
-# include PGO build helper used by Dockerfile.depot
-!/.github
-!/.github/scripts
-!/.github/scripts/build_pgo_bolt.sh
-
 # include licenses
 !LICENSE-*
 

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 *                           @gakonst
 crates/chain-state/         @fgimenez @mattsse
 crates/chainspec/           @Rjected @joshieDo @mattsse
-crates/cli/                 @mattsse @Rjected
+crates/cli/                 @mattsse
 crates/config/              @shekhirin @mattsse @Rjected 
 crates/consensus/           @mattsse @Rjected
 crates/e2e-test-utils/      @mattsse @Rjected @klkvr @fgimenez

.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

@@ -1,144 +0,0 @@
-#!/usr/bin/env bash
-#
-# Builds (or fetches from cache) reth binaries for benchmarking.
-#
-# Usage: bench-reth-build.sh <baseline|feature> <source-dir> <commit> [branch-sha]
-#
-#   baseline — build/fetch the baseline binary at <commit> (merge-base)
-#              source-dir must be checked out at <commit>
-#   feature  — build/fetch the candidate binary + reth-bench at <commit>
-#              source-dir must be checked out at <commit>
-#              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
-#
-# Required: mc (MinIO client) with a configured alias
-# Optional env: BENCH_BIG_BLOCKS (true/false) — build reth-bb instead of reth
-set -euxo 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() {
-  local binary="$1" expected_commit="$2"
-  local version binary_sha
-  version=$("$binary" --version 2>/dev/null) || return 1
-  binary_sha=$(echo "$version" | sed -n 's/^Commit SHA: *//p')
-  if [ -z "$binary_sha" ]; then
-    echo "Warning: could not extract commit SHA from version output"
-    return 1
-  fi
-  if [ "$binary_sha" = "$expected_commit" ]; then
-    return 0
-  fi
-  echo "Cache mismatch: binary built from ${binary_sha} but expected ${expected_commit}"
-  return 1
-}
-
-case "$MODE" in
-  baseline|main)
-    BUCKET="minio/reth-binaries/${COMMIT}${BUILD_SUFFIX}"
-    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
-        CACHE_VALID=true
-      else
-        echo "Cached baseline binary is stale or download failed, rebuilding..."
-      fi
-    fi
-    if [ "$CACHE_VALID" = false ]; then
-      echo "Building baseline ${NODE_BIN} (${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}"
-    fi
-    ;;
-
-  feature|branch)
-    BRANCH_SHA="${4:-$COMMIT}"
-    BUCKET="minio/reth-binaries/${BRANCH_SHA}${BUILD_SUFFIX}"
-
-    CACHE_VALID=false
-    if $MC stat --no-list "${BUCKET}/${NODE_BIN}" &>/dev/null && $MC stat --no-list "${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
-        CACHE_VALID=true
-      else
-        echo "Cached feature binary is stale or download failed, rebuilding..."
-      fi
-    fi
-    if [ "$CACHE_VALID" = false ]; then
-      echo "Building feature ${NODE_BIN} (${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 install-reth-bench
-      $MC cp "target/profiling/${NODE_BIN}" "${BUCKET}/${NODE_BIN}"
-      $MC cp "$(which reth-bench)" "${BUCKET}/reth-bench"
-    fi
-    ;;
-
-  *)
-    echo "Usage: $0 <baseline|feature> <source-dir> <commit> [branch-sha]"
-    exit 1
-    ;;
-esac

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

@@ -1,260 +0,0 @@
-#!/usr/bin/env python3
-"""Generate benchmark charts from reth-bench CSV output.
-
-Usage:
-    bench-engine-charts.py <combined_csv> --output-dir <dir> [--baseline <baseline_csv>]
-
-Generates three PNG charts:
-  1. newPayload latency + Ggas/s per block (+ latency diff when baseline present)
-  2. Wait breakdown (persistence, execution cache, sparse trie) per block
-  3. Scatter plot of gas used vs latency
-
-When --baseline is provided, charts overlay both datasets for comparison.
-"""
-
-import argparse
-import csv
-import sys
-from pathlib import Path
-
-import numpy as np
-
-try:
-    import matplotlib
-
-    matplotlib.use("Agg")
-    import matplotlib.pyplot as plt
-except ImportError:
-    print("matplotlib is required: pip install matplotlib", file=sys.stderr)
-    sys.exit(1)
-
-GIGAGAS = 1_000_000_000
-
-
-def parse_combined_csv(path: str) -> list[dict]:
-    rows = []
-    with open(path) as f:
-        reader = csv.DictReader(f)
-        for row in reader:
-            rows.append(
-                {
-                    "block_number": int(row["block_number"]),
-                    "gas_used": int(row["gas_used"]),
-                    "new_payload_latency_us": int(row["new_payload_latency"]),
-                    "persistence_wait_us": int(row["persistence_wait"])
-                    if row.get("persistence_wait")
-                    else None,
-                    "execution_cache_wait_us": int(row.get("execution_cache_wait", 0)),
-                    "sparse_trie_wait_us": int(row.get("sparse_trie_wait", 0)),
-                }
-            )
-    return rows
-
-
-def plot_latency_and_throughput(
-    feature: list[dict], baseline: list[dict] | None, out: Path,
-    baseline_name: str = "baseline", feature_name: str = "feature",
-):
-    num_plots = 3 if baseline else 2
-    fig, axes = plt.subplots(num_plots, 1, figsize=(12, 4 * num_plots), sharex=True)
-    ax1, ax2 = axes[0], axes[1]
-
-    feat_x = [r["block_number"] for r in feature]
-    feat_lat = [r["new_payload_latency_us"] / 1_000 for r in feature]
-    feat_ggas = []
-    for r in feature:
-        lat_s = r["new_payload_latency_us"] / 1_000_000
-        feat_ggas.append(r["gas_used"] / lat_s / GIGAGAS if lat_s > 0 else 0)
-
-    if baseline:
-        base_x = [r["block_number"] for r in baseline]
-        base_lat = [r["new_payload_latency_us"] / 1_000 for r in baseline]
-        base_ggas = []
-        for r in baseline:
-            lat_s = r["new_payload_latency_us"] / 1_000_000
-            base_ggas.append(r["gas_used"] / lat_s / GIGAGAS if lat_s > 0 else 0)
-        l, = ax1.plot(base_x, base_lat, linewidth=0.8, label=baseline_name, alpha=0.7)
-        ax1.axhline(np.median(base_lat), color=l.get_color(), linestyle="--", linewidth=1, alpha=0.7, label=f"{baseline_name} median")
-        l, = ax2.plot(base_x, base_ggas, linewidth=0.8, label=baseline_name, alpha=0.7)
-        ax2.axhline(np.median(base_ggas), color=l.get_color(), linestyle="--", linewidth=1, alpha=0.7, label=f"{baseline_name} median")
-
-    l, = ax1.plot(feat_x, feat_lat, linewidth=0.8, label=feature_name)
-    ax1.axhline(np.median(feat_lat), color=l.get_color(), linestyle="--", linewidth=1, label=f"{feature_name} median")
-    ax1.set_ylabel("Latency (ms)")
-    ax1.set_title("newPayload Latency per Block")
-    ax1.grid(True, alpha=0.3)
-    ax1.legend()
-
-    l, = ax2.plot(feat_x, feat_ggas, linewidth=0.8, label=feature_name)
-    ax2.axhline(np.median(feat_ggas), color=l.get_color(), linestyle="--", linewidth=1, label=f"{feature_name} median")
-    ax2.set_ylabel("Ggas/s")
-    ax2.set_title("Execution Throughput per Block")
-    ax2.grid(True, alpha=0.3)
-    ax2.legend()
-
-    if baseline:
-        ax3 = axes[2]
-        base_by_block = {r["block_number"]: r["new_payload_latency_us"] for r in baseline}
-        blocks, diffs = [], []
-        for r in feature:
-            bn = r["block_number"]
-            if bn in base_by_block and base_by_block[bn] > 0:
-                pct = (r["new_payload_latency_us"] - base_by_block[bn]) / base_by_block[bn] * 100
-                blocks.append(bn)
-                diffs.append(pct)
-        if blocks:
-            colors = ["green" if d <= 0 else "red" for d in diffs]
-            ax3.bar(blocks, diffs, width=1.0, color=colors, alpha=0.7, edgecolor="none")
-            ax3.axhline(0, color="black", linewidth=0.5)
-        ax3.set_ylabel("Δ Latency (%)")
-        ax3.set_title("Per-Block newPayload Latency Change (feature vs baseline)")
-        ax3.grid(True, alpha=0.3, axis="y")
-
-    axes[-1].set_xlabel("Block Number")
-    fig.tight_layout()
-    fig.savefig(out, dpi=150)
-    plt.close(fig)
-
-
-def plot_wait_breakdown(
-    feature: list[dict], baseline: list[dict] | None, out: Path,
-    baseline_name: str = "baseline", feature_name: str = "feature",
-):
-    series = [
-        ("Persistence Wait", "persistence_wait_us"),
-        ("State Cache Wait", "execution_cache_wait_us"),
-        ("Trie Cache Wait", "sparse_trie_wait_us"),
-    ]
-
-    fig, axes = plt.subplots(len(series), 1, figsize=(12, 3 * len(series)), sharex=True)
-    for ax, (label, key) in zip(axes, series):
-        if baseline:
-            bx = [r["block_number"] for r in baseline if r[key] is not None]
-            by = [r[key] / 1_000 for r in baseline if r[key] is not None]
-            if bx:
-                ax.plot(bx, by, linewidth=0.8, label=baseline_name, alpha=0.7)
-
-        fx = [r["block_number"] for r in feature if r[key] is not None]
-        fy = [r[key] / 1_000 for r in feature if r[key] is not None]
-        if fx:
-            ax.plot(fx, fy, linewidth=0.8, label=feature_name)
-
-        ax.set_ylabel("ms")
-        ax.set_title(label)
-        ax.grid(True, alpha=0.3)
-        if baseline:
-            ax.legend()
-
-    axes[-1].set_xlabel("Block Number")
-    fig.suptitle("Wait Time Breakdown per Block", fontsize=14, y=1.01)
-    fig.tight_layout()
-    fig.savefig(out, dpi=150, bbox_inches="tight")
-    plt.close(fig)
-
-
-def _add_regression(ax, x, y, color, label):
-    """Add a linear regression line to the axes."""
-    if len(x) < 2:
-        return
-    xa, ya = np.array(x), np.array(y)
-    m, b = np.polyfit(xa, ya, 1)
-    x_range = np.linspace(xa.min(), xa.max(), 100)
-    ax.plot(x_range, m * x_range + b, color=color, linewidth=1.5, alpha=0.8,
-            label=label)
-
-
-def plot_gas_vs_latency(
-    feature: list[dict], baseline: list[dict] | None, out: Path,
-    baseline_name: str = "baseline", feature_name: str = "feature",
-):
-    fig, ax = plt.subplots(figsize=(8, 6))
-
-    if baseline:
-        bgas = [r["gas_used"] / 1_000_000 for r in baseline]
-        blat = [r["new_payload_latency_us"] / 1_000 for r in baseline]
-        ax.scatter(bgas, blat, s=8, alpha=0.5)
-        _add_regression(ax, bgas, blat, "tab:blue", baseline_name)
-
-    fgas = [r["gas_used"] / 1_000_000 for r in feature]
-    flat = [r["new_payload_latency_us"] / 1_000 for r in feature]
-    ax.scatter(fgas, flat, s=8, alpha=0.6)
-    _add_regression(ax, fgas, flat, "tab:orange", feature_name)
-
-    ax.set_xlabel("Gas Used (Mgas)")
-    ax.set_ylabel("newPayload Latency (ms)")
-    ax.set_title("Gas Used vs Latency")
-    ax.grid(True, alpha=0.3)
-    ax.legend()
-    fig.tight_layout()
-    fig.savefig(out, dpi=150)
-    plt.close(fig)
-
-
-def merge_csvs(paths: list[str]) -> list[dict]:
-    """Parse and merge multiple CSVs, averaging values for duplicate blocks."""
-    by_block: dict[int, list[dict]] = {}
-    for path in paths:
-        for row in parse_combined_csv(path):
-            by_block.setdefault(row["block_number"], []).append(row)
-
-    merged = []
-    for bn in sorted(by_block):
-        rows = by_block[bn]
-        if len(rows) == 1:
-            merged.append(rows[0])
-        else:
-            avg = {"block_number": bn}
-            for key in ("gas_used", "new_payload_latency_us"):
-                avg[key] = int(sum(r[key] for r in rows) / len(rows))
-            for key in ("persistence_wait_us", "execution_cache_wait_us", "sparse_trie_wait_us"):
-                vals = [r[key] for r in rows if r[key] is not None]
-                avg[key] = int(sum(vals) / len(vals)) if vals else None
-            merged.append(avg)
-    return merged
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Generate benchmark charts")
-    parser.add_argument(
-        "--feature", nargs="+", required=True,
-        help="Path(s) to feature combined_latency.csv",
-    )
-    parser.add_argument(
-        "--output-dir", required=True, help="Output directory for PNG charts"
-    )
-    parser.add_argument(
-        "--baseline", nargs="+", help="Path(s) to baseline combined_latency.csv"
-    )
-    parser.add_argument("--baseline-name", default="baseline", help="Label for baseline")
-    parser.add_argument("--feature-name", "--branch-name", default="feature", help="Label for feature")
-    args = parser.parse_args()
-
-    feature = merge_csvs(args.feature)
-    if not feature:
-        print("No results found in feature CSV(s)", file=sys.stderr)
-        sys.exit(1)
-
-    baseline = None
-    if args.baseline:
-        baseline = merge_csvs(args.baseline)
-        if not baseline:
-            print(
-                "Warning: no results in baseline CSV(s), skipping comparison",
-                file=sys.stderr,
-            )
-            baseline = None
-
-    out_dir = Path(args.output_dir)
-    out_dir.mkdir(parents=True, exist_ok=True)
-
-    bname = args.baseline_name
-    fname = args.feature_name
-    plot_latency_and_throughput(feature, baseline, out_dir / "latency_throughput.png", bname, fname)
-    plot_wait_breakdown(feature, baseline, out_dir / "wait_breakdown.png", bname, fname)
-    plot_gas_vs_latency(feature, baseline, out_dir / "gas_vs_latency.png", bname, fname)
-
-    print(f"Charts written to {out_dir}")
-
-
-if __name__ == "__main__":
-    main()

.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

@@ -1,323 +0,0 @@
-#!/usr/bin/env bash
-#
-# Runs a single reth-bench cycle: mount snapshot → start node → warmup →
-# benchmark → stop node → recover snapshot.
-#
-# 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_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
-
-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"
-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 [ "${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
-      # capture reth's exit and save the profile.
-      sudo pkill -INT -x reth 2>/dev/null || true
-      # Wait for samply to finish writing the profile and exit
-      for i in $(seq 1 120); do
-        sudo pgrep -x samply > /dev/null 2>&1 || break
-        if [ $((i % 10)) -eq 0 ]; then
-          echo "Waiting for samply to finish writing profile... (${i}s)"
-        fi
-        sleep 1
-      done
-      if sudo pgrep -x samply > /dev/null 2>&1; then
-        echo "Samply still running after 120s, sending SIGTERM..."
-        sudo pkill -x samply 2>/dev/null || true
-      fi
-    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
-    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
-}
-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
-sudo sh -c 'echo 3 > /proc/sys/vm/drop_caches'
-echo "=== Cache state after drop ==="
-free -h
-grep Cached /proc/meminfo
-
-# Start reth
-# CPU layout: core 0 = OS/IRQs/reth-bench/aux, cores 1+ = reth node
-RETH_BENCH="$(which reth-bench)"
-ONLINE=$(nproc --all)
-MAX_RETH=$(( ONLINE - 1 ))
-if [ "${BENCH_CORES:-0}" -gt 0 ] && [ "$BENCH_CORES" -lt "$MAX_RETH" ]; then
-  MAX_RETH=$BENCH_CORES
-fi
-RETH_CPUS="1-${MAX_RETH}"
-
-BIG_BLOCKS="${BENCH_BIG_BLOCKS:-false}"
-
-RETH_ARGS=(
-  node
-  --datadir "$DATADIR"
-  --log.file.directory "$OUTPUT_DIR/reth-logs"
-  --engine.accept-execution-requests-hash
-  --http
-  --http.port 8545
-  --ws
-  --ws.api all
-  --authrpc.port 8551
-  --disable-discovery
-  --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 \
-    "$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[@]}" \
-    > "$LOG" 2>&1 &
-fi
-stdbuf -oL tail -f "$LOG" | sed -u "s/^/[reth] /" &
-TAIL_PID=$!
-
-for i in $(seq 1 60); do
-  if curl -sf http://127.0.0.1:8545 -X POST \
-    -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"
-    break
-  fi
-  if [ "$i" -eq 60 ]; then
-    echo "::error::reth (${LABEL}) failed to start within 60s"
-    cat "$LOG"
-    exit 1
-  fi
-  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
-
-if [ "$BIG_BLOCKS" = "true" ]; then
-  # Big blocks mode: replay pre-generated payloads
-  BIG_BLOCKS_DIR="${BENCH_BIG_BLOCKS_DIR:-${BENCH_WORK_DIR}/big-blocks}"
-
-  BB_BENCH_ARGS=(--reth-new-payload)
-  if [ -n "${BENCH_WAIT_TIME:-}" ]; then
-    BB_BENCH_ARGS+=(--wait-time "$BENCH_WAIT_TIME")
-  fi
-
-  # 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
-
-# cleanup runs via trap

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

@@ -1,129 +0,0 @@
-#!/usr/bin/env bash
-#
-# Downloads the latest snapshot into the schelk volume using
-# `reth download` 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).
-#
-# Usage: bench-reth-snapshot.sh [--check]
-#   --check   Only check if a download is needed; exits 0 if up-to-date, 10 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
-
-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"
-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_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}…)"
-  exit 0
-fi
-
-echo "Snapshot needs update (local: ${LOCAL_HASH:+${LOCAL_HASH:0:16}…}${LOCAL_HASH:-<none>}, remote: ${REMOTE_HASH:0:16}…)"
-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'"
-  exit 1
-fi
-BASE_URL="${MINIO_ENDPOINT}/reth-snapshots/${SNAPSHOT_NAME}"
-
-# 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
-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"
-  [ -z "${BENCH_COMMENT_ID:-}" ] && return 0
-  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")"
-  curl -sf -X PATCH \
-    -H "Authorization: token ${GITHUB_TOKEN}" \
-    -H "Accept: application/vnd.github.v3+json" \
-    "https://api.github.com/repos/${BENCH_REPO}/issues/comments/${BENCH_COMMENT_ID}" \
-    -d "$(jq -nc --arg body "$body" '{body: $body}')" \
-    > /dev/null 2>&1 || true
-}
-
-update_comment "Downloading snapshot…"
-
-# Download using reth download (manifest-path with rewritten base_url)
-"$RETH" download \
-  --manifest-path "$MANIFEST_TMP" \
-  -y \
-  --minimal \
-  --datadir "$DATADIR"
-
-update_comment "Downloading snapshot… done"
-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}…)"

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

@@ -1,603 +0,0 @@
-#!/usr/bin/env python3
-"""Parse reth-bench CSV output and generate a summary JSON + markdown comparison.
-
-Usage:
-    bench-reth-summary.py <combined_csv> <gas_csv> \
-        --output-summary <summary.json> \
-        --output-markdown <comment.md> \
-        --baseline-csv <baseline_combined.csv> \
-        [--repo <owner/repo>] \
-        [--baseline-ref <sha>] \
-        [--feature-name <name>] \
-        [--feature-sha <sha>]
-
-Generates a paired statistical comparison between baseline and feature.
-Matches blocks by number and computes per-block diffs to cancel out gas
-variance. Fails if baseline or feature CSV is missing or empty.
-"""
-
-import argparse
-import csv
-import json
-import math
-import random
-import sys
-
-GIGAGAS = 1_000_000_000
-T_CRITICAL = 1.96  # two-tailed 95% confidence
-BOOTSTRAP_ITERATIONS = 10_000
-
-
-def _opt_int(row: dict, key: str) -> int | None:
-    """Return int value for a CSV field, or None if missing/empty."""
-    v = row.get(key)
-    if v is None or v == "":
-        return None
-    return int(v)
-
-
-def parse_combined_csv(path: str) -> list[dict]:
-    """Parse combined_latency.csv into a list of per-block dicts."""
-    rows = []
-    with open(path) as f:
-        reader = csv.DictReader(f)
-        for row in reader:
-            rows.append(
-                {
-                    "block_number": int(row["block_number"]),
-                    "gas_used": int(row["gas_used"]),
-                    "gas_limit": int(row["gas_limit"]),
-                    "transaction_count": int(row["transaction_count"]),
-                    "new_payload_latency_us": int(row["new_payload_latency"]),
-                    "fcu_latency_us": int(row["fcu_latency"]),
-                    "total_latency_us": int(row["total_latency"]),
-                    "persistence_wait_us": _opt_int(row, "persistence_wait"),
-                    "execution_cache_wait_us": _opt_int(row, "execution_cache_wait"),
-                    "sparse_trie_wait_us": _opt_int(row, "sparse_trie_wait"),
-                }
-            )
-    return rows
-
-
-def parse_gas_csv(path: str) -> list[dict]:
-    """Parse total_gas.csv into a list of per-block dicts."""
-    rows = []
-    with open(path) as f:
-        reader = csv.DictReader(f)
-        for row in reader:
-            rows.append(
-                {
-                    "block_number": int(row["block_number"]),
-                    "gas_used": int(row["gas_used"]),
-                    "time_us": int(row["time"]),
-                }
-            )
-    return rows
-
-
-def stddev(values: list[float], mean: float) -> float:
-    if len(values) < 2:
-        return 0.0
-    return math.sqrt(sum((v - mean) ** 2 for v in values) / (len(values) - 1))
-
-
-def percentile(sorted_vals: list[float], pct: int) -> float:
-    if not sorted_vals:
-        return 0.0
-    idx = int(len(sorted_vals) * pct / 100)
-    idx = min(idx, len(sorted_vals) - 1)
-    return sorted_vals[idx]
-
-
-def compute_stats(combined: list[dict]) -> dict:
-    """Compute per-run statistics from parsed CSV data."""
-    n = len(combined)
-    if n == 0:
-        return {}
-
-    latencies_ms = [r["new_payload_latency_us"] / 1_000 for r in combined]
-    sorted_lat = sorted(latencies_ms)
-    mean_lat = sum(latencies_ms) / n
-    std_lat = stddev(latencies_ms, mean_lat)
-
-    mgas_s_values = []
-    for r in combined:
-        lat_s = r["new_payload_latency_us"] / 1_000_000
-        if lat_s > 0:
-            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
-
-    return {
-        "n": n,
-        "mean_ms": mean_lat,
-        "stddev_ms": std_lat,
-        "p50_ms": percentile(sorted_lat, 50),
-        "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,
-    }
-
-
-def compute_wait_stats(combined: list[dict], field: str) -> dict:
-    """Compute mean/p50/p95 for a wait time field (in ms)."""
-    values_ms = []
-    for r in combined:
-        v = r.get(field)
-        if v is not None:
-            values_ms.append(v / 1_000)
-    if not values_ms:
-        return {}
-    n = len(values_ms)
-    mean_val = sum(values_ms) / n
-    sorted_vals = sorted(values_ms)
-    return {
-        "mean_ms": mean_val,
-        "p50_ms": percentile(sorted_vals, 50),
-        "p95_ms": percentile(sorted_vals, 95),
-    }
-
-
-def _paired_data(
-    baseline: list[dict], feature: list[dict]
-) -> tuple[list[tuple[float, float]], list[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
-    """
-    baseline_by_block = {r["block_number"]: r for r in baseline}
-    feature_by_block = {r["block_number"]: r for r in feature}
-    common_blocks = sorted(set(baseline_by_block) & set(feature_by_block))
-
-    pairs = []
-    lat_diffs_ms = []
-    mgas_diffs = []
-    total_lat_diffs_ms = []
-    for bn in common_blocks:
-        b = baseline_by_block[bn]
-        f = feature_by_block[bn]
-        b_ms = b["new_payload_latency_us"] / 1_000
-        f_ms = f["new_payload_latency_us"] / 1_000
-        pairs.append((b_ms, f_ms))
-        lat_diffs_ms.append(f_ms - b_ms)
-        b_lat_s = b["new_payload_latency_us"] / 1_000_000
-        f_lat_s = f["new_payload_latency_us"] / 1_000_000
-        if b_lat_s > 0 and f_lat_s > 0:
-            mgas_diffs.append(
-                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
-        )
-    return pairs, lat_diffs_ms, mgas_diffs, total_lat_diffs_ms
-
-
-def compute_paired_stats(
-    baseline_runs: list[list[dict]],
-    feature_runs: list[list[dict]],
-) -> dict:
-    """Compute paired statistics between baseline and feature runs.
-
-    Each pair (baseline_runs[i], feature_runs[i]) produces per-block diffs.
-    All diffs are pooled for the final CI.
-    """
-    all_pairs = []
-    all_lat_diffs = []
-    all_mgas_diffs = []
-    all_total_lat_diffs = []
-    blocks_per_pair = []
-    for baseline, feature in zip(baseline_runs, feature_runs):
-        pairs, lat_diffs, mgas_diffs, total_lat_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)
-        blocks_per_pair.append(len(pairs))
-
-    if not all_lat_diffs:
-        return {}
-
-    n = len(all_lat_diffs)
-    mean_diff = sum(all_lat_diffs) / n
-    std_diff = stddev(all_lat_diffs, mean_diff)
-    se = std_diff / math.sqrt(n) if n > 0 else 0.0
-    ci = T_CRITICAL * se
-
-    # Bootstrap CI on difference-of-percentiles (resample paired blocks)
-    base_lats = sorted([p[0] for p in all_pairs])
-    feature_lats = sorted([p[1] for p in all_pairs])
-    p50_diff = percentile(feature_lats, 50) - percentile(base_lats, 50)
-    p90_diff = percentile(feature_lats, 90) - percentile(base_lats, 90)
-    p99_diff = percentile(feature_lats, 99) - percentile(base_lats, 99)
-
-    rng = random.Random(42)
-    p50_boot, p90_boot, p99_boot = [], [], []
-    for _ in range(BOOTSTRAP_ITERATIONS):
-        sample = rng.choices(all_pairs, k=n)
-        b_sorted = sorted(p[0] for p in sample)
-        f_sorted = sorted(p[1] for p in sample)
-        p50_boot.append(percentile(f_sorted, 50) - percentile(b_sorted, 50))
-        p90_boot.append(percentile(f_sorted, 90) - percentile(b_sorted, 90))
-        p99_boot.append(percentile(f_sorted, 99) - percentile(b_sorted, 99))
-    p50_boot.sort()
-    p90_boot.sort()
-    p99_boot.sort()
-    lo = int(BOOTSTRAP_ITERATIONS * 0.025)
-    hi = int(BOOTSTRAP_ITERATIONS * 0.975)
-
-    mean_mgas_diff = sum(all_mgas_diffs) / len(all_mgas_diffs) if all_mgas_diffs else 0.0
-    std_mgas_diff = stddev(all_mgas_diffs, mean_mgas_diff) if len(all_mgas_diffs) > 1 else 0.0
-    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
-
-    return {
-        "n": n,
-        "mean_diff_ms": mean_diff,
-        "ci_ms": ci,
-        "p50_diff_ms": p50_diff,
-        "p50_ci_ms": (p50_boot[hi] - p50_boot[lo]) / 2,
-        "p90_diff_ms": p90_diff,
-        "p90_ci_ms": (p90_boot[hi] - p90_boot[lo]) / 2,
-        "p99_diff_ms": p99_diff,
-        "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,
-        "blocks": max(blocks_per_pair),
-    }
-
-
-
-def format_duration(seconds: float) -> str:
-    if seconds >= 60:
-        return f"{seconds / 60:.1f}min"
-    return f"{seconds}s"
-
-
-def format_gas(gas: int) -> str:
-    if gas >= GIGAGAS:
-        return f"{gas / GIGAGAS:.1f}G"
-    if gas >= 1_000_000:
-        return f"{gas / 1_000_000:.1f}M"
-    return f"{gas:,}"
-
-
-
-def fmt_ms(v: float) -> str:
-    return f"{v:.2f}ms"
-
-
-def fmt_mgas(v: float) -> str:
-    return f"{v:.2f}"
-
-
-def fmt_s(v: float) -> str:
-    return f"{v:.2f}s"
-
-
-def significance(pct: float, ci_pct: float, lower_is_better: bool) -> str:
-    """Return significance label: 'good', 'bad', or 'neutral'."""
-    significant = abs(pct) > ci_pct
-    if not significant:
-        return "neutral"
-    elif (pct < 0) == lower_is_better:
-        return "good"
-    else:
-        return "bad"
-
-
-def change_str(pct: float, ci_pct: float, lower_is_better: bool) -> str:
-    """Format change% with paired CI significance.
-
-    Significant if the CI doesn't cross zero (i.e. |pct| > ci_pct).
-    """
-    sig = significance(pct, ci_pct, lower_is_better)
-    emoji = {"good": "✅", "bad": "❌", "neutral": "⚪"}[sig]
-    return f"{pct:+.2f}% {emoji} (±{ci_pct:.2f}%)"
-
-
-def compute_changes(
-    baseline_stats: dict, feature_stats: dict, paired_stats: dict
-) -> dict:
-    """Pre-compute change percentages and significance for each metric."""
-    def pct(base: float, feat: float) -> float:
-        return (feat - base) / base * 100.0 if base > 0 else 0.0
-
-    def ci_pct(ci_ms: float, base_ms: float) -> float:
-        return ci_ms / base_ms * 100.0 if base_ms > 0 else 0.0
-
-    metrics = [
-        ("mean", "mean_ms", "ci_ms", "mean_ms", True),
-        ("p50", "p50_ms", "p50_ci_ms", "p50_ms", True),
-        ("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),
-    ]
-    changes = {}
-    for name, stat_key, ci_key, base_key, lower_is_better in metrics:
-        p = pct(baseline_stats[stat_key], feature_stats[stat_key])
-        c = ci_pct(paired_stats[ci_key], baseline_stats[base_key])
-        changes[name] = {
-            "pct": round(p, 4),
-            "ci_pct": round(c, 4),
-            "sig": significance(p, c, lower_is_better),
-        }
-    return changes
-
-
-def generate_comparison_table(
-    run1: dict,
-    run2: dict,
-    paired: dict,
-    repo: str,
-    baseline_ref: str,
-    baseline_name: str,
-    feature_name: str,
-    feature_sha: str,
-    big_blocks: bool = False,
-    warmup_blocks: str | None = None,
-    wait_time: str | None = None,
-) -> str:
-    """Generate a markdown comparison table between baseline and feature."""
-    n = paired["blocks"]
-
-    def pct(base: float, feat: float) -> float:
-        return (feat - base) / base * 100.0 if base > 0 else 0.0
-
-    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"])
-
-    # 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
-    p99_ci_pct = paired["p99_ci_ms"] / run1["p99_ms"] * 100.0 if run1["p99_ms"] > 0 else 0.0
-
-    # 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
-
-    base_url = f"https://github.com/{repo}/commit"
-    baseline_label = f"[`{baseline_name}`]({base_url}/{baseline_ref})"
-    feature_label = f"[`{feature_name}`]({base_url}/{feature_sha})"
-
-    lines = [
-        f"| Metric | {baseline_label} | {feature_label} | Change |",
-        "|--------|------|--------|--------|",
-        f"| Mean | {fmt_ms(run1['mean_ms'])} | {fmt_ms(run2['mean_ms'])} | {change_str(mean_pct, lat_ci_pct, lower_is_better=True)} |",
-        f"| StdDev | {fmt_ms(run1['stddev_ms'])} | {fmt_ms(run2['stddev_ms'])} | |",
-        f"| P50 | {fmt_ms(run1['p50_ms'])} | {fmt_ms(run2['p50_ms'])} | {change_str(p50_pct, p50_ci_pct, lower_is_better=True)} |",
-        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)} |",
-        "",
-    ]
-    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}")
-    lines.append(f"*{', '.join(meta_parts)}*")
-    return "\n".join(lines)
-
-
-def generate_wait_time_table(
-    title: str,
-    baseline_stats: dict,
-    feature_stats: dict,
-    baseline_label: str,
-    feature_label: str,
-) -> str:
-    """Generate a markdown table for a wait time metric."""
-    if not baseline_stats or not feature_stats:
-        return ""
-    lines = [
-        f"### {title}",
-        "",
-        f"| Metric | {baseline_label} | {feature_label} |",
-        "|--------|------|--------|",
-        f"| Mean | {fmt_ms(baseline_stats['mean_ms'])} | {fmt_ms(feature_stats['mean_ms'])} |",
-        f"| P50 | {fmt_ms(baseline_stats['p50_ms'])} | {fmt_ms(feature_stats['p50_ms'])} |",
-        f"| P95 | {fmt_ms(baseline_stats['p95_ms'])} | {fmt_ms(feature_stats['p95_ms'])} |",
-    ]
-    return "\n".join(lines)
-
-
-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", ""]
-    if behind_baseline > 0:
-        s = "s" if behind_baseline > 1 else ""
-        diff_link = f"https://github.com/{repo}/compare/{baseline_ref[:12]}...{baseline_name}"
-        lines.append(f"> ⚠️ Feature is [**{behind_baseline} commit{s} behind `{baseline_name}`**]({diff_link}). Consider rebasing for accurate results.")
-        lines.append("")
-    lines.append(comparison_table)
-    if wait_time_tables:
-        lines.append("")
-        lines.append("<details>")
-        lines.append("<summary>Wait Time Breakdown</summary>")
-        lines.append("")
-        for table in wait_time_tables:
-            if table:
-                lines.append(table)
-                lines.append("")
-        lines.append("</details>")
-    if grafana_url:
-        lines.append("")
-        lines.append(f"**[Grafana Dashboard]({grafana_url})**")
-    return "\n".join(lines)
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Parse reth-bench ABBA results")
-    parser.add_argument(
-        "--baseline-csv", nargs="+", required=True,
-        help="Baseline combined_latency.csv files (A1, A2)",
-    )
-    parser.add_argument(
-        "--feature-csv", "--branch-csv", nargs="+", required=True,
-        help="Feature combined_latency.csv files (B1, B2)",
-    )
-    parser.add_argument("--gas-csv", required=True, help="Path to total_gas.csv")
-    parser.add_argument(
-        "--output-summary", required=True, help="Output JSON summary path"
-    )
-    parser.add_argument("--output-markdown", required=True, help="Output markdown path")
-    parser.add_argument(
-        "--repo", default="paradigmxyz/reth", help="GitHub repo (owner/name)"
-    )
-    parser.add_argument("--baseline-ref", default=None, help="Baseline commit SHA")
-    parser.add_argument("--baseline-name", default=None, help="Baseline display name")
-    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("--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):
-        print("Must provide equal number of baseline and feature CSVs", file=sys.stderr)
-        sys.exit(1)
-
-    baseline_runs = []
-    feature_runs = []
-    for path in args.baseline_csv:
-        data = parse_combined_csv(path)
-        if not data:
-            print(f"No results in {path}", file=sys.stderr)
-            sys.exit(1)
-        baseline_runs.append(data)
-    for path in args.feature_csv:
-        data = parse_combined_csv(path)
-        if not data:
-            print(f"No results in {path}", file=sys.stderr)
-            sys.exit(1)
-        feature_runs.append(data)
-
-    gas = parse_gas_csv(args.gas_csv)
-
-    all_baseline = [r for run in baseline_runs for r in run]
-    all_feature = [r for run in feature_runs for r in run]
-
-    baseline_stats = compute_stats(all_baseline)
-    feature_stats = compute_stats(all_feature)
-    paired_stats = compute_paired_stats(baseline_runs, feature_runs)
-
-    if not paired_stats:
-        print("No common blocks between baseline and feature runs", file=sys.stderr)
-        sys.exit(1)
-
-    baseline_ref = args.baseline_ref or "main"
-    baseline_name = args.baseline_name or "baseline"
-    feature_name = args.feature_name or "feature"
-    feature_sha = args.feature_ref or "unknown"
-
-    comparison_table = generate_comparison_table(
-        baseline_stats,
-        feature_stats,
-        paired_stats,
-        repo=args.repo,
-        baseline_ref=baseline_ref,
-        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,
-    )
-    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)")
-
-    base_url = f"https://github.com/{args.repo}/commit"
-    baseline_label = f"[`{baseline_name}`]({base_url}/{baseline_ref})"
-    feature_label = f"[`{feature_name}`]({base_url}/{feature_sha})"
-
-    wait_fields = [
-        ("persistence_wait_us", "Persistence Wait"),
-        ("sparse_trie_wait_us", "Trie Cache Update Wait"),
-        ("execution_cache_wait_us", "Execution Cache Update Wait"),
-    ]
-    wait_time_tables = []
-    wait_time_data = {}
-    for field, title in wait_fields:
-        b_stats = compute_wait_stats(all_baseline, field)
-        f_stats = compute_wait_stats(all_feature, field)
-        if b_stats and f_stats:
-            wait_time_data[field] = {
-                "title": title,
-                "baseline": b_stats,
-                "feature": f_stats,
-            }
-        table = generate_wait_time_table(title, b_stats, f_stats, baseline_label, feature_label)
-        if table:
-            wait_time_tables.append(table)
-
-    summary = {
-        "blocks": paired_stats["blocks"],
-        "big_blocks": args.big_blocks,
-        "warmup_blocks": args.warmup_blocks,
-        "wait_time": args.wait_time,
-        "baseline": {
-            "name": baseline_name,
-            "ref": baseline_ref,
-            "stats": baseline_stats,
-        },
-        "feature": {
-            "name": feature_name,
-            "ref": feature_sha,
-            "stats": feature_stats,
-        },
-        "paired": paired_stats,
-        "changes": compute_changes(baseline_stats, feature_stats, paired_stats),
-        "wait_times": wait_time_data,
-    }
-    with open(args.output_summary, "w") as f:
-        json.dump(summary, f, indent=2)
-    print(f"Summary written to {args.output_summary}")
-
-    markdown = generate_markdown(
-        summary, comparison_table,
-        wait_time_tables=wait_time_tables,
-        behind_baseline=args.behind_baseline,
-        repo=args.repo,
-        baseline_ref=baseline_ref,
-        baseline_name=baseline_name,
-        grafana_url=args.grafana_url,
-    )
-
-    with open(args.output_markdown, "w") as f:
-        f.write(markdown)
-    print(f"Markdown written to {args.output_markdown}")
-
-
-if __name__ == "__main__":
-    main()

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

@@ -1,231 +0,0 @@
-#!/usr/bin/env bash
-#
-# Resolves baseline and feature refs for scheduled benchmark runs.
-#
-# Supports two 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.
-#
-# Usage: bench-scheduled-refs.sh <force> <mode>
-#   force — "true" to run even if no new commit (bypass skip logic)
-#   mode  — "nightly" or "hourly"
-#
-# 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)
-#
-# 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)
-#
-# 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
-
-# ==========================================================================
-# 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

@@ -1,308 +0,0 @@
-// Sends Slack notifications for reth-bench results.
-//
-// Reads from environment:
-//   SLACK_BENCH_BOT_TOKEN  – Slack Bot User OAuth Token (xoxb-...)
-//   SLACK_BENCH_CHANNEL    – Public channel ID for significant improvements
-//   BENCH_WORK_DIR         – Directory containing summary.json
-//   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:
-//   const notify = require('./.github/scripts/bench-slack-notify.js');
-//   await notify.success({ core, context });
-//   await notify.failure({ core, context, failedStep: '...' });
-
-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';
-
-function loadSlackUsers(repoRoot) {
-  try {
-    const raw = fs.readFileSync(path.join(repoRoot, '.github', 'scripts', 'bench-slack-users.json'), 'utf8');
-    const data = JSON.parse(raw);
-    // Filter out non-user-ID entries (like _comment)
-    const users = {};
-    for (const [k, v] of Object.entries(data)) {
-      if (!k.startsWith('_') && typeof v === 'string' && v.startsWith('U')) {
-        users[k] = v;
-      }
-    }
-    return users;
-  } catch {
-    return {};
-  }
-}
-
-async function postToSlack(token, channel, blocks, text, core, threadTs) {
-  const payload = { channel, blocks, text, unfurl_links: false };
-  if (threadTs) payload.thread_ts = threadTs;
-  const resp = await fetch(SLACK_API, {
-    method: 'POST',
-    headers: {
-      'Authorization': `Bearer ${token}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(payload),
-  });
-  const data = await resp.json();
-  if (!data.ok) {
-    core.warning(`Slack API error (channel ${channel}): ${JSON.stringify(data)}`);
-  }
-  return data;
-}
-
-function cell(text) {
-  const s = String(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 prUrl = prNumber ? `https://github.com/${repo}/pull/${prNumber}` : '';
-  const commitUrl = `https://github.com/${repo}/commit`;
-  const baselineLink = `<${commitUrl}/${summary.baseline.ref}|${summary.baseline.name}>`;
-  const featureLink = `<${commitUrl}/${summary.feature.ref}|${summary.feature.name}>`;
-
-  // Meta line
-  const metaParts = [];
-  if (prNumber) metaParts.push(`*<${prUrl}|PR #${prNumber}>*`);
-  metaParts.push(`triggered by ${actorSlackId ? `<@${actorSlackId}>` : `@${actor}`}`);
-
-  // Baseline/feature lines with samply profile links
-  let baselineLine = `*Baseline:* ${baselineLink}`;
-  const bl1 = samplyUrls['baseline-1'];
-  const bl2 = samplyUrls['baseline-2'];
-  if (bl1) baselineLine += ` | <${bl1}|Samply 1>`;
-  if (bl2) baselineLine += ` | <${bl2}|Samply 2>`;
-
-  let featureLine = `*Feature:* ${featureLink}`;
-  const fl1 = samplyUrls['feature-1'];
-  const fl2 = samplyUrls['feature-2'];
-  if (fl1) featureLine += ` | <${fl1}|Samply 1>`;
-  if (fl2) featureLine += ` | <${fl2}|Samply 2>`;
-
-  const countsLine = blocksLabel(summary).map(p => `*${p.key}:* ${p.value}`).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');
-
-  // Action buttons
-  const diffUrl = `https://github.com/${repo}/compare/${summary.baseline.ref}...${summary.feature.ref}`;
-  const buttons = [
-    {
-      type: 'button',
-      text: { type: 'plain_text', text: 'CI :github:', emoji: true },
-      url: jobUrl,
-      action_id: 'ci_button',
-    },
-    {
-      type: 'button',
-      text: { type: 'plain_text', text: 'Diff :github:', emoji: true },
-      url: diffUrl,
-      action_id: 'diff_button',
-    },
-  ];
-
-  // 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 },
-    },
-    {
-      type: 'section',
-      text: { type: 'mrkdwn', text: sectionText },
-    },
-    {
-      type: 'table',
-      column_settings: [
-        { align: 'left' },
-        { align: 'right' },
-        { align: 'right' },
-        { align: 'right' },
-      ],
-      rows: tableRows,
-    },
-    {
-      type: 'actions',
-      elements: buttons,
-    },
-  ];
-
-  // 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 = [
-      [cell('Wait Time'), cell('Baseline'), cell('Feature')],
-      ...wtRows.map(r => [cell(r.title), cell(r.baseline), cell(r.feature)]),
-    ];
-    threadBlocks.push({
-      type: 'table',
-      column_settings: [
-        { align: 'left' },
-        { align: 'right' },
-        { align: 'right' },
-      ],
-      rows: waitTableRows,
-    });
-  }
-
-  return { blocks, threadBlocks };
-}
-
-function buildFailureBlocks({ prNumber, actor, actorSlackId, jobUrl, repo, failedStep }) {
-  const prUrl = prNumber ? `https://github.com/${repo}/pull/${prNumber}` : '';
-  const actorMention = actorSlackId ? `<@${actorSlackId}>` : `@${actor}`;
-  const parts = [
-    prNumber ? `*<${prUrl}|PR #${prNumber}>*` : '',
-    `by ${actorMention}`,
-    `failed while *${failedStep}*`,
-  ].filter(Boolean);
-
-  const buttons = [
-    {
-      type: 'button',
-      text: { type: 'plain_text', text: 'CI :github:', emoji: true },
-      url: jobUrl,
-      action_id: 'ci_button',
-    },
-  ];
-
-  return [
-    {
-      type: 'header',
-      text: { type: 'plain_text', text: ':rotating_light: Bench Failed', emoji: true },
-    },
-    {
-      type: 'section',
-      text: { type: 'mrkdwn', text: parts.join(' | ') },
-    },
-    {
-      type: 'actions',
-      elements: buttons,
-    },
-  ];
-}
-
-async function success({ core, context }) {
-  const token = process.env.SLACK_BENCH_BOT_TOKEN;
-  if (!token) {
-    core.info('SLACK_BENCH_BOT_TOKEN not set, skipping Slack notification');
-    return;
-  }
-
-  let summary;
-  try {
-    summary = JSON.parse(fs.readFileSync(process.env.BENCH_WORK_DIR + '/summary.json', 'utf8'));
-  } catch (e) {
-    core.warning('Could not read summary.json for Slack notification');
-    return;
-  }
-
-  const repo = `${context.repo.owner}/${context.repo.repo}`;
-  const prNumber = process.env.BENCH_PR;
-  const actor = process.env.BENCH_ACTOR;
-  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);
-
-  const slackUsers = loadSlackUsers(process.env.GITHUB_WORKSPACE || '.');
-  const actorSlackId = slackUsers[actor];
-
-  const { blocks, threadBlocks } = buildSuccessBlocks({ summary, prNumber, actor, actorSlackId, jobUrl, repo, samplyUrls });
-  const text = `Bench: ${summary.baseline.name} vs ${summary.feature.name}`;
-
-  async function sendWithThread(ch) {
-    const res = await postToSlack(token, ch, blocks, text, core);
-    if (res.ok && res.ts && threadBlocks.length > 0) {
-      for (const tb of threadBlocks) {
-        await postToSlack(token, ch, [tb], 'Wait time breakdown', core, res.ts);
-      }
-    }
-  }
-
-  // Post to public channel if any metric shows significant improvement or regression
-  const channel = process.env.SLACK_BENCH_CHANNEL;
-  let postedToChannel = false;
-  if (channel) {
-    const changes = summary.changes || {};
-    const hasImprovement = Object.values(changes).some(c => c.sig === 'good');
-    if (hasImprovement) {
-      await sendWithThread(channel);
-      postedToChannel = true;
-    } else {
-      core.info('No significant improvement, skipping public channel notification');
-    }
-  }
-
-  // DM the actor only when results were not posted to the public channel
-  if (!postedToChannel) {
-    if (actorSlackId) {
-      await sendWithThread(actorSlackId);
-    } else {
-      core.info(`No Slack user mapping for GitHub user '${actor}', skipping DM`);
-    }
-  } else {
-    core.info(`Results posted to channel, skipping DM to ${actor}`);
-  }
-}
-
-async function failure({ core, context, failedStep }) {
-  const token = process.env.SLACK_BENCH_BOT_TOKEN;
-  if (!token) {
-    core.info('SLACK_BENCH_BOT_TOKEN not set, skipping Slack notification');
-    return;
-  }
-
-  const repo = `${context.repo.owner}/${context.repo.repo}`;
-  const prNumber = process.env.BENCH_PR;
-  const actor = process.env.BENCH_ACTOR;
-  const jobUrl = process.env.BENCH_JOB_URL ||
-    `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
-
-  const slackUsers = loadSlackUsers(process.env.GITHUB_WORKSPACE || '.');
-  const actorSlackId = slackUsers[actor];
-
-  const blocks = buildFailureBlocks({ prNumber, actor, actorSlackId, jobUrl, repo, failedStep });
-  const text = `Bench failed while ${failedStep}`;
-
-  // Always DM the actor
-  if (actorSlackId) {
-    await postToSlack(token, actorSlackId, blocks, text, core);
-  } else {
-    core.info(`No Slack user mapping for GitHub user '${actor}', skipping DM`);
-  }
-
-  // Only DM for failures, don't post to public channel
-}
-
-module.exports = { success, failure };

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

@@ -1,25 +0,0 @@
-{
-  "_comment": "Maps GitHub usernames to Slack user IDs. Find yours: Slack profile > ··· > Copy member ID.",
-  "shekhirin": "U09FAL2UMLJ",
-  "mattsse": "U09FQNPMRT3",
-  "klkvr": "U09FAK95FC2",
-  "joshieDo": "U09LHN6GYAU",
-  "mediocregopher": "U09FF75KMQU",
-  "yongkangc": "U09FB0ECTD4",
-  "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"
-}

.github/scripts/bench-update-status.js

@@ -1,27 +0,0 @@
-// Updates the reth-bench PR comment with current status.
-//
-// Reads from environment:
-//   BENCH_COMMENT_ID  – GitHub comment ID to update
-//   BENCH_JOB_URL     – URL to the Actions job page
-//   BENCH_CONFIG      – Config line (blocks, warmup, refs)
-//   BENCH_ACTOR       – User who triggered the benchmark
-//
-// Usage from actions/github-script:
-//   const s = require('./.github/scripts/bench-update-status.js');
-//   await s({github, context, status: 'Building baseline binary...'});
-
-function buildBody(status) {
-  return `cc @${process.env.BENCH_ACTOR}\n\n🚀 Benchmark started! [View job](${process.env.BENCH_JOB_URL})\n\n⏳ **Status:** ${status}\n\n${process.env.BENCH_CONFIG}`;
-}
-
-async function updateStatus({ github, context, status }) {
-  await github.rest.issues.updateComment({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    comment_id: parseInt(process.env.BENCH_COMMENT_ID),
-    body: buildBody(status),
-  });
-}
-
-updateStatus.buildBody = buildBody;
-module.exports = updateStatus;

.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,96 +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 blocksLabel(summary) {
-  const parts = [];
-  if (summary.big_blocks) {
-    parts.push({ key: 'Big Blocks', value: summary.blocks });
-  } 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) },
-  ];
-}
-
-// 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/build_pgo_bolt.sh

@@ -1,414 +0,0 @@
-#!/usr/bin/env bash
-#
-# Full PGO+BOLT optimized build for reth using real reth-bench workloads.
-#
-# Phases:
-#   1. Build PGO-instrumented reth, run reth-bench → collect PGO profiles
-#   2. Build BOLT-instrumented reth (with PGO), run reth-bench → collect BOLT profiles
-#   3. Build final PGO+BOLT optimized binary
-#
-# Required environment variables:
-#   DATADIR    - Path to reth datadir (must already contain chain data)
-#   RPC_URL    - Source RPC URL for reth-bench to fetch payloads from
-#
-# Optional environment variables:
-#   PGO_BLOCKS      - Number of blocks for PGO profiling (default: 20)
-#   BOLT_BLOCKS     - Number of blocks for BOLT profiling (default: 20)
-#   SKIP_BOLT       - Temporarily skip BOLT phases (default: false)
-#   STRIP_SYMBOLS   - Strip debug symbols from output binary (default: true)
-#   COLLECT_PGO_ONLY - Stop after producing merged.profdata (default: false)
-#   PGO_PROFDATA    - Path to pre-collected merged.profdata (optional)
-#   PROFILE         - Cargo profile (default: maxperf-symbols)
-#   FEATURES        - Cargo features (default: jemalloc,asm-keccak,min-debug-logs)
-#   TARGET          - Target triple (default: auto-detected)
-#   EXTRA_RUSTFLAGS - Additional RUSTFLAGS (e.g. -C target-cpu=x86-64-v3)
-#
-# Output:
-#   target/$PROFILE_DIR/reth  — final optimized binary
-set -euxo pipefail
-
-gha_section_start() {
-    local title="$1"
-    if [ -n "${GITHUB_ACTIONS:-}" ]; then
-        echo "::group::$title"
-    else
-        echo ""
-        echo "=== $title ==="
-    fi
-}
-
-gha_section_end() {
-    if [ -n "${GITHUB_ACTIONS:-}" ]; then
-        echo "::endgroup::"
-    fi
-}
-
-cd "$(dirname "$0")/../.."
-
-# ── Configuration ──────────────────────────────────────────────────────────────
-PGO_BLOCKS="${PGO_BLOCKS:-20}"
-BOLT_BLOCKS="${BOLT_BLOCKS:-20}"
-SKIP_BOLT="${SKIP_BOLT:-false}"
-STRIP_SYMBOLS="${STRIP_SYMBOLS:-true}"
-COLLECT_PGO_ONLY="${COLLECT_PGO_ONLY:-false}"
-PROFILE="${PROFILE:-maxperf-symbols}"
-FEATURES="${FEATURES:-jemalloc,asm-keccak,min-debug-logs}"
-TARGET="${TARGET:-$(rustc -Vv | grep host | cut -d' ' -f2)}"
-BASE_RUSTFLAGS="${RUSTFLAGS:-}"
-EXTRA_RUSTFLAGS="${EXTRA_RUSTFLAGS:-}"
-COMBINED_RUSTFLAGS="$BASE_RUSTFLAGS $EXTRA_RUSTFLAGS"
-PGO_PROFDATA="${PGO_PROFDATA:-}"
-DATADIR="${DATADIR:-}"
-RPC_URL="${RPC_URL:-}"
-
-SKIP_BOLT_BOOL=false
-if [[ "${SKIP_BOLT,,}" == "true" || "$SKIP_BOLT" == "1" ]]; then
-    SKIP_BOLT_BOOL=true
-fi
-
-STRIP_SYMBOLS_BOOL=false
-if [[ "${STRIP_SYMBOLS,,}" == "true" || "$STRIP_SYMBOLS" == "1" ]]; then
-    STRIP_SYMBOLS_BOOL=true
-fi
-
-COLLECT_PGO_ONLY_BOOL=false
-if [[ "${COLLECT_PGO_ONLY,,}" == "true" || "$COLLECT_PGO_ONLY" == "1" ]]; then
-    COLLECT_PGO_ONLY_BOOL=true
-fi
-
-USE_PRECOLLECTED_PGO=false
-if [ -n "$PGO_PROFDATA" ]; then
-    if [ ! -f "$PGO_PROFDATA" ]; then
-        echo "error: PGO_PROFDATA points to a missing file: $PGO_PROFDATA"
-        exit 1
-    fi
-    USE_PRECOLLECTED_PGO=true
-fi
-
-NEEDS_BENCH_WORKLOAD=true
-if [ "$USE_PRECOLLECTED_PGO" = true ] && [ "$SKIP_BOLT_BOOL" = true ]; then
-    NEEDS_BENCH_WORKLOAD=false
-fi
-
-if [ "$NEEDS_BENCH_WORKLOAD" = true ]; then
-    : "${DATADIR:?DATADIR must be set to the reth data directory}"
-    : "${RPC_URL:?RPC_URL must be set}"
-fi
-
-if [[ "$PROFILE" == dev ]]; then
-    PROFILE_DIR=debug
-else
-    PROFILE_DIR=$PROFILE
-fi
-
-MANIFEST_PATH="bin/reth"
-
-LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
-PGO_DIR="$PWD/target/pgo-profiles"
-BOLT_DIR="$PWD/target/bolt-profiles"
-CARGO_ARGS=(--profile "$PROFILE" --features "$FEATURES" --manifest-path "$MANIFEST_PATH/Cargo.toml" --bin "reth" --locked)
-
-# Enable debug symbols for BOLT (requires symbols to reorder code).
-# Strip them at the end.
-PROFILE_UPPER=$(echo "$PROFILE" | tr '[:lower:]-' '[:upper:]_')
-export "CARGO_PROFILE_${PROFILE_UPPER}_STRIP=debuginfo"
-
-gha_section_start "Full PGO+BOLT Build"
-echo "Binary:      reth"
-echo "Manifest:    $MANIFEST_PATH"
-echo "Target:      $TARGET"
-echo "Profile:     $PROFILE"
-echo "Features:    $FEATURES"
-echo "LLVM:        $LLVM_VERSION"
-echo "PGO blocks:  $PGO_BLOCKS"
-echo "BOLT blocks: $BOLT_BLOCKS"
-echo "Skip BOLT:   $SKIP_BOLT"
-echo "Strip symbols: $STRIP_SYMBOLS"
-echo "Collect only: $COLLECT_PGO_ONLY"
-echo "PGO profdata: ${PGO_PROFDATA:-<collect with reth-bench>}"
-echo "RUSTFLAGS:   ${BASE_RUSTFLAGS:-<unset>}"
-echo "EXTRA_RUSTFLAGS: ${EXTRA_RUSTFLAGS:-<unset>}"
-if [ "$NEEDS_BENCH_WORKLOAD" = true ]; then
-    echo "Datadir:     $DATADIR"
-    echo "RPC URL:     $RPC_URL"
-else
-    echo "Datadir:     <not required>"
-    echo "RPC URL:     <not required>"
-fi
-gha_section_end
-
-# ── Prerequisites ──────────────────────────────────────────────────────────────
-gha_section_start "Installing prerequisites"
-rustup component add llvm-tools-preview
-
-LLVM_PROFDATA=$(find "$(rustc --print sysroot)" -name llvm-profdata -type f | head -1)
-if [ -z "$LLVM_PROFDATA" ]; then
-    echo "error: llvm-profdata not found"
-    exit 1
-fi
-
-install_bolt() {
-    if command -v llvm-bolt &>/dev/null; then
-        echo "BOLT already installed"
-        return
-    fi
-    echo "Installing BOLT from apt.llvm.org..."
-    wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc >/dev/null
-    CODENAME=$(lsb_release -cs)
-    echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-$LLVM_VERSION main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null
-    sudo apt-get update -qq
-    sudo apt-get install -y -qq "bolt-$LLVM_VERSION"
-    sudo ln -sf "/usr/bin/llvm-bolt-$LLVM_VERSION" /usr/local/bin/llvm-bolt
-    sudo ln -sf "/usr/bin/merge-fdata-$LLVM_VERSION" /usr/local/bin/merge-fdata
-}
-if [ "$SKIP_BOLT_BOOL" = true ]; then
-    echo "Skipping BOLT installation (SKIP_BOLT=$SKIP_BOLT)"
-else
-    install_bolt
-fi
-gha_section_end
-
-if [ "$NEEDS_BENCH_WORKLOAD" = true ]; then
-    # Build reth-bench once (non-instrumented) — reused for both phases.
-    gha_section_start "Building reth-bench"
-    RUSTFLAGS="$COMBINED_RUSTFLAGS" \
-        cargo build --profile "$PROFILE" --features "$FEATURES" \
-        --manifest-path bin/reth-bench/Cargo.toml --bin reth-bench --locked
-    RETH_BENCH_BIN="$(find target -name reth-bench -type f -executable | head -1)"
-    echo "reth-bench: $RETH_BENCH_BIN"
-    gha_section_end
-else
-    gha_section_start "Building reth-bench"
-    echo "Skipping reth-bench build (pre-collected PGO with SKIP_BOLT=true)"
-    gha_section_end
-fi
-
-# ── Helpers ────────────────────────────────────────────────────────────────────
-RETH_PID=
-cleanup() {
-    if [ -n "${RETH_PID:-}" ] && kill -0 "$RETH_PID" 2>/dev/null; then
-        echo "Stopping reth (pid $RETH_PID)..."
-        sudo kill "$RETH_PID" 2>/dev/null || true
-        for i in $(seq 1 60); do
-            sudo kill -0 "$RETH_PID" 2>/dev/null || break
-            if [ $((i % 10)) -eq 0 ]; then
-                echo "  waiting... (${i}s)"
-            fi
-            sleep 1
-        done
-        sudo kill -9 "$RETH_PID" 2>/dev/null || true
-    fi
-}
-trap cleanup EXIT
-
-# Start reth, wait for RPC, run reth-bench, then stop reth.
-# Arguments: $1 = reth binary path, $2 = number of blocks, $3 = log label
-run_bench_workload() {
-    local reth_bin="$1" blocks="$2" label="$3"
-    local http_port=8545 authrpc_port=8551
-
-    echo "--- Starting reth ($label) ---"
-    sudo "$reth_bin" node \
-        --datadir "$DATADIR" \
-        --log.file.directory "/tmp/reth-${label}-logs" \
-        --engine.accept-execution-requests-hash \
-        --http --http.port "$http_port" \
-        --authrpc.port "$authrpc_port" \
-        --disable-discovery --no-persist-peers \
-        > "/tmp/reth-${label}.log" 2>&1 &
-    RETH_PID=$!
-
-    echo "Waiting for reth RPC..."
-    for i in $(seq 1 120); do
-        if curl -sf "http://127.0.0.1:$http_port" -X POST \
-            -H 'Content-Type: application/json' \
-            -d '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
-            > /dev/null 2>&1; then
-            echo "reth is ready after ${i}s"
-            break
-        fi
-        if [ "$i" -eq 120 ]; then
-            echo "error: reth failed to start within 120s"
-            cat "/tmp/reth-${label}.log"
-            exit 1
-        fi
-        sleep 1
-    done
-
-    echo "Running reth-bench ($blocks blocks)..."
-    "$RETH_BENCH_BIN" new-payload-fcu \
-        --rpc-url "$RPC_URL" \
-        --engine-rpc-url "http://127.0.0.1:$authrpc_port" \
-        --jwt-secret "$DATADIR/jwt.hex" \
-        --advance "$blocks" \
-        --reth-new-payload 2>&1 | sed -u "s/^/[$label] /"
-
-    echo "Stopping reth ($label)..."
-    sudo kill "$RETH_PID" 2>/dev/null || true
-    for i in $(seq 1 60); do
-        sudo kill -0 "$RETH_PID" 2>/dev/null || break
-        sleep 1
-    done
-    sudo kill -9 "$RETH_PID" 2>/dev/null || true
-    RETH_PID=
-}
-
-publish_binary() {
-    local source_bin="$1"
-    for out in "target/$TARGET/$PROFILE_DIR" "target/$PROFILE_DIR"; do
-        local destination="$out/reth"
-        mkdir -p "$out"
-        # Skip copying when source and destination resolve to the same inode.
-        if [ -e "$destination" ] && [ "$source_bin" -ef "$destination" ]; then
-            continue
-        fi
-        cp "$source_bin" "$destination"
-    done
-}
-
-if [ "$USE_PRECOLLECTED_PGO" = true ]; then
-    gha_section_start "Phase 1: Using Pre-Collected PGO Profile"
-    rm -rf "$PGO_DIR"
-    mkdir -p "$PGO_DIR"
-    cp "$PGO_PROFDATA" "$PGO_DIR/merged.profdata"
-    echo "Using pre-collected profile: $PGO_PROFDATA"
-    echo "PGO profile: $PGO_DIR/merged.profdata ($(ls -lh "$PGO_DIR/merged.profdata" | awk '{print $5}'))"
-    gha_section_end
-else
-    # ── Phase 1: PGO profile collection ───────────────────────────────────────
-    gha_section_start "Phase 1: PGO Profile Collection"
-
-    rm -rf "$PGO_DIR"
-    mkdir -p "$PGO_DIR"
-
-    echo "Building PGO-instrumented binary..."
-    RUSTFLAGS="-Cprofile-generate=$PGO_DIR -Crelocation-model=pic $COMBINED_RUSTFLAGS" \
-        cargo build "${CARGO_ARGS[@]}" --target "$TARGET"
-
-    PGO_RETH_BIN="$PWD/target/$TARGET/$PROFILE_DIR/reth"
-    echo "Instrumented binary: $PGO_RETH_BIN ($(ls -lh "$PGO_RETH_BIN" | awk '{print $5}'))"
-
-    run_bench_workload "$PGO_RETH_BIN" "$PGO_BLOCKS" "pgo"
-
-    # Fix ownership if reth ran as root.
-    sudo chown -R "$(id -un):$(id -gn)" "$PGO_DIR" 2>/dev/null || true
-
-    # Merge PGO profiles.
-    echo "Merging PGO profiles..."
-    PROFRAW_COUNT=$(find "$PGO_DIR" -name '*.profraw' | wc -l)
-    echo "Found $PROFRAW_COUNT .profraw files"
-    if [ "$PROFRAW_COUNT" -eq 0 ]; then
-        echo "error: no .profraw files — instrumented binary did not produce profiles"
-        exit 1
-    fi
-    "$LLVM_PROFDATA" merge -o "$PGO_DIR/merged.profdata" "$PGO_DIR"/*.profraw
-    echo "PGO profile: $PGO_DIR/merged.profdata ($(ls -lh "$PGO_DIR/merged.profdata" | awk '{print $5}'))"
-    gha_section_end
-fi
-
-if [ "$COLLECT_PGO_ONLY_BOOL" = true ]; then
-    gha_section_start "PGO Collection Complete"
-    echo "COLLECT_PGO_ONLY=true, skipping PGO/BOLT optimized binary build"
-    echo "Profile: $PGO_DIR/merged.profdata"
-    gha_section_end
-    exit 0
-fi
-
-if [ "$SKIP_BOLT_BOOL" = true ]; then
-    gha_section_start "BOLT Phase Skipped"
-    echo "SKIP_BOLT=$SKIP_BOLT, building PGO-only binary"
-    echo "Building PGO-optimized binary..."
-    RUSTFLAGS="-Cprofile-use=$PGO_DIR/merged.profdata $COMBINED_RUSTFLAGS" \
-        cargo build "${CARGO_ARGS[@]}" --target "$TARGET"
-
-    BUILT_BIN="$PWD/target/$TARGET/$PROFILE_DIR/reth"
-    if [ "$STRIP_SYMBOLS_BOOL" = true ]; then
-        echo "Stripping debug symbols..."
-        strip "$BUILT_BIN"
-    else
-        echo "Skipping strip (STRIP_SYMBOLS=$STRIP_SYMBOLS)"
-    fi
-    publish_binary "$BUILT_BIN"
-    gha_section_end
-else
-    # ── Phase 2: BOLT profile collection (with PGO) ──────────────────────────
-    gha_section_start "Phase 2: BOLT Profile Collection (with PGO)"
-
-    rm -rf "$BOLT_DIR"
-    mkdir -p "$BOLT_DIR"
-
-    echo "Building BOLT-instrumented binary with PGO..."
-    # --emit-relocs preserves relocation entries in the binary, required by llvm-bolt -instrument
-    RUSTFLAGS="-Cprofile-use=$PGO_DIR/merged.profdata -Clink-arg=-Wl,--emit-relocs $COMBINED_RUSTFLAGS" \
-        cargo build "${CARGO_ARGS[@]}" --target "$TARGET"
-
-    # Instrument with BOLT
-    BUILT_BIN="$PWD/target/$TARGET/$PROFILE_DIR/reth"
-    BOLT_INSTRUMENTED_BIN="$BUILT_BIN-bolt-instrumented"
-
-    echo "Instrumenting binary with BOLT..."
-    # --skip-funcs: skip compiler-generated drop_in_place functions that BOLT can't handle
-    # as split functions in relocation mode (triggered by --emit-relocs)
-    llvm-bolt "$BUILT_BIN" \
-        -instrument \
-        --instrumentation-file-append-pid \
-        --instrumentation-file="$BOLT_DIR/prof" \
-        --skip-funcs='.*drop_in_place.*' \
-        -o "$BOLT_INSTRUMENTED_BIN"
-    echo "BOLT-instrumented binary: $BOLT_INSTRUMENTED_BIN ($(ls -lh "$BOLT_INSTRUMENTED_BIN" | awk '{print $5}'))"
-
-    run_bench_workload "$BOLT_INSTRUMENTED_BIN" "$BOLT_BLOCKS" "bolt"
-
-    # Fix ownership for BOLT profiles
-    sudo chown -R "$(id -un):$(id -gn)" "$BOLT_DIR" 2>/dev/null || true
-
-    # Merge BOLT profiles
-    echo "Merging BOLT profiles..."
-    FDATA_COUNT=$(find "$BOLT_DIR" -name '*.fdata' | wc -l)
-    echo "Found $FDATA_COUNT .fdata files"
-    if [ "$FDATA_COUNT" -eq 0 ]; then
-        echo "error: no .fdata files — BOLT-instrumented binary did not produce profiles"
-        exit 1
-    fi
-    merge-fdata "$BOLT_DIR"/*.fdata > "$BOLT_DIR/merged.fdata"
-    echo "BOLT profile: $BOLT_DIR/merged.fdata ($(ls -lh "$BOLT_DIR/merged.fdata" | awk '{print $5}'))"
-    gha_section_end
-
-    # ── Phase 3: Final optimized build ───────────────────────────────────────
-    gha_section_start "Phase 3: Final PGO+BOLT Optimized Build"
-
-    echo "Building PGO-optimized binary..."
-    # --emit-relocs preserves relocation entries in the binary, required by llvm-bolt for code reordering
-    RUSTFLAGS="-Cprofile-use=$PGO_DIR/merged.profdata -Clink-arg=-Wl,--emit-relocs $COMBINED_RUSTFLAGS" \
-        cargo build "${CARGO_ARGS[@]}" --target "$TARGET"
-
-    BUILT_BIN="$PWD/target/$TARGET/$PROFILE_DIR/reth"
-    OPTIMIZED_BIN="$BUILT_BIN-bolt-optimized"
-
-    echo "Optimizing with BOLT..."
-    llvm-bolt "$BUILT_BIN" \
-        -o "$OPTIMIZED_BIN" \
-        --data "$BOLT_DIR/merged.fdata" \
-        -reorder-blocks=ext-tsp \
-        -reorder-functions=cdsort \
-        -split-functions \
-        -split-all-cold \
-        -dyno-stats \
-        -icf=1 \
-        -use-gnu-stack \
-        --skip-funcs='.*drop_in_place.*'
-
-    if [ "$STRIP_SYMBOLS_BOOL" = true ]; then
-        echo "Stripping debug symbols..."
-        strip "$OPTIMIZED_BIN"
-    else
-        echo "Skipping strip (STRIP_SYMBOLS=$STRIP_SYMBOLS)"
-    fi
-    publish_binary "$OPTIMIZED_BIN"
-    gha_section_end
-fi
-
-gha_section_start "Build Complete"
-ls -lh "target/$PROFILE_DIR/reth"
-echo "Output: target/$PROFILE_DIR/reth"
-gha_section_end

.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.
@@ -39,6 +59,10 @@ engine-auth: [ ]
 #
 # System contract tests (already fixed and deployed):
 #
+# tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout and test_invalid_log_length
+#   System contract is already fixed and deployed; tests cover scenarios where contract is
+#   malformed which can't happen retroactively. No point in adding checks.
+#
 # tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment
 # tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment
 #   Post-fork system contract deployment tests. Should fix for spec compliance but not realistic
@@ -47,8 +71,32 @@ eels/consume-engine:
   - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test_engine-zero_nonce]-reth
   - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-nonzero_balance]-reth
   - tests/prague/eip7251_consolidations/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-zero_balance]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_amount_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_amount_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_index_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_index_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_pubkey_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_pubkey_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_signature_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_signature_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_withdrawal_credentials_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Prague-blockchain_test_engine-log_argument_withdrawal_credentials_size-value_zero]-reth
   - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-nonzero_balance]-reth
   - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-zero_balance]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_False]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_True]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_amount_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_amount_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_index_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_index_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_pubkey_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_pubkey_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_signature_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_signature_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_withdrawal_credentials_offset-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_layout[fork_Osaka-blockchain_test_engine-log_argument_withdrawal_credentials_size-value_zero]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Osaka-blockchain_test_engine-slice_bytes_False]-reth
+  - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Osaka-blockchain_test_engine-slice_bytes_True]-reth
   - tests/paris/eip7610_create_collision/test_initcollision.py::test_init_collision_create_tx[fork_Osaka-tx_type_0-blockchain_test_engine_from_state_test-non-empty-balance-revert-initcode]-reth
   - tests/paris/eip7610_create_collision/test_initcollision.py::test_init_collision_create_tx[fork_Prague-tx_type_0-blockchain_test_engine_from_state_test-non-empty-balance-correct-initcode]-reth
   - tests/paris/eip7610_create_collision/test_initcollision.py::test_init_collision_create_tx[fork_Paris-tx_type_1-blockchain_test_engine_from_state_test-non-empty-balance-correct-initcode]-reth

.github/scripts/hive/ignored_tests.yaml

@@ -11,16 +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)
+  - 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)
   - Transaction Re-Org, Re-Org Out (Cancun) (reth)
   - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P9 (Cancun) (reth)
-  # Hive test infra bug: geth sidecar switched to PathScheme for state storage, which has
-  # strict trie integrity requirements incompatible with inserting intentionally invalid blocks.
-  # 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)

.github/scripts/hive/run_simulator.sh

@@ -6,20 +6,8 @@ cd hivetests/
 sim="${1}"
 limit="${2}"
 
-# Use lower parallelism for eels tests to avoid OOM-killing the runner
-parallelism=16
-if [[ "${sim}" == *"eels"* ]]; then
-    parallelism=4
-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 16 --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-scheduled.yml

@@ -1,982 +0,0 @@
-# Scheduled regression benchmarks (nightly + hourly).
-#
-# Two modes:
-#   nightly — Compares the previous nightly Docker build against the current one.
-#             Runs daily after docker.yml produces a new nightly image.
-#   hourly  — Compares main HEAD against the last benchmarked commit to catch
-#             regressions quickly. Falls back to HEAD~1 on first run.
-#             Skips if no new commits or if a previous run is still in progress.
-#
-# State is persisted between runs via the decofe/reth-bench-charts repo: each
-# successful run saves the feature commit SHA so the next run knows what to
-# compare against.
-
-on:
-  schedule:
-    # Nightly: compares previous vs current nightly Docker build
-    - cron: "30 5 * * *"
-    # Hourly: compares main HEAD vs last benchmarked commit, skips if no new commits
-    - cron: "0 * * * *"
-  workflow_dispatch:
-    inputs:
-      force:
-        description: "Force run even if no new commit (bypass skip logic)"
-        required: false
-        default: false
-        type: boolean
-      no_slack:
-        description: "Suppress Slack notifications"
-        required: false
-        default: true
-        type: boolean
-      mode:
-        description: "Benchmark mode"
-        required: false
-        default: "nightly"
-        type: choice
-        options:
-          - nightly
-          - hourly
-
-env:
-  CARGO_TERM_COLOR: always
-  RUSTC_WRAPPER: "sccache"
-
-name: bench-scheduled
-
-permissions:
-  contents: read
-  actions: read
-
-jobs:
-  # ---------------------------------------------------------------------------
-  # Job 1: Resolve refs, check staleness, manage state
-  # ---------------------------------------------------------------------------
-  resolve-refs:
-    name: resolve-refs
-    runs-on: ubuntu-latest
-    outputs:
-      mode: ${{ steps.mode.outputs.mode }}
-      baseline-ref: ${{ steps.refs.outputs.baseline-ref }}
-      feature-ref: ${{ steps.refs.outputs.feature-ref }}
-      should-skip: ${{ steps.refs.outputs.should-skip }}
-      is-stale: ${{ steps.refs.outputs.is-stale }}
-      stale-age-hours: ${{ steps.refs.outputs.stale-age-hours }}
-      nightly-created: ${{ steps.refs.outputs.nightly-created }}
-      long-running: ${{ steps.refs.outputs.long-running }}
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          sparse-checkout: .github/scripts
-          sparse-checkout-cone-mode: true
-          fetch-depth: 2
-
-      - name: Detect mode
-        id: mode
-        run: |
-          # Maps cron schedules to modes (must match the schedule entries above)
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            MODE="${{ inputs.mode || 'nightly' }}"
-          elif [ "${{ github.event.schedule }}" = "30 5 * * *" ]; then
-            MODE="nightly"
-          else
-            MODE="hourly"
-          fi
-          echo "mode=$MODE" >> "$GITHUB_OUTPUT"
-          echo "Detected mode: $MODE"
-
-      - name: Resolve refs
-        id: refs
-        env:
-          GH_TOKEN: ${{ github.token }}
-          DEREK_TOKEN: ${{ secrets.DEREK_TOKEN }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
-          GITHUB_RUN_ID: ${{ github.run_id }}
-        run: |
-          FORCE="${{ inputs.force || 'false' }}"
-          MODE="${{ steps.mode.outputs.mode }}"
-          .github/scripts/bench-scheduled-refs.sh "$FORCE" "$MODE"
-
-      - name: Alert on long-running hourly
-        if: steps.mode.outputs.mode == 'hourly' && steps.refs.outputs.long-running == 'true'
-        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 token = process.env.SLACK_BENCH_BOT_TOKEN;
-            const channel = process.env.SLACK_BENCH_CHANNEL;
-            if (!token || !channel) return;
-
-            const repo = '${{ github.repository }}';
-            const runUrl = `${context.serverUrl}/${repo}/actions/runs/${context.runId}`;
-            const blocks = [
-              {
-                type: 'header',
-                text: { type: 'plain_text', text: ':warning: Hourly Bench: previous run still in progress', emoji: true },
-              },
-              {
-                type: 'section',
-                text: {
-                  type: 'mrkdwn',
-                  text: 'A previous hourly benchmark run is still in progress. This invocation will be skipped.\nThis may indicate a long-running or stuck job.',
-                },
-              },
-              {
-                type: 'actions',
-                elements: [{
-                  type: 'button',
-                  text: { type: 'plain_text', text: 'View Run :github:', emoji: true },
-                  url: runUrl,
-                  action_id: 'ci_button',
-                }],
-              },
-            ];
-            await fetch('https://slack.com/api/chat.postMessage', {
-              method: 'POST',
-              headers: { 'Authorization': `Bearer ${token}`, 'Content-Type': 'application/json' },
-              body: JSON.stringify({ channel, blocks, text: 'Hourly bench: previous run still in progress', unfurl_links: false }),
-            });
-
-      - name: Alert on stale nightly
-        if: steps.mode.outputs.mode == 'nightly' && steps.refs.outputs.is-stale == 'true'
-        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 token = process.env.SLACK_BENCH_BOT_TOKEN;
-            const channel = process.env.SLACK_BENCH_CHANNEL;
-            if (!token || !channel) {
-              core.warning('Slack credentials not set, skipping stale nightly alert');
-              return;
-            }
-
-            const ageHours = '${{ steps.refs.outputs.stale-age-hours }}';
-            const created = '${{ steps.refs.outputs.nightly-created }}';
-            const featureRef = '${{ steps.refs.outputs.feature-ref }}';
-            const shortSha = featureRef.slice(0, 8);
-            const repo = '${{ github.repository }}';
-            const runUrl = `${context.serverUrl}/${repo}/actions/runs/${context.runId}`;
-
-            const blocks = [
-              {
-                type: 'header',
-                text: { type: 'plain_text', text: ':rotating_light: Nightly Regression: nightly build is stale', emoji: true },
-              },
-              {
-                type: 'section',
-                text: {
-                  type: 'mrkdwn',
-                  text: [
-                    '*Nightly regression did not run* — nightly build is stale',
-                    '',
-                    `The latest nightly image was built from a commit that is *${ageHours}h old* (threshold: 24h).`,
-                    `This means today's nightly docker build likely failed and no new image was produced.`,
-                    '',
-                    `Stale commit: \`${shortSha}\` (built at ${created})`,
-                    '',
-                    '*Action required:* Check the <https://github.com/' + repo + '/actions/workflows/docker.yml|docker.yml> workflow for failures.',
-                  ].join('\n'),
-                },
-              },
-              {
-                type: 'actions',
-                elements: [
-                  {
-                    type: 'button',
-                    text: { type: 'plain_text', text: 'View Run :github:', emoji: true },
-                    url: runUrl,
-                    action_id: 'ci_button',
-                  },
-                ],
-              },
-            ];
-
-            const resp = await fetch('https://slack.com/api/chat.postMessage', {
-              method: 'POST',
-              headers: {
-                'Authorization': `Bearer ${token}`,
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                channel,
-                blocks,
-                text: 'Nightly regression: nightly build is stale',
-                unfurl_links: false,
-              }),
-            });
-            const data = await resp.json();
-            if (!data.ok) {
-              core.warning(`Slack API error: ${JSON.stringify(data)}`);
-            }
-
-      - name: Fail on stale nightly
-        if: steps.mode.outputs.mode == 'nightly' && steps.refs.outputs.is-stale == 'true'
-        run: |
-          echo "::error::Nightly build is stale (>24h old). Aborting."
-          exit 1
-
-  # ---------------------------------------------------------------------------
-  # Job 2: Run the benchmark
-  # ---------------------------------------------------------------------------
-  bench-scheduled:
-    needs: resolve-refs
-    if: |
-      needs.resolve-refs.outputs.should-skip != 'true' &&
-      needs.resolve-refs.outputs.is-stale != 'true'
-    name: bench-scheduled
-    runs-on: [self-hosted, Linux, X64, available]
-    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: ""
-      BENCH_MODE: ${{ needs.resolve-refs.outputs.mode }}
-      BENCH_ACTOR: "${{ needs.resolve-refs.outputs.mode }}-regression"
-      BENCH_BLOCKS: "2000"
-      BENCH_WARMUP_BLOCKS: "500"
-      BENCH_SAMPLY: "false"
-      BENCH_CORES: "0"
-      BENCH_BIG_BLOCKS: "false"
-      BENCH_WAIT_TIME: ""
-      BENCH_BASELINE_ARGS: ""
-      BENCH_FEATURE_ARGS: ""
-      BENCH_ABBA: "true"
-      BENCH_COMMENT_ID: ""
-      BENCH_NO_SLACK: ${{ github.event_name == 'workflow_dispatch' && inputs.no_slack == true && 'true' || 'false' }}
-      BENCH_METRICS_ADDR: "127.0.0.1:9100"
-      BENCH_OTLP_DISABLED: "true"
-      BASELINE_REF: ${{ needs.resolve-refs.outputs.baseline-ref }}
-      FEATURE_REF: ${{ needs.resolve-refs.outputs.feature-ref }}
-    steps:
-      - name: Clean up previous bench-work
-        run: sudo rm -rf "$BENCH_WORK_DIR" 2>/dev/null || true
-
-      - uses: actions/checkout@v6
-        with:
-          submodules: true
-          fetch-depth: 0
-          ref: ${{ needs.resolve-refs.outputs.feature-ref }}
-
-      - name: Resolve job URL
-        id: job-url
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const { data: jobs } = await github.rest.actions.listJobsForWorkflowRun({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: context.runId,
-            });
-            const job = jobs.jobs.find(j => j.name === 'bench-scheduled');
-            const jobUrl = job ? job.html_url : `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
-            core.exportVariable('BENCH_JOB_URL', jobUrl);
-
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: mozilla-actions/sccache-action@v0.0.9
-        continue-on-error: true
-
-      - name: Install dependencies
-        env:
-          DEREK_TOKEN: ${{ secrets.DEREK_TOKEN }}
-        run: |
-          mkdir -p "$HOME/.local/bin"
-
-          # apt packages
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends \
-            python3 make jq zstd curl dmsetup \
-            linux-tools-"$(uname -r)" || \
-            sudo apt-get install -y --no-install-recommends linux-tools-generic
-
-          # mc (MinIO client)
-          if ! command -v mc &>/dev/null; then
-            curl -sSfL https://dl.min.io/client/mc/release/linux-amd64/mc -o "$HOME/.local/bin/mc"
-            chmod +x "$HOME/.local/bin/mc"
-          fi
-
-          # uv (Python package manager)
-          if ! command -v uv &>/dev/null; then
-            curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$HOME/.local/bin" sh
-          fi
-
-          # Configure git auth for private repos
-          git config --global url."https://x-access-token:${DEREK_TOKEN}@github.com/".insteadOf "https://github.com/"
-
-          # thin-provisioning-tools (era_invalidate, required by schelk)
-          if ! command -v era_invalidate &>/dev/null; then
-            git clone --depth 1 https://github.com/jthornber/thin-provisioning-tools /tmp/tpt
-            sudo make -C /tmp/tpt install
-            rm -rf /tmp/tpt
-          fi
-
-          # schelk (snapshot rollback tool, invoked via sudo)
-          if ! sudo sh -c 'command -v schelk' &>/dev/null; then
-            cargo install --git https://github.com/tempoxyz/schelk --locked
-            sudo install "$HOME/.cargo/bin/schelk" /usr/local/bin/
-          fi
-
-      - name: Check dependencies
-        run: |
-          export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
-          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-          missing=()
-          for cmd in mc schelk cpupower taskset stdbuf python3 curl make uv pzstd jq; do
-            command -v "$cmd" &>/dev/null || missing+=("$cmd")
-          done
-          if [ ${#missing[@]} -gt 0 ]; then
-            echo "::error::Missing required tools: ${missing[*]}"
-            exit 1
-          fi
-          echo "All dependencies found"
-
-      - name: Resolve display names
-        id: refs
-        run: |
-          BASELINE_SHORT=$(echo "$BASELINE_REF" | cut -c1-8)
-          FEATURE_SHORT=$(echo "$FEATURE_REF" | cut -c1-8)
-          echo "baseline-name=${BENCH_MODE}-${BASELINE_SHORT}" >> "$GITHUB_OUTPUT"
-          echo "feature-name=${BENCH_MODE}-${FEATURE_SHORT}" >> "$GITHUB_OUTPUT"
-          echo "baseline-ref=$BASELINE_REF" >> "$GITHUB_OUTPUT"
-          echo "feature-ref=$FEATURE_REF" >> "$GITHUB_OUTPUT"
-
-      - 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
-
-      - name: Prepare source dirs
-        run: |
-          if [ -d ../reth-baseline ]; then
-            git -C ../reth-baseline fetch origin "$BASELINE_REF"
-          else
-            git clone . ../reth-baseline
-          fi
-          git -C ../reth-baseline checkout "$BASELINE_REF"
-
-          if [ -d ../reth-feature ]; then
-            git -C ../reth-feature fetch origin "$FEATURE_REF"
-          else
-            git clone . ../reth-feature
-          fi
-          git -C ../reth-feature checkout "$FEATURE_REF"
-
-      - name: Build binaries
-        id: build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BENCH_REPO: ${{ github.repository }}
-        run: |
-          BASELINE_DIR="$(cd ../reth-baseline && pwd)"
-          FEATURE_DIR="$(cd ../reth-feature && pwd)"
-
-          .github/scripts/bench-reth-build.sh baseline "${BASELINE_DIR}" "$BASELINE_REF" &
-          PID_BASELINE=$!
-          .github/scripts/bench-reth-build.sh feature "${FEATURE_DIR}" "$FEATURE_REF" &
-          PID_FEATURE=$!
-
-          FAIL=0
-          wait $PID_BASELINE || FAIL=1
-          wait $PID_FEATURE || FAIL=1
-          if [ $FAIL -ne 0 ]; then
-            echo "::error::One or more build tasks failed"
-            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/reth
-        run: .github/scripts/bench-reth-snapshot.sh
-
-      # System tuning for reproducible benchmarks
-      - name: System setup
-        run: |
-          sudo cpupower frequency-set -g performance || true
-          # 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)
-          for cpu in /sys/devices/system/cpu/cpu*/topology/thread_siblings_list; do
-            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" || 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
-            [ -d "$p" ] && echo never | sudo tee "$p/enabled" && echo never | sudo tee "$p/defrag" && break
-          done || true
-          # Prevent deep C-states
-          sudo sh -c 'exec 3<>/dev/cpu_dma_latency; echo -ne "\x00\x00\x00\x00" >&3; sleep infinity' &
-          # Move all 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
-          echo "=== Benchmark environment ==="
-          uname -r
-          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
-          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
-
-      - 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
-          rm -rf "$BENCH_WORK_DIR"
-          mkdir -p "$BENCH_WORK_DIR"
-
-      - name: Start metrics proxy
-        run: |
-          BENCH_ID="${BENCH_MODE}-${{ 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)"
-
-      # Interleaved run order (B-F-F-B) to reduce systematic bias
-      - name: "Run benchmark: baseline (1/2)"
-        id: run-baseline-1
-        run: |
-          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":"$(date +%s)","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-          LABELS
-          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
-        run: |
-          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":"$(date +%s)","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-          LABELS
-          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)"
-        id: run-feature-2
-        run: |
-          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":"$(date +%s)","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
-          LABELS
-          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)"
-        id: run-baseline-2
-        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/reth "$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}"
-
-      - name: Scan logs for errors
-        if: "!cancelled()"
-        run: |
-          ERRORS_FILE="$BENCH_WORK_DIR/errors.md"
-          found=false
-          for run_dir in baseline-1 feature-1 feature-2 baseline-2; do
-            LOG="$BENCH_WORK_DIR/$run_dir/node.log"
-            if [ ! -f "$LOG" ]; then continue; fi
-
-            panics=$(grep -c -E 'panicked at' "$LOG" || true)
-            errors=$(grep -c ' ERROR ' "$LOG" || true)
-
-            if [ "$panics" -gt 0 ] || [ "$errors" -gt 0 ]; then
-              if [ "$found" = false ]; then
-                printf '### ⚠️ Node Errors\n\n' >> "$ERRORS_FILE"
-                found=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
-
-      - name: Parse results
-        id: results
-        if: success()
-        env:
-          BASELINE_NAME: ${{ steps.refs.outputs.baseline-name }}
-          FEATURE_NAME: ${{ steps.refs.outputs.feature-name }}
-        run: |
-          SUMMARY_ARGS="--output-summary $BENCH_WORK_DIR/summary.json"
-          SUMMARY_ARGS="$SUMMARY_ARGS --output-markdown $BENCH_WORK_DIR/comment.md"
-          SUMMARY_ARGS="$SUMMARY_ARGS --repo ${{ github.repository }}"
-          SUMMARY_ARGS="$SUMMARY_ARGS --baseline-ref ${BASELINE_REF}"
-          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"
-          BASELINE_CSVS="$BASELINE_CSVS $BENCH_WORK_DIR/baseline-2/combined_latency.csv"
-          FEATURE_CSVS="$FEATURE_CSVS $BENCH_WORK_DIR/feature-2/combined_latency.csv"
-          SUMMARY_ARGS="$SUMMARY_ARGS --baseline-csv $BASELINE_CSVS"
-          SUMMARY_ARGS="$SUMMARY_ARGS --feature-csv $FEATURE_CSVS"
-          SUMMARY_ARGS="$SUMMARY_ARGS --gas-csv $BENCH_WORK_DIR/feature-1/total_gas.csv"
-
-          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
-
-      - name: Upload to ClickHouse
-        if: success()
-        env:
-          CLICKHOUSE_HOST: ${{ secrets.CLICKHOUSE_HOST }}
-          CLICKHOUSE_USER: ${{ secrets.CLICKHOUSE_USER }}
-          CLICKHOUSE_PASSWORD: ${{ secrets.CLICKHOUSE_PASSWORD }}
-        run: |
-          WORKFLOW_NAME="workflows-nightly-regression-${{ github.run_id }}"
-          DIFF_URL="https://github.com/${{ github.repository }}/compare/${BASELINE_REF}...${FEATURE_REF}"
-          GRAFANA_URL='${{ steps.metrics.outputs.grafana-url }}'
-          JOB_URL="${BENCH_JOB_URL:-${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}}"
-
-          python3 .github/scripts/bench-upload-clickhouse.py \
-            --summary "$BENCH_WORK_DIR/summary.json" \
-            --workflow-name "$WORKFLOW_NAME" \
-            --chain mainnet \
-            --grafana-url "${GRAFANA_URL:-}" \
-            --github-diff-url "$DIFF_URL" \
-            --job-url "$JOB_URL"
-
-      - name: Generate charts
-        if: success() && env.BENCH_MODE != 'hourly'
-        env:
-          BASELINE_NAME: ${{ steps.refs.outputs.baseline-name }}
-          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"
-          FEATURE_CSVS="$FEATURE_CSVS $BENCH_WORK_DIR/feature-2/combined_latency.csv"
-          BASELINE_CSVS="$BASELINE_CSVS $BENCH_WORK_DIR/baseline-2/combined_latency.csv"
-          CHART_ARGS="$CHART_ARGS --feature $FEATURE_CSVS"
-          CHART_ARGS="$CHART_ARGS --baseline $BASELINE_CSVS"
-          CHART_ARGS="$CHART_ARGS --baseline-name ${BASELINE_NAME}"
-          CHART_ARGS="$CHART_ARGS --feature-name ${FEATURE_NAME}"
-          # shellcheck disable=SC2086
-          uv run --with matplotlib python3 .github/scripts/bench-reth-charts.py $CHART_ARGS
-
-      - name: Upload results
-        if: "!cancelled()"
-        uses: actions/upload-artifact@v7
-        with:
-          name: bench-scheduled-results
-          path: ${{ env.BENCH_WORK_DIR }}
-
-      - name: Push charts
-        id: push-charts
-        if: success() && env.BENCH_MODE != 'hourly'
-        run: |
-          RUN_ID=${{ github.run_id }}
-          CHART_DIR="nightly/${RUN_ID}"
-          CHARTS_REPO="https://x-access-token:${{ secrets.DEREK_TOKEN }}@github.com/decofe/reth-bench-charts.git"
-
-          TMP_DIR=$(mktemp -d)
-          if git clone --depth 1 "${CHARTS_REPO}" "${TMP_DIR}" 2>/dev/null; then
-            true
-          else
-            git init "${TMP_DIR}"
-            git -C "${TMP_DIR}" remote add origin "${CHARTS_REPO}"
-          fi
-
-          mkdir -p "${TMP_DIR}/${CHART_DIR}"
-          cp "$BENCH_WORK_DIR"/charts/*.png "${TMP_DIR}/${CHART_DIR}/"
-          git -C "${TMP_DIR}" add "${CHART_DIR}"
-          git -C "${TMP_DIR}" -c user.name="github-actions" -c user.email="github-actions@github.com" \
-            commit -m "nightly bench charts for run ${RUN_ID}"
-          git -C "${TMP_DIR}" push origin HEAD:main
-          echo "sha=$(git -C "${TMP_DIR}" rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-          rm -rf "${TMP_DIR}"
-
-      - name: Write job summary
-        if: success()
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const fs = require('fs');
-            const { verdict, metricRows, waitTimeRows, blocksLabel } = require('./.github/scripts/bench-utils');
-
-            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 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}`;
-
-            const mode = process.env.BENCH_MODE || 'nightly';
-            const modeLabel = mode === 'hourly' ? 'Hourly Regression' : 'Nightly Regression';
-            let md = `# ${emoji} ${modeLabel}: ${label}\n\n`;
-            md += `**Baseline:** ${baselineLink}\n`;
-            md += `**Feature:** ${featureLink} ([diff](${diffUrl}))\n`;
-            md += blocksLabel(summary).map(p => `**${p.key}:** ${p.value}`).join(' · ') + '\n\n';
-
-            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';
-
-            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
-            const chartSha = '${{ steps.push-charts.outputs.sha }}';
-            if (chartSha) {
-              const runId = '${{ github.run_id }}';
-              const baseUrl = `https://raw.githubusercontent.com/decofe/reth-bench-charts/${chartSha}/nightly/${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`;
-              }
-            }
-
-            const grafanaUrl = '${{ steps.metrics.outputs.grafana-url }}';
-            if (grafanaUrl) {
-              md += `### Grafana Dashboard\n\n[View real-time metrics](${grafanaUrl})\n\n`;
-            }
-
-            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();
-
-      - name: Send Slack notification (success)
-        if: success() && env.BENCH_NO_SLACK != 'true'
-        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 fs = require('fs');
-            const { verdict, fmtChange, fmtMs, metricRows, waitTimeRows, blocksLabel } = require('./.github/scripts/bench-utils');
-
-            const token = process.env.SLACK_BENCH_BOT_TOKEN;
-            const channel = process.env.SLACK_BENCH_CHANNEL;
-            if (!token || !channel) {
-              core.info('Slack credentials not set, skipping notification');
-              return;
-            }
-
-            let summary;
-            try {
-              summary = JSON.parse(fs.readFileSync(process.env.BENCH_WORK_DIR + '/summary.json', 'utf8'));
-            } catch (e) {
-              core.warning('Could not read summary.json for Slack notification');
-              return;
-            }
-
-            // Filter notifications based on mode
-            const changes = summary.changes || {};
-            const mode = process.env.BENCH_MODE || 'nightly';
-            const hasRegression = Object.values(changes).some(c => c.sig === 'bad');
-
-            // Hourly mode: only notify on regressions
-            if (mode === 'hourly' && !hasRegression) {
-              core.info('Hourly mode: no regression detected, skipping Slack notification');
-              return;
-            }
-
-            // Nightly mode: always notify (report every run regardless of significance)
-
-            const SLACK_VERDICT = {
-              '⚠️': ':warning:',
-              '❌': ':x:',
-              '✅': ':white_check_mark:',
-              '⚪': ':white_circle:',
-            };
-
-            const repo = `${context.repo.owner}/${context.repo.repo}`;
-            const { emoji, label } = verdict(changes);
-            const headerEmoji = SLACK_VERDICT[emoji] || emoji;
-            const commitUrl = `https://github.com/${repo}/commit`;
-            const baselineLink = `<${commitUrl}/${summary.baseline.ref}|${summary.baseline.name}>`;
-            const featureLink = `<${commitUrl}/${summary.feature.ref}|${summary.feature.name}>`;
-            const diffUrl = `https://github.com/${repo}/compare/${summary.baseline.ref}...${summary.feature.ref}`;
-            const jobUrl = process.env.BENCH_JOB_URL || `${context.serverUrl}/${repo}/actions/runs/${context.runId}`;
-
-            function cell(text) { return { type: 'raw_text', text: String(text) || ' ' }; }
-
-            const modeLabel = mode === 'hourly' ? 'Hourly Regression' : 'Nightly Regression';
-            const sectionText = [
-              `*${modeLabel}*`,
-              '',
-              `*Baseline:* ${baselineLink}`,
-              `*Feature:* ${featureLink}`,
-              blocksLabel(summary).map(p => `*${p.key}:* ${p.value}`).join(' | '),
-            ].join('\n');
-
-            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} ${modeLabel}: ${label}`, emoji: true },
-              },
-              {
-                type: 'section',
-                text: { type: 'mrkdwn', text: sectionText },
-              },
-              {
-                type: 'table',
-                column_settings: [{ align: 'left' }, { align: 'right' }, { align: 'right' }, { align: 'right' }],
-                rows: tableRows,
-              },
-              {
-                type: 'actions',
-                elements: [
-                  {
-                    type: 'button',
-                    text: { type: 'plain_text', text: 'CI :github:', emoji: true },
-                    url: jobUrl,
-                    action_id: 'ci_button',
-                  },
-                  {
-                    type: 'button',
-                    text: { type: 'plain_text', text: 'Diff :github:', emoji: true },
-                    url: diffUrl,
-                    action_id: 'diff_button',
-                  },
-                ],
-              },
-            ];
-
-            const text = `${modeLabel}: ${summary.baseline.name} vs ${summary.feature.name}`;
-            const resp = await fetch('https://slack.com/api/chat.postMessage', {
-              method: 'POST',
-              headers: {
-                'Authorization': `Bearer ${token}`,
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({ channel, blocks, text, unfurl_links: false }),
-            });
-            const data = await resp.json();
-            if (!data.ok) {
-              core.warning(`Slack API error: ${JSON.stringify(data)}`);
-              return;
-            }
-
-            // Post wait time breakdown as threaded reply
-            const wtRows = waitTimeRows(summary);
-            if (data.ts && wtRows.length > 0) {
-              const waitTableRows = [
-                [cell('Wait Time'), cell('Baseline'), cell('Feature')],
-                ...wtRows.map(r => [cell(r.title), cell(r.baseline), cell(r.feature)]),
-              ];
-              await fetch('https://slack.com/api/chat.postMessage', {
-                method: 'POST',
-                headers: {
-                  'Authorization': `Bearer ${token}`,
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                  channel,
-                  thread_ts: data.ts,
-                  blocks: [{
-                    type: 'table',
-                    column_settings: [{ align: 'left' }, { align: 'right' }, { align: 'right' }],
-                    rows: waitTableRows,
-                  }],
-                  text: 'Wait time breakdown',
-                  unfurl_links: false,
-                }),
-              });
-            }
-
-      - name: Send Slack notification (failure)
-        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 token = process.env.SLACK_BENCH_BOT_TOKEN;
-            const channel = process.env.SLACK_BENCH_CHANNEL;
-            if (!token || !channel) return;
-
-            const steps_status = [
-              ['building binaries', '${{ steps.build.outcome }}'],
-              ['downloading snapshot', '${{ steps.snapshot-download.outcome }}'],
-              ['running baseline benchmark (1/2)', '${{ steps.run-baseline-1.outcome }}'],
-              ['running feature benchmark (1/2)', '${{ steps.run-feature-1.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';
-
-            const repo = `${context.repo.owner}/${context.repo.repo}`;
-            const jobUrl = process.env.BENCH_JOB_URL || `${context.serverUrl}/${repo}/actions/runs/${context.runId}`;
-
-            const mode = process.env.BENCH_MODE || 'nightly';
-            const modeLabel = mode === 'hourly' ? 'Hourly' : 'Nightly';
-
-            const blocks = [
-              {
-                type: 'header',
-                text: { type: 'plain_text', text: `:rotating_light: ${modeLabel} Bench Failed`, emoji: true },
-              },
-              {
-                type: 'section',
-                text: { type: 'mrkdwn', text: `*${modeLabel} regression* failed while *${failedStep}*\ncc <@U09FARE0B9Q> <@U09FAL2UMLJ>` },
-              },
-              {
-                type: 'actions',
-                elements: [{
-                  type: 'button',
-                  text: { type: 'plain_text', text: 'View Logs :github:', emoji: true },
-                  url: jobUrl,
-                  action_id: 'ci_button',
-                }],
-              },
-            ];
-
-            await fetch('https://slack.com/api/chat.postMessage', {
-              method: 'POST',
-              headers: {
-                'Authorization': `Bearer ${token}`,
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                channel,
-                blocks,
-                text: `${modeLabel} bench failed while ${failedStep}`,
-                unfurl_links: false,
-              }),
-            });
-
-      - name: Restore system settings
-        if: always()
-        run: |
-          sudo systemctl start irqbalance cron atd 2>/dev/null || true
-
-  # ---------------------------------------------------------------------------
-  # Job 3: Save state on success
-  # ---------------------------------------------------------------------------
-  save-state:
-    needs: [resolve-refs, bench-scheduled]
-    if: success()
-    name: save-state
-    runs-on: ubuntu-latest
-    steps:
-      - name: Push state to charts repo
-        env:
-          DEREK_TOKEN: ${{ secrets.DEREK_TOKEN }}
-        run: |
-          MODE="${{ needs.resolve-refs.outputs.mode }}"
-          FEATURE_REF="${{ needs.resolve-refs.outputs.feature-ref }}"
-          CHARTS_REPO="https://x-access-token:${DEREK_TOKEN}@github.com/decofe/reth-bench-charts.git"
-
-          TMP_DIR=$(mktemp -d)
-          if git clone --depth 1 --branch state "${CHARTS_REPO}" "${TMP_DIR}" 2>/dev/null; then
-            true
-          else
-            git init "${TMP_DIR}"
-            git -C "${TMP_DIR}" remote add origin "${CHARTS_REPO}"
-          fi
-
-          mkdir -p "${TMP_DIR}/state"
-          echo "${FEATURE_REF}" > "${TMP_DIR}/state/${MODE}-last-feature-ref"
-          git -C "${TMP_DIR}" add state/
-          git -C "${TMP_DIR}" diff --cached --quiet && echo "No state change" && exit 0
-          git -C "${TMP_DIR}" -c user.name="github-actions" -c user.email="github-actions@github.com" \
-            commit -m "bench: update ${MODE} state to ${FEATURE_REF}"
-          git -C "${TMP_DIR}" push origin HEAD:state
-          rm -rf "${TMP_DIR}"

.github/workflows/book.yml

@@ -15,7 +15,7 @@ env:
 
 jobs:
   build:
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-8
     timeout-minutes: 90
     steps:
       - name: Checkout
@@ -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/check-alloy.yml

@@ -25,7 +25,7 @@ env:
 jobs:
   check:
     name: Check compilation with patched alloy
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-16' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-16
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4

.github/workflows/compact.yml

@@ -18,7 +18,7 @@ env:
 name: compact-codec
 jobs:
   compact-codec:
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     strategy:
       matrix:
         bin:

.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
@@ -15,6 +15,7 @@ on:
 
 jobs:
   build:
+    if: github.repository == 'paradigmxyz/reth'
     timeout-minutes: 45
     runs-on: ubuntu-latest
     permissions:
@@ -30,22 +31,10 @@ jobs:
           echo "sha=${{ github.sha }}" >> "$GITHUB_OUTPUT"
           echo "describe=$(git describe --always --tags)" >> "$GITHUB_OUTPUT"
 
-      - name: Detect fork
-        id: fork
-        run: |
-          if [ "${{ github.event_name }}" = "pull_request" ] && [ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]; then
-            echo "is_fork=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "is_fork=false" >> "$GITHUB_OUTPUT"
-          fi
-
-      # Depot build (upstream only)
       - name: Set up Depot CLI
-        if: steps.fork.outputs.is_fork == 'false'
         uses: depot/setup-action@v1
 
-      - name: Build reth image (Depot)
-        if: steps.fork.outputs.is_fork == 'false'
+      - name: Build reth image
         uses: depot/bake-action@v1
         env:
           DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
@@ -57,26 +46,8 @@ jobs:
           targets: ${{ inputs.hive_target }}
           push: false
 
-      # Docker build (forks)
-      - name: Set up Docker Buildx
-        if: steps.fork.outputs.is_fork == 'true'
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build reth image (Docker)
-        if: steps.fork.outputs.is_fork == 'true'
-        uses: docker/bake-action@v6
-        env:
-          VERGEN_GIT_SHA: ${{ steps.git.outputs.sha }}
-          VERGEN_GIT_DESCRIBE: ${{ steps.git.outputs.describe }}
-        with:
-          files: docker-bake.hcl
-          targets: ${{ inputs.hive_target }}
-          push: false
-          set: |
-            *.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

@@ -28,30 +28,12 @@ on:
         required: false
         type: boolean
         default: false
-      pgo:
-        description: "Enable PGO profiling"
-        required: false
-        type: boolean
-        default: false
-      pgo_blocks:
-        description: "Number of blocks to execute for PGO profiling"
-        required: false
-        type: string
-        default: "20"
 
 jobs:
-  collect-pgo-profile:
-    if: github.repository == 'paradigmxyz/reth' && github.event_name == 'workflow_dispatch' && inputs.pgo
-    uses: ./.github/workflows/pgo-profile.yml
-    with:
-      pgo_blocks: ${{ inputs.pgo_blocks || '20' }}
-    secrets: inherit
-
   build:
-    if: github.repository == 'paradigmxyz/reth' && !failure() && !cancelled()
+    if: github.repository == 'paradigmxyz/reth'
     name: Build Docker images
     runs-on: ubuntu-24.04
-    needs: collect-pgo-profile
     permissions:
       packages: write
       contents: read
@@ -63,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 }}
@@ -76,30 +58,6 @@ jobs:
           echo "describe=$(git describe --always --tags)" >> "$GITHUB_OUTPUT"
           echo "dirty=false" >> "$GITHUB_OUTPUT"
 
-      - name: Download pre-collected PGO profile
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.pgo }}
-        uses: actions/download-artifact@v7
-        with:
-          name: pgo-profdata
-          path: dist
-
-      - name: Configure PGO build args
-        id: pgo
-        run: |
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]] && [[ "${{ inputs.pgo }}" == "true" ]]; then
-            if [ ! -f dist/merged.profdata ]; then
-              echo "::error::Expected dist/merged.profdata from collect-pgo-profile job"
-              exit 1
-            fi
-            echo "use_pgo_bolt=true" >> "$GITHUB_OUTPUT"
-            echo "pgo_profdata=dist/merged.profdata" >> "$GITHUB_OUTPUT"
-            echo "Using pre-collected PGO profile from collect-pgo-profile job"
-          else
-            echo "use_pgo_bolt=false" >> "$GITHUB_OUTPUT"
-            echo "pgo_profdata=" >> "$GITHUB_OUTPUT"
-            echo "PGO disabled"
-          fi
-
       - name: Determine build parameters
         id: params
         run: |
@@ -149,9 +107,6 @@ jobs:
           push: ${{ !(github.event_name == 'workflow_dispatch' && inputs.dry_run) }}
           set: |
             ${{ steps.params.outputs.ethereum_set }}
-            *.args.USE_PGO_BOLT=${{ steps.pgo.outputs.use_pgo_bolt }}
-            *.args.PGO_PROFDATA=${{ steps.pgo.outputs.pgo_profdata }}
-            *.args.STRIP_SYMBOLS=false
 
       - name: Verify image architectures
         env:
@@ -183,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

@@ -20,7 +20,7 @@ concurrency:
 jobs:
   test:
     name: e2e-testsuite
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-4
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 90
@@ -47,7 +47,7 @@ jobs:
 
   rocksdb:
     name: e2e-rocksdb
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-4
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 60
@@ -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,17 +15,24 @@ 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:
     if: github.repository == 'paradigmxyz/reth'
     timeout-minutes: 45
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-4
     steps:
       - uses: actions/checkout@v6
       - name: Checkout hive tests
@@ -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,11 +184,11 @@ 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) }}
-    # 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' }}
+    name: ${{ matrix.storage }} / ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
+    runs-on: depot-ubuntu-latest-4
     permissions:
       issues: write
     steps:
@@ -189,15 +197,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,14 +22,15 @@ 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' }}
+    runs-on: depot-ubuntu-latest-4
     env:
       RUST_BACKTRACE: 1
     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

@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
     name: run kurtosis
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     needs:
       - build-reth
     steps:
@@ -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

@@ -13,7 +13,7 @@ env:
 jobs:
   clippy-binaries:
     name: clippy binaries / ${{ matrix.type }}
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 30
     strategy:
       matrix:
@@ -42,7 +42,7 @@ jobs:
 
   clippy:
     name: clippy
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
@@ -59,7 +59,7 @@ jobs:
           RUSTFLAGS: -D warnings
 
   wasm:
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
@@ -79,7 +79,7 @@ jobs:
           .github/scripts/check_wasm.sh
 
   riscv:
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v6
@@ -98,7 +98,7 @@ jobs:
 
   crate-checks:
     name: crate-checks (${{ matrix.partition }}/${{ matrix.total_partitions }})
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-4
     strategy:
       matrix:
         partition: [1, 2, 3]
@@ -117,14 +117,14 @@ jobs:
 
   msrv:
     name: MSRV
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.93" # MSRV
+          toolchain: "1.88" # MSRV
       - uses: mozilla-actions/sccache-action@v0.0.9
       - uses: Swatinem/rust-cache@v2
         with:
@@ -135,7 +135,7 @@ jobs:
 
   docs:
     name: docs
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-4
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
@@ -153,7 +153,7 @@ jobs:
 
   fmt:
     name: fmt
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
@@ -167,7 +167,7 @@ jobs:
 
   udeps:
     name: udeps
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
@@ -182,7 +182,7 @@ jobs:
 
   book:
     name: book
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
@@ -237,9 +237,34 @@ 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: depot-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' }}
+    runs-on: depot-ubuntu-latest
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v6
@@ -272,6 +297,7 @@ jobs:
       - typos
       - grafana
       - no-test-deps
+      - features
       - feature-propagation
       - deny
     timeout-minutes: 30

.github/workflows/pgo-profile.yml

@@ -1,99 +0,0 @@
-name: pgo-profile
-
-on:
-  workflow_call:
-    inputs:
-      pgo_blocks:
-        description: "Number of blocks to execute for PGO profiling"
-        required: false
-        type: string
-        default: "20"
-  workflow_dispatch:
-    inputs:
-      pgo_blocks:
-        description: "Number of blocks to execute for PGO profiling"
-        required: false
-        type: string
-        default: "20"
-
-jobs:
-  collect:
-    name: collect PGO profiles
-    runs-on: [self-hosted, Linux, X64]
-    timeout-minutes: 180
-    env:
-      SCHELK_MOUNT: /reth-bench
-      BENCH_RPC_URL: https://ethereum.reth.rs/rpc
-      RUSTC_WRAPPER: "sccache"
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          submodules: true
-      - uses: rui314/setup-mold@v1
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: x86_64-unknown-linux-gnu
-      - uses: mozilla-actions/sccache-action@v0.0.9
-        continue-on-error: true
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends \
-            dmsetup lsb-release wget linux-tools-"$(uname -r)" || \
-            sudo apt-get install -y --no-install-recommends linux-tools-generic
-
-      - name: Download snapshot if needed
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BENCH_REPO: ${{ github.repository }}
-        run: |
-          if ! .github/scripts/bench-reth-snapshot.sh --check; then
-            echo "Snapshot outdated or missing, downloading..."
-            .github/scripts/bench-reth-snapshot.sh
-          fi
-
-      - name: Mount snapshot
-        run: |
-          sudo schelk recover -y --kill || true
-          sudo schelk mount -y
-          sync
-          sudo sh -c 'echo 3 > /proc/sys/vm/drop_caches'
-
-      - name: Collect PGO profile
-        run: |
-          DATADIR="$SCHELK_MOUNT/datadir" \
-          RPC_URL="$BENCH_RPC_URL" \
-          PGO_BLOCKS="${{ inputs.pgo_blocks || '20' }}" \
-          BOLT_BLOCKS="${{ inputs.pgo_blocks || '20' }}" \
-          COLLECT_PGO_ONLY=true \
-          SKIP_BOLT=true \
-          PROFILE=maxperf-symbols \
-          FEATURES="jemalloc,asm-keccak,min-debug-logs" \
-          TARGET=x86_64-unknown-linux-gnu \
-          EXTRA_RUSTFLAGS="-C target-cpu=x86-64-v3 -C target-feature=+pclmulqdq" \
-            .github/scripts/build_pgo_bolt.sh
-
-      - name: Show PGO profile stats
-        run: |
-          LLVM_PROFDATA=$(find "$(rustc --print sysroot)" -name llvm-profdata -type f | head -1)
-          if [ -z "$LLVM_PROFDATA" ]; then
-            echo "::error::llvm-profdata not found in rust toolchain"
-            exit 1
-          fi
-          "$LLVM_PROFDATA" show --detailed-summary --topn=20 target/pgo-profiles/merged.profdata
-
-      - name: Upload PGO profile
-        uses: actions/upload-artifact@v7
-        with:
-          name: pgo-profdata
-          path: target/pgo-profiles/merged.profdata
-          retention-days: 1
-
-      - name: Recover snapshot
-        if: always()
-        run: |
-          sudo schelk recover -y --kill || true

.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

@@ -13,14 +13,6 @@ on:
         description: "Enable dry run mode (builds artifacts but skips uploads and release creation)"
         type: boolean
         default: false
-      pgo:
-        description: "Enable PGO profiling"
-        type: boolean
-        default: false
-      pgo_blocks:
-        description: "Number of blocks to execute for PGO profiling on self-hosted runner"
-        type: string
-        default: "20"
 
 env:
   REPO_NAME: ${{ github.repository_owner }}/reth
@@ -45,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 }}
@@ -77,22 +69,26 @@ jobs:
       fail-fast: true
       matrix:
         configs:
-          - target: aarch64-unknown-linux-gnu
-            os: ubuntu-24.04-arm
+          - target: x86_64-unknown-linux-gnu
+            os: ubuntu-24.04
+            profile: maxperf
+            allow_fail: false
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-24.04
             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: ""
+          - target: riscv64gc-unknown-linux-gnu
+            os: ubuntu-24.04
+            profile: maxperf
+            allow_fail: true
         build:
           - command: build
             binary: reth
@@ -104,10 +100,9 @@ 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
+          cargo install cross --git https://github.com/cross-rs/cross
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
@@ -119,12 +114,7 @@ jobs:
           echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
 
       - name: Build Reth
-        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,105 +135,23 @@ 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
 
-  collect-pgo-profile:
-    if: github.event_name == 'workflow_dispatch' && inputs.pgo
-    uses: ./.github/workflows/pgo-profile.yml
-    with:
-      pgo_blocks: ${{ inputs.pgo_blocks || '20' }}
-    secrets: inherit
-
-  build-pgo:
-    if: github.event_name == 'workflow_dispatch' && inputs.pgo
-    name: build release (x86_64-linux PGO+BOLT)
-    runs-on: [self-hosted, Linux, X64]
-    needs: [extract-version, collect-pgo-profile]
-    timeout-minutes: 120
-    env:
-      RUSTC_WRAPPER: "sccache"
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          submodules: true
-      - uses: rui314/setup-mold@v1
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: x86_64-unknown-linux-gnu
-      - uses: mozilla-actions/sccache-action@v0.0.9
-        continue-on-error: true
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-
-      - name: Download pre-collected PGO profile
-        uses: actions/download-artifact@v7
-        with:
-          name: pgo-profdata
-          path: dist
-
-      - name: Verify PGO profile artifact
-        run: |
-          test -f dist/merged.profdata
-          ls -lh dist/merged.profdata
-
-      - name: Build Reth with PGO+BOLT
-        run: |
-          SKIP_BOLT=true \
-          PGO_PROFDATA="$PWD/dist/merged.profdata" \
-          PROFILE=maxperf-symbols \
-          FEATURES="jemalloc,asm-keccak,min-debug-logs" \
-          TARGET=x86_64-unknown-linux-gnu \
-          EXTRA_RUSTFLAGS="-C target-cpu=x86-64-v3 -C target-feature=+pclmulqdq" \
-            .github/scripts/build_pgo_bolt.sh
-
-      - name: Move binary
-        run: |
-          mkdir artifacts
-          mv target/maxperf-symbols/reth ./artifacts
-
-      - name: Configure GPG and create artifacts
-        env:
-          GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        run: |
-          export GPG_TTY=$(tty)
-          echo -n "$GPG_SIGNING_KEY" | base64 --decode | gpg --batch --import
-          cd artifacts
-          tar -czf reth-${{ needs.extract-version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz reth*
-          echo "$GPG_PASSPHRASE" | gpg --passphrase-fd 0 --pinentry-mode loopback --batch -ab reth-${{ needs.extract-version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz
-          mv *tar.gz* ..
-        shell: bash
-
-      - name: Upload artifact
-        if: ${{ github.event.inputs.dry_run != 'true' }}
-        uses: actions/upload-artifact@v7
-        with:
-          name: reth-${{ needs.extract-version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz
-          path: reth-${{ needs.extract-version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz
-
-      - name: Upload signature
-        if: ${{ github.event.inputs.dry_run != 'true' }}
-        uses: actions/upload-artifact@v7
-        with:
-          name: reth-${{ needs.extract-version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc
-          path: reth-${{ needs.extract-version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc
-
   draft-release:
     name: draft release
     runs-on: ubuntu-latest
-    needs: [build, build-pgo, extract-version]
-    if: ${{ !failure() && !cancelled() && github.event.inputs.dry_run != 'true' }}
+    needs: [build, extract-version]
+    if: ${{ github.event.inputs.dry_run != 'true' }}
     env:
       VERSION: ${{ needs.extract-version.outputs.VERSION }}
     permissions:
@@ -256,7 +164,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

@@ -23,7 +23,7 @@ jobs:
     name: stage-run-test
     # Only run stage commands test in merge groups
     if: github.event_name == 'merge_group'
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
@@ -38,7 +38,7 @@ jobs:
           cache-on-failure: true
       - name: Build reth
         run: |
-          cargo install --locked --path bin/reth
+          cargo install --path bin/reth
       - name: Run headers stage
         run: |
           reth stage run headers --from ${{ env.FROM_BLOCK }} --to ${{ env.TO_BLOCK }} --commit --checkpoints
@@ -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/sync-era.yml

@@ -19,7 +19,7 @@ jobs:
   sync:
     if: github.repository == 'paradigmxyz/reth'
     name: sync (${{ matrix.chain.bin }})
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

.github/workflows/sync.yml

@@ -19,7 +19,7 @@ jobs:
   sync:
     if: github.repository == 'paradigmxyz/reth'
     name: sync (${{ matrix.chain.bin }})
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

.github/workflows/unit.yml

@@ -19,13 +19,15 @@ concurrency:
 
 jobs:
   test:
-    name: test / ${{ matrix.type }}
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest-4' || 'ubuntu-latest' }}
+    name: test / ${{ matrix.type }} / ${{ matrix.storage }}
+    runs-on: depot-ubuntu-latest-4
     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: depot-ubuntu-latest-4
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
@@ -90,7 +92,7 @@ jobs:
 
   doc:
     name: doc tests
-    runs-on: ${{ github.repository == 'paradigmxyz/reth' && 'depot-ubuntu-latest' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 30

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,391 @@
+# 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. **Commit Messages**: Follow conventional format (feat:, fix:, chore:, etc.)
+
+### Opening PRs against <https://github.com/paradigmxyz/reth>
+
+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?
+
+
+### 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 
+```

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace.package]
-version = "2.0.0"
+version = "1.11.3"
 edition = "2024"
-rust-version = "1.93"
+rust-version = "1.88"
 license = "MIT OR Apache-2.0"
 homepage = "https://paradigmxyz.github.io/reth"
 repository = "https://github.com/paradigmxyz/reth"
@@ -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,7 @@ members = [
     "crates/engine/invalid-block-hooks/",
     "crates/engine/local",
     "crates/engine/primitives/",
-    "crates/engine/execution-cache/",
+    "crates/engine/service",
     "crates/engine/tree/",
     "crates/engine/util/",
     "crates/era",
@@ -78,6 +78,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 +101,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 +113,7 @@ members = [
     "crates/storage/nippy-jar/",
     "crates/storage/provider/",
     "crates/storage/storage-api/",
+    "crates/storage/zstd-compressors/",
     "crates/tasks/",
     "crates/tokio-util/",
     "crates/tracing/",
@@ -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.1.0", default-features = false }
-reth-codecs-derive = "0.1.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,9 +347,9 @@ 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-service = { path = "crates/engine/service" }
 reth-engine-util = { path = "crates/engine/util" }
 reth-era = { path = "crates/era" }
 reth-era-downloader = { path = "crates/era-downloader" }
@@ -394,7 +399,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.1.0", default-features = false }
+reth-primitives = { path = "crates/primitives", default-features = false }
+reth-primitives-traits = { path = "crates/primitives-traits", default-features = false }
 reth-provider = { path = "crates/storage/provider" }
 reth-prune = { path = "crates/prune/prune" }
 reth-prune-types = { path = "crates/prune/types", default-features = false }
@@ -410,7 +416,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.1.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,71 +434,95 @@ 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.1.0", default-features = false }
+reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-features = false }
 
 # revm
-revm = { version = "36.0.0", default-features = false }
-revm-bytecode = { version = "9.0.0", default-features = false }
-revm-database = { version = "12.0.0", default-features = false }
-revm-state = { version = "10.0.0", default-features = false }
-revm-primitives = { version = "22.1.0", default-features = false }
-revm-interpreter = { version = "34.0.0", default-features = false }
-revm-database-interface = { version = "10.0.0", default-features = false }
-revm-inspectors = "0.36.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-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.30.0", default-features = false }
-alloy-rlp = { version = "0.3.13", default-features = false, features = ["core-net"] }
+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.5"
 
-alloy-consensus = { version = "1.8.2", default-features = false }
-alloy-contract = { version = "1.8.2", default-features = false }
-alloy-eips = { version = "1.8.2", default-features = false }
-alloy-genesis = { version = "1.8.2", default-features = false }
-alloy-json-rpc = { version = "1.8.2", default-features = false }
-alloy-network = { version = "1.8.2", default-features = false }
-alloy-network-primitives = { version = "1.8.2", default-features = false }
-alloy-provider = { version = "1.8.2", features = ["reqwest", "debug-api"], default-features = false }
-alloy-pubsub = { version = "1.8.2", default-features = false }
-alloy-rpc-client = { version = "1.8.2", default-features = false }
-alloy-rpc-types = { version = "1.8.2", features = ["eth"], default-features = false }
-alloy-rpc-types-admin = { version = "1.8.2", default-features = false }
-alloy-rpc-types-anvil = { version = "1.8.2", default-features = false }
-alloy-rpc-types-beacon = { version = "1.8.2", default-features = false }
-alloy-rpc-types-debug = { version = "1.8.2", default-features = false }
-alloy-rpc-types-engine = { version = "1.8.2", default-features = false }
-alloy-rpc-types-eth = { version = "1.8.2", default-features = false }
-alloy-rpc-types-mev = { version = "1.8.2", default-features = false }
-alloy-rpc-types-trace = { version = "1.8.2", default-features = false }
-alloy-rpc-types-txpool = { version = "1.8.2", default-features = false }
-alloy-serde = { version = "1.8.2", default-features = false }
-alloy-signer = { version = "1.8.2", default-features = false }
-alloy-signer-local = { version = "1.8.2", default-features = false }
-alloy-transport = { version = "1.8.2" }
-alloy-transport-http = { version = "1.8.2", features = ["reqwest-rustls-tls"], default-features = false }
-alloy-transport-ipc = { version = "1.8.2", default-features = false }
-alloy-transport-ws = { version = "1.8.2", default-features = false }
+alloy-consensus = { version = "1.6.3", default-features = false }
+alloy-contract = { version = "1.6.3", default-features = false }
+alloy-eips = { version = "1.6.3", default-features = false }
+alloy-genesis = { version = "1.6.3", default-features = false }
+alloy-json-rpc = { version = "1.6.3", default-features = false }
+alloy-network = { version = "1.6.3", default-features = false }
+alloy-network-primitives = { version = "1.6.3", default-features = false }
+alloy-provider = { version = "1.6.3", features = [
+    "reqwest",
+    "debug-api",
+], default-features = false }
+alloy-pubsub = { version = "1.6.3", default-features = false }
+alloy-rpc-client = { version = "1.6.3", default-features = false }
+alloy-rpc-types = { version = "1.6.3", features = [
+    "eth",
+], default-features = false }
+alloy-rpc-types-admin = { version = "1.6.3", default-features = false }
+alloy-rpc-types-anvil = { version = "1.6.3", default-features = false }
+alloy-rpc-types-beacon = { version = "1.6.3", default-features = false }
+alloy-rpc-types-debug = { version = "1.6.3", default-features = false }
+alloy-rpc-types-engine = { version = "1.6.3", default-features = false }
+alloy-rpc-types-eth = { version = "1.6.3", default-features = false }
+alloy-rpc-types-mev = { version = "1.6.3", default-features = false }
+alloy-rpc-types-trace = { version = "1.6.3", default-features = false }
+alloy-rpc-types-txpool = { version = "1.6.3", default-features = false }
+alloy-serde = { version = "1.6.3", default-features = false }
+alloy-signer = { version = "1.6.3", default-features = false }
+alloy-signer-local = { version = "1.6.3", default-features = false }
+alloy-transport = { version = "1.6.3" }
+alloy-transport-http = { version = "1.6.3", features = [
+    "reqwest-rustls-tls",
+], default-features = false }
+alloy-transport-ipc = { version = "1.6.3", default-features = false }
+alloy-transport-ws = { version = "1.6.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 }
 arrayvec = { version = "0.7.6", default-features = false }
 aquamarine = "0.6"
 auto_impl = "1"
-backon = { version = "1.2", default-features = false, features = ["std-blocking-sleep", "tokio-sleep"] }
+backon = { version = "1.2", default-features = false, features = [
+    "std-blocking-sleep",
+    "tokio-sleep",
+] }
 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,33 +538,36 @@ 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"] }
+notify = { version = "8.0.0", default-features = false, features = [
+    "macos_fsevent",
+] }
 nybbles = { version = "0.4.8", default-features = false }
-once_cell = { version = "1.19", default-features = false, features = ["critical-section"] }
+once_cell = { version = "1.19", default-features = false, features = [
+    "critical-section",
+] }
 parking_lot = "0.12"
-quanta = "0.12"
 paste = "1.0"
 rand = "0.9"
 rayon = "1.7"
-thread-priority = "3.0.0"
 rustc-hash = { version = "2.0", default-features = false }
 schnellru = "0.2"
 serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_with = { version = "3", default-features = false, features = ["macros"] }
 sha2 = { version = "0.10", default-features = false }
+shellexpand = "3.0.0"
 shlex = "1.3"
-slotmap = "1"
 smallvec = "1"
 strum = { version = "0.27", default-features = false }
 strum_macros = "0.27"
 syn = "2.0"
 thiserror = { version = "2.0.0", default-features = false }
 tar = "0.4.44"
-tracing = { version = "0.1.0", default-features = false, features = ["attributes"] }
+tracing = { version = "0.1.0", default-features = false, features = [
+    "attributes",
+] }
 tracing-appender = "0.2"
 url = { version = "2.3", default-features = false }
 zstd = "0.13"
@@ -570,10 +602,14 @@ 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"
@@ -598,7 +634,10 @@ proptest-arbitrary-interop = "0.1.0"
 # crypto
 enr = { version = "0.13", default-features = false }
 k256 = { version = "0.13", default-features = false, features = ["ecdsa"] }
-secp256k1 = { version = "0.30", default-features = false, features = ["global-context", "recovery"] }
+secp256k1 = { version = "0.30", default-features = false, features = [
+    "global-context",
+    "recovery",
+] }
 # rand 8 for secp256k1
 rand_08 = { package = "rand", version = "0.8" }
 
@@ -623,7 +662,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,9 +678,8 @@ 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"] }
+tracy-client = "0.18.0"
 snmalloc-rs = { version = "0.3.7", features = ["build_cc"] }
 
 aes = "0.8.1"
@@ -654,8 +692,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"
 ctrlc = "3.4"
@@ -674,6 +710,7 @@ 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 }
@@ -686,7 +723,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"
@@ -729,6 +766,12 @@ ipnet = "2.11"
 # 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" }
@@ -737,6 +780,10 @@ ipnet = "2.11"
 # 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 = "9bc2dba" }
+# 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" }

Cross.toml

@@ -19,11 +19,10 @@ pre-build = [
 image = "ubuntu:24.04"
 pre-build = [
     "apt update",
-    "apt install --yes gcc gcc-riscv64-linux-gnu g++-riscv64-linux-gnu libclang-dev make",
+    "apt install --yes gcc gcc-riscv64-linux-gnu libclang-dev make",
 ]
 env.passthrough = [
     "CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc",
-    "CXX_riscv64gc_unknown_linux_gnu=riscv64-linux-gnu-g++",
 ]
 
 [build.env]

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker.io/docker/dockerfile:1.7-labs
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.93 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
 WORKDIR /app
 
 LABEL org.opencontainers.image.source=https://github.com/paradigmxyz/reth

Dockerfile.depot

@@ -1,12 +1,10 @@
 # syntax=docker/dockerfile:1
 
 # Dockerfile for reth, optimized for Depot builds
-# Supports PGO+BOLT optimization for maximum performance
 # Usage:
 #   reth: --build-arg BINARY=reth
-#   PGO+BOLT: --build-arg USE_PGO_BOLT=true (Linux x86_64/aarch64 only)
 
-FROM rust:1.93 AS builder
+FROM rust:1 AS builder
 WORKDIR /app
 
 LABEL org.opencontainers.image.source=https://github.com/paradigmxyz/reth
@@ -45,18 +43,6 @@ ENV VERGEN_GIT_SHA=$VERGEN_GIT_SHA
 ENV VERGEN_GIT_DESCRIBE=$VERGEN_GIT_DESCRIBE
 ENV VERGEN_GIT_DIRTY=$VERGEN_GIT_DIRTY
 
-# Enable PGO+BOLT optimization (Linux only)
-ARG USE_PGO_BOLT=false
-ENV USE_PGO_BOLT=$USE_PGO_BOLT
-
-# Optional path to a pre-collected merged.profdata file in build context.
-ARG PGO_PROFDATA=""
-ENV PGO_PROFDATA=$PGO_PROFDATA
-
-# Whether to strip debug symbols from PGO-built binaries.
-ARG STRIP_SYMBOLS=true
-ENV STRIP_SYMBOLS=$STRIP_SYMBOLS
-
 # Build application
 # Platform-specific RUSTFLAGS: amd64 uses x86-64-v3 (Haswell+) with pclmulqdq for rocksdb
 ARG TARGETPLATFORM
@@ -67,21 +53,12 @@ RUN --mount=type=secret,id=DEPOT_TOKEN,env=SCCACHE_WEBDAV_TOKEN \
     --mount=type=cache,target=$SCCACHE_DIR,sharing=shared \
     export RUSTC_WRAPPER=sccache SCCACHE_WEBDAV_ENDPOINT=https://cache.depot.dev SCCACHE_DIR=/sccache && \
     sccache --start-server && \
-    if [ "$USE_PGO_BOLT" = "true" ] && [ "$TARGETPLATFORM" = "linux/amd64" ] && [ -n "$PGO_PROFDATA" ] && [ -f "$PGO_PROFDATA" ]; then \
-        apt-get update && apt-get install -y -qq lsb-release wget sudo && \
-        BINARY="$BINARY" PROFILE="$BUILD_PROFILE" FEATURES="$FEATURES" SKIP_BOLT=true STRIP_SYMBOLS="$STRIP_SYMBOLS" PGO_PROFDATA="$PGO_PROFDATA" \
-            ./.github/scripts/build_pgo_bolt.sh; \
-    else \
-        if [ "$USE_PGO_BOLT" = "true" ]; then \
-            echo "PGO requested but pre-collected profile missing at '${PGO_PROFDATA:-<unset>}' - falling back to non-PGO build"; \
-        fi; \
-        if [ -n "$RUSTFLAGS" ]; then \
-            export RUSTFLAGS="$RUSTFLAGS"; \
-        elif [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
-            export RUSTFLAGS="-C target-cpu=x86-64-v3 -C target-feature=+pclmulqdq"; \
-        fi && \
-        cargo build --profile $BUILD_PROFILE --features "$FEATURES" --locked --bin $BINARY --manifest-path $MANIFEST_PATH/Cargo.toml; \
+    if [ -n "$RUSTFLAGS" ]; then \
+        export RUSTFLAGS="$RUSTFLAGS"; \
+    elif [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+        export RUSTFLAGS="-C target-cpu=x86-64-v3 -C target-feature=+pclmulqdq"; \
     fi && \
+    cargo build --profile $BUILD_PROFILE --features "$FEATURES" --locked --bin $BINARY --manifest-path $MANIFEST_PATH/Cargo.toml && \
     sccache --show-stats
 
 # Copy binary to a known location (ARG not resolved in COPY)

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,20 +67,20 @@ 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.
 #
 # These commands require that:
 #
-# - `cross` is installed (`cargo install --locked cross`).
+# - `cross` is installed (`cargo install cross`).
 # - Docker is running.
 # - The current user is in the `docker` group.
 #
@@ -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.
@@ -265,7 +261,7 @@ lint-typos: ensure-typos
 
 ensure-typos:
 	@if ! command -v typos &> /dev/null; then \
-		echo "typos not found. Please install it by running the command 'cargo install --locked typos-cli' or refer to the following link for more information: https://github.com/crate-ci/typos"; \
+		echo "typos not found. Please install it by running the command 'cargo install typos-cli' or refer to the following link for more information: https://github.com/crate-ci/typos"; \
 		exit 1; \
     fi
 

README.md

@@ -7,7 +7,7 @@
 
 **Modular, contributor-friendly and blazing-fast implementation of the Ethereum protocol**
 
-![](./assets/reth-2.png)
+![](./assets/reth-prod.png)
 
 **[Install](https://paradigmxyz.github.io/reth/installation/installation.html)**
 | [User Docs](https://reth.rs)
@@ -93,7 +93,7 @@ When updating this, also update:
 - .github/workflows/lint.yml
 -->
 
-The Minimum Supported Rust Version (MSRV) of this project is [1.93.0](https://blog.rust-lang.org/2026/01/22/Rust-1.93.0/).
+The Minimum Supported Rust Version (MSRV) of this project is [1.88.0](https://blog.rust-lang.org/2025/06/26/Rust-1.88.0/).
 
 See the docs for detailed instructions on how to [build from source](https://reth.rs/installation/source/).
 

bin/reth-bb/Cargo.toml

@@ -1,100 +0,0 @@
-[package]
-name = "reth-bb"
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-license.workspace = true
-homepage.workspace = true
-repository.workspace = true
-description = "Reth node configured for big block payload execution"
-
-[lints]
-workspace = true
-
-[dependencies]
-# reth
-reth-ethereum-cli.workspace = true
-reth-chainspec.workspace = true
-reth-ethereum-primitives.workspace = true
-reth-cli-util.workspace = true
-reth-node-core.workspace = true
-reth-node-ethereum.workspace = true
-reth-node-builder.workspace = true
-reth-node-api.workspace = true
-reth-ethereum-consensus.workspace = true
-reth-engine-primitives = { workspace = true, features = ["std"] }
-reth-engine-tree.workspace = true
-reth-primitives-traits.workspace = true
-reth-payload-primitives.workspace = true
-reth-provider.workspace = true
-reth-rpc-api.workspace = true
-reth-rpc-engine-api.workspace = true
-reth-evm.workspace = true
-reth-evm-ethereum.workspace = true
-reth-ethereum-forks.workspace = true
-reth-revm.workspace = true
-reth-consensus.workspace = true
-reth-chain-state.workspace = true
-reth-errors.workspace = true
-reth-storage-errors.workspace = true
-
-# alloy
-alloy-rpc-types = { workspace = true, features = ["engine"] }
-alloy-primitives.workspace = true
-alloy-rlp.workspace = true
-alloy-consensus.workspace = true
-alloy-eips.workspace = true
-alloy-evm.workspace = true
-
-# tracing
-tracing.workspace = true
-
-# misc
-clap = { workspace = true, features = ["derive", "env"] }
-jsonrpsee = { workspace = true, features = ["server", "macros"] }
-async-trait.workspace = true
-derive_more.workspace = true
-crossbeam-channel.workspace = true
-tokio = { workspace = true, features = ["sync"] }
-revm.workspace = true
-revm-primitives.workspace = true
-alloy-hardforks.workspace = true
-metrics.workspace = true
-
-# std
-eyre.workspace = true
-
-[features]
-default = [
-    "jemalloc",
-    "reth-cli-util/jemalloc",
-    "asm-keccak",
-    "min-debug-logs",
-]
-
-jemalloc = [
-    "reth-cli-util/jemalloc",
-    "reth-node-core/jemalloc",
-    "reth-ethereum-cli/jemalloc",
-    "reth-provider/jemalloc",
-]
-
-asm-keccak = [
-    "reth-node-core/asm-keccak",
-    "reth-ethereum-cli/asm-keccak",
-    "reth-node-ethereum/asm-keccak",
-    "alloy-primitives/asm-keccak",
-    "alloy-evm/asm-keccak",
-    "revm/asm-keccak",
-    "revm-primitives/asm-keccak",
-]
-
-min-debug-logs = [
-    "tracing/release_max_level_debug",
-    "reth-ethereum-cli/min-debug-logs",
-    "reth-node-core/min-debug-logs",
-]
-
-[[bin]]
-name = "reth-bb"
-path = "src/main.rs"

bin/reth-bb/README.md

@@ -1,67 +0,0 @@
-# reth-bb
-
-A modified reth node for benchmarking **big block** execution — payloads that merge transactions from multiple consecutive blocks into a single block to simulate high-gas workloads.
-
-> **Not for production use.** reth-bb disables some consensus-related validations to allow artificially large blocks. It is intended solely for performance benchmarking.
-
-## How it works
-
-reth-bb extends the standard Ethereum node with:
-
-1. **Multi-segment execution** — a custom `reth_newPayload` handler that accepts optional `BigBlockData` alongside the payload. When present, the block is executed in multiple segments, each with its own EVM environment (matching the original blocks that were merged).
-
-2. **Relaxed consensus** — the gas-limit bound-divisor check and blob gas validation are skipped, since merged blocks exceed single-block limits.
-
-## Quick start
-
-The full workflow has four steps: **build** binaries, **generate** big blocks,  **start** reth-bb, and **replay** the payloads.
-
-### Prerequisites
-
-- A synced reth datadir for the target chain (e.g. hoodi)
-- Rust toolchain
-
-### 1. Build
-
-```bash
-cargo build --profile profiling -p reth-bb -p reth-bench
-```
-
-### 2. Generate big blocks
-
-Fetch consecutive blocks from an RPC and merge them until a target gas is reached. Use `--from-block` set to the block number following the one the node is currently synced to (i.e. the next block the node would process):
-
-```bash
-reth-bench generate-big-block \
-    --rpc-url https://rpc.hoodi.ethpandaops.io \
-    --chain hoodi \
-    --from-block 910020 \
-    --target-gas 2G \
-    --num-big-blocks 5 \
-    --output-dir /tmp/payloads
-```
-
-This produces one JSON file per big block in the output directory.
-
-### 3. Start reth-bb
-
-```bash
-reth-bb node \
-    --datadir /data/reth/hoodi \
-    --chain hoodi \
-    --http --http.api debug,eth \
-    --authrpc.jwtsecret /tmp/jwt.hex \
-    -d
-```
-
-### 4. Replay payloads
-
-```bash
-reth-bench replay-payloads \
-    --engine-rpc-url http://localhost:8551 \
-    --jwt-secret /tmp/jwt.hex \
-    --payload-dir /tmp/payloads \
-    --reth-new-payload
-```
-
-The `--reth-new-payload` flag is required for big blocks — it uses the `reth_newPayload` endpoint which carries the multi-segment execution metadata.

bin/reth-bb/src/evm.rs

@@ -1,570 +0,0 @@
-//! Big-block executor.
-//!
-//! Provides [`BbBlockExecutor`] and [`BbBlockExecutorFactory`] which handle
-//! segment boundaries within big-block payloads.
-//!
-//! [`BbBlockExecutor`] wraps [`EthBlockExecutor`] and intercepts
-//! `execute_transaction` to apply segment-boundary changes.
-
-use crate::evm_config::BigBlockSegment;
-use alloy_eips::eip7685::Requests;
-use alloy_evm::{
-    block::{
-        BlockExecutionError, BlockExecutionResult, BlockExecutor, BlockExecutorFactory,
-        BlockExecutorFor, ExecutableTx, OnStateHook, StateChangeSource, StateDB,
-    },
-    eth::{EthBlockExecutionCtx, EthBlockExecutor, EthEvmContext, EthTxResult},
-    precompiles::PrecompilesMap,
-    Database, EthEvm, EthEvmFactory, Evm, FromRecoveredTx, FromTxWithEncoded,
-};
-use alloy_primitives::B256;
-use reth_ethereum_primitives::{Receipt, TransactionSigned};
-use reth_evm_ethereum::RethReceiptBuilder;
-use revm::{
-    context::{BlockEnv, TxEnv},
-    context_interface::result::{EVMError, HaltReason},
-    handler::PrecompileProvider,
-    interpreter::InterpreterResult,
-    primitives::hardfork::SpecId,
-    Inspector,
-};
-use std::sync::{Arc, Mutex};
-use tracing::{debug, trace};
-
-// ---------------------------------------------------------------------------
-// BbEvmPlan — runtime segment tracking state
-// ---------------------------------------------------------------------------
-
-/// Runtime state for segment boundary tracking.
-pub(crate) struct BbEvmPlan {
-    /// The segment boundaries and environments.
-    pub(crate) segments: Vec<BigBlockSegment>,
-    /// Index of the next segment to switch to (starts at 1).
-    pub(crate) next_segment: usize,
-    /// Number of user transactions executed so far.
-    pub(crate) tx_counter: usize,
-    /// Block hashes to seed for inter-segment BLOCKHASH resolution.
-    /// Includes both prior block hashes and inter-segment hashes.
-    pub(crate) block_hashes_to_seed: Vec<(u64, B256)>,
-}
-
-impl BbEvmPlan {
-    /// Creates a new `BbEvmPlan` from segments and hardfork flags.
-    pub(crate) fn new(segments: Vec<BigBlockSegment>) -> Self {
-        // Pre-compute all inter-segment block hashes.
-        let mut block_hashes_to_seed = Vec::new();
-        for seg in segments.iter().skip(1) {
-            let finished_block_number = seg.evm_env.block_env.number.saturating_to::<u64>() - 1;
-            let finished_block_hash = seg.ctx.parent_hash;
-            block_hashes_to_seed.push((finished_block_number, finished_block_hash));
-        }
-
-        Self { segments, next_segment: 1, tx_counter: 0, block_hashes_to_seed }
-    }
-
-    /// Returns the 256 block hashes relevant to a segment with the given block
-    /// number. BLOCKHASH can look back 256 blocks, so we select entries in
-    /// `[block_number - 256, block_number)`.
-    pub(crate) fn hashes_for_block(&self, block_number: u64) -> Vec<(u64, B256)> {
-        let min = block_number.saturating_sub(256);
-        self.block_hashes_to_seed
-            .iter()
-            .copied()
-            .filter(|(n, _)| *n >= min && *n < block_number)
-            .collect()
-    }
-}
-
-impl std::fmt::Debug for BbEvmPlan {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("BbEvmPlan")
-            .field("segments", &self.segments)
-            .field("next_segment", &self.next_segment)
-            .field("tx_counter", &self.tx_counter)
-            .field("block_hashes_to_seed", &self.block_hashes_to_seed)
-            .finish()
-    }
-}
-
-// ---------------------------------------------------------------------------
-// BbBlockExecutor — handles segment boundaries
-// ---------------------------------------------------------------------------
-
-/// Function pointer that seeds block hashes into the DB's block hash cache.
-///
-/// Injected from `ConfigureEvm::create_executor` where the concrete `State<DB>`
-/// type is known, allowing `BbBlockExecutor` to reseed the ring buffer at
-/// segment boundaries without requiring additional trait bounds on `DB`.
-pub(crate) type BlockHashSeeder<DB> = fn(&mut DB, &[(u64, B256)]);
-
-/// Block executor that wraps [`EthBlockExecutor`] and handles segment-boundary
-/// changes for big-block execution.
-///
-/// At segment boundaries, the inner executor is finished (applying its
-/// end-of-block logic: post-execution system calls, withdrawal balance
-/// increments) and a new one is constructed for the next segment (applying
-/// its start-of-block logic: EIP-2935/EIP-4788 system calls).
-///
-/// Gas counters reset at each boundary so that each segment's real gas limit
-/// is used (preserving correct GASLIMIT opcode behavior). Accumulated offsets
-/// are applied to receipts and totals in `finish()`.
-pub(crate) struct BbBlockExecutor<'a, DB, I, P, Spec>
-where
-    DB: Database,
-{
-    /// The inner executor. `None` transiently during `apply_segment_boundary`.
-    inner: Option<EthBlockExecutor<'a, EthEvm<DB, I, P>, Spec, RethReceiptBuilder>>,
-    plan: Option<BbEvmPlan>,
-    /// Requests accumulated from segments that have been finished at
-    /// boundaries. Merged into the final result in `finish()`.
-    accumulated_requests: Requests,
-    /// Cumulative gas used by all segments that have been finished at
-    /// boundaries. Added to receipts and the final gas total in `finish()`.
-    gas_used_offset: u64,
-    /// Cumulative blob gas used by all segments that have been finished at
-    /// boundaries.
-    blob_gas_used_offset: u64,
-    /// Shared state hook that survives inner executor finish/reconstruct
-    /// cycles at segment boundaries. Each inner executor receives a
-    /// forwarding hook that delegates to this shared instance.
-    shared_hook: Arc<Mutex<Option<Box<dyn OnStateHook>>>>,
-    /// Callback to reseed block hashes into the DB's cache at segment
-    /// boundaries. See [`BlockHashSeeder`].
-    block_hash_seeder: Option<BlockHashSeeder<DB>>,
-}
-
-impl<'a, DB, I, P, Spec> BbBlockExecutor<'a, DB, I, P, Spec>
-where
-    DB: StateDB,
-    I: Inspector<EthEvmContext<DB>>,
-    P: PrecompileProvider<EthEvmContext<DB>, Output = InterpreterResult>,
-    Spec: alloy_evm::eth::spec::EthExecutorSpec + Clone,
-    EthEvm<DB, I, P>: Evm<
-        DB = DB,
-        Tx = TxEnv,
-        HaltReason = HaltReason,
-        Error = EVMError<DB::Error>,
-        Spec = SpecId,
-        BlockEnv = BlockEnv,
-    >,
-    TxEnv: FromRecoveredTx<TransactionSigned> + FromTxWithEncoded<TransactionSigned>,
-{
-    pub(crate) fn new(
-        evm: EthEvm<DB, I, P>,
-        ctx: EthBlockExecutionCtx<'a>,
-        spec: Spec,
-        receipt_builder: RethReceiptBuilder,
-        plan: Option<BbEvmPlan>,
-        block_hash_seeder: Option<BlockHashSeeder<DB>>,
-    ) -> Self {
-        let inner = EthBlockExecutor::new(evm, ctx, spec, receipt_builder);
-        Self {
-            inner: Some(inner),
-            plan,
-            accumulated_requests: Requests::default(),
-            gas_used_offset: 0,
-            blob_gas_used_offset: 0,
-            shared_hook: Arc::new(Mutex::new(None)),
-            block_hash_seeder,
-        }
-    }
-
-    /// Creates a forwarding `OnStateHook` that delegates to the shared hook.
-    fn forwarding_hook(&self) -> Option<Box<dyn OnStateHook>> {
-        let shared = self.shared_hook.clone();
-        Some(Box::new(move |source: StateChangeSource, state: &revm::state::EvmState| {
-            if let Some(hook) = shared.lock().unwrap().as_mut() {
-                hook.on_state(source, state);
-            }
-        }))
-    }
-
-    const fn inner(&self) -> &EthBlockExecutor<'a, EthEvm<DB, I, P>, Spec, RethReceiptBuilder> {
-        self.inner.as_ref().expect("inner executor must exist")
-    }
-
-    const fn inner_mut(
-        &mut self,
-    ) -> &mut EthBlockExecutor<'a, EthEvm<DB, I, P>, Spec, RethReceiptBuilder> {
-        self.inner.as_mut().expect("inner executor must exist")
-    }
-
-    fn reseed_block_hashes_for(&mut self, block_number: u64) {
-        let Some(seeder) = self.block_hash_seeder else { return };
-        let hashes = match &self.plan {
-            Some(plan) => plan.hashes_for_block(block_number),
-            None => return,
-        };
-        seeder(self.inner_mut().evm_mut().db_mut(), &hashes);
-    }
-
-    fn maybe_apply_boundary(&mut self) -> Result<(), BlockExecutionError> {
-        loop {
-            let plan = match &self.plan {
-                Some(p) => p,
-                None => return Ok(()),
-            };
-
-            if plan.next_segment >= plan.segments.len() ||
-                plan.tx_counter != plan.segments[plan.next_segment].start_tx
-            {
-                return Ok(());
-            }
-
-            self.apply_segment_boundary()?;
-        }
-    }
-
-    fn apply_segment_boundary(&mut self) -> Result<(), BlockExecutionError> {
-        let plan = self.plan.as_mut().expect("plan must exist");
-        let seg_idx = plan.next_segment;
-        let prev_seg_idx = seg_idx - 1;
-
-        debug!(
-            target: "engine::bb::evm",
-            seg_idx,
-            tx_counter = plan.tx_counter,
-            "Applying segment boundary"
-        );
-
-        // Swap the inner executor's ctx to the finished segment's values so
-        // that finish() applies the correct withdrawals and post-execution
-        // system calls for that segment.
-        let prev_segment = &plan.segments[prev_seg_idx];
-        let prev_ctx = EthBlockExecutionCtx {
-            parent_hash: prev_segment.ctx.parent_hash,
-            parent_beacon_block_root: prev_segment.ctx.parent_beacon_block_root,
-            ommers: prev_segment.ctx.ommers,
-            withdrawals: prev_segment.ctx.withdrawals.clone(),
-            extra_data: prev_segment.ctx.extra_data.clone(),
-            tx_count_hint: prev_segment.ctx.tx_count_hint,
-        };
-
-        // Clone the next segment's data before we consume inner.
-        let new_segment = &plan.segments[seg_idx];
-        let new_block_env = new_segment.evm_env.block_env.clone();
-        let mut new_cfg_env = new_segment.evm_env.cfg_env.clone();
-        new_cfg_env.disable_base_fee = true;
-        let new_ctx = EthBlockExecutionCtx {
-            parent_hash: new_segment.ctx.parent_hash,
-            parent_beacon_block_root: new_segment.ctx.parent_beacon_block_root,
-            ommers: new_segment.ctx.ommers,
-            withdrawals: new_segment.ctx.withdrawals.clone(),
-            extra_data: new_segment.ctx.extra_data.clone(),
-            tx_count_hint: new_segment.ctx.tx_count_hint,
-        };
-
-        plan.next_segment += 1;
-
-        // Finish the inner executor for the completed segment. This applies
-        // post-execution system calls (EIP-7002/7251) and withdrawal balance
-        // increments via EthBlockExecutor::finish().
-        let mut inner = self.inner.take().expect("inner executor must exist");
-        inner.ctx = prev_ctx;
-        let spec = inner.spec.clone();
-        let receipt_builder = inner.receipt_builder;
-        let (mut evm, result) = inner.finish()?;
-
-        // Receipts already have globally-correct cumulative_gas_used (fixed
-        // up in commit_transaction). Update the offset with this segment's
-        // gas so that subsequent segments' receipts are adjusted correctly.
-        self.gas_used_offset += result.gas_used;
-        self.blob_gas_used_offset += result.blob_gas_used;
-        self.accumulated_requests.extend(result.requests);
-
-        let last_receipt_cumulative =
-            result.receipts.last().map(|r| r.cumulative_gas_used).unwrap_or(0);
-        let seg_block_number = prev_segment.evm_env.block_env.number.saturating_to::<u64>();
-        debug!(
-            target: "engine::bb::evm",
-            prev_seg_idx,
-            seg_block_number,
-            segment_gas_used = result.gas_used,
-            gas_used_offset = self.gas_used_offset,
-            last_receipt_cumulative,
-            receipt_count = result.receipts.len(),
-            "Finished segment"
-        );
-
-        // Swap EVM env to the next segment's values (using real gas_limit).
-        let ctx = evm.ctx_mut();
-        ctx.block = new_block_env;
-        ctx.cfg = new_cfg_env;
-
-        // Build a new inner executor for the next segment. gas_used starts
-        // at 0 so the per-transaction gas check uses this segment's real
-        // gas_limit correctly.
-        let mut new_inner = EthBlockExecutor::new(evm, new_ctx, spec, receipt_builder);
-
-        // Carry forward receipts from prior segments.
-        new_inner.receipts = result.receipts;
-
-        // Re-install the forwarding state hook so the parallel state root
-        // task continues to receive state changes.
-        if self.shared_hook.lock().unwrap().is_some() {
-            new_inner.set_state_hook(self.forwarding_hook());
-        }
-
-        self.inner = Some(new_inner);
-
-        // Reseed the block hash cache for the new segment's 256-block window
-        // before applying pre-execution changes (which may use BLOCKHASH).
-        let new_block_number = self.plan.as_ref().unwrap().segments[seg_idx]
-            .evm_env
-            .block_env
-            .number
-            .saturating_to::<u64>();
-        self.reseed_block_hashes_for(new_block_number);
-
-        // Apply pre-execution changes for the new segment (EIP-2935, EIP-4788).
-        self.inner_mut().apply_pre_execution_changes()?;
-
-        trace!(target: "engine::bb::evm", "Started segment {seg_idx}");
-
-        Ok(())
-    }
-}
-
-impl<'a, DB, I, P, Spec> BlockExecutor for BbBlockExecutor<'a, DB, I, P, Spec>
-where
-    DB: StateDB,
-    I: Inspector<EthEvmContext<DB>>,
-    P: PrecompileProvider<EthEvmContext<DB>, Output = InterpreterResult>,
-    Spec: alloy_evm::eth::spec::EthExecutorSpec + Clone,
-    EthEvm<DB, I, P>: Evm<
-        DB = DB,
-        Tx = TxEnv,
-        HaltReason = HaltReason,
-        Error = EVMError<DB::Error>,
-        Spec = SpecId,
-        BlockEnv = BlockEnv,
-    >,
-    TxEnv: FromRecoveredTx<TransactionSigned> + FromTxWithEncoded<TransactionSigned>,
-{
-    type Transaction = TransactionSigned;
-    type Receipt = Receipt;
-    type Evm = EthEvm<DB, I, P>;
-    type Result = EthTxResult<HaltReason, alloy_consensus::TxType>;
-
-    fn apply_pre_execution_changes(&mut self) -> Result<(), BlockExecutionError> {
-        // Swap the EVM's block_env and executor ctx to the first segment's
-        // values so that the initial EIP-2935/EIP-4788 system calls use the
-        // correct block number and parent hash. Without this, the outer big
-        // block header's block_number (which is synthetic) would be used,
-        // writing to wrong EIP-2935 slots and corrupting state.
-        if let Some(seg0) = self.plan.as_ref().map(|p| &p.segments[0]) {
-            let block_env = seg0.evm_env.block_env.clone();
-            let block_number = block_env.number.saturating_to::<u64>();
-            let mut cfg_env = seg0.evm_env.cfg_env.clone();
-            cfg_env.disable_base_fee = true;
-            let seg0_ctx = EthBlockExecutionCtx {
-                parent_hash: seg0.ctx.parent_hash,
-                parent_beacon_block_root: seg0.ctx.parent_beacon_block_root,
-                ommers: seg0.ctx.ommers,
-                withdrawals: seg0.ctx.withdrawals.clone(),
-                extra_data: seg0.ctx.extra_data.clone(),
-                tx_count_hint: seg0.ctx.tx_count_hint,
-            };
-
-            let inner = self.inner_mut();
-            let evm_ctx = inner.evm.ctx_mut();
-            evm_ctx.block = block_env;
-            evm_ctx.cfg = cfg_env;
-            inner.ctx = seg0_ctx;
-
-            self.reseed_block_hashes_for(block_number);
-        }
-
-        self.inner_mut().apply_pre_execution_changes()
-    }
-
-    fn execute_transaction_without_commit(
-        &mut self,
-        tx: impl ExecutableTx<Self>,
-    ) -> Result<Self::Result, BlockExecutionError> {
-        self.maybe_apply_boundary()?;
-        self.inner_mut().execute_transaction_without_commit(tx)
-    }
-
-    fn commit_transaction(&mut self, output: Self::Result) -> Result<u64, BlockExecutionError> {
-        let gas_used = self.inner_mut().commit_transaction(output)?;
-
-        // Fix up cumulative_gas_used on the just-committed receipt so that
-        // the receipt root task (which reads receipts incrementally) sees
-        // globally-correct values across all segments.
-        let offset = self.gas_used_offset;
-        if offset > 0 &&
-            let Some(receipt) = self.inner_mut().receipts.last_mut()
-        {
-            receipt.cumulative_gas_used += offset;
-        }
-
-        if let Some(plan) = &mut self.plan {
-            plan.tx_counter += 1;
-        }
-        Ok(gas_used)
-    }
-
-    fn finish(
-        mut self,
-    ) -> Result<(Self::Evm, BlockExecutionResult<Self::Receipt>), BlockExecutionError> {
-        // Swap the inner executor's ctx to the last segment's ctx so that
-        // EthBlockExecutor::finish() applies the correct withdrawal balance
-        // increments and post-execution system calls.
-        if let Some(last_seg) = self.plan.as_ref().map(|p| p.segments.last().unwrap()) {
-            let last_ctx = EthBlockExecutionCtx {
-                parent_hash: last_seg.ctx.parent_hash,
-                parent_beacon_block_root: last_seg.ctx.parent_beacon_block_root,
-                ommers: last_seg.ctx.ommers,
-                withdrawals: last_seg.ctx.withdrawals.clone(),
-                extra_data: last_seg.ctx.extra_data.clone(),
-                tx_count_hint: last_seg.ctx.tx_count_hint,
-            };
-            self.inner_mut().ctx = last_ctx;
-        }
-        let inner = self.inner.take().expect("inner executor must exist");
-        let (evm, mut result) = inner.finish()?;
-
-        // Receipts already have globally-correct cumulative_gas_used (fixed
-        // up in commit_transaction). Add the offset to the totals so they
-        // reflect gas across all segments.
-        let last_segment_gas = result.gas_used;
-        result.gas_used += self.gas_used_offset;
-        result.blob_gas_used += self.blob_gas_used_offset;
-
-        let last_receipt_cumulative =
-            result.receipts.last().map(|r| r.cumulative_gas_used).unwrap_or(0);
-        debug!(
-            target: "engine::bb::evm",
-            last_segment_gas,
-            gas_used_offset = self.gas_used_offset,
-            total_gas_used = result.gas_used,
-            last_receipt_cumulative,
-            receipt_count = result.receipts.len(),
-            "Finished final segment"
-        );
-
-        // Merge requests accumulated from earlier segment boundaries into
-        // the final result.
-        if !self.accumulated_requests.is_empty() {
-            let mut merged = self.accumulated_requests;
-            merged.extend(result.requests);
-            result.requests = merged;
-        }
-
-        Ok((evm, result))
-    }
-
-    fn set_state_hook(&mut self, hook: Option<Box<dyn OnStateHook>>) {
-        if self.plan.is_some() {
-            // Store the real hook in the shared slot and give the inner
-            // executor a lightweight forwarder. This way the hook survives
-            // inner executor finish/reconstruct cycles at segment boundaries.
-            *self.shared_hook.lock().unwrap() = hook;
-            let fwd = self.forwarding_hook();
-            self.inner_mut().set_state_hook(fwd);
-        } else {
-            self.inner_mut().set_state_hook(hook);
-        }
-    }
-
-    fn evm_mut(&mut self) -> &mut Self::Evm {
-        self.inner_mut().evm_mut()
-    }
-
-    fn evm(&self) -> &Self::Evm {
-        self.inner().evm()
-    }
-
-    fn receipts(&self) -> &[Self::Receipt] {
-        self.inner().receipts()
-    }
-}
-
-// ---------------------------------------------------------------------------
-// BbBlockExecutorFactory
-// ---------------------------------------------------------------------------
-
-/// Block executor factory that produces [`BbBlockExecutor`] for
-/// boundary-aware big-block execution.
-#[derive(Debug, Clone)]
-pub struct BbBlockExecutorFactory<Spec> {
-    receipt_builder: RethReceiptBuilder,
-    spec: Spec,
-    evm_factory: EthEvmFactory,
-    /// Staged plan consumed by the next [`BbBlockExecutor`].
-    pub(crate) staged_plan: Arc<Mutex<Option<BbEvmPlan>>>,
-}
-
-impl<Spec> BbBlockExecutorFactory<Spec> {
-    pub fn new(
-        receipt_builder: RethReceiptBuilder,
-        spec: Spec,
-        evm_factory: EthEvmFactory,
-    ) -> Self {
-        Self { receipt_builder, spec, evm_factory, staged_plan: Arc::new(Mutex::new(None)) }
-    }
-
-    pub const fn evm_factory(&self) -> &EthEvmFactory {
-        &self.evm_factory
-    }
-
-    pub const fn spec(&self) -> &Spec {
-        &self.spec
-    }
-
-    pub const fn receipt_builder(&self) -> &RethReceiptBuilder {
-        &self.receipt_builder
-    }
-
-    pub(crate) fn stage_plan(&self, plan: BbEvmPlan) {
-        *self.staged_plan.lock().unwrap() = Some(plan);
-    }
-
-    fn take_plan(&self) -> Option<BbEvmPlan> {
-        self.staged_plan.lock().unwrap().take()
-    }
-
-    pub(crate) fn create_executor_with_seeder<'a, DB, I>(
-        &'a self,
-        evm: EthEvm<DB, I, PrecompilesMap>,
-        ctx: EthBlockExecutionCtx<'a>,
-        block_hash_seeder: Option<BlockHashSeeder<DB>>,
-    ) -> BbBlockExecutor<'a, DB, I, PrecompilesMap, &'a Spec>
-    where
-        Spec: alloy_evm::eth::spec::EthExecutorSpec,
-        DB: StateDB + 'a,
-        I: Inspector<EthEvmContext<DB>> + 'a,
-    {
-        let plan = self.take_plan();
-        BbBlockExecutor::new(evm, ctx, &self.spec, self.receipt_builder, plan, block_hash_seeder)
-    }
-}
-
-impl<Spec> BlockExecutorFactory for BbBlockExecutorFactory<Spec>
-where
-    Spec: alloy_evm::eth::spec::EthExecutorSpec + 'static,
-    TxEnv: FromRecoveredTx<TransactionSigned> + FromTxWithEncoded<TransactionSigned>,
-{
-    type EvmFactory = EthEvmFactory;
-    type ExecutionCtx<'a> = EthBlockExecutionCtx<'a>;
-    type Transaction = TransactionSigned;
-    type Receipt = Receipt;
-
-    fn evm_factory(&self) -> &Self::EvmFactory {
-        &self.evm_factory
-    }
-
-    fn create_executor<'a, DB, I>(
-        &'a self,
-        evm: EthEvm<DB, I, PrecompilesMap>,
-        ctx: EthBlockExecutionCtx<'a>,
-    ) -> impl BlockExecutorFor<'a, Self, DB, I>
-    where
-        DB: StateDB + 'a,
-        I: Inspector<EthEvmContext<DB>> + 'a,
-    {
-        let plan = self.take_plan();
-        BbBlockExecutor::new(evm, ctx, &self.spec, self.receipt_builder, plan, None)
-    }
-}