From 04af8238d242178175169741b4d26cb631797769 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:03:13 +0200
Subject: [PATCH 01/18] feat(bench): add txgen benchmark runner scripts

---
 .github/scripts/bench-txgen-build.sh          |  59 ++++
 .github/scripts/bench-txgen-install.sh        |  18 ++
 .../scripts/bench-txgen-report-to-reth-csv.py | 107 ++++++++
 .github/scripts/bench-txgen-run.sh            | 258 ++++++++++++++++++
 4 files changed, 442 insertions(+)
 create mode 100755 .github/scripts/bench-txgen-build.sh
 create mode 100755 .github/scripts/bench-txgen-install.sh
 create mode 100755 .github/scripts/bench-txgen-report-to-reth-csv.py
 create mode 100755 .github/scripts/bench-txgen-run.sh

diff --git a/.github/scripts/bench-txgen-build.sh b/.github/scripts/bench-txgen-build.sh
new file mode 100755
index 00000000000..80b1ab3a753
--- /dev/null
+++ b/.github/scripts/bench-txgen-build.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#
+# Builds the node binary for the txgen-backed PR benchmark path.
+#
+# Usage: bench-txgen-build.sh <baseline|feature> <source-dir> <commit>
+#
+# This intentionally does not build or install reth-bench. Big-block benchmarks
+# still use the legacy reth-bench path because txgen does not yet replay the
+# reth-bb payload/env-switch/BAL format.
+set -euxo pipefail
+
+MODE="$1"
+SOURCE_DIR="$2"
+COMMIT="$3"
+
+if [ "${BENCH_BIG_BLOCKS:-false}" = "true" ]; then
+  echo "::error::txgen path does not support big-block benchmarks yet; use the reth-bench driver"
+  exit 1
+fi
+
+EXTRA_FEATURES=""
+EXTRA_RUSTFLAGS=""
+if [ "${BENCH_TRACY:-off}" != "off" ]; then
+  EXTRA_FEATURES="tracy,tracy-client/ondemand"
+  EXTRA_RUSTFLAGS=" -C force-frame-pointers=yes"
+fi
+
+build_node_binary() {
+  local features_arg=""
+  local workspace_arg=""
+
+  cd "$SOURCE_DIR"
+  if [ -n "$EXTRA_FEATURES" ]; then
+    features_arg="--features ${EXTRA_FEATURES}"
+    workspace_arg="--workspace"
+  fi
+
+  # shellcheck disable=SC2086
+  RUSTFLAGS="-C target-cpu=native${EXTRA_RUSTFLAGS}" \
+    cargo build --locked --profile profiling --bin reth $workspace_arg $features_arg
+}
+
+case "$MODE" in
+  baseline|main)
+    echo "Building baseline reth (${COMMIT}) from source for txgen benchmark..."
+    build_node_binary
+    ;;
+
+  feature|branch)
+    echo "Building feature reth (${COMMIT}) from source for txgen benchmark..."
+    rustup show active-toolchain || rustup default stable
+    build_node_binary
+    ;;
+
+  *)
+    echo "Usage: $0 <baseline|feature> <source-dir> <commit>"
+    exit 1
+    ;;
+esac
diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
new file mode 100755
index 00000000000..dd5ce58b357
--- /dev/null
+++ b/.github/scripts/bench-txgen-install.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# Installs the txgen tools used by the txgen-backed PR benchmark path.
+# Keep this separate from bench-reth-build.sh so scheduled benchmarks can keep
+# using the legacy reth-bench runner until they are migrated explicitly.
+#
+# Required env:
+#   TXGEN_REV   – pinned txgen git revision
+# Optional env:
+#   TXGEN_REPO  – txgen repository URL (default: https://github.com/tempoxyz/txgen)
+set -euxo pipefail
+
+: "${TXGEN_REV:?TXGEN_REV must be set to a pinned txgen revision}"
+
+TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
+
+cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" --bin txgen-ethereum --locked
+cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" --bin bench --locked
diff --git a/.github/scripts/bench-txgen-report-to-reth-csv.py b/.github/scripts/bench-txgen-report-to-reth-csv.py
new file mode 100755
index 00000000000..01620d94260
--- /dev/null
+++ b/.github/scripts/bench-txgen-report-to-reth-csv.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+"""Convert txgen `bench send-blocks` JSON into the legacy reth-bench CSVs.
+
+The PR benchmark rendering pipeline still consumes `combined_latency.csv` and
+`total_gas.csv`. This adapter lets the txgen-backed runner reuse the existing
+summary/charts/slack code while we migrate those consumers to txgen JSON.
+"""
+
+import argparse
+import csv
+import json
+from pathlib import Path
+
+
+def opt_int(value, default=None):
+    if value is None:
+        return default
+    return int(value)
+
+
+def block_latency_us(block: dict) -> tuple[int, int, int]:
+    # txgen currently records server newPayload latency in microseconds but
+    # client-side forkchoiceUpdated latency in milliseconds.
+    new_payload_us = opt_int(block.get("new_payload_server_latency_us"))
+    if new_payload_us is None:
+        new_payload_us = opt_int(block.get("new_payload_ms"), 0) * 1000
+    fcu_us = opt_int(block.get("forkchoice_updated_ms"), 0) * 1000
+    return new_payload_us, fcu_us, new_payload_us + fcu_us
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Convert txgen JSON report to reth-bench CSVs")
+    parser.add_argument("report", help="txgen JSON report path")
+    parser.add_argument("output_dir", help="directory for combined_latency.csv and total_gas.csv")
+    args = parser.parse_args()
+
+    report_path = Path(args.report)
+    output_dir = Path(args.output_dir)
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    with report_path.open() as f:
+        report = json.load(f)
+
+    blocks = report.get("blocks") or []
+    if not blocks:
+        raise SystemExit(f"txgen report {report_path} does not contain any blocks")
+
+    combined_path = output_dir / "combined_latency.csv"
+    with combined_path.open("w", newline="") as f:
+        writer = csv.DictWriter(
+            f,
+            fieldnames=[
+                "block_number",
+                "gas_limit",
+                "transaction_count",
+                "gas_used",
+                "new_payload_latency",
+                "fcu_latency",
+                "total_latency",
+                "persistence_wait",
+                "execution_cache_wait",
+                "sparse_trie_wait",
+            ],
+        )
+        writer.writeheader()
+        for block in blocks:
+            new_payload_us, fcu_us, total_us = block_latency_us(block)
+            writer.writerow(
+                {
+                    "block_number": block["number"],
+                    "gas_limit": block["gas_limit"],
+                    "transaction_count": block["tx_count"],
+                    "gas_used": block["gas_used"],
+                    "new_payload_latency": new_payload_us,
+                    "fcu_latency": fcu_us,
+                    "total_latency": total_us,
+                    "persistence_wait": block.get("persistence_wait_us") or 0,
+                    "execution_cache_wait": block.get("execution_cache_wait_us") or 0,
+                    "sparse_trie_wait": block.get("sparse_trie_wait_us") or 0,
+                }
+            )
+
+    total_gas_path = output_dir / "total_gas.csv"
+    elapsed_us = 0
+    with total_gas_path.open("w", newline="") as f:
+        writer = csv.DictWriter(
+            f,
+            fieldnames=["block_number", "transaction_count", "gas_used", "time"],
+        )
+        writer.writeheader()
+        for block in blocks:
+            _, _, total_us = block_latency_us(block)
+            elapsed_us += total_us
+            writer.writerow(
+                {
+                    "block_number": block["number"],
+                    "transaction_count": block["tx_count"],
+                    "gas_used": block["gas_used"],
+                    "time": elapsed_us,
+                }
+            )
+
+    print(f"Wrote legacy CSVs from {report_path} to {output_dir}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/scripts/bench-txgen-run.sh b/.github/scripts/bench-txgen-run.sh
new file mode 100755
index 00000000000..264bc1e0bdc
--- /dev/null
+++ b/.github/scripts/bench-txgen-run.sh
@@ -0,0 +1,258 @@
+#!/usr/bin/env bash
+#
+# Runs a single txgen-backed Engine API benchmark cycle:
+# mount snapshot → start node → extract source blocks → warmup → send-blocks →
+# convert txgen JSON report into the legacy reth-bench CSVs.
+#
+# Usage: bench-txgen-run.sh <label> <binary> <output-dir>
+#
+# Required env: SCHELK_MOUNT, BENCH_RPC_URL, BENCH_BLOCKS, BENCH_WARMUP_BLOCKS
+# Optional env: BENCH_WORK_DIR, BENCH_BASELINE_ARGS, BENCH_FEATURE_ARGS,
+#               BENCH_OTLP_TRACES_ENDPOINT, BENCH_OTLP_LOGS_ENDPOINT,
+#               BENCH_OTLP_DISABLED
+set -euxo pipefail
+
+LABEL="$1"
+BINARY="$2"
+OUTPUT_DIR="$3"
+DATADIR="$SCHELK_MOUNT/datadir"
+mkdir -p "$OUTPUT_DIR"
+LOG="${OUTPUT_DIR}/node.log"
+
+RETH_SCOPE="${RETH_SCOPE:-reth-bench.scope}"
+
+# Unsupported txgen-path behavior is made explicit here. Keep these checks near
+# the top so new txgen support can be added one feature at a time.
+if [ "${BENCH_BIG_BLOCKS:-false}" = "true" ]; then
+  echo "::error::txgen driver does not support big-block benchmarks yet; use the reth-bench driver"
+  exit 1
+fi
+if [ -n "${BENCH_WAIT_TIME:-}" ]; then
+  echo "::error::txgen driver does not support BENCH_WAIT_TIME yet"
+  exit 1
+fi
+if [ -n "${BENCH_BAL:-}" ] && [ "${BENCH_BAL}" != "false" ]; then
+  echo "::error::txgen driver does not support BAL replay yet; use big-blocks with the reth-bench driver"
+  exit 1
+fi
+
+cleanup() {
+  kill "${TAIL_PID:-}" 2>/dev/null || true
+  if sudo systemctl is-active "$RETH_SCOPE" >/dev/null 2>&1; then
+    if [ "${BENCH_SAMPLY:-false}" = "true" ]; then
+      sudo pkill -INT -x reth 2>/dev/null || true
+      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
+      sudo pkill -x samply 2>/dev/null || true
+    fi
+    sudo systemctl stop "$RETH_SCOPE" 2>/dev/null || true
+    sleep 1
+  fi
+  sudo systemctl reset-failed "$RETH_SCOPE" 2>/dev/null || true
+  sudo chown -R "$(id -un):$(id -gn)" "$OUTPUT_DIR" 2>/dev/null || true
+  sudo schelk recover -y --kill || true
+}
+TAIL_PID=
+trap cleanup EXIT
+
+sudo systemctl stop "$RETH_SCOPE" 2>/dev/null || true
+sudo systemctl reset-failed "$RETH_SCOPE" 2>/dev/null || true
+sudo schelk recover -y --kill || sudo schelk full-recover -y || true
+
+sudo schelk mount -y || true
+if [ ! -d "$DATADIR/db" ] || [ ! -d "$DATADIR/static_files" ]; then
+  echo "::error::Failed to mount benchmark datadir at ${DATADIR}"
+  ls -la "$SCHELK_MOUNT" || true
+  ls -la "$DATADIR" || true
+  exit 1
+fi
+sync
+sudo sh -c 'echo 3 > /proc/sys/vm/drop_caches'
+echo "=== Cache state after drop ==="
+free -h
+grep Cached /proc/meminfo
+
+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}"
+
+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
+)
+
+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
+
+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
+  # shellcheck disable=SC2206
+  RETH_ARGS+=($EXTRA_NODE_ARGS)
+fi
+
+if [ -n "${BENCH_METRICS_ADDR:-}" ]; then
+  RETH_ARGS+=(--metrics "$BENCH_METRICS_ADDR")
+fi
+
+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
+
+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
+
+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
+
+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
+
+TXGEN_ETHEREUM="$(which txgen-ethereum)"
+TXGEN_BENCH="$(which bench)"
+BENCH_NICE="sudo nice -n -20 sudo -u $(id -un)"
+
+HEAD_JSON=$(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}')
+HEAD_HEX=$(jq -r '.result' <<< "$HEAD_JSON")
+HEAD_DEC=$((16#${HEAD_HEX#0x}))
+
+WARMUP="${BENCH_WARMUP_BLOCKS:-0}"
+BLOCKS="${BENCH_BLOCKS:?BENCH_BLOCKS must be set}"
+TOTAL=$(( WARMUP + BLOCKS ))
+if [ "$BLOCKS" -le 0 ] || [ "$TOTAL" -le 0 ]; then
+  echo "::error::BENCH_BLOCKS must be greater than 0"
+  exit 1
+fi
+
+TXGEN_DIR="$OUTPUT_DIR/txgen"
+mkdir -p "$TXGEN_DIR"
+ALL_BLOCKS="$TXGEN_DIR/all-blocks.ndjson"
+WARMUP_BLOCKS="$TXGEN_DIR/warmup-blocks.ndjson"
+BENCHMARK_BLOCKS="$TXGEN_DIR/benchmark-blocks.ndjson"
+
+EXTRACT_FROM=$(( HEAD_DEC + 1 ))
+EXTRACT_TO=$(( HEAD_DEC + TOTAL ))
+echo "Extracting blocks ${EXTRACT_FROM}..${EXTRACT_TO} for txgen benchmark (${WARMUP} warmup, ${BLOCKS} measured)"
+"$TXGEN_ETHEREUM" extract \
+  --rpc "$BENCH_RPC_URL" \
+  --from "$EXTRACT_FROM" \
+  --to "$EXTRACT_TO" \
+  -o "$ALL_BLOCKS"
+
+if [ "$WARMUP" -gt 0 ] 2>/dev/null; then
+  head -n "$WARMUP" "$ALL_BLOCKS" > "$WARMUP_BLOCKS"
+else
+  : > "$WARMUP_BLOCKS"
+fi
+awk -v warmup="$WARMUP" 'NR > warmup { print }' "$ALL_BLOCKS" > "$BENCHMARK_BLOCKS"
+
+if [ "$WARMUP" -gt 0 ] 2>/dev/null; then
+  echo "Running txgen warmup (${WARMUP} blocks)..."
+  $BENCH_NICE "$TXGEN_BENCH" send-blocks \
+    --engine http://127.0.0.1:8551 \
+    --jwt-secret "$DATADIR/jwt.hex" \
+    --input "$WARMUP_BLOCKS" \
+    --wait-for-persistence never \
+    --report json:"$TXGEN_DIR/warmup-report.json" 2>&1 | sed -u "s/^/[bench] /"
+else
+  echo "Skipping warmup (0 blocks)..."
+fi
+
+# TODO(txgen): expose a wait-time flag and plumb BENCH_WAIT_TIME here.
+# TODO(txgen): expose microsecond client-side FCU latency to avoid ms rounding.
+# TODO(txgen): support reth-bb payload/env-switch/BAL replay so big-blocks can move here.
+echo "Running txgen measured benchmark (${BLOCKS} blocks)..."
+$BENCH_NICE "$TXGEN_BENCH" send-blocks \
+  --engine http://127.0.0.1:8551 \
+  --jwt-secret "$DATADIR/jwt.hex" \
+  --input "$BENCHMARK_BLOCKS" \
+  --wait-for-persistence never \
+  --report json:"$OUTPUT_DIR/report.json" 2>&1 | sed -u "s/^/[bench] /"
+
+python3 .github/scripts/bench-txgen-report-to-reth-csv.py "$OUTPUT_DIR/report.json" "$OUTPUT_DIR"

From dbe13bf81d9727f63cf2588c5dd5e0fc61b9cff3 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:05:31 +0200
Subject: [PATCH 02/18] feat(bench): route PR benchmarks through txgen

---
 .github/scripts/bench-reth-summary.py |  2 +
 .github/scripts/bench-utils.js        |  2 +
 .github/workflows/bench.yml           | 59 +++++++++++++++++++++------
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/bench-reth-summary.py b/.github/scripts/bench-reth-summary.py
index 300006cad6c..da6b7de1d11 100755
--- a/.github/scripts/bench-reth-summary.py
+++ b/.github/scripts/bench-reth-summary.py
@@ -521,6 +521,7 @@ def main():
     parser.add_argument("--warmup-blocks", default=None, help="Number of warmup blocks")
     parser.add_argument("--wait-time", default=None, help="Wait time interval used between blocks")
     parser.add_argument("--bal-mode", default=None, help="BAL mode (true, feature, baseline)")
+    parser.add_argument("--driver", default=None, help="Benchmark driver used for this run")
     parser.add_argument("--grafana-url", default=None, help="Grafana dashboard URL for this benchmark run")
     args = parser.parse_args()
 
@@ -605,6 +606,7 @@ def main():
 
     summary = {
         "blocks": paired_stats["blocks"],
+        "driver": args.driver,
         "big_blocks": args.big_blocks,
         "warmup_blocks": args.warmup_blocks,
         "wait_time": args.wait_time,
diff --git a/.github/scripts/bench-utils.js b/.github/scripts/bench-utils.js
index 393c402fb25..6e67a95bdcd 100644
--- a/.github/scripts/bench-utils.js
+++ b/.github/scripts/bench-utils.js
@@ -54,6 +54,8 @@ function balModeLabel(mode) {
 
 function blocksLabel(summary) {
   const parts = [];
+  const driver = summary.driver || process.env.BENCH_DRIVER || '';
+  if (driver) parts.push({ key: 'Driver', value: driver });
   if (summary.big_blocks) {
     parts.push({ key: 'Big Blocks', value: summary.blocks });
     const balMode = balModeLabel(summary.bal_mode || summary.bal || process.env.BENCH_BAL || 'false');
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index df9ec9ee49e..66739881e66 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -432,8 +432,10 @@ jobs:
             const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
             const featureArgsVal = '${{ steps.args.outputs.feature-args }}';
             const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
+            const driver = bigBlocks ? 'reth-bench' : 'txgen';
+            const driverNote = `, driver: \`${driver}\``;
             const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
-            const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
+            const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${driverNote}${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
 
             const { data: comment } = await github.rest.issues.createComment({
               owner: context.repo.owner,
@@ -476,8 +478,10 @@ jobs:
             const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
             const featureArgsVal = '${{ steps.args.outputs.feature-args }}';
             const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
+            const driver = bigBlocks ? 'reth-bench' : 'txgen';
+            const driverNote = `, driver: \`${driver}\``;
             const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
-            const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
+            const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${driverNote}${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
             const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
 
             const numRunners = parseInt(process.env.BENCH_RUNNERS) || 1;
@@ -528,7 +532,7 @@ jobs:
 
   reth-bench:
     needs: reth-bench-ack
-    name: reth-bench
+    name: bench-${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bench' || 'txgen' }}
     runs-on: [self-hosted, Linux, X64, available]
     permissions:
       contents: read
@@ -554,9 +558,11 @@ jobs:
       BENCH_OTLP: ${{ needs.reth-bench-ack.outputs.otlp }}
       BENCH_COMMENT_ID: ${{ needs.reth-bench-ack.outputs.comment-id }}
       BENCH_SLACK: ${{ needs.reth-bench-ack.outputs.slack }}
+      BENCH_DRIVER: ${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bench' || 'txgen' }}
       BENCH_NODE_BIN: ${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bb' || 'reth' }}
       BENCH_SNAPSHOT_MANIFEST_URL: ${{ secrets.BENCH_SNAPSHOT_MANIFEST_URL }}
       BENCH_METRICS_ADDR: "127.0.0.1:9100"
+      TXGEN_REV: 420cad10ad2d1ffa10d5708a892a910e101d7811
       BENCH_OTLP_TRACES_ENDPOINT: ${{ needs.reth-bench-ack.outputs.otlp != 'false' && secrets.BENCH_OTLP_TRACES_ENDPOINT || '' }}
       BENCH_OTLP_LOGS_ENDPOINT: ${{ needs.reth-bench-ack.outputs.otlp != 'false' && secrets.BENCH_OTLP_LOGS_ENDPOINT || '' }}
     steps:
@@ -601,7 +607,8 @@ jobs:
               repo: context.repo.repo,
               run_id: context.runId,
             });
-            const job = jobs.jobs.find(j => j.name === 'reth-bench');
+            const expectedJobName = `bench-${process.env.BENCH_DRIVER || 'txgen'}`;
+            const job = jobs.jobs.find(j => j.name === expectedJobName);
             const jobUrl = job ? job.html_url : `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
             core.exportVariable('BENCH_JOB_URL', jobUrl);
 
@@ -628,8 +635,10 @@ jobs:
             const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
             const featureArgsVal = process.env.BENCH_FEATURE_ARGS || '';
             const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
+            const driver = process.env.BENCH_DRIVER || (bigBlocks ? 'reth-bench' : 'txgen');
+            const driverNote = `, driver: \`${driver}\``;
             const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
-            core.exportVariable('BENCH_CONFIG', `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`);
+            core.exportVariable('BENCH_CONFIG', `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${driverNote}${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`);
 
             const { buildBody } = require('./.github/scripts/bench-update-status.js');
             await github.rest.issues.updateComment({
@@ -835,9 +844,16 @@ jobs:
           BASELINE_DIR="$(cd ../reth-baseline && pwd)"
           FEATURE_DIR="$(cd ../reth-feature && pwd)"
 
-          .github/scripts/bench-reth-build.sh baseline "${BASELINE_DIR}" "${{ steps.refs.outputs.baseline-ref }}" &
+          if [ "$BENCH_DRIVER" = "txgen" ]; then
+            .github/scripts/bench-txgen-install.sh
+            BUILD_SCRIPT=.github/scripts/bench-txgen-build.sh
+          else
+            BUILD_SCRIPT=.github/scripts/bench-reth-build.sh
+          fi
+
+          "$BUILD_SCRIPT" baseline "${BASELINE_DIR}" "${{ steps.refs.outputs.baseline-ref }}" &
           PID_BASELINE=$!
-          .github/scripts/bench-reth-build.sh feature "${FEATURE_DIR}" "${{ steps.refs.outputs.feature-ref }}" &
+          "$BUILD_SCRIPT" feature "${FEATURE_DIR}" "${{ steps.refs.outputs.feature-ref }}" &
           PID_FEATURE=$!
 
           FAIL=0
@@ -966,7 +982,11 @@ jobs:
           cat > "$BENCH_LABELS_FILE" <<LABELS
           {"benchmark_run":"feature-1","run_type":"feature","git_ref":"${FEATURE_REF}","bench_sha":"${FEATURE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
           LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh feature "../reth-feature/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/feature-1"
+          RUN_SCRIPT=.github/scripts/bench-reth-run.sh
+          if [ "$BENCH_DRIVER" = "txgen" ]; then
+            RUN_SCRIPT=.github/scripts/bench-txgen-run.sh
+          fi
+          taskset -c 0 "$RUN_SCRIPT" feature "../reth-feature/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/feature-1"
 
       - name: "Run benchmark: baseline (1/2)"
         id: run-baseline-1
@@ -979,7 +999,11 @@ jobs:
           cat > "$BENCH_LABELS_FILE" <<LABELS
           {"benchmark_run":"baseline-1","run_type":"baseline","git_ref":"${BASELINE_REF}","bench_sha":"${BASELINE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
           LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh baseline "../reth-baseline/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/baseline-1"
+          RUN_SCRIPT=.github/scripts/bench-reth-run.sh
+          if [ "$BENCH_DRIVER" = "txgen" ]; then
+            RUN_SCRIPT=.github/scripts/bench-txgen-run.sh
+          fi
+          taskset -c 0 "$RUN_SCRIPT" baseline "../reth-baseline/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/baseline-1"
 
       - name: "Run benchmark: baseline (2/2)"
         if: env.BENCH_ABBA != 'false'
@@ -993,7 +1017,11 @@ jobs:
           cat > "$BENCH_LABELS_FILE" <<LABELS
           {"benchmark_run":"baseline-2","run_type":"baseline","git_ref":"${BASELINE_REF}","bench_sha":"${BASELINE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
           LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh baseline "../reth-baseline/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/baseline-2"
+          RUN_SCRIPT=.github/scripts/bench-reth-run.sh
+          if [ "$BENCH_DRIVER" = "txgen" ]; then
+            RUN_SCRIPT=.github/scripts/bench-txgen-run.sh
+          fi
+          taskset -c 0 "$RUN_SCRIPT" baseline "../reth-baseline/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/baseline-2"
 
       - name: "Run benchmark: feature (2/2)"
         if: env.BENCH_ABBA != 'false'
@@ -1007,7 +1035,11 @@ jobs:
           cat > "$BENCH_LABELS_FILE" <<LABELS
           {"benchmark_run":"feature-2","run_type":"feature","git_ref":"${FEATURE_REF}","bench_sha":"${FEATURE_REF}","benchmark_id":"${BENCH_ID}","run_start_epoch":"${LAST_RUN_START}","reference_epoch":"${BENCH_REFERENCE_EPOCH}"}
           LABELS
-          taskset -c 0 .github/scripts/bench-reth-run.sh feature "../reth-feature/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/feature-2"
+          RUN_SCRIPT=.github/scripts/bench-reth-run.sh
+          if [ "$BENCH_DRIVER" = "txgen" ]; then
+            RUN_SCRIPT=.github/scripts/bench-txgen-run.sh
+          fi
+          taskset -c 0 "$RUN_SCRIPT" feature "../reth-feature/target/profiling/${BENCH_NODE_BIN}" "$BENCH_WORK_DIR/feature-2"
 
       - name: Stop metrics proxy & generate Grafana URL
         id: metrics
@@ -1146,6 +1178,9 @@ jobs:
           if [ -n "${BENCH_BAL:-}" ] && [ "${BENCH_BAL}" != "false" ]; then
             SUMMARY_ARGS="$SUMMARY_ARGS --bal-mode $BENCH_BAL"
           fi
+          if [ -n "${BENCH_DRIVER:-}" ]; then
+            SUMMARY_ARGS="$SUMMARY_ARGS --driver $BENCH_DRIVER"
+          fi
           GRAFANA_URL='${{ steps.metrics.outputs.grafana-url }}'
           if [ -n "$GRAFANA_URL" ]; then
             SUMMARY_ARGS="$SUMMARY_ARGS --grafana-url $GRAFANA_URL"
@@ -1177,7 +1212,7 @@ jobs:
         if: "!cancelled()"
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
-          name: bench-reth-results
+          name: bench-results
           path: ${{ env.BENCH_WORK_DIR }}
 
       - name: Push charts

From 808630ffbed0c8cc696d3b098ae5ca9dfbbc3bdd Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:06:50 +0200
Subject: [PATCH 03/18] fix(bench): install txgen workspace packages

---
 .github/scripts/bench-txgen-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index dd5ce58b357..444a5bf0cb5 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -14,5 +14,5 @@ set -euxo pipefail
 
 TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
 
-cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" --bin txgen-ethereum --locked
-cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" --bin bench --locked
+cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" -p txgen-ethereum --bin txgen-ethereum --locked
+cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" -p bench-cli --bin bench --locked

From fbe92313b4e933323743c998f211dbe1a3192dd4 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:11:38 +0200
Subject: [PATCH 04/18] fix(bench): pass txgen packages to cargo install

---
 .github/scripts/bench-txgen-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index 444a5bf0cb5..42c8f4aaa80 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -14,5 +14,5 @@ set -euxo pipefail
 
 TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
 
-cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" -p txgen-ethereum --bin txgen-ethereum --locked
-cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" -p bench-cli --bin bench --locked
+cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" txgen-ethereum --bin txgen-ethereum --locked
+cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" bench-cli --bin bench --locked

From bd7db87405e990983102c0c207ccec1e4b63a978 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:14:04 +0200
Subject: [PATCH 05/18] fix(bench): use git cli for private txgen fetches

---
 .github/scripts/bench-txgen-install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index 42c8f4aaa80..22b243e1fe0 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -14,5 +14,9 @@ set -euxo pipefail
 
 TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
 
+# txgen is private. Use the git CLI so cargo honors the workflow's
+# url.*.insteadOf auth configuration from the dependency install step.
+export CARGO_NET_GIT_FETCH_WITH_CLI=true
+
 cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" txgen-ethereum --bin txgen-ethereum --locked
 cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" bench-cli --bin bench --locked

From b3f16381fac30c3bc10aa02d53519a6c5bbd0f2e Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:16:31 +0200
Subject: [PATCH 06/18] fix(bench): configure txgen auth during install

---
 .github/scripts/bench-txgen-install.sh | 10 ++++++++--
 .github/workflows/bench.yml            |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index 22b243e1fe0..d2abc1a3542 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -14,8 +14,14 @@ set -euxo pipefail
 
 TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
 
-# txgen is private. Use the git CLI so cargo honors the workflow's
-# url.*.insteadOf auth configuration from the dependency install step.
+# txgen is private. Use the git CLI so cargo honors git's auth configuration.
+# Configure auth here as well because cargo invokes git from this build step,
+# not from the earlier dependency-install step.
+if [ -n "${DEREK_TOKEN:-}" ]; then
+  set +x
+  git config --global url."https://x-access-token:${DEREK_TOKEN}@github.com/".insteadOf "https://github.com/"
+  set -x
+fi
 export CARGO_NET_GIT_FETCH_WITH_CLI=true
 
 cargo install --git "$TXGEN_REPO" --rev "$TXGEN_REV" txgen-ethereum --bin txgen-ethereum --locked
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 66739881e66..f83c87d223f 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -839,6 +839,7 @@ jobs:
         id: build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEREK_TOKEN: ${{ secrets.DEREK_TOKEN }}
           BENCH_REPO: ${{ github.repository }}
         run: |
           BASELINE_DIR="$(cd ../reth-baseline && pwd)"

From 458b7bd9ec8807e6753a89c66bd9a6d15d68efd6 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:19:09 +0200
Subject: [PATCH 07/18] fix(bench): use derek pat for txgen checkout

---
 .github/scripts/bench-txgen-install.sh | 5 +++--
 .github/workflows/bench.yml            | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index d2abc1a3542..84d34d09e09 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -17,9 +17,10 @@ TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
 # txgen is private. Use the git CLI so cargo honors git's auth configuration.
 # Configure auth here as well because cargo invokes git from this build step,
 # not from the earlier dependency-install step.
-if [ -n "${DEREK_TOKEN:-}" ]; then
+AUTH_TOKEN="${DEREK_PAT:-${DEREK_TOKEN:-}}"
+if [ -n "$AUTH_TOKEN" ]; then
   set +x
-  git config --global url."https://x-access-token:${DEREK_TOKEN}@github.com/".insteadOf "https://github.com/"
+  git config --global url."https://x-access-token:${AUTH_TOKEN}@github.com/".insteadOf "https://github.com/"
   set -x
 fi
 export CARGO_NET_GIT_FETCH_WITH_CLI=true
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index f83c87d223f..485fed8051b 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -839,6 +839,7 @@ jobs:
         id: build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEREK_PAT: ${{ secrets.DEREK_PAT }}
           DEREK_TOKEN: ${{ secrets.DEREK_TOKEN }}
           BENCH_REPO: ${{ github.repository }}
         run: |

From 5ebd5f5e4e36c1a5a3d93706f60855c27b30b748 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:22:40 +0200
Subject: [PATCH 08/18] fix(bench): support txgen checkout tokens

---
 .github/scripts/bench-txgen-install.sh | 2 +-
 .github/workflows/bench.yml            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index 84d34d09e09..5dac1e8d38a 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -17,7 +17,7 @@ TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
 # txgen is private. Use the git CLI so cargo honors git's auth configuration.
 # Configure auth here as well because cargo invokes git from this build step,
 # not from the earlier dependency-install step.
-AUTH_TOKEN="${DEREK_PAT:-${DEREK_TOKEN:-}}"
+AUTH_TOKEN="${TXGEN_TOKEN:-${GH_PROJECT_TOKEN:-${DEREK_PAT:-${DEREK_TOKEN:-}}}}"
 if [ -n "$AUTH_TOKEN" ]; then
   set +x
   git config --global url."https://x-access-token:${AUTH_TOKEN}@github.com/".insteadOf "https://github.com/"
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 485fed8051b..ce7b17c86f1 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -839,6 +839,8 @@ jobs:
         id: build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TXGEN_TOKEN: ${{ secrets.TXGEN_TOKEN }}
+          GH_PROJECT_TOKEN: ${{ secrets.GH_PROJECT_TOKEN }}
           DEREK_PAT: ${{ secrets.DEREK_PAT }}
           DEREK_TOKEN: ${{ secrets.DEREK_TOKEN }}
           BENCH_REPO: ${{ github.repository }}

From 0c56869eced39ca8dc3efe734b80f780f9108fcc Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:43:29 +0200
Subject: [PATCH 09/18] fix(bench): use txgen deploy key

---
 .github/scripts/bench-txgen-install.sh | 18 +++++++++++++-----
 .github/workflows/bench.yml            |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index 5dac1e8d38a..fc5bd007332 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -14,11 +14,19 @@ set -euxo pipefail
 
 TXGEN_REPO="${TXGEN_REPO:-https://github.com/tempoxyz/txgen}"
 
-# txgen is private. Use the git CLI so cargo honors git's auth configuration.
-# Configure auth here as well because cargo invokes git from this build step,
-# not from the earlier dependency-install step.
-AUTH_TOKEN="${TXGEN_TOKEN:-${GH_PROJECT_TOKEN:-${DEREK_PAT:-${DEREK_TOKEN:-}}}}"
-if [ -n "$AUTH_TOKEN" ]; then
+# txgen is private. Prefer the deploy key secret; fall back to token auth for
+# local/manual runs. Use the git CLI so cargo honors the auth configuration.
+if [ -n "${TXGEN_DEPLOY_KEY:-}" ]; then
+  set +x
+  mkdir -p "$HOME/.ssh"
+  printf '%s\n' "$TXGEN_DEPLOY_KEY" > "$HOME/.ssh/txgen_deploy_key"
+  chmod 600 "$HOME/.ssh/txgen_deploy_key"
+  ssh-keyscan github.com >> "$HOME/.ssh/known_hosts" 2>/dev/null
+  export GIT_SSH_COMMAND="ssh -i $HOME/.ssh/txgen_deploy_key -o IdentitiesOnly=yes"
+  set -x
+  TXGEN_REPO="${TXGEN_SSH_REPO:-git@github.com:tempoxyz/txgen.git}"
+elif [ -n "${TXGEN_TOKEN:-${GH_PROJECT_TOKEN:-${DEREK_PAT:-${DEREK_TOKEN:-}}}}" ]; then
+  AUTH_TOKEN="${TXGEN_TOKEN:-${GH_PROJECT_TOKEN:-${DEREK_PAT:-${DEREK_TOKEN:-}}}}"
   set +x
   git config --global url."https://x-access-token:${AUTH_TOKEN}@github.com/".insteadOf "https://github.com/"
   set -x
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index ce7b17c86f1..2021bf4cebd 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -839,6 +839,7 @@ jobs:
         id: build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TXGEN_DEPLOY_KEY: ${{ secrets.TXGEN_DEPLOY_KEY }}
           TXGEN_TOKEN: ${{ secrets.TXGEN_TOKEN }}
           GH_PROJECT_TOKEN: ${{ secrets.GH_PROJECT_TOKEN }}
           DEREK_PAT: ${{ secrets.DEREK_PAT }}

From d3395c114168f99158a0406d8e399a670e1c41ed Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 16:56:12 +0200
Subject: [PATCH 10/18] fix(bench): use cargo-compatible txgen ssh url

---
 .github/scripts/bench-txgen-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/bench-txgen-install.sh b/.github/scripts/bench-txgen-install.sh
index fc5bd007332..e3334dc2a3b 100755
--- a/.github/scripts/bench-txgen-install.sh
+++ b/.github/scripts/bench-txgen-install.sh
@@ -24,7 +24,7 @@ if [ -n "${TXGEN_DEPLOY_KEY:-}" ]; then
   ssh-keyscan github.com >> "$HOME/.ssh/known_hosts" 2>/dev/null
   export GIT_SSH_COMMAND="ssh -i $HOME/.ssh/txgen_deploy_key -o IdentitiesOnly=yes"
   set -x
-  TXGEN_REPO="${TXGEN_SSH_REPO:-git@github.com:tempoxyz/txgen.git}"
+  TXGEN_REPO="${TXGEN_SSH_REPO:-ssh://git@github.com/tempoxyz/txgen.git}"
 elif [ -n "${TXGEN_TOKEN:-${GH_PROJECT_TOKEN:-${DEREK_PAT:-${DEREK_TOKEN:-}}}}" ]; then
   AUTH_TOKEN="${TXGEN_TOKEN:-${GH_PROJECT_TOKEN:-${DEREK_PAT:-${DEREK_TOKEN:-}}}}"
   set +x

From 3ef3d3d7cb8b3ad440c0ff60c727cd859eb4ba37 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 17:10:34 +0200
Subject: [PATCH 11/18] fix(bench): extract txgen blocks from raw RPC

---
 .github/scripts/bench-txgen-extract.py | 95 ++++++++++++++++++++++++++
 .github/scripts/bench-txgen-run.sh     |  5 +-
 .github/workflows/bench.yml            |  1 +
 3 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100755 .github/scripts/bench-txgen-extract.py

diff --git a/.github/scripts/bench-txgen-extract.py b/.github/scripts/bench-txgen-extract.py
new file mode 100755
index 00000000000..9d74ea70929
--- /dev/null
+++ b/.github/scripts/bench-txgen-extract.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+"""Extract raw blocks for txgen send-blocks.
+
+This intentionally uses a numeric `debug_getRawBlock` parameter because some
+public RPC providers reject the hex quantity form that alloy's Debug API emits.
+"""
+
+import argparse
+import json
+import sys
+import time
+import urllib.error
+import urllib.request
+
+
+def rpc_call(url: str, method: str, params: list, retries: int = 4):
+    payload = json.dumps({"jsonrpc": "2.0", "method": method, "params": params, "id": 1}).encode()
+    last_err = None
+    for attempt in range(retries):
+        try:
+            req = urllib.request.Request(
+                url,
+                data=payload,
+                headers={"Content-Type": "application/json", "User-Agent": "reth-bench-txgen"},
+                method="POST",
+            )
+            with urllib.request.urlopen(req, timeout=30) as resp:
+                data = json.loads(resp.read())
+            if "error" in data:
+                raise RuntimeError(data["error"].get("message", data["error"]))
+            return data["result"]
+        except (urllib.error.URLError, TimeoutError, json.JSONDecodeError, RuntimeError) as err:
+            last_err = err
+            if attempt + 1 == retries:
+                break
+            time.sleep(0.5 * (2**attempt))
+    raise RuntimeError(last_err)
+
+
+def parse_quantity(value: str) -> int:
+    return int(value, 16) if isinstance(value, str) and value.startswith("0x") else int(value)
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--rpc", required=True)
+    parser.add_argument("--from", dest="from_block", type=int, required=True)
+    parser.add_argument("--to", dest="to_block", type=int, required=True)
+    parser.add_argument("-o", "--output", required=True)
+    args = parser.parse_args()
+
+    if args.from_block > args.to_block:
+        parser.error("--from must be <= --to")
+
+    total = args.to_block - args.from_block + 1
+    started = time.monotonic()
+    last_log = started
+
+    with open(args.output, "w", encoding="utf-8") as out:
+        for idx, number in enumerate(range(args.from_block, args.to_block + 1), start=1):
+            try:
+                raw = rpc_call(args.rpc, "debug_getRawBlock", [number])
+                block = rpc_call(args.rpc, "eth_getBlockByNumber", [hex(number), False])
+            except RuntimeError as err:
+                print(f"failed to fetch block {number}: {err}", file=sys.stderr)
+                return 1
+
+            if not raw or not block:
+                print(f"missing block {number}", file=sys.stderr)
+                return 1
+
+            line = {
+                "raw": raw,
+                "key": block["hash"],
+                "number": parse_quantity(block["number"]),
+                "timestamp": parse_quantity(block["timestamp"]),
+                "gas_used": parse_quantity(block["gasUsed"]),
+                "gas_limit": parse_quantity(block["gasLimit"]),
+                "tx_count": len(block.get("transactions", [])),
+            }
+            out.write(json.dumps(line, separators=(",", ":")) + "\n")
+
+            now = time.monotonic()
+            if idx == total or idx % 100 == 0 or now - last_log >= 5:
+                elapsed = now - started
+                rate = idx / elapsed if elapsed else 0
+                print(f"extracted {idx}/{total} blocks ({idx / total * 100:.1f}%) - {rate:.0f} blocks/s", file=sys.stderr)
+                last_log = now
+
+    print(f"wrote {total} blocks to {args.output}", file=sys.stderr)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/.github/scripts/bench-txgen-run.sh b/.github/scripts/bench-txgen-run.sh
index 264bc1e0bdc..a85d1e7c3a2 100755
--- a/.github/scripts/bench-txgen-run.sh
+++ b/.github/scripts/bench-txgen-run.sh
@@ -218,9 +218,10 @@ BENCHMARK_BLOCKS="$TXGEN_DIR/benchmark-blocks.ndjson"
 
 EXTRACT_FROM=$(( HEAD_DEC + 1 ))
 EXTRACT_TO=$(( HEAD_DEC + TOTAL ))
+SOURCE_RPC_URL="${BENCH_TXGEN_RPC_URL:-$BENCH_RPC_URL}"
 echo "Extracting blocks ${EXTRACT_FROM}..${EXTRACT_TO} for txgen benchmark (${WARMUP} warmup, ${BLOCKS} measured)"
-"$TXGEN_ETHEREUM" extract \
-  --rpc "$BENCH_RPC_URL" \
+python3 .github/scripts/bench-txgen-extract.py \
+  --rpc "$SOURCE_RPC_URL" \
   --from "$EXTRACT_FROM" \
   --to "$EXTRACT_TO" \
   -o "$ALL_BLOCKS"
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 2021bf4cebd..c4931857892 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -540,6 +540,7 @@ jobs:
     timeout-minutes: 120
     env:
       BENCH_RPC_URL: https://ethereum.reth.rs/rpc
+      BENCH_TXGEN_RPC_URL: https://eth.llamarpc.com
       SCHELK_MOUNT: /reth-bench
       RETH_SCOPE: reth-bench.scope
       BENCH_WORK_DIR: ${{ github.workspace }}/bench-work

From caecac51a1848d7a6e21ec500638e14d7121bc88 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 17:21:46 +0200
Subject: [PATCH 12/18] fix(bench): retry txgen raw block extraction

---
 .github/scripts/bench-txgen-extract.py | 8 +++++---
 .github/scripts/bench-txgen-run.sh     | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/bench-txgen-extract.py b/.github/scripts/bench-txgen-extract.py
index 9d74ea70929..205d3ebd0db 100755
--- a/.github/scripts/bench-txgen-extract.py
+++ b/.github/scripts/bench-txgen-extract.py
@@ -13,7 +13,7 @@
 import urllib.request
 
 
-def rpc_call(url: str, method: str, params: list, retries: int = 4):
+def rpc_call(url: str, method: str, params: list, retries: int = 12):
     payload = json.dumps({"jsonrpc": "2.0", "method": method, "params": params, "id": 1}).encode()
     last_err = None
     for attempt in range(retries):
@@ -33,7 +33,7 @@ def rpc_call(url: str, method: str, params: list, retries: int = 4):
             last_err = err
             if attempt + 1 == retries:
                 break
-            time.sleep(0.5 * (2**attempt))
+            time.sleep(min(10.0, 0.5 * (2**attempt)))
     raise RuntimeError(last_err)
 
 
@@ -44,6 +44,7 @@ def parse_quantity(value: str) -> int:
 def main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument("--rpc", required=True)
+    parser.add_argument("--metadata-rpc")
     parser.add_argument("--from", dest="from_block", type=int, required=True)
     parser.add_argument("--to", dest="to_block", type=int, required=True)
     parser.add_argument("-o", "--output", required=True)
@@ -52,6 +53,7 @@ def main() -> int:
     if args.from_block > args.to_block:
         parser.error("--from must be <= --to")
 
+    metadata_rpc = args.metadata_rpc or args.rpc
     total = args.to_block - args.from_block + 1
     started = time.monotonic()
     last_log = started
@@ -60,7 +62,7 @@ def main() -> int:
         for idx, number in enumerate(range(args.from_block, args.to_block + 1), start=1):
             try:
                 raw = rpc_call(args.rpc, "debug_getRawBlock", [number])
-                block = rpc_call(args.rpc, "eth_getBlockByNumber", [hex(number), False])
+                block = rpc_call(metadata_rpc, "eth_getBlockByNumber", [hex(number), False])
             except RuntimeError as err:
                 print(f"failed to fetch block {number}: {err}", file=sys.stderr)
                 return 1
diff --git a/.github/scripts/bench-txgen-run.sh b/.github/scripts/bench-txgen-run.sh
index a85d1e7c3a2..a02130c37a9 100755
--- a/.github/scripts/bench-txgen-run.sh
+++ b/.github/scripts/bench-txgen-run.sh
@@ -222,6 +222,7 @@ SOURCE_RPC_URL="${BENCH_TXGEN_RPC_URL:-$BENCH_RPC_URL}"
 echo "Extracting blocks ${EXTRACT_FROM}..${EXTRACT_TO} for txgen benchmark (${WARMUP} warmup, ${BLOCKS} measured)"
 python3 .github/scripts/bench-txgen-extract.py \
   --rpc "$SOURCE_RPC_URL" \
+  --metadata-rpc "$BENCH_RPC_URL" \
   --from "$EXTRACT_FROM" \
   --to "$EXTRACT_TO" \
   -o "$ALL_BLOCKS"

From d9fc749c6c1b167ca48d16d068825b47b4e8966d Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Thu, 30 Apr 2026 17:36:41 +0200
Subject: [PATCH 13/18] fix(bench): validate raw blocks before txgen replay

---
 .github/scripts/bench-txgen-extract.py | 42 +++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/bench-txgen-extract.py b/.github/scripts/bench-txgen-extract.py
index 205d3ebd0db..445585a61fb 100755
--- a/.github/scripts/bench-txgen-extract.py
+++ b/.github/scripts/bench-txgen-extract.py
@@ -41,6 +41,46 @@ def parse_quantity(value: str) -> int:
     return int(value, 16) if isinstance(value, str) and value.startswith("0x") else int(value)
 
 
+def validate_top_level_rlp(raw: str) -> None:
+    if not isinstance(raw, str) or not raw.startswith("0x"):
+        raise ValueError("raw block is not a hex string")
+    data = bytes.fromhex(raw[2:])
+    if not data:
+        raise ValueError("raw block is empty")
+
+    prefix = data[0]
+    if prefix <= 0x7F:
+        total = 1
+    elif prefix <= 0xB7:
+        total = 1 + prefix - 0x80
+    elif prefix <= 0xBF:
+        len_len = prefix - 0xB7
+        total = 1 + len_len + int.from_bytes(data[1 : 1 + len_len], "big")
+    elif prefix <= 0xF7:
+        total = 1 + prefix - 0xC0
+    else:
+        len_len = prefix - 0xF7
+        total = 1 + len_len + int.from_bytes(data[1 : 1 + len_len], "big")
+
+    if total != len(data):
+        raise ValueError(f"raw block RLP length mismatch: expected {total} bytes, got {len(data)}")
+
+
+def fetch_raw_block(url: str, number: int, retries: int = 12) -> str:
+    last_err = None
+    for attempt in range(retries):
+        try:
+            raw = rpc_call(url, "debug_getRawBlock", [number], retries=1)
+            validate_top_level_rlp(raw)
+            return raw
+        except (RuntimeError, ValueError) as err:
+            last_err = err
+            if attempt + 1 == retries:
+                break
+            time.sleep(min(10.0, 0.5 * (2**attempt)))
+    raise RuntimeError(last_err)
+
+
 def main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument("--rpc", required=True)
@@ -61,7 +101,7 @@ def main() -> int:
     with open(args.output, "w", encoding="utf-8") as out:
         for idx, number in enumerate(range(args.from_block, args.to_block + 1), start=1):
             try:
-                raw = rpc_call(args.rpc, "debug_getRawBlock", [number])
+                raw = fetch_raw_block(args.rpc, number)
                 block = rpc_call(metadata_rpc, "eth_getBlockByNumber", [hex(number), False])
             except RuntimeError as err:
                 print(f"failed to fetch block {number}: {err}", file=sys.stderr)

From c434bebe62e88de1eef8d59758686b3125f8ac04 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Tue, 5 May 2026 15:22:55 +0200
Subject: [PATCH 14/18] feat(bench): add tracy support to txgen runner

---
 .github/scripts/bench-txgen-run.sh | 36 +++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/bench-txgen-run.sh b/.github/scripts/bench-txgen-run.sh
index a02130c37a9..ab21731d80d 100755
--- a/.github/scripts/bench-txgen-run.sh
+++ b/.github/scripts/bench-txgen-run.sh
@@ -9,7 +9,8 @@
 # Required env: SCHELK_MOUNT, BENCH_RPC_URL, BENCH_BLOCKS, BENCH_WARMUP_BLOCKS
 # Optional env: BENCH_WORK_DIR, BENCH_BASELINE_ARGS, BENCH_FEATURE_ARGS,
 #               BENCH_OTLP_TRACES_ENDPOINT, BENCH_OTLP_LOGS_ENDPOINT,
-#               BENCH_OTLP_DISABLED
+#               BENCH_OTLP_DISABLED, BENCH_TRACY, BENCH_TRACY_FILTER,
+#               BENCH_TRACY_SAMPLING_HZ
 set -euxo pipefail
 
 LABEL="$1"
@@ -38,6 +39,22 @@ fi
 
 cleanup() {
   kill "${TAIL_PID:-}" 2>/dev/null || true
+  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
       sudo pkill -INT -x reth 2>/dev/null || true
@@ -58,6 +75,7 @@ cleanup() {
   sudo schelk recover -y --kill || true
 }
 TAIL_PID=
+TRACY_PID=
 trap cleanup EXIT
 
 sudo systemctl stop "$RETH_SCOPE" 2>/dev/null || true
@@ -127,6 +145,15 @@ if [ "${BENCH_OTLP_DISABLED:-false}" != "true" ]; then
   fi
 fi
 
+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}")
@@ -246,6 +273,13 @@ else
   echo "Skipping warmup (0 blocks)..."
 fi
 
+if [ "${BENCH_TRACY:-off}" != "off" ]; then
+  echo "Starting tracy-capture..."
+  tracy-capture -f -o "$OUTPUT_DIR/tracy-profile.tracy" &
+  TRACY_PID=$!
+  sleep 0.5
+fi
+
 # TODO(txgen): expose a wait-time flag and plumb BENCH_WAIT_TIME here.
 # TODO(txgen): expose microsecond client-side FCU latency to avoid ms rounding.
 # TODO(txgen): support reth-bb payload/env-switch/BAL replay so big-blocks can move here.

From 256df6891ecc0d5dc426aabc53e8cbd2d4db3e91 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Tue, 5 May 2026 18:28:09 +0200
Subject: [PATCH 15/18] feat(bench): select txgen driver automatically

---
 .github/workflows/bench.yml | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index c4931857892..f941abdf638 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -130,6 +130,9 @@ jobs:
       feature-args: ${{ steps.args.outputs.feature-args }}
       abba: ${{ steps.args.outputs.abba }}
       otlp: ${{ steps.args.outputs.otlp }}
+      driver: ${{ steps.args.outputs.driver }}
+      node-bin: ${{ steps.args.outputs.node-bin }}
+      driver-reason: ${{ steps.args.outputs.driver-reason }}
       comment-id: ${{ steps.ack.outputs.comment-id }}
     steps:
       - name: Check org membership
@@ -339,6 +342,14 @@ jobs:
               }
             }
 
+            const fallbackReasons = [];
+            if (bigBlocks === 'true') fallbackReasons.push('big-blocks');
+            if (bal !== 'false') fallbackReasons.push('BAL');
+            if (waitTime) fallbackReasons.push('wait-time');
+            const driver = fallbackReasons.length ? 'reth-bench' : 'txgen';
+            const nodeBin = bigBlocks === 'true' ? 'reth-bb' : 'reth';
+            const driverReason = fallbackReasons.join(',');
+
             core.setOutput('pr', pr || '');
             core.setOutput('actor', actor);
             core.setOutput('blocks', blocks);
@@ -357,6 +368,9 @@ jobs:
             core.setOutput('feature-args', featureNodeArgs);
             core.setOutput('abba', abba);
             core.setOutput('otlp', otlp);
+            core.setOutput('driver', driver);
+            core.setOutput('node-bin', nodeBin);
+            core.setOutput('driver-reason', driverReason);
 
       - name: Acknowledge request
         id: ack
@@ -432,8 +446,9 @@ jobs:
             const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
             const featureArgsVal = '${{ steps.args.outputs.feature-args }}';
             const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
-            const driver = bigBlocks ? 'reth-bench' : 'txgen';
-            const driverNote = `, driver: \`${driver}\``;
+            const driver = '${{ steps.args.outputs.driver }}' || (bigBlocks ? 'reth-bench' : 'txgen');
+            const driverReason = '${{ steps.args.outputs.driver-reason }}';
+            const driverNote = driverReason ? `, driver: \`${driver}\` (fallback: \`${driverReason}\`)` : `, driver: \`${driver}\``;
             const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
             const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${driverNote}${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
 
@@ -478,8 +493,9 @@ jobs:
             const baselineArgsNote = baselineArgsVal ? `, baseline-args: \`${baselineArgsVal}\`` : '';
             const featureArgsVal = '${{ steps.args.outputs.feature-args }}';
             const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
-            const driver = bigBlocks ? 'reth-bench' : 'txgen';
-            const driverNote = `, driver: \`${driver}\``;
+            const driver = '${{ steps.args.outputs.driver }}' || (bigBlocks ? 'reth-bench' : 'txgen');
+            const driverReason = '${{ steps.args.outputs.driver-reason }}';
+            const driverNote = driverReason ? `, driver: \`${driver}\` (fallback: \`${driverReason}\`)` : `, driver: \`${driver}\``;
             const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
             const config = `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${driverNote}${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`;
             const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
@@ -532,7 +548,7 @@ jobs:
 
   reth-bench:
     needs: reth-bench-ack
-    name: bench-${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bench' || 'txgen' }}
+    name: bench-${{ needs.reth-bench-ack.outputs.driver }}
     runs-on: [self-hosted, Linux, X64, available]
     permissions:
       contents: read
@@ -559,8 +575,9 @@ jobs:
       BENCH_OTLP: ${{ needs.reth-bench-ack.outputs.otlp }}
       BENCH_COMMENT_ID: ${{ needs.reth-bench-ack.outputs.comment-id }}
       BENCH_SLACK: ${{ needs.reth-bench-ack.outputs.slack }}
-      BENCH_DRIVER: ${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bench' || 'txgen' }}
-      BENCH_NODE_BIN: ${{ needs.reth-bench-ack.outputs.big-blocks == 'true' && 'reth-bb' || 'reth' }}
+      BENCH_DRIVER: ${{ needs.reth-bench-ack.outputs.driver }}
+      BENCH_NODE_BIN: ${{ needs.reth-bench-ack.outputs.node-bin }}
+      BENCH_DRIVER_REASON: ${{ needs.reth-bench-ack.outputs.driver-reason }}
       BENCH_SNAPSHOT_MANIFEST_URL: ${{ secrets.BENCH_SNAPSHOT_MANIFEST_URL }}
       BENCH_METRICS_ADDR: "127.0.0.1:9100"
       TXGEN_REV: 420cad10ad2d1ffa10d5708a892a910e101d7811
@@ -637,7 +654,8 @@ jobs:
             const featureArgsVal = process.env.BENCH_FEATURE_ARGS || '';
             const featureArgsNote = featureArgsVal ? `, feature-args: \`${featureArgsVal}\`` : '';
             const driver = process.env.BENCH_DRIVER || (bigBlocks ? 'reth-bench' : 'txgen');
-            const driverNote = `, driver: \`${driver}\``;
+            const driverReason = process.env.BENCH_DRIVER_REASON || '';
+            const driverNote = driverReason ? `, driver: \`${driver}\` (fallback: \`${driverReason}\`)` : `, driver: \`${driver}\``;
             const blocksDesc = bigBlocks ? 'blocks: `big`' : `${blocks} blocks, ${warmup} warmup blocks`;
             core.exportVariable('BENCH_CONFIG', `**Config:** ${blocksDesc}, baseline: \`${baseline}\`, feature: \`${feature}\`${driverNote}${samplyNote}${slackNote}${balNote}${coresNote}${abbaNote}${otlpNote}${waitTimeNote}${baselineArgsNote}${featureArgsNote}`);
 

From 78259ae69a57cf169bf830203fd7cd6a851b2de9 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Tue, 5 May 2026 18:49:40 +0200
Subject: [PATCH 16/18] fix(bench): include driver in final report

---
 .github/scripts/bench-reth-summary.py | 11 +++++++++++
 .github/scripts/bench-utils.js        |  6 +++++-
 .github/workflows/bench.yml           |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/bench-reth-summary.py b/.github/scripts/bench-reth-summary.py
index da6b7de1d11..9871409178e 100755
--- a/.github/scripts/bench-reth-summary.py
+++ b/.github/scripts/bench-reth-summary.py
@@ -385,6 +385,8 @@ def generate_comparison_table(
     warmup_blocks: str | None = None,
     wait_time: str | None = None,
     bal_mode: str | None = None,
+    driver: str | None = None,
+    driver_reason: str | None = None,
 ) -> str:
     """Generate a markdown comparison table between baseline and feature."""
     n = paired["blocks"]
@@ -431,6 +433,11 @@ def pct(base: float, feat: float) -> float:
         "",
     ]
     meta_parts = [f"{n} {'big blocks' if big_blocks else 'blocks'}"]
+    if driver:
+        driver_label = driver
+        if driver_reason:
+            driver_label += f" (fallback: {driver_reason})"
+        meta_parts.append(f"driver: {driver_label}")
     if warmup_blocks:
         meta_parts.append(f"{warmup_blocks} warmup")
     if wait_time:
@@ -522,6 +529,7 @@ def main():
     parser.add_argument("--wait-time", default=None, help="Wait time interval used between blocks")
     parser.add_argument("--bal-mode", default=None, help="BAL mode (true, feature, baseline)")
     parser.add_argument("--driver", default=None, help="Benchmark driver used for this run")
+    parser.add_argument("--driver-reason", default=None, help="Why the benchmark fell back to this driver")
     parser.add_argument("--grafana-url", default=None, help="Grafana dashboard URL for this benchmark run")
     args = parser.parse_args()
 
@@ -576,6 +584,8 @@ def main():
         warmup_blocks=args.warmup_blocks,
         wait_time=args.wait_time,
         bal_mode=bal_mode,
+        driver=args.driver,
+        driver_reason=args.driver_reason,
     )
     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)")
@@ -607,6 +617,7 @@ def main():
     summary = {
         "blocks": paired_stats["blocks"],
         "driver": args.driver,
+        "driver_reason": args.driver_reason,
         "big_blocks": args.big_blocks,
         "warmup_blocks": args.warmup_blocks,
         "wait_time": args.wait_time,
diff --git a/.github/scripts/bench-utils.js b/.github/scripts/bench-utils.js
index 6e67a95bdcd..2889e706d85 100644
--- a/.github/scripts/bench-utils.js
+++ b/.github/scripts/bench-utils.js
@@ -55,7 +55,11 @@ function balModeLabel(mode) {
 function blocksLabel(summary) {
   const parts = [];
   const driver = summary.driver || process.env.BENCH_DRIVER || '';
-  if (driver) parts.push({ key: 'Driver', value: driver });
+  const driverReason = summary.driver_reason || process.env.BENCH_DRIVER_REASON || '';
+  if (driver) {
+    const value = driverReason ? `${driver} (fallback: ${driverReason})` : driver;
+    parts.push({ key: 'Driver', value });
+  }
   if (summary.big_blocks) {
     parts.push({ key: 'Big Blocks', value: summary.blocks });
     const balMode = balModeLabel(summary.bal_mode || summary.bal || process.env.BENCH_BAL || 'false');
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index f941abdf638..8554436299f 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -1205,6 +1205,9 @@ jobs:
           if [ -n "${BENCH_DRIVER:-}" ]; then
             SUMMARY_ARGS="$SUMMARY_ARGS --driver $BENCH_DRIVER"
           fi
+          if [ -n "${BENCH_DRIVER_REASON:-}" ]; then
+            SUMMARY_ARGS="$SUMMARY_ARGS --driver-reason $BENCH_DRIVER_REASON"
+          fi
           GRAFANA_URL='${{ steps.metrics.outputs.grafana-url }}'
           if [ -n "$GRAFANA_URL" ]; then
             SUMMARY_ARGS="$SUMMARY_ARGS --grafana-url $GRAFANA_URL"

From bc8d81d30c19f638b7b5fae80537df82be8e9bbd Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Tue, 5 May 2026 19:02:52 +0200
Subject: [PATCH 17/18] refactor(bench): use txgen block extraction

---
 .github/scripts/bench-txgen-extract.py | 137 -------------------------
 .github/scripts/bench-txgen-run.sh     |   3 +-
 2 files changed, 1 insertion(+), 139 deletions(-)
 delete mode 100755 .github/scripts/bench-txgen-extract.py

diff --git a/.github/scripts/bench-txgen-extract.py b/.github/scripts/bench-txgen-extract.py
deleted file mode 100755
index 445585a61fb..00000000000
--- a/.github/scripts/bench-txgen-extract.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python3
-"""Extract raw blocks for txgen send-blocks.
-
-This intentionally uses a numeric `debug_getRawBlock` parameter because some
-public RPC providers reject the hex quantity form that alloy's Debug API emits.
-"""
-
-import argparse
-import json
-import sys
-import time
-import urllib.error
-import urllib.request
-
-
-def rpc_call(url: str, method: str, params: list, retries: int = 12):
-    payload = json.dumps({"jsonrpc": "2.0", "method": method, "params": params, "id": 1}).encode()
-    last_err = None
-    for attempt in range(retries):
-        try:
-            req = urllib.request.Request(
-                url,
-                data=payload,
-                headers={"Content-Type": "application/json", "User-Agent": "reth-bench-txgen"},
-                method="POST",
-            )
-            with urllib.request.urlopen(req, timeout=30) as resp:
-                data = json.loads(resp.read())
-            if "error" in data:
-                raise RuntimeError(data["error"].get("message", data["error"]))
-            return data["result"]
-        except (urllib.error.URLError, TimeoutError, json.JSONDecodeError, RuntimeError) as err:
-            last_err = err
-            if attempt + 1 == retries:
-                break
-            time.sleep(min(10.0, 0.5 * (2**attempt)))
-    raise RuntimeError(last_err)
-
-
-def parse_quantity(value: str) -> int:
-    return int(value, 16) if isinstance(value, str) and value.startswith("0x") else int(value)
-
-
-def validate_top_level_rlp(raw: str) -> None:
-    if not isinstance(raw, str) or not raw.startswith("0x"):
-        raise ValueError("raw block is not a hex string")
-    data = bytes.fromhex(raw[2:])
-    if not data:
-        raise ValueError("raw block is empty")
-
-    prefix = data[0]
-    if prefix <= 0x7F:
-        total = 1
-    elif prefix <= 0xB7:
-        total = 1 + prefix - 0x80
-    elif prefix <= 0xBF:
-        len_len = prefix - 0xB7
-        total = 1 + len_len + int.from_bytes(data[1 : 1 + len_len], "big")
-    elif prefix <= 0xF7:
-        total = 1 + prefix - 0xC0
-    else:
-        len_len = prefix - 0xF7
-        total = 1 + len_len + int.from_bytes(data[1 : 1 + len_len], "big")
-
-    if total != len(data):
-        raise ValueError(f"raw block RLP length mismatch: expected {total} bytes, got {len(data)}")
-
-
-def fetch_raw_block(url: str, number: int, retries: int = 12) -> str:
-    last_err = None
-    for attempt in range(retries):
-        try:
-            raw = rpc_call(url, "debug_getRawBlock", [number], retries=1)
-            validate_top_level_rlp(raw)
-            return raw
-        except (RuntimeError, ValueError) as err:
-            last_err = err
-            if attempt + 1 == retries:
-                break
-            time.sleep(min(10.0, 0.5 * (2**attempt)))
-    raise RuntimeError(last_err)
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--rpc", required=True)
-    parser.add_argument("--metadata-rpc")
-    parser.add_argument("--from", dest="from_block", type=int, required=True)
-    parser.add_argument("--to", dest="to_block", type=int, required=True)
-    parser.add_argument("-o", "--output", required=True)
-    args = parser.parse_args()
-
-    if args.from_block > args.to_block:
-        parser.error("--from must be <= --to")
-
-    metadata_rpc = args.metadata_rpc or args.rpc
-    total = args.to_block - args.from_block + 1
-    started = time.monotonic()
-    last_log = started
-
-    with open(args.output, "w", encoding="utf-8") as out:
-        for idx, number in enumerate(range(args.from_block, args.to_block + 1), start=1):
-            try:
-                raw = fetch_raw_block(args.rpc, number)
-                block = rpc_call(metadata_rpc, "eth_getBlockByNumber", [hex(number), False])
-            except RuntimeError as err:
-                print(f"failed to fetch block {number}: {err}", file=sys.stderr)
-                return 1
-
-            if not raw or not block:
-                print(f"missing block {number}", file=sys.stderr)
-                return 1
-
-            line = {
-                "raw": raw,
-                "key": block["hash"],
-                "number": parse_quantity(block["number"]),
-                "timestamp": parse_quantity(block["timestamp"]),
-                "gas_used": parse_quantity(block["gasUsed"]),
-                "gas_limit": parse_quantity(block["gasLimit"]),
-                "tx_count": len(block.get("transactions", [])),
-            }
-            out.write(json.dumps(line, separators=(",", ":")) + "\n")
-
-            now = time.monotonic()
-            if idx == total or idx % 100 == 0 or now - last_log >= 5:
-                elapsed = now - started
-                rate = idx / elapsed if elapsed else 0
-                print(f"extracted {idx}/{total} blocks ({idx / total * 100:.1f}%) - {rate:.0f} blocks/s", file=sys.stderr)
-                last_log = now
-
-    print(f"wrote {total} blocks to {args.output}", file=sys.stderr)
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())
diff --git a/.github/scripts/bench-txgen-run.sh b/.github/scripts/bench-txgen-run.sh
index ab21731d80d..0fe2313acb9 100755
--- a/.github/scripts/bench-txgen-run.sh
+++ b/.github/scripts/bench-txgen-run.sh
@@ -247,9 +247,8 @@ EXTRACT_FROM=$(( HEAD_DEC + 1 ))
 EXTRACT_TO=$(( HEAD_DEC + TOTAL ))
 SOURCE_RPC_URL="${BENCH_TXGEN_RPC_URL:-$BENCH_RPC_URL}"
 echo "Extracting blocks ${EXTRACT_FROM}..${EXTRACT_TO} for txgen benchmark (${WARMUP} warmup, ${BLOCKS} measured)"
-python3 .github/scripts/bench-txgen-extract.py \
+"$TXGEN_ETHEREUM" extract \
   --rpc "$SOURCE_RPC_URL" \
-  --metadata-rpc "$BENCH_RPC_URL" \
   --from "$EXTRACT_FROM" \
   --to "$EXTRACT_TO" \
   -o "$ALL_BLOCKS"

From 4e777bc4dda5555848ea93b765e7dcc52ae49bc3 Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Tue, 5 May 2026 19:59:39 +0200
Subject: [PATCH 18/18] feat(bench): support txgen wait-time

---
 .github/scripts/bench-txgen-run.sh | 19 ++++++++++---------
 .github/workflows/bench.yml        |  3 +--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/scripts/bench-txgen-run.sh b/.github/scripts/bench-txgen-run.sh
index 0fe2313acb9..4f9e4d11bc6 100755
--- a/.github/scripts/bench-txgen-run.sh
+++ b/.github/scripts/bench-txgen-run.sh
@@ -7,10 +7,10 @@
 # Usage: bench-txgen-run.sh <label> <binary> <output-dir>
 #
 # Required env: SCHELK_MOUNT, BENCH_RPC_URL, BENCH_BLOCKS, BENCH_WARMUP_BLOCKS
-# Optional env: BENCH_WORK_DIR, BENCH_BASELINE_ARGS, BENCH_FEATURE_ARGS,
-#               BENCH_OTLP_TRACES_ENDPOINT, BENCH_OTLP_LOGS_ENDPOINT,
-#               BENCH_OTLP_DISABLED, BENCH_TRACY, BENCH_TRACY_FILTER,
-#               BENCH_TRACY_SAMPLING_HZ
+# Optional env: BENCH_WORK_DIR, BENCH_WAIT_TIME, BENCH_BASELINE_ARGS,
+#               BENCH_FEATURE_ARGS, BENCH_OTLP_TRACES_ENDPOINT,
+#               BENCH_OTLP_LOGS_ENDPOINT, BENCH_OTLP_DISABLED,
+#               BENCH_TRACY, BENCH_TRACY_FILTER, BENCH_TRACY_SAMPLING_HZ
 set -euxo pipefail
 
 LABEL="$1"
@@ -28,10 +28,6 @@ if [ "${BENCH_BIG_BLOCKS:-false}" = "true" ]; then
   echo "::error::txgen driver does not support big-block benchmarks yet; use the reth-bench driver"
   exit 1
 fi
-if [ -n "${BENCH_WAIT_TIME:-}" ]; then
-  echo "::error::txgen driver does not support BENCH_WAIT_TIME yet"
-  exit 1
-fi
 if [ -n "${BENCH_BAL:-}" ] && [ "${BENCH_BAL}" != "false" ]; then
   echo "::error::txgen driver does not support BAL replay yet; use big-blocks with the reth-bench driver"
   exit 1
@@ -222,6 +218,10 @@ fi
 TXGEN_ETHEREUM="$(which txgen-ethereum)"
 TXGEN_BENCH="$(which bench)"
 BENCH_NICE="sudo nice -n -20 sudo -u $(id -un)"
+TXGEN_SEND_ARGS=()
+if [ -n "${BENCH_WAIT_TIME:-}" ]; then
+  TXGEN_SEND_ARGS+=(--wait-time "$BENCH_WAIT_TIME")
+fi
 
 HEAD_JSON=$(curl -sf http://127.0.0.1:8545 -X POST \
   -H 'Content-Type: application/json' \
@@ -266,6 +266,7 @@ if [ "$WARMUP" -gt 0 ] 2>/dev/null; then
     --engine http://127.0.0.1:8551 \
     --jwt-secret "$DATADIR/jwt.hex" \
     --input "$WARMUP_BLOCKS" \
+    "${TXGEN_SEND_ARGS[@]}" \
     --wait-for-persistence never \
     --report json:"$TXGEN_DIR/warmup-report.json" 2>&1 | sed -u "s/^/[bench] /"
 else
@@ -279,7 +280,6 @@ if [ "${BENCH_TRACY:-off}" != "off" ]; then
   sleep 0.5
 fi
 
-# TODO(txgen): expose a wait-time flag and plumb BENCH_WAIT_TIME here.
 # TODO(txgen): expose microsecond client-side FCU latency to avoid ms rounding.
 # TODO(txgen): support reth-bb payload/env-switch/BAL replay so big-blocks can move here.
 echo "Running txgen measured benchmark (${BLOCKS} blocks)..."
@@ -287,6 +287,7 @@ $BENCH_NICE "$TXGEN_BENCH" send-blocks \
   --engine http://127.0.0.1:8551 \
   --jwt-secret "$DATADIR/jwt.hex" \
   --input "$BENCHMARK_BLOCKS" \
+  "${TXGEN_SEND_ARGS[@]}" \
   --wait-for-persistence never \
   --report json:"$OUTPUT_DIR/report.json" 2>&1 | sed -u "s/^/[bench] /"
 
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 8554436299f..63579ca5301 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -345,7 +345,6 @@ jobs:
             const fallbackReasons = [];
             if (bigBlocks === 'true') fallbackReasons.push('big-blocks');
             if (bal !== 'false') fallbackReasons.push('BAL');
-            if (waitTime) fallbackReasons.push('wait-time');
             const driver = fallbackReasons.length ? 'reth-bench' : 'txgen';
             const nodeBin = bigBlocks === 'true' ? 'reth-bb' : 'reth';
             const driverReason = fallbackReasons.join(',');
@@ -580,7 +579,7 @@ jobs:
       BENCH_DRIVER_REASON: ${{ needs.reth-bench-ack.outputs.driver-reason }}
       BENCH_SNAPSHOT_MANIFEST_URL: ${{ secrets.BENCH_SNAPSHOT_MANIFEST_URL }}
       BENCH_METRICS_ADDR: "127.0.0.1:9100"
-      TXGEN_REV: 420cad10ad2d1ffa10d5708a892a910e101d7811
+      TXGEN_REV: 5b04a80d557cc6658573db6ccf49ce04cbf07ea3
       BENCH_OTLP_TRACES_ENDPOINT: ${{ needs.reth-bench-ack.outputs.otlp != 'false' && secrets.BENCH_OTLP_TRACES_ENDPOINT || '' }}
       BENCH_OTLP_LOGS_ENDPOINT: ${{ needs.reth-bench-ack.outputs.otlp != 'false' && secrets.BENCH_OTLP_LOGS_ENDPOINT || '' }}
     steps: