fix: use admin_addPeer for op-geth peer reconciliation

op-geth does not support admin_addStaticPeer; classify op-geth via compose path (admin_nodeInfo often still says Geth) and fall back on go-ethereum-style "does not exist/is not available" errors so reinject and connect-peers restore peers (e.g. hashkey-mainnet).
2026-07-30 11:58:12 +00:00
128 changed files with 1208 additions and 16873 deletions
--- a/arb/nitro/connext-sepolia-nitro-archive-leveldb-hash.yml
+++ b/arb/nitro/connext-sepolia-nitro-archive-leveldb-hash.yml
@@ -116,7 +116,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain:
+    chain: everclear-sepolia
    method-groups:
      enabled:
        - debug
--- a/arb/nitro/connext-sepolia-nitro-pruned-pebble-path.yml
+++ b/arb/nitro/connext-sepolia-nitro-pruned-pebble-path.yml
@@ -117,7 +117,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain:
+    chain: everclear-sepolia
    method-groups:
      enabled:
        - debug
--- a/arc/reth/arc-mainnet-reth-archive-trace.yml
+++ b/arc/reth/arc-mainnet-reth-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  arc-mainnet-archive-consensus-init:
-    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-v0.7.3}
+    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-0.7.2}
    user: 0:0
    entrypoint: [/usr/local/bin/arc-node-consensus, init]
    command:
@@ -45,7 +45,7 @@ services:
  arc-mainnet-archive-sockets-init:
    image: debian:bookworm-slim
    entrypoint: [/bin/sh, -c]
-    command: [chown 999:999 /sockets]
+    command: [rm -f /sockets/*.ipc && chown 999:999 /sockets]
    restart: no
    depends_on:
      arc-mainnet-archive-consensus-init:
@@ -57,7 +57,7 @@ services:
    logging: *logging-defaults

  arc-mainnet-archive:
-    image: ${ARC_RETH_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-execution}:${ARC_MAINNET_RETH_VERSION:-v0.7.3}
+    image: ${ARC_RETH_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-execution}:${ARC_MAINNET_RETH_VERSION:-0.7.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -119,7 +119,7 @@ services:
    shm_size: 2gb

  arc-mainnet-archive-node:
-    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-v0.7.3}
+    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-0.7.2}
    user: 0:0
    expose:
      - 31000
@@ -160,9 +160,6 @@ volumes:
  arc-mainnet-reth-archive-trace-execution:
  arc-mainnet-reth-archive-trace-sockets:

-x-ephemeral-volumes:
-  - arc-mainnet-reth-archive-trace-sockets
-
 x-upstreams:
  - id: $${ID}
    labels:
--- a/arc/reth/arc-mainnet-reth-pruned-trace.yml
+++ b/arc/reth/arc-mainnet-reth-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  arc-mainnet-consensus-init:
-    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-v0.7.3}
+    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-0.7.2}
    user: 0:0
    entrypoint: [/usr/local/bin/arc-node-consensus, init]
    command:
@@ -45,7 +45,7 @@ services:
  arc-mainnet-sockets-init:
    image: debian:bookworm-slim
    entrypoint: [/bin/sh, -c]
-    command: [chown 999:999 /sockets]
+    command: [rm -f /sockets/*.ipc && chown 999:999 /sockets]
    restart: no
    depends_on:
      arc-mainnet-consensus-init:
@@ -57,7 +57,7 @@ services:
    logging: *logging-defaults

  arc-mainnet:
-    image: ${ARC_RETH_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-execution}:${ARC_MAINNET_RETH_VERSION:-v0.7.3}
+    image: ${ARC_RETH_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-execution}:${ARC_MAINNET_RETH_VERSION:-0.7.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -120,7 +120,7 @@ services:
    shm_size: 2gb

  arc-mainnet-node:
-    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-v0.7.3}
+    image: ${ARC_CONSENSUS_IMAGE:-docker.cloudsmith.io/circle/arc-network/arc-consensus}:${ARC_MAINNET_CONSENSUS_VERSION:-0.7.2}
    user: 0:0
    expose:
      - 31000
@@ -161,9 +161,6 @@ volumes:
  arc-mainnet-reth-pruned-trace-execution:
  arc-mainnet-reth-pruned-trace-sockets:

-x-ephemeral-volumes:
-  - arc-mainnet-reth-pruned-trace-sockets
-
 x-upstreams:
  - id: $${ID}
    labels:
--- a/arc/reth/arc-testnet-reth-archive-trace.yml
+++ b/arc/reth/arc-testnet-reth-archive-trace.yml
@@ -45,7 +45,7 @@ services:
  arc-testnet-archive-sockets-init:
    image: debian:bookworm-slim
    entrypoint: [/bin/sh, -c]
-    command: [chown 999:999 /sockets]
+    command: [rm -f /sockets/*.ipc && chown 999:999 /sockets]
    restart: no
    depends_on:
      arc-testnet-archive-consensus-init:
@@ -160,9 +160,6 @@ volumes:
  arc-testnet-reth-archive-trace-execution:
  arc-testnet-reth-archive-trace-sockets:

-x-ephemeral-volumes:
-  - arc-testnet-reth-archive-trace-sockets
-
 x-upstreams:
  - id: $${ID}
    labels:
--- a/arc/reth/arc-testnet-reth-pruned-trace.yml
+++ b/arc/reth/arc-testnet-reth-pruned-trace.yml
@@ -45,7 +45,7 @@ services:
  arc-testnet-sockets-init:
    image: debian:bookworm-slim
    entrypoint: [/bin/sh, -c]
-    command: [chown 999:999 /sockets]
+    command: [rm -f /sockets/*.ipc && chown 999:999 /sockets]
    restart: no
    depends_on:
      arc-testnet-consensus-init:
@@ -161,9 +161,6 @@ volumes:
  arc-testnet-reth-pruned-trace-execution:
  arc-testnet-reth-pruned-trace-sockets:

-x-ephemeral-volumes:
-  - arc-testnet-reth-pruned-trace-sockets
-
 x-upstreams:
  - id: $${ID}
    labels:
--- a/arc/reth/arc-testnet-reth-pruned.yml
+++ b/arc/reth/arc-testnet-reth-pruned.yml
@@ -45,7 +45,7 @@ services:
  arc-testnet-sockets-init:
    image: debian:bookworm-slim
    entrypoint: [/bin/sh, -c]
-    command: [chown 999:999 /sockets]
+    command: [rm -f /sockets/*.ipc && chown 999:999 /sockets]
    restart: no
    depends_on:
      arc-testnet-consensus-init:
@@ -161,9 +161,6 @@ volumes:
  arc-testnet-reth-pruned-execution:
  arc-testnet-reth-pruned-sockets:

-x-ephemeral-volumes:
-  - arc-testnet-reth-pruned-sockets
-
 x-upstreams:
  - id: $${ID}
    labels:
--- a/avalanche/go/avalanche-fuji-go-archive-leveldb.yml
+++ b/avalanche/go/avalanche-fuji-go-archive-leveldb.yml
@@ -107,7 +107,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: avalanche-fuji
+    chain: avalanche
    method-groups:
      enabled:
        - debug
--- a/avalanche/go/avalanche-fuji-go-pruned-leveldb.prune.yml
+++ b/avalanche/go/avalanche-fuji-go-pruned-leveldb.prune.yml
@@ -107,7 +107,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: avalanche-fuji
+    chain: avalanche
    method-groups:
      enabled:
        - debug
--- a/avalanche/go/avalanche-fuji-go-pruned-leveldb.yml
+++ b/avalanche/go/avalanche-fuji-go-pruned-leveldb.yml
@@ -107,7 +107,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: avalanche-fuji
+    chain: avalanche
    method-groups:
      enabled:
        - debug
--- a/avalanche/go/avalanche-fuji-go-pruned-pebbledb.prune.yml
+++ b/avalanche/go/avalanche-fuji-go-pruned-pebbledb.prune.yml
@@ -107,7 +107,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: avalanche-fuji
+    chain: avalanche
    method-groups:
      enabled:
        - debug
--- a/avalanche/go/avalanche-fuji-go-pruned-pebbledb.yml
+++ b/avalanche/go/avalanche-fuji-go-pruned-pebbledb.yml
@@ -107,7 +107,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: avalanche-fuji
+    chain: avalanche
    method-groups:
      enabled:
        - debug
--- a/backup-node.sh
+++ b/backup-node.sh
@@ -157,15 +157,8 @@ for key in $keys; do
    folder_size_gb=$(printf "%.0f" "$folder_size")

    if (( folder_size_gb < 1 )) && [[ "$FORCE_SMALL" != true ]]; then
-	# The torn-backup floor applies to the MAIN data volume only (key == compose
-	# basename). Sidecar volumes (eigenda-proxy, configs, ...) are legitimately
-	# tiny — a 0G sidecar aborting the whole backup left no manifest and blocked
-	# the refresh lane on every ronin bench-retire (4 cycles, 2026-07).
-	if [[ "$key" == "$(basename "$compose_name")" ]]; then
-	    echo "FATAL: existing datadir too small for backup (${folder_size_gb}G at $source_folder); use --force if intentional" >&2
-	    exit 1
-	fi
-	echo "NOTE: sidecar volume rpc_$key is ${folder_size_gb}G — allowing small backup (floor guards the main data volume only)"
+	echo "FATAL: existing datadir too small for backup (${folder_size_gb}G at $source_folder); use --force if intentional" >&2
+	exit 1
    fi
    
    timestamp=$(date +'%Y-%m-%d-%H-%M-%S')
--- a/berachain/reth/berachain-bartio-reth-archive-trace.yml
+++ b/berachain/reth/berachain-bartio-reth-archive-trace.yml
@@ -61,7 +61,7 @@ x-logging-defaults: &logging-defaults

 services:
  berachain-bartio-reth:
-    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BARTIO_RETH_VERSION:-v1.4.4}
+    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BARTIO_RETH_VERSION:-v1.4.0}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/berachain/reth/berachain-bartio-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-bartio-reth-pruned-trace.yml
@@ -61,7 +61,7 @@ x-logging-defaults: &logging-defaults

 services:
  berachain-bartio-reth-pruned:
-    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BARTIO_RETH_VERSION:-v1.4.4}
+    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BARTIO_RETH_VERSION:-v1.4.0}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/berachain/reth/berachain-bepolia-reth-archive-trace.yml
+++ b/berachain/reth/berachain-bepolia-reth-archive-trace.yml
@@ -61,7 +61,7 @@ x-logging-defaults: &logging-defaults

 services:
  berachain-bepolia-reth:
-    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BEPOLIA_RETH_VERSION:-v1.4.4}
+    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BEPOLIA_RETH_VERSION:-v1.4.3-rc.0}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
@@ -61,7 +61,7 @@ x-logging-defaults: &logging-defaults

 services:
  berachain-bepolia-reth-pruned:
-    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BEPOLIA_RETH_VERSION:-v1.4.4}
+    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_BEPOLIA_RETH_VERSION:-v1.4.3-rc.0}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/berachain/reth/berachain-mainnet-reth-archive-trace.yml
+++ b/berachain/reth/berachain-mainnet-reth-archive-trace.yml
@@ -61,7 +61,7 @@ x-logging-defaults: &logging-defaults

 services:
  berachain-mainnet-reth:
-    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_MAINNET_RETH_VERSION:-v1.4.4}
+    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_MAINNET_RETH_VERSION:-v1.4.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
@@ -61,7 +61,7 @@ x-logging-defaults: &logging-defaults

 services:
  berachain-mainnet-reth-pruned:
-    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_MAINNET_RETH_VERSION:-v1.4.4}
+    image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/berachain/bera-reth}:${BERACHAIN_MAINNET_RETH_VERSION:-v1.4.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/clone-backup.sh
+++ b/clone-backup.sh
@@ -298,7 +298,6 @@ cleanup_all_ports() {
 # Transfer backup file using screen method with better error handling
 transfer_backup() {
    local key=$1
-    local compose_file=$2
    local volume_name="rpc_$key"
    
    # Find the newest restorable backup file (skip near-empty artifacts)
@@ -310,13 +309,6 @@ transfer_backup() {
            echo "Note: no backup for secrets/jwt volume $volume_name (regenerated at create-node), skipping"
            return 2
        fi
-        # Check if this volume is optional or ephemeral - if so, skip gracefully
-        if [[ -n "$compose_file" && -f "$compose_file" ]]; then
-            if is_ephemeral_volume_key "$key" "$compose_file" || is_optional_volume_key "$key" "$compose_file"; then
-                echo "Note: no backup for optional/ephemeral volume $volume_name (will be created empty at destination), skipping"
-                return 2
-            fi
-        fi
        echo "Warning: No restorable backup file found for $volume_name, skipping"
        return 1
    fi
@@ -510,7 +502,6 @@ LISTENER
 # Fallback: Direct SSH pipe
 transfer_backup_ssh() {
    local key=$1
-    local compose_file=$2
    local volume_name="rpc_$key"
    
    # Find the newest restorable backup file (skip near-empty artifacts)
@@ -522,13 +513,6 @@ transfer_backup_ssh() {
            echo "Note: no backup for secrets/jwt volume $volume_name (regenerated at create-node), skipping"
            return 2
        fi
-        # Check if this volume is optional or ephemeral - if so, skip gracefully
-        if [[ -n "$compose_file" && -f "$compose_file" ]]; then
-            if is_ephemeral_volume_key "$key" "$compose_file" || is_optional_volume_key "$key" "$compose_file"; then
-                echo "Note: no backup for optional/ephemeral volume $volume_name (will be created empty at destination), skipping"
-                return 2
-            fi
-        fi
        echo "Warning: No restorable backup file found for $volume_name, skipping"
        return 1
    fi
@@ -658,7 +642,7 @@ main() {

    for key in $keys; do
        # Try nc method first
-        transfer_backup "$key" "$dir/$1.yml"
+        transfer_backup "$key"
        rc=$?

        if [[ $rc -eq 2 ]]; then
@@ -666,7 +650,7 @@ main() {
            skipped_volumes="$skipped_volumes $key"
        elif [[ $rc -ne 0 ]]; then
            echo "NC transfer failed, trying direct SSH..."
-            transfer_backup_ssh "$key" "$dir/$1.yml"
+            transfer_backup_ssh "$key"
            rc=$?

            if [[ $rc -eq 0 ]]; then
--- a/compose_registry.json
+++ b/compose_registry.json
--- a/connect-peers.sh
+++ b/connect-peers.sh
@@ -318,12 +318,19 @@ check_rpc_success() {
    return 1
 }

-# Function to detect client type from node name
+# Function to detect client type from node name (+ optional compose path hint).
+# op-geth often still reports admin_nodeInfo.name as "Geth/…", so the compose
+# path (…/op-geth/… or *-op-geth-*) is the reliable signal.
 detect_client_type() {
    local node_name="$1"
+    local compose_hint="${2:-}"
    local name_lower=$(echo "$node_name" | tr '[:upper:]' '[:lower:]')
-    
-    if [[ "$name_lower" == *"geth"* ]]; then
+    local hint_lower=$(echo "$compose_hint" | tr '[:upper:]' '[:lower:]')
+
+    # op-geth lacks admin_addStaticPeer — must use admin_addPeer
+    if [[ "$name_lower" == *"op-geth"* ]] || [[ "$hint_lower" == *"op-geth"* ]]; then
+        echo "op-geth"
+    elif [[ "$name_lower" == *"geth"* ]]; then
        echo "geth"
    elif [[ "$name_lower" == *"reth"* ]]; then
        echo "reth"
@@ -346,12 +353,12 @@ add_static_peer() {
    local response
    local method
    
-    # Determine which method to try first based on client type
+    # Determine which method to try first based on client type.
+    # Only vanilla geth supports admin_addStaticPeer; op-geth does not.
    if [[ "$client_type" == "geth" ]]; then
-        # Geth supports admin_addStaticPeer
        method="admin_addStaticPeer"
    else
-        # Reth and most other clients use admin_addPeer
+        # op-geth, reth, and most other clients use admin_addPeer
        method="admin_addPeer"
    fi
    
@@ -364,10 +371,11 @@ add_static_peer() {
        return 1
    }
    
-    # Check if method not found, try fallback
-    if echo "$response" | grep -qi "method not found"; then
+    # Fallback when the primary method is unsupported. go-ethereum-style errors
+    # say "the method X does not exist/is not available", not "method not found".
+    if echo "$response" | grep -qiE 'method not found|does not exist|not available|-32601'; then
        if [[ "$method" == "admin_addStaticPeer" ]]; then
-            # Try admin_addPeer as fallback
+            # Try admin_addPeer as fallback (required for op-geth)
            method="admin_addPeer"
            response=$(curl --ipv4 -s -X POST "$url" \
                -H "Content-Type: application/json" \
@@ -425,7 +433,7 @@ echo -e "${GREEN}OK${NC}"
 SOURCE_ENODE=$(extract_enode "$SOURCE_INFO")
 SOURCE_NAME=$(extract_name "$SOURCE_INFO")
 SOURCE_PUBKEY=$(echo "$SOURCE_ENODE" | sed -E 's|enode://([^@]+)@.*|\1|')
-SOURCE_CLIENT=$(detect_client_type "$SOURCE_NAME")
+SOURCE_CLIENT=$(detect_client_type "$SOURCE_NAME" "$COMPOSE_FILE")

 if [[ -z "$SOURCE_ENODE" ]]; then
    echo -e "${RED}Could not extract enode from source${NC}"
@@ -457,7 +465,7 @@ echo -e "${GREEN}OK${NC}"
 TARGET_ENODE=$(extract_enode "$TARGET_INFO")
 TARGET_NAME=$(extract_name "$TARGET_INFO")
 TARGET_PUBKEY=$(echo "$TARGET_ENODE" | sed -E 's|enode://([^@]+)@.*|\1|')
-TARGET_CLIENT=$(detect_client_type "$TARGET_NAME")
+TARGET_CLIENT=$(detect_client_type "$TARGET_NAME" "$TARGET_COMPOSE_FILE")

 if [[ -z "$TARGET_ENODE" ]]; then
    echo -e "${RED}Could not extract enode from target${NC}"
--- a/core/core/core-buffalo-core-pruned-pebble-path.yml
+++ b/core/core/core-buffalo-core-pruned-pebble-path.yml
@@ -115,7 +115,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain:
+    chain: core-testnet
    method-groups:
      enabled:
        - debug
--- a/core/core/core-pigeon-core-pruned-pebble-path.yml
+++ b/core/core/core-pigeon-core-pruned-pebble-path.yml
@@ -115,7 +115,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: core-testnet
+    chain: core-pigeon
    method-groups:
      enabled:
        - debug
--- a/erigon3.Dockerfile
+++ b/erigon3.Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2
 ARG REPO=https://github.com/erigontech/erigon.git
-ARG VERSION=v3.5.3
+ARG VERSION=v3.4.4
 ARG COMMIT=${COMMIT:-${VERSION}}

 FROM docker.io/library/golang:1.24.1-alpine3.20 AS builder
--- a/ethereum/besu/ethereum-mainnet-besu-pruned-bonsai--nimbus.yml
+++ b/ethereum/besu/ethereum-mainnet-besu-pruned-bonsai--nimbus.yml
@@ -189,15 +189,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-besu-pruned-bonsai_nimbus]
 ...
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-hoodi-erigon3-archive:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-hoodi-erigon3-minimal:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-hoodi-erigon3:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-mainnet-erigon3-archive:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-mainnet-erigon3-minimal:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-mainnet-erigon3:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-sepolia-erigon3-archive:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-sepolia-erigon3-minimal:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-sepolia-erigon3:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.5.3}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/ethereum/geth/ethereum-hoodi-geth-pruned-pebble-path--nimbus.yml
+++ b/ethereum/geth/ethereum-hoodi-geth-pruned-pebble-path--nimbus.yml
@@ -195,15 +195,8 @@ x-upstreams:
    chain: eth-beacon-chain-hoodi
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-hoodi-geth-pruned-pebble-path_nimbus]
 ...
--- a/ethereum/geth/ethereum-hoodi-geth-pruned-pebble-path.yml
+++ b/ethereum/geth/ethereum-hoodi-geth-pruned-pebble-path.yml
@@ -196,15 +196,8 @@ x-upstreams:
    chain: eth-beacon-chain-hoodi
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-hoodi-geth-pruned-pebble-path_prysm]
 ...
--- a/ethereum/geth/ethereum-mainnet-geth-minimal-pebble-path.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-minimal-pebble-path.yml
@@ -200,15 +200,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-geth-minimal-pebble-path_prysm]
 ...
--- a/ethereum/geth/ethereum-mainnet-geth-pruned-leveldb-hash--nimbus--fireeth.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-pruned-leveldb-hash--nimbus--fireeth.yml
@@ -259,15 +259,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-geth-pruned-leveldb-hash_nimbus]
 ...
--- a/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus--fireeth.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus--fireeth.yml
@@ -261,15 +261,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-geth-pruned-pebble-path_nimbus]
 ...
--- a/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus.yml
@@ -195,15 +195,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-geth-pruned-pebble-path_nimbus]
 ...
--- a/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path.yml
@@ -196,15 +196,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-geth-pruned-pebble-path_prysm]
 ...
--- a/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path--nimbus.yml
+++ b/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path--nimbus.yml
@@ -195,15 +195,8 @@ x-upstreams:
    chain: eth-beacon-chain-sepolia
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-sepolia-geth-pruned-pebble-path_nimbus]
 ...
--- a/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path.yml
+++ b/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path.yml
@@ -196,15 +196,8 @@ x-upstreams:
    chain: eth-beacon-chain-sepolia
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-sepolia-geth-pruned-pebble-path_prysm]
 ...
--- a/ethereum/nethermind/ethereum-hoodi-nethermind-pruned-rocksdb-trace--nimbus.yml
+++ b/ethereum/nethermind/ethereum-hoodi-nethermind-pruned-rocksdb-trace--nimbus.yml
@@ -169,15 +169,8 @@ x-upstreams:
    chain: eth-beacon-chain-hoodi
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-hoodi-nethermind-pruned-rocksdb-trace_nimbus]
 ...
--- a/ethereum/nethermind/ethereum-mainnet-nethermind-pruned-rocksdb-trace--nimbus.yml
+++ b/ethereum/nethermind/ethereum-mainnet-nethermind-pruned-rocksdb-trace--nimbus.yml
@@ -169,15 +169,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-nethermind-pruned-rocksdb-trace_nimbus]
 ...
--- a/ethereum/nethermind/ethereum-sepolia-nethermind-pruned-rocksdb-trace--nimbus.yml
+++ b/ethereum/nethermind/ethereum-sepolia-nethermind-pruned-rocksdb-trace--nimbus.yml
@@ -169,15 +169,8 @@ x-upstreams:
    chain: eth-beacon-chain-sepolia
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-sepolia-nethermind-pruned-rocksdb-trace_nimbus]
 ...
--- a/ethereum/reth/ethereum-hoodi-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-hoodi-reth-archive-trace.yml
@@ -184,15 +184,8 @@ x-upstreams:
    chain: eth-beacon-chain-hoodi
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-hoodi-reth-archive-trace_prysm]
 ...
--- a/ethereum/reth/ethereum-hoodi-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-hoodi-reth-pruned-trace.yml
@@ -185,15 +185,8 @@ x-upstreams:
    chain: eth-beacon-chain-hoodi
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-hoodi-reth-pruned-trace_prysm]
 ...
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
@@ -191,15 +191,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-reth-archive-trace_lighthouse-pruned-blobs]
 ...
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
@@ -183,15 +183,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-reth-archive-trace_nimbus]
 ...
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
@@ -184,15 +184,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-reth-archive-trace_prysm]
 ...
--- a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
@@ -123,7 +123,7 @@ services:
      - pruning

  ethereum-mainnet-reth-minimal-node:
-    image: ${ETHEREUM_BLSYNC_IMAGE:-ethereum/client-go}:${ETHEREUM_MAINNET_BLSYNC_VERSION:-alltools-v1.17.5}
+    image: ${ETHEREUM_BLSYNC_IMAGE:-ethereum/client-go}:${ETHEREUM_MAINNET_BLSYNC_VERSION:-alltools-v1.17.4}
    ports:
      - 19286:19286
      - 19286:19286/udp
--- a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
@@ -242,15 +242,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-reth-minimal-trace_nimbus]
 ...
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--lighthouse.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--lighthouse.yml
@@ -190,15 +190,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-reth-pruned-trace_lighthouse]
 ...
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
@@ -184,15 +184,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-reth-pruned-trace_nimbus]
 ...
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
@@ -185,15 +185,8 @@ x-upstreams:
    chain: eth-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-mainnet-reth-pruned-trace_prysm]
 ...
--- a/ethereum/reth/ethereum-sepolia-reth-archive-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-archive-trace--nimbus.yml
@@ -183,15 +183,8 @@ x-upstreams:
    chain: eth-beacon-chain-sepolia
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-sepolia-reth-archive-trace_nimbus]
 ...
--- a/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
@@ -184,15 +184,8 @@ x-upstreams:
    chain: eth-beacon-chain-sepolia
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-sepolia-reth-archive-trace_prysm]
 ...
--- a/ethereum/reth/ethereum-sepolia-reth-pruned-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-pruned-trace--nimbus.yml
@@ -184,15 +184,8 @@ x-upstreams:
    chain: eth-beacon-chain-sepolia
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-sepolia-reth-pruned-trace_nimbus]
 ...
--- a/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
@@ -185,15 +185,8 @@ x-upstreams:
    chain: eth-beacon-chain-sepolia
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [ethereum-sepolia-reth-pruned-trace_prysm]
 ...
--- a/fuse/nethermind/fuse-spark-nethermind-archive-rocksdb-trace.yml
+++ b/fuse/nethermind/fuse-spark-nethermind-archive-rocksdb-trace.yml
@@ -96,8 +96,26 @@ services:
 volumes:
  fuse-spark-nethermind-archive-rocksdb-trace:

-# fuse-spark (Sparknet, chainid 123) is ABSENT from dRPC chains.yaml - not a
-# servable dRPC chain. x-upstreams removed 2026-08-05 (it declared the MAINNET
-# slug "fuse", which would have advertised testnet data as mainnet). This file is
-# hand-written (fuse has chains: null in context.yml); onboarding it to generation
-# is the clean long-term fix. See chain-aliases.yaml fuse/spark: null.
+x-upstreams:
+  - id: $${ID}
+    labels:
+      provider: $${PROVIDER}
+    connection:
+      generic:
+        rpc:
+          url: $${RPC_URL}
+        ws:
+          frameSize: 20Mb
+          msgSize: 50Mb
+          url: $${WS_URL}
+    chain: fuse
+    method-groups:
+      enabled:
+        - debug
+        - filter
+        - trace
+    methods:
+      disabled:
+      enabled:
+        - name: txpool_content # TODO: should be disabled for rollup nodes
+...
--- a/fuse/nethermind/fuse-spark-nethermind-minimal-rocksdb-trace.yml
+++ b/fuse/nethermind/fuse-spark-nethermind-minimal-rocksdb-trace.yml
@@ -99,8 +99,26 @@ services:
 volumes:
  fuse-spark-nethermind-minimal-rocksdb-trace:

-# fuse-spark (Sparknet, chainid 123) is ABSENT from dRPC chains.yaml - not a
-# servable dRPC chain. x-upstreams removed 2026-08-05 (it declared the MAINNET
-# slug "fuse", which would have advertised testnet data as mainnet). This file is
-# hand-written (fuse has chains: null in context.yml); onboarding it to generation
-# is the clean long-term fix. See chain-aliases.yaml fuse/spark: null.
+x-upstreams:
+  - id: $${ID}
+    labels:
+      provider: $${PROVIDER}
+    connection:
+      generic:
+        rpc:
+          url: $${RPC_URL}
+        ws:
+          frameSize: 20Mb
+          msgSize: 50Mb
+          url: $${WS_URL}
+    chain: fuse
+    method-groups:
+      enabled:
+        - debug
+        - filter
+        - trace
+    methods:
+      disabled:
+      enabled:
+        - name: txpool_content # TODO: should be disabled for rollup nodes
+...
--- a/fuse/nethermind/fuse-spark-nethermind-pruned-rocksdb-trace.yml
+++ b/fuse/nethermind/fuse-spark-nethermind-pruned-rocksdb-trace.yml
@@ -94,8 +94,26 @@ services:
 volumes:
  fuse-spark-nethermind-pruned-rocksdb-trace:

-# fuse-spark (Sparknet, chainid 123) is ABSENT from dRPC chains.yaml - not a
-# servable dRPC chain. x-upstreams removed 2026-08-05 (it declared the MAINNET
-# slug "fuse", which would have advertised testnet data as mainnet). This file is
-# hand-written (fuse has chains: null in context.yml); onboarding it to generation
-# is the clean long-term fix. See chain-aliases.yaml fuse/spark: null.
+x-upstreams:
+  - id: $${ID}
+    labels:
+      provider: $${PROVIDER}
+    connection:
+      generic:
+        rpc:
+          url: $${RPC_URL}
+        ws:
+          frameSize: 20Mb
+          msgSize: 50Mb
+          url: $${WS_URL}
+    chain: fuse
+    method-groups:
+      enabled:
+        - debug
+        - filter
+        - trace
+    methods:
+      disabled:
+      enabled:
+        - name: txpool_content # TODO: should be disabled for rollup nodes
+...
--- a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  gnosis-chiado-erigon3-archive:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.5.3}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  gnosis-chiado-erigon3-minimal:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.5.3}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  gnosis-chiado-erigon3:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.5.3}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  gnosis-mainnet-erigon3-archive:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  gnosis-mainnet-erigon3-minimal:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  gnosis-mainnet-erigon3:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/gnosis/nethermind/gnosis-chiado-nethermind-archive-rocksdb-trace.yml
+++ b/gnosis/nethermind/gnosis-chiado-nethermind-archive-rocksdb-trace.yml
@@ -171,15 +171,8 @@ x-upstreams:
    chain: gnosis-beacon-chain-chiado
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-chiado-nethermind-archive-rocksdb-trace_nimbus]
 ...
--- a/gnosis/nethermind/gnosis-chiado-nethermind-minimal-rocksdb-trace.yml
+++ b/gnosis/nethermind/gnosis-chiado-nethermind-minimal-rocksdb-trace.yml
@@ -174,15 +174,8 @@ x-upstreams:
    chain: gnosis-beacon-chain-chiado
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-chiado-nethermind-minimal-rocksdb-trace_nimbus]
 ...
--- a/gnosis/nethermind/gnosis-chiado-nethermind-pruned-rocksdb-trace.yml
+++ b/gnosis/nethermind/gnosis-chiado-nethermind-pruned-rocksdb-trace.yml
@@ -169,15 +169,8 @@ x-upstreams:
    chain: gnosis-beacon-chain-chiado
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-chiado-nethermind-pruned-rocksdb-trace_nimbus]
 ...
--- a/gnosis/nethermind/gnosis-mainnet-nethermind-archive-rocksdb-trace.yml
+++ b/gnosis/nethermind/gnosis-mainnet-nethermind-archive-rocksdb-trace.yml
@@ -171,15 +171,8 @@ x-upstreams:
    chain: gnosis-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-mainnet-nethermind-archive-rocksdb-trace_nimbus]
 ...
--- a/gnosis/nethermind/gnosis-mainnet-nethermind-minimal-rocksdb-trace.yml
+++ b/gnosis/nethermind/gnosis-mainnet-nethermind-minimal-rocksdb-trace.yml
@@ -174,15 +174,8 @@ x-upstreams:
    chain: gnosis-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-mainnet-nethermind-minimal-rocksdb-trace_nimbus]
 ...
--- a/gnosis/nethermind/gnosis-mainnet-nethermind-pruned-rocksdb-trace.yml
+++ b/gnosis/nethermind/gnosis-mainnet-nethermind-pruned-rocksdb-trace.yml
@@ -169,15 +169,8 @@ x-upstreams:
    chain: gnosis-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-mainnet-nethermind-pruned-rocksdb-trace_nimbus]
 ...
--- a/gnosis/reth/gnosis-chiado-reth-archive-trace.yml
+++ b/gnosis/reth/gnosis-chiado-reth-archive-trace.yml
@@ -183,15 +183,8 @@ x-upstreams:
    chain: gnosis-beacon-chain-chiado
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-chiado-reth-archive-trace_nimbus]
 ...
--- a/gnosis/reth/gnosis-chiado-reth-pruned-trace.yml
+++ b/gnosis/reth/gnosis-chiado-reth-pruned-trace.yml
@@ -184,15 +184,8 @@ x-upstreams:
    chain: gnosis-beacon-chain-chiado
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-chiado-reth-pruned-trace_nimbus]
 ...
--- a/gnosis/reth/gnosis-mainnet-reth-archive-trace.yml
+++ b/gnosis/reth/gnosis-mainnet-reth-archive-trace.yml
@@ -183,15 +183,8 @@ x-upstreams:
    chain: gnosis-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-mainnet-reth-archive-trace_nimbus]
 ...
--- a/gnosis/reth/gnosis-mainnet-reth-pruned-trace.yml
+++ b/gnosis/reth/gnosis-mainnet-reth-pruned-trace.yml
@@ -184,15 +184,8 @@ x-upstreams:
    chain: gnosis-beacon-chain
    labels:
      provider: $${PROVIDER}-beacon-chain
-    options:
-      # dshackle 0.79.10's beacon health validator times out on the spec-compliant
-      # empty-body 200 from /eth/v1/node/health (nimbus), flapping the upstream
-      # UNAVAILABLE and failing live requests ("Source was empty"). Head tracking
-      # still governs health with validation off. 2026-07-10, dRPC incident.
-      disable-validation: true
    connection:
      generic:
        rpc:
          url: $${RPC_URL}
-x-optional-volumes: [gnosis-mainnet-reth-pruned-trace_nimbus]
 ...
--- a/immutable-zkevm/geth/immutable-zkevm-mainnet-geth-pruned-pebble-path.yml
+++ b/immutable-zkevm/geth/immutable-zkevm-mainnet-geth-pruned-pebble-path.yml
@@ -32,7 +32,7 @@ x-logging-defaults: &logging-defaults

 services:
  immutable-zkevm-mainnet-geth:
-    image: ${IMMUTABLE_ZKEVM_GETH_IMAGE:-ethereum/client-go}:${IMMUTABLE_ZKEVM_MAINNET_GETH_VERSION:-v1.17.5}
+    image: ${IMMUTABLE_ZKEVM_GETH_IMAGE:-ethereum/client-go}:${IMMUTABLE_ZKEVM_MAINNET_GETH_VERSION:-v1.17.4}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/linea/besu/linea-mainnet-besu-pruned-bonsai.yml
+++ b/linea/besu/linea-mainnet-besu-pruned-bonsai.yml
@@ -54,7 +54,6 @@ services:
      - 9545
    command:
      - --Xbonsai-full-flat-db-enabled=true
-      - --bonsai-historical-block-limit=4096
      - --bootnodes=enode://069800db9e6e0ec9cadca670994ef1aea2cfd3d88133e63ecadbc1cdbd1a5847b09838ee08d8b5f02a9c32ee13abeb4d4104bb5514e5322c9d7ee19f41ff3e51@3.132.73.210:31002,enode://a8e03a71eab12ec4b47bb6e19169d8e4dc7a58373a2476969bbe463f2dded6003037fa4dd5f71e15027f7fc8d7340956fbbefed67ddd116ac19a7f74da034b61@3.132.73.210:31003,enode://97706526cf79df9d930003644f9156805f6c8bd964fc79e083444f7014ce10c9bdd2c5049e63b58040dca1d4c82ebef970822198cf0714de830cff4111534ff1@18.223.198.165:31004,enode://24e1c654a801975a96b7f54ebd7452ab15777fc635c1db25bdbd4425fdb04e7f4768e9e838a87ab724320a765e41631d5d37758c933ad0e8668693558125c8aa@18.223.198.165:31000,enode://27010891d960f73d272a553f72b6336c6698db3ade98d631f09c764e57674a797be5ebc6829ddbb65ab564f439ebc75215d20aa98b6f351d12ea623e7d139ac3@3.132.73.210:31001,enode://228e1b8a4931e46f383e30721dac21fb8fb4e5e1b32c870e13b25478c82db3dc1cd9e7ceb93d302a766466b55638cc9c5cbfc43aa48fa41ced19baf365951f76@3.1.142.64:31002,enode://c22eb0d40fc3ad5ea710aeddea906567778166bfe18c157955e8c39b23a46c45db18a0fa2ba07f2b64c81178a8c796aec2a29151533920ead06fcdfc6d8d03c6@47.128.192.57:31004,enode://8ce733abe39fd7ae0a278b9893f85c1193c611a3886168690dd843435460f22cc4d61f9e8d0ace7f5905836a665319a31cccdaacdada2acc69972c382ecce7db@3.1.142.64:31003,enode://b7c1b2bed65a855f7a2104aac9a14674dfdf018fdac763415b373b29ce18cdb81d36328ba4e5c9f12629f3a50c3e8f9ee048f22dbdbe93a82813da89c6b81334@51.20.235.126:31004,enode://95270e0550848a72fb141cf27f1c4ea10714edde365b411dc0fa06c81c0f282ce155eb9fa472b6b8bb9ee98395eeaf4c5a7b02a01fe58b37ea98ba152eda4c37@13.50.94.193:31000,enode://72013391755f24f08567b932feeeec4c893c06e0b1fb480890c83bf87fd277ad86a5ab9cb586db9ae9970371a2f8cb0c96f6c9f69045abca0fb801db7f047138@51.20.235.126:31001
      - --data-path=/opt/besu/database
      - --data-storage-format=BONSAI
--- a/linea/besu/linea-sepolia-besu-pruned-bonsai.yml
+++ b/linea/besu/linea-sepolia-besu-pruned-bonsai.yml
@@ -54,7 +54,6 @@ services:
      - 9545
    command:
      - --Xbonsai-full-flat-db-enabled=true
-      - --bonsai-historical-block-limit=4096
      - --bootnodes=enode://6f20afbe4397e51b717a7c1ad3095e79aee48c835eebd9237a3e8a16951ade1fe0e66e981e30ea269849fcb6ba03d838da37f524fabd2a557474194a2e2604fa@18.221.100.27:31002,enode://ce1e0d8e0500cb5c0ac56bdcdafb2d6320c3a2c5125b5ccf12f5dfc9b47ee74acbcafc32559017613136c9c36a0ce74ba4f83b7fb8244f099f3b15708d9d3129@3.23.75.47:31000,enode://1b026a5eb0ae74300f58987d235ef0e3a550df963345cb3574be3b0b54378bd11f14dfd515a8976f2c2d2826090e9507b8ccc24f896a9ffffffcabcfd996a733@3.129.120.128:31001
      - --data-path=/opt/besu/database
      - --data-storage-format=BONSAI
--- a/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  linea-mainnet-erigon3-archive:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  linea-mainnet-erigon3-minimal:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  linea-mainnet-erigon3:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.5.3}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  linea-sepolia-erigon3-archive:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.5.3}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  linea-sepolia-erigon3-minimal:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.5.3}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  linea-sepolia-erigon3:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.5.3}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.5.2}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/linea/mainnet/maru/config.toml.template
+++ b/linea/mainnet/maru/config.toml.template
@@ -1,14 +1,10 @@
-# [linea] finalization provider DISABLED (2026-07-31): Maru CL stuck at slot
-# 6764022 with EL head ~24k behind tip; Maru sent FCU finalized ahead of EL
-# head → Besu -38002 Invalid forkchoice. Maru has no linea.enabled flag —
-# presence of [linea] enables the provider; comment out to disable. Re-enable
-# (uncomment) once EL has caught tip.
-# [linea]
-# contract-address = "0xd19d4B5d358258f05D7B411E21A1460D11B0876F"
-# l1-eth-api = { endpoint = "${L1_RPC}" }
-# l1-polling-interval = "6 seconds"
-# l1-highest-block-tag = "finalized"
-# l2-eth-api-endpoint = { endpoint = "${SEQUENCER}" }
+# Uncomment the below [linea] section for finalized L2 block tag
+[linea]
+contract-address = "0xd19d4B5d358258f05D7B411E21A1460D11B0876F"
+l1-eth-api = { endpoint = "${L1_RPC}" }
+l1-polling-interval = "6 seconds"
+l1-highest-block-tag = "finalized"
+l2-eth-api-endpoint = { endpoint = "${SEQUENCER}" }

 [persistence]
 data-path = "/opt/maru/data"
--- a/list-restorable.sh
+++ b/list-restorable.sh
@@ -13,20 +13,6 @@

 dir="$(dirname "$0")"
 source "$dir/volume-utils.sh"
-
-# Get required persistent volume keys (all volumes minus ephemeral minus optional)
-get_required_volume_keys() {
-  local compose_file=$1
-  local key
-  
-  while IFS= read -r key; do
-    [[ -z "$key" ]] && continue
-    # Skip if ephemeral or optional
-    if ! is_ephemeral_volume_key "$key" "$compose_file" && ! is_optional_volume_key "$key" "$compose_file"; then
-      echo "$key"
-    fi
-  done < <(get_volume_keys "$compose_file")
-}
 registry_file="${dir}/compose_registry.json"
 backup_dir="/backup"

@@ -121,6 +107,7 @@ while IFS= read -r entry; do
    fi
    
    compose_file=$(echo "$entry" | jq -r '.compose_file')
+    volumes=$(echo "$entry" | jq -r '.volumes[]')
    
    # Check if compose file exists
    compose_path="${dir}/${compose_file}.yml"
@@ -128,16 +115,11 @@ while IFS= read -r entry; do
        continue
    fi
    
-    # Check each required volume for backup file
+    # Check each volume for backup file
    all_backups_exist=true
    missing_volumes=()
    backup_info=()
    
-    # Required persistent volumes only (exclude ephemeral + optional).
-    # Must feed the loop via done<<< / done< <(...) — putting < <(...) on
-    # `read` re-runs the producer every iteration and infinite-loops on the
-    # first key (vibe regression 2026-08-04 d896378e).
-    volumes=$(get_required_volume_keys "$compose_path")
    while IFS= read -r volume; do
        volume_name="rpc_${volume}"
        # jwt/secrets volumes are regenerated at create-node — never backed up by
--- a/op/erigon/soneium-minato-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/soneium-minato-sepolia-op-erigon-archive-trace.yml
@@ -69,7 +69,7 @@ services:
      - --p2p.allowed-ports=32283
      - --p2p.allowed-ports=37283
      - --port=12283
-      - --rollup.sequencerhttp=https://rpc.minato.soneium.org
+      - --rollup.sequencerhttp=https://rpc.soneium.org
      - --rpc.gascap=6000000000
      - --rpc.returndata.limit=1500000
      - --http
@@ -176,7 +176,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: soneium-minato
+    chain: soneium
    method-groups:
      enabled:
        - debug
--- a/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
@@ -267,7 +267,7 @@ services:
      - EIGENDA_PROXY_S3_CREDENTIAL_TYPE=public
      - EIGENDA_PROXY_S3_ENDPOINT=storage.googleapis.com
      - EIGENDA_PROXY_S3_PATH=blobs/
-      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V2
+      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V1,V2
      - EIGENDA_PROXY_STORAGE_FALLBACK_TARGETS=s3
    restart: unless-stopped
    networks:
--- a/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
@@ -266,7 +266,7 @@ services:
      - EIGENDA_PROXY_S3_CREDENTIAL_TYPE=public
      - EIGENDA_PROXY_S3_ENDPOINT=storage.googleapis.com
      - EIGENDA_PROXY_S3_PATH=blobs/
-      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V2
+      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V1,V2
      - EIGENDA_PROXY_STORAGE_FALLBACK_TARGETS=s3
    restart: unless-stopped
    networks:
--- a/op/geth/celo-mainnet-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-pebble-hash.yml
@@ -264,7 +264,7 @@ services:
      - EIGENDA_PROXY_S3_CREDENTIAL_TYPE=public
      - EIGENDA_PROXY_S3_ENDPOINT=storage.googleapis.com
      - EIGENDA_PROXY_S3_PATH=blobs/
-      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V2
+      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V1,V2
      - EIGENDA_PROXY_STORAGE_FALLBACK_TARGETS=s3
    restart: unless-stopped
    networks:
--- a/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
@@ -264,7 +264,7 @@ services:
      - EIGENDA_PROXY_S3_CREDENTIAL_TYPE=public
      - EIGENDA_PROXY_S3_ENDPOINT=storage.googleapis.com
      - EIGENDA_PROXY_S3_PATH=blobs/
-      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V2
+      - EIGENDA_PROXY_STORAGE_BACKENDS_TO_ENABLE=V1,V2
      - EIGENDA_PROXY_STORAGE_FALLBACK_TARGETS=s3
    restart: unless-stopped
    networks:
--- a/op/geth/fraxtal-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/fraxtal-mainnet-op-geth-archive-leveldb-hash.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 13290:13290
+      - 13290:13290/udp
    expose:
      - 8545
      - 6060
@@ -61,6 +64,7 @@ services:
      - GETH_ROLLUP_SEQUENCERHTTP=https://rpc.mainnet.frax.com
    entrypoint: /bin/sh -c '[ -f /config/genesis.json ] && geth --db.engine=leveldb --gcmode=archive --datadir /data init --state.scheme=hash /config/genesis.json; [ -f /config/static-nodes.json ] && cp -f /config/static-nodes.json /data/static-nodes.json; exec geth "$@"' --
    command:
+      - --bootnodes=enr:-J24QI8QR7VIgvQFuvLl09b9ocugoQ1WkS_AOMWKFgNX48-4P1hjgDKGeMFXZmKtfjYA2aEehxKT066riaktnxhh92OGAY5Sw_QsgmlkgnY0gmlwhCztZu2Hb3BzdGFja4P8AQCJc2VjcDI1NmsxoQM2KM0mkdH97Ze8AqwxLeqc934PKj8-xoKsyP6mAptWwIN0Y3CCdl2DdWRwgnZd,enr:-J24QGD1J-g2EPY9b7XiuwLhIoGocVp2qx2gWSfDI_CdftiPSHlgi7G6LtzkQlDskuSvRj4OXTg3vXLISubphXNNhqyGAY5Sw8GxgmlkgnY0gmlwhCzW_iGHb3BzdGFja4P8AQCJc2VjcDI1NmsxoQPvMYlJHJUsEyciuJCTkKHLE2ogZ6cs2xuPI28CGq0CTIN0Y3CCdl2DdWRwgnZd,enr:-J24QCA5I3xroUXt7Ge_Kf04VCRBnI-GbZeyBxOkkpIDGGLrVsonrbngQG1hAEnufRb1TgS6sNFCGtaZ2ZpRx7AgciGGAY5SxEy0gmlkgnY0gmlwhCLzRQyHb3BzdGFja4P8AQCJc2VjcDI1NmsxoQOaHzrtPQWYcwAcFJWFrbGlbNUsBC0VEhCcH02RbgEIwIN0Y3CCdl2DdWRwgnZd
      - --datadir=/data
      - --db.engine=leveldb
      - --gcmode=archive
@@ -68,8 +72,9 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
+      - --nat=extip:${IP}
      - --networkid=252
-      - --nodiscover
+      - --port=13290
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=hash
@@ -140,7 +145,7 @@ services:
      - OP_NODE_RPC_ADDR=0.0.0.0
      - OP_NODE_RPC_PORT=9545
      - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
      - OP_NODE_VERIFIER_L1_CONFS=0
    entrypoint: [op-node]
    restart: unless-stopped
--- a/op/geth/fraxtal-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/fraxtal-mainnet-op-geth-pruned-pebble-path.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 10282:10282
+      - 10282:10282/udp
    expose:
      - 8545
      - 6060
@@ -61,6 +64,7 @@ services:
      - GETH_ROLLUP_SEQUENCERHTTP=https://rpc.mainnet.frax.com
    entrypoint: /bin/sh -c '[ -f /config/genesis.json ] && geth --db.engine=pebble --gcmode=full --datadir /data init --state.scheme=path /config/genesis.json; [ -f /config/static-nodes.json ] && cp -f /config/static-nodes.json /data/static-nodes.json; exec geth "$@"' --
    command:
+      - --bootnodes=enr:-J24QI8QR7VIgvQFuvLl09b9ocugoQ1WkS_AOMWKFgNX48-4P1hjgDKGeMFXZmKtfjYA2aEehxKT066riaktnxhh92OGAY5Sw_QsgmlkgnY0gmlwhCztZu2Hb3BzdGFja4P8AQCJc2VjcDI1NmsxoQM2KM0mkdH97Ze8AqwxLeqc934PKj8-xoKsyP6mAptWwIN0Y3CCdl2DdWRwgnZd,enr:-J24QGD1J-g2EPY9b7XiuwLhIoGocVp2qx2gWSfDI_CdftiPSHlgi7G6LtzkQlDskuSvRj4OXTg3vXLISubphXNNhqyGAY5Sw8GxgmlkgnY0gmlwhCzW_iGHb3BzdGFja4P8AQCJc2VjcDI1NmsxoQPvMYlJHJUsEyciuJCTkKHLE2ogZ6cs2xuPI28CGq0CTIN0Y3CCdl2DdWRwgnZd,enr:-J24QCA5I3xroUXt7Ge_Kf04VCRBnI-GbZeyBxOkkpIDGGLrVsonrbngQG1hAEnufRb1TgS6sNFCGtaZ2ZpRx7AgciGGAY5SxEy0gmlkgnY0gmlwhCLzRQyHb3BzdGFja4P8AQCJc2VjcDI1NmsxoQOaHzrtPQWYcwAcFJWFrbGlbNUsBC0VEhCcH02RbgEIwIN0Y3CCdl2DdWRwgnZd
      - --datadir=/data
      - --db.engine=pebble
      - --gcmode=full
@@ -68,12 +72,13 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
+      - --nat=extip:${IP}
      - --networkid=252
-      - --nodiscover
+      - --port=10282
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=path
-      - --syncmode=full
+      - --syncmode=snap
      - --http
      - --http.addr=0.0.0.0
      - --http.api=eth,net,web3,debug,admin,txpool,engine
@@ -140,7 +145,7 @@ services:
      - OP_NODE_RPC_ADDR=0.0.0.0
      - OP_NODE_RPC_PORT=9545
      - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
      - OP_NODE_VERIFIER_L1_CONFS=0
    entrypoint: [op-node]
    restart: unless-stopped
--- a/op/geth/soneium-minato-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/soneium-minato-sepolia-op-geth-archive-leveldb-hash.yml
@@ -55,7 +55,7 @@ services:
    environment:
      - GETH_OP_NETWORK=soneium-minato-sepolia
      - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
-      - GETH_ROLLUP_SEQUENCERHTTP=https://rpc.minato.soneium.org
+      - GETH_ROLLUP_SEQUENCERHTTP=https://rpc.soneium.org
    entrypoint: /bin/sh -c 'exec geth "$@"' --
    command:
      - --datadir=/data
@@ -176,7 +176,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: soneium-minato
+    chain: soneium
    method-groups:
      enabled:
        - debug
--- a/op/geth/soneium-minato-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/soneium-minato-sepolia-op-geth-pruned-pebble-path.yml
@@ -55,7 +55,7 @@ services:
    environment:
      - GETH_OP_NETWORK=soneium-minato-sepolia
      - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
-      - GETH_ROLLUP_SEQUENCERHTTP=https://rpc.minato.soneium.org
+      - GETH_ROLLUP_SEQUENCERHTTP=https://rpc.soneium.org
    entrypoint: /bin/sh -c 'exec geth "$@"' --
    command:
      - --datadir=/data
@@ -176,7 +176,7 @@ x-upstreams:
          frameSize: 20Mb
          msgSize: 50Mb
          url: $${WS_URL}
-    chain: soneium-minato
+    chain: soneium
    method-groups:
      enabled:
        - debug
--- a/Show More
+++ b/Show More