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).
deploy: regenerate compose from vibe-node main 47bb3d78e3c1
2026-07-30 11:58:12 +00:00 · 2026-07-30 08:05:17 +00:00 · 2026-07-30 07:51:24 +00:00 · 2026-07-30 07:29:36 +00:00 · 2026-07-30 07:25:54 +00:00 · 2026-07-29 12:27:48 +00:00
41 changed files with 197 additions and 1240 deletions
--- a/compose_registry.json
+++ b/compose_registry.json
@@ -4077,38 +4077,6 @@
      "hashkeychain-mainnet-op-erigon-archive-trace"
    ]
  },
-  {
-    "chain": "mainnet",
-    "client": "erigon",
-    "compose_file": "op/erigon/ink-mainnet-op-erigon-archive-trace--kona",
-    "features": [
-      "trace"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "archive",
-    "volumes": [
-      "ink-mainnet-op-erigon-archive-trace"
-    ]
-  },
-  {
-    "chain": "mainnet",
-    "client": "erigon",
-    "compose_file": "op/erigon/ink-mainnet-op-erigon-archive-trace",
-    "features": [
-      "trace"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "archive",
-    "volumes": [
-      "ink-mainnet-op-erigon-archive-trace"
-    ]
-  },
  {
    "chain": "sepolia",
    "client": "erigon",
@@ -5518,74 +5486,6 @@
      "hemi-sepolia-op-geth-pruned-leveldb-hash"
    ]
  },
-  {
-    "chain": "mainnet",
-    "client": "geth",
-    "compose_file": "op/geth/ink-mainnet-op-geth-archive-leveldb-hash--kona",
-    "features": [
-      "hash",
-      "leveldb"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "archive",
-    "volumes": [
-      "ink-mainnet-op-geth-archive-leveldb-hash"
-    ]
-  },
-  {
-    "chain": "mainnet",
-    "client": "geth",
-    "compose_file": "op/geth/ink-mainnet-op-geth-archive-leveldb-hash",
-    "features": [
-      "hash",
-      "leveldb"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "archive",
-    "volumes": [
-      "ink-mainnet-op-geth-archive-leveldb-hash"
-    ]
-  },
-  {
-    "chain": "mainnet",
-    "client": "geth",
-    "compose_file": "op/geth/ink-mainnet-op-geth-pruned-pebble-path--kona",
-    "features": [
-      "path",
-      "pebble"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "pruned",
-    "volumes": [
-      "ink-mainnet-op-geth-pruned-pebble-path"
-    ]
-  },
-  {
-    "chain": "mainnet",
-    "client": "geth",
-    "compose_file": "op/geth/ink-mainnet-op-geth-pruned-pebble-path",
-    "features": [
-      "path",
-      "pebble"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "pruned",
-    "volumes": [
-      "ink-mainnet-op-geth-pruned-pebble-path"
-    ]
-  },
  {
    "chain": "sepolia",
    "client": "geth",
@@ -6449,7 +6349,7 @@
      "leveldb"
    ],
    "network": "soneium",
-    "node": "kona",
+    "node": "node",
    "relay": null,
    "stack": "op",
    "type": "archive",
@@ -6466,7 +6366,7 @@
      "leveldb"
    ],
    "network": "soneium",
-    "node": "kona",
+    "node": "node",
    "relay": null,
    "stack": "op",
    "type": "archive",
@@ -6483,7 +6383,7 @@
      "pebble"
    ],
    "network": "soneium",
-    "node": "kona",
+    "node": "node",
    "relay": null,
    "stack": "op",
    "type": "pruned",
@@ -6500,7 +6400,7 @@
      "pebble"
    ],
    "network": "soneium",
-    "node": "kona",
+    "node": "node",
    "relay": null,
    "stack": "op",
    "type": "pruned",
@@ -7583,38 +7483,6 @@
      "hashkeychain-testnet-op-reth-pruned-trace"
    ]
  },
-  {
-    "chain": "mainnet",
-    "client": "reth",
-    "compose_file": "op/reth/ink-mainnet-op-reth-archive-trace--kona",
-    "features": [
-      "trace"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "archive",
-    "volumes": [
-      "ink-mainnet-op-reth-archive-trace"
-    ]
-  },
-  {
-    "chain": "mainnet",
-    "client": "reth",
-    "compose_file": "op/reth/ink-mainnet-op-reth-archive-trace",
-    "features": [
-      "trace"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "archive",
-    "volumes": [
-      "ink-mainnet-op-reth-archive-trace"
-    ]
-  },
  {
    "chain": "mainnet",
    "client": "reth",
@@ -7631,22 +7499,6 @@
      "ink-mainnet-op-reth-pruned-trace"
    ]
  },
-  {
-    "chain": "mainnet",
-    "client": "reth",
-    "compose_file": "op/reth/ink-mainnet-op-reth-pruned-trace",
-    "features": [
-      "trace"
-    ],
-    "network": "ink",
-    "node": "kona",
-    "relay": null,
-    "stack": "op",
-    "type": "pruned",
-    "volumes": [
-      "ink-mainnet-op-reth-pruned-trace"
-    ]
-  },
  {
    "chain": "sepolia",
    "client": "reth",
--- 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/drpc-free.yml
+++ b/drpc-free.yml
@@ -1,6 +1,6 @@
 services:
  dshackle-free:
-    image: drpcorg/dshackle:0.79.10
+    image: ${DSHACKLE_IMAGE:-stakesquid/dshackle:0.79.11-ss2@sha256:624866381b672e051042f4f383fb19af1d9d4e508929ac92b2d70db3212ead92}
    restart: unless-stopped
    volumes:
      - ./free_configs:/etc/dshackle
--- a/drpc.yml
+++ b/drpc.yml
@@ -23,7 +23,7 @@ services:
      sleep 10; done'

  dshackle:
-    image: drpcorg/dshackle:0.79.10
+    image: ${DSHACKLE_IMAGE:-stakesquid/dshackle:0.79.11-ss2@sha256:624866381b672e051042f4f383fb19af1d9d4e508929ac92b2d70db3212ead92}
    restart: unless-stopped
    volumes:
      - ./main_configs:/etc/dshackle
--- a/ethereum/besu/ethereum-mainnet-besu-pruned-bonsai--nimbus.yml
+++ b/ethereum/besu/ethereum-mainnet-besu-pruned-bonsai--nimbus.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  ethereum-mainnet-besu:
-    image: ${ETHEREUM_BESU_IMAGE:-hyperledger/besu}:${ETHEREUM_MAINNET_BESU_VERSION:-26.7.0}
+    image: ${ETHEREUM_BESU_IMAGE:-hyperledger/besu}:${ETHEREUM_MAINNET_BESU_VERSION:-26.7.1}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
--- a/op/erigon/hashkeychain-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/hashkeychain-mainnet-op-erigon-archive-trace.yml
@@ -128,6 +128,9 @@ services:
      - OP_NODE_METRICS_ADDR=0.0.0.0
      - OP_NODE_METRICS_ENABLED=true
      - OP_NODE_METRICS_PORT=7300
+      - OP_NODE_OVERRIDE_HOLOCENE=1785306600
+      - OP_NODE_OVERRIDE_ISTHMUS=1785306900
+      - OP_NODE_OVERRIDE_JOVIAN=1785307200
      - OP_NODE_P2P_ADVERTISE_IP=${IP}
      - OP_NODE_P2P_LISTEN_IP=0.0.0.0
      - OP_NODE_P2P_LISTEN_TCP_PORT=16378
--- a/op/erigon/ink-mainnet-op-erigon-archive-trace--kona.yml
+++ b/op/erigon/ink-mainnet-op-erigon-archive-trace--kona.yml
@@ -1,206 +0,0 @@
---
-x-logging-defaults: &logging-defaults
-  driver: json-file
-  options:
-    max-size: "512m"
-    max-file: "2"
-
-# Usage:
-#
-# mkdir rpc && cd rpc
-#
-# git init
-# git remote add origin https://github.com/StakeSquid/ethereum-rpc-docker.git
-# git fetch origin vibe
-# git checkout origin/vibe
-#
-# docker run --rm alpine sh -c "printf '0x'; head -c32 /dev/urandom | xxd -p -c 64" > .jwtsecret
-#
-# env
-# ...
-# IP=$(curl ipinfo.io/ip)
-# DOMAIN=${IP}.traefik.me
-# COMPOSE_FILE=base.yml:rpc.yml:op/erigon/ink-mainnet-op-erigon-archive-trace--kona.yml
-#
-# docker compose up -d
-#
-# curl -X POST https://${IP}.traefik.me/ink-mainnet-op-erigon \
-#   -H "Content-Type: application/json" \
-#   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
-
-services:
-  ink-mainnet-op-erigon:
-    image: ${INK_ERIGON_IMAGE:-testinprod/op-erigon}:${INK_MAINNET_ERIGON_VERSION:-v2.61.3-0.10.1}
-    sysctls:
-      # TCP Performance
-      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
-      net.ipv4.tcp_no_metrics_save: 1             # Disable metrics cache
-      net.ipv4.tcp_rmem: 4096 87380 16777216      # Increase TCP read buffers
-      net.ipv4.tcp_wmem: 4096 87380 16777216      # Increase TCP write buffers
-      net.core.somaxconn: 32768                   # Higher connection queue
-      # Memory/Connection Management
-      # net.core.netdev_max_backlog: 50000          # Increase network buffer
-      net.ipv4.tcp_max_syn_backlog: 30000         # More SYN requests
-      net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
-    ulimits:
-      nofile: 1048576    # Max open files (for RPC/WS connections)
-      memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
-    user: root
-    ports:
-      - 11990:11990
-      - 11990:11990/udp
-      - 31990:31990
-      - 31990:31990/udp
-      - 36990:36990
-      - 36990:36990/udp
-    expose:
-      - 8545
-      - 6060
-      - 8551
-    entrypoint: /bin/sh -c '[ ! -d /root/.local/share/erigon/chaindata/mdbx.dat ] && erigon init --datadir /root/.local/share/erigon /config/genesis.json; exec erigon "$@"' --
-    command:
-      - --datadir=/root/.local/share/erigon
-      - --maxpeers=50
-      - --metrics
-      - --metrics.addr=0.0.0.0
-      - --metrics.port=6060
-      - --nat=extip:${IP}
-      - --networkid=57073
-      - --p2p.allowed-ports=31990
-      - --p2p.allowed-ports=36990
-      - --port=11990
-      - --rollup.sequencerhttp=https://rpc-gel.inkonchain.com
-      - --rpc.gascap=6000000000
-      - --rpc.returndata.limit=1500000
-      - --http
-      - --http.addr=0.0.0.0
-      - --http.api=eth,erigon,web3,net,debug,trace,txpool,admin,engine
-      - --http.port=8545
-      - --http.vhosts=*
-      - --ws
-      - --ws.port=8545
-      - --authrpc.addr=0.0.0.0
-      - --authrpc.jwtsecret=/jwtsecret
-      - --authrpc.vhosts=*
-    restart: unless-stopped
-    stop_grace_period: 5m
-    networks:
-      - chains
-    volumes:
-      - ${INK_MAINNET_OP_ERIGON_ARCHIVE_TRACE_DATA:-ink-mainnet-op-erigon-archive-trace}:/root/.local/share/erigon
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-      - /slowdisk:/slowdisk
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=6060
-      - prometheus-scrape.path=/debug/metrics/prometheus
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/ink-mainnet-op-erigon
-      - traefik.http.services.ink-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-mainnet-op-erigon`) || Path(`/ink-mainnet-op-erigon/`))}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Path(`/ink-mainnet-op-erigon`) || Path(`/ink-mainnet-op-erigon/`)}
-      - traefik.http.routers.ink-mainnet-op-erigon-archive-trace.middlewares=ink-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
-    shm_size: 2gb
-
-  ink-mainnet-op-erigon-node:
-    image: ${INK_KONA_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/kona-node}:${INK_MAINNET_KONA_VERSION:-v1.6.2}
-    ports:
-      - 16990:16990
-      - 16990:16990/udp
-    environment:
-      - KONA_METRICS_ADDR=0.0.0.0
-      - KONA_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - KONA_NODE_L1_ETH_RPC=${INK_MAINNET_L1_EXECUTION_RPC:-${ETHEREUM_MAINNET_EXECUTION_RPC}}
-      - KONA_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
-      - KONA_NODE_L2_CHAIN_ID=57073
-      - KONA_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - KONA_NODE_L2_ENGINE_RPC=http://ink-mainnet-op-erigon:8551
-      - KONA_NODE_L2_ENGINE_TIMEOUT=120000
-      - KONA_NODE_L2_TRUST_RPC=true
-      - KONA_NODE_METRICS_PORT=7300
-      - KONA_NODE_MODE=Validator
-      - KONA_NODE_P2P_ADVERTISE_IP=${IP}
-      - KONA_NODE_P2P_BOOTNODES=enode://92534205dd72a8787df902c89a775d9a45882739a973a7030d4d338c9b65387cfb77629907f9b6afb4e2bd98d9e6d2ccfde02d8a968b4fbccb68f0f4db5f4d83@34.13.199.202:30305?discport=30305,enode://26b0306725a78a8d193c2074bfd9e71233dbd3b75ab74be0ab555f72865fd88a285774526243f36653844eb95d62108c35f8c2723656b2c9568716ee2463f8d7@34.7.48.80:30305?discport=30305,enode://0c7bbb6bca9ce80952d8d8f8ba966e6b9e80faf75a165f320a53722f32b51c4b1da16ba59ab14f5194e51095a2755d8d3086a0220e34d88729cc8f4cc5499116@35.204.27.165:30305?discport=30305,enode://869d07b5932f17e8490990f75a3f94195e9504ddb6b85f7189e5a9c0a8fff8b00aecf6f3ac450ecba6cdabdb5858788a94bde2b613e0f2d82e9b395355f76d1a@34.65.67.101:30305?discport=30305,enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:30305?discport=30305,enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305?discport=30305
-      - KONA_NODE_P2P_LISTEN_IP=0.0.0.0
-      - KONA_NODE_P2P_LISTEN_TCP_PORT=16990
-      - KONA_NODE_P2P_LISTEN_UDP_PORT=16990
-      - KONA_NODE_RPC_ADDR=0.0.0.0
-      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=execution-layer
-    entrypoint: [kona-node, node]
-    restart: unless-stopped
-    depends_on:
-      ink-mainnet-op-erigon:
-        condition: service_started
-        restart: true
-    networks:
-      - chains
-    volumes:
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=7300
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-erigon-archive-trace-node-stripprefix.stripprefix.prefixes=/ink-mainnet-op-erigon/node
-      - traefik.http.services.ink-mainnet-op-erigon-archive-trace-node.loadbalancer.server.port=9545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-mainnet-op-erigon/node`)}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.rule=PathPrefix(`/ink-mainnet-op-erigon/node`)}
-      - traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.middlewares=ink-mainnet-op-erigon-archive-trace-node-stripprefix, ipallowlist
-
-volumes:
-  ink-mainnet-op-erigon-archive-trace:
-
-x-upstreams:
-  - id: $${ID}
-    labels:
-      provider: $${PROVIDER}
-    connection:
-      generic:
-        rpc:
-          url: $${RPC_URL}
-        ws:
-          frameSize: 20Mb
-          msgSize: 50Mb
-          url: $${WS_URL}
-    chain: ink
-    method-groups:
-      enabled:
-        - debug
-        - filter
-        - trace
-    methods:
-      disabled:
-      enabled:
-        - name: txpool_content # TODO: should be disabled for rollup nodes
-        # standard geth and erigon
-        - name: debug_accountRange
-        - name: debug_getModifiedAccountsByNumber
-        - name: debug_getModifiedAccountsByHash
-        # non standard geth and erigon
-        - name: eth_getRawTransactionByHash
-        - name: eth_getRawTransactionByBlockHashAndIndex
-        # non standard erigon only
-        - name: eth_getBlockReceipts
-        - name: eth_protocolVersion
-        - name: eth_callMany
-        - name: eth_callBundle
-        - name: debug_accountAt
-        - name: debug_traceCallMany
-        - name: erigon_getHeaderByHash
-        - name: erigon_getBlockReceiptsByBlockHash
-        - name: erigon_getHeaderByNumber
-        - name: erigon_getLogsByHash
-        - name: erigon_forks
-        - name: erigon_getBlockByTimestamp
-        - name: erigon_BlockNumber
-        - name: erigon_getLatestLogs
-...
--- a/op/erigon/ink-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/ink-mainnet-op-erigon-archive-trace.yml
@@ -1,214 +0,0 @@
---
-x-logging-defaults: &logging-defaults
-  driver: json-file
-  options:
-    max-size: "512m"
-    max-file: "2"
-
-# Usage:
-#
-# mkdir rpc && cd rpc
-#
-# git init
-# git remote add origin https://github.com/StakeSquid/ethereum-rpc-docker.git
-# git fetch origin vibe
-# git checkout origin/vibe
-#
-# docker run --rm alpine sh -c "printf '0x'; head -c32 /dev/urandom | xxd -p -c 64" > .jwtsecret
-#
-# env
-# ...
-# IP=$(curl ipinfo.io/ip)
-# DOMAIN=${IP}.traefik.me
-# COMPOSE_FILE=base.yml:rpc.yml:op/erigon/ink-mainnet-op-erigon-archive-trace.yml
-#
-# docker compose up -d
-#
-# curl -X POST https://${IP}.traefik.me/ink-mainnet-op-erigon \
-#   -H "Content-Type: application/json" \
-#   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
-
-services:
-  ink-mainnet-op-erigon:
-    image: ${INK_ERIGON_IMAGE:-testinprod/op-erigon}:${INK_MAINNET_ERIGON_VERSION:-v2.61.3-0.10.1}
-    sysctls:
-      # TCP Performance
-      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
-      net.ipv4.tcp_no_metrics_save: 1             # Disable metrics cache
-      net.ipv4.tcp_rmem: 4096 87380 16777216      # Increase TCP read buffers
-      net.ipv4.tcp_wmem: 4096 87380 16777216      # Increase TCP write buffers
-      net.core.somaxconn: 32768                   # Higher connection queue
-      # Memory/Connection Management
-      # net.core.netdev_max_backlog: 50000          # Increase network buffer
-      net.ipv4.tcp_max_syn_backlog: 30000         # More SYN requests
-      net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
-    ulimits:
-      nofile: 1048576    # Max open files (for RPC/WS connections)
-      memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
-    user: root
-    ports:
-      - 11990:11990
-      - 11990:11990/udp
-      - 31990:31990
-      - 31990:31990/udp
-      - 36990:36990
-      - 36990:36990/udp
-    expose:
-      - 8545
-      - 6060
-      - 8551
-    entrypoint: /bin/sh -c '[ ! -d /root/.local/share/erigon/chaindata/mdbx.dat ] && erigon init --datadir /root/.local/share/erigon /config/genesis.json; exec erigon "$@"' --
-    command:
-      - --datadir=/root/.local/share/erigon
-      - --maxpeers=50
-      - --metrics
-      - --metrics.addr=0.0.0.0
-      - --metrics.port=6060
-      - --nat=extip:${IP}
-      - --networkid=57073
-      - --p2p.allowed-ports=31990
-      - --p2p.allowed-ports=36990
-      - --port=11990
-      - --rollup.sequencerhttp=https://rpc-gel.inkonchain.com
-      - --rpc.gascap=6000000000
-      - --rpc.returndata.limit=1500000
-      - --http
-      - --http.addr=0.0.0.0
-      - --http.api=eth,erigon,web3,net,debug,trace,txpool,admin,engine
-      - --http.port=8545
-      - --http.vhosts=*
-      - --ws
-      - --ws.port=8545
-      - --authrpc.addr=0.0.0.0
-      - --authrpc.jwtsecret=/jwtsecret
-      - --authrpc.vhosts=*
-    restart: unless-stopped
-    stop_grace_period: 5m
-    networks:
-      - chains
-    volumes:
-      - ${INK_MAINNET_OP_ERIGON_ARCHIVE_TRACE_DATA:-ink-mainnet-op-erigon-archive-trace}:/root/.local/share/erigon
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-      - /slowdisk:/slowdisk
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=6060
-      - prometheus-scrape.path=/debug/metrics/prometheus
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/ink-mainnet-op-erigon
-      - traefik.http.services.ink-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-mainnet-op-erigon`) || Path(`/ink-mainnet-op-erigon/`))}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Path(`/ink-mainnet-op-erigon`) || Path(`/ink-mainnet-op-erigon/`)}
-      - traefik.http.routers.ink-mainnet-op-erigon-archive-trace.middlewares=ink-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
-    shm_size: 2gb
-
-  ink-mainnet-op-erigon-node:
-    image: ${INK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${INK_MAINNET_NODE_VERSION:-v1.19.2}
-    ports:
-      - 16990:16990
-      - 16990:16990/udp
-    environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${INK_MAINNET_L1_EXECUTION_RPC:-${ETHEREUM_MAINNET_EXECUTION_RPC}}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-standard}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
-      - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=erigon
-      - OP_NODE_L2_ENGINE_RPC=http://ink-mainnet-op-erigon:8551
-      - OP_NODE_L2_ENGINE_RPC_TIMEOUT=120s
-      - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
-      - OP_NODE_LOG_LEVEL=info
-      - OP_NODE_METRICS_ADDR=0.0.0.0
-      - OP_NODE_METRICS_ENABLED=true
-      - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=ink-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
-      - OP_NODE_P2P_BOOTNODES=enode://92534205dd72a8787df902c89a775d9a45882739a973a7030d4d338c9b65387cfb77629907f9b6afb4e2bd98d9e6d2ccfde02d8a968b4fbccb68f0f4db5f4d83@34.13.199.202:30305?discport=30305,enode://26b0306725a78a8d193c2074bfd9e71233dbd3b75ab74be0ab555f72865fd88a285774526243f36653844eb95d62108c35f8c2723656b2c9568716ee2463f8d7@34.7.48.80:30305?discport=30305,enode://0c7bbb6bca9ce80952d8d8f8ba966e6b9e80faf75a165f320a53722f32b51c4b1da16ba59ab14f5194e51095a2755d8d3086a0220e34d88729cc8f4cc5499116@35.204.27.165:30305?discport=30305,enode://869d07b5932f17e8490990f75a3f94195e9504ddb6b85f7189e5a9c0a8fff8b00aecf6f3ac450ecba6cdabdb5858788a94bde2b613e0f2d82e9b395355f76d1a@34.65.67.101:30305?discport=30305,enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:30305?discport=30305,enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305?discport=30305
-      - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=16990
-      - OP_NODE_P2P_LISTEN_UDP_PORT=16990
-      - OP_NODE_P2P_STATIC=/ip4/34.6.118.237/tcp/9003/p2p/16Uiu2HAmKjbznKezrhsXMXVT3tSwviv8jojmfLeY9Zd53VvLmGsn,/ip4/34.178.43.233/tcp/9003/p2p/16Uiu2HAm27U7EgvM6C7N2Y3152ysiEd7K3YGXVzZ2ypsnu5ZE4cY,/ip4/34.6.162.247/tcp/9003/p2p/16Uiu2HAmDhreSpDkx8F78jiJPRV9Npm6VoNB2trgNBNWBreLsBmH
-      - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
-      - 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=execution-layer
-      - OP_NODE_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
-    restart: unless-stopped
-    depends_on:
-      ink-mainnet-op-erigon:
-        condition: service_started
-        restart: true
-    networks:
-      - chains
-    volumes:
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=7300
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-erigon-archive-trace-node-stripprefix.stripprefix.prefixes=/ink-mainnet-op-erigon/node
-      - traefik.http.services.ink-mainnet-op-erigon-archive-trace-node.loadbalancer.server.port=9545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-mainnet-op-erigon/node`)}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.rule=PathPrefix(`/ink-mainnet-op-erigon/node`)}
-      - traefik.http.routers.ink-mainnet-op-erigon-archive-trace-node.middlewares=ink-mainnet-op-erigon-archive-trace-node-stripprefix, ipallowlist
-
-volumes:
-  ink-mainnet-op-erigon-archive-trace:
-
-x-upstreams:
-  - id: $${ID}
-    labels:
-      provider: $${PROVIDER}
-    connection:
-      generic:
-        rpc:
-          url: $${RPC_URL}
-        ws:
-          frameSize: 20Mb
-          msgSize: 50Mb
-          url: $${WS_URL}
-    chain: ink
-    method-groups:
-      enabled:
-        - debug
-        - filter
-        - trace
-    methods:
-      disabled:
-      enabled:
-        - name: txpool_content # TODO: should be disabled for rollup nodes
-        # standard geth and erigon
-        - name: debug_accountRange
-        - name: debug_getModifiedAccountsByNumber
-        - name: debug_getModifiedAccountsByHash
-        # non standard geth and erigon
-        - name: eth_getRawTransactionByHash
-        - name: eth_getRawTransactionByBlockHashAndIndex
-        # non standard erigon only
-        - name: eth_getBlockReceipts
-        - name: eth_protocolVersion
-        - name: eth_callMany
-        - name: eth_callBundle
-        - name: debug_accountAt
-        - name: debug_traceCallMany
-        - name: erigon_getHeaderByHash
-        - name: erigon_getBlockReceiptsByBlockHash
-        - name: erigon_getHeaderByNumber
-        - name: erigon_getLogsByHash
-        - name: erigon_forks
-        - name: erigon_getBlockByTimestamp
-        - name: erigon_BlockNumber
-        - name: erigon_getLatestLogs
-...
--- a/op/erigon/mode-sepolia-op-erigon-archive-trace--kona.yml
+++ b/op/erigon/mode-sepolia-op-erigon-archive-trace--kona.yml
@@ -65,9 +65,10 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
      - --p2p.allowed-ports=33212
      - --p2p.allowed-ports=38212
+      - --port=13212
      - --rollup.sequencerhttp=https://sepolia.mode.network
      - --rpc.gascap=6000000000
      - --rpc.returndata.limit=1500000
@@ -128,7 +129,7 @@ services:
      - KONA_NODE_P2P_LISTEN_UDP_PORT=18212
      - KONA_NODE_RPC_ADDR=0.0.0.0
      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
--- a/op/erigon/mode-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/mode-sepolia-op-erigon-archive-trace.yml
@@ -65,9 +65,10 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
      - --p2p.allowed-ports=33212
      - --p2p.allowed-ports=38212
+      - --port=13212
      - --rollup.sequencerhttp=https://sepolia.mode.network
      - --rpc.gascap=6000000000
      - --rpc.returndata.limit=1500000
@@ -135,7 +136,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/hashkeychain-mainnet-op-geth-archive-leveldb-hash--kona.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash--kona.yml
@@ -54,6 +54,9 @@ services:
      - 8551
    environment:
      - GETH_BOOTNODES=enode://5ecd6d2054a58fa00729b73396044a35e6aceeafe58373d2f26b3f50a3934175fb56f8efa538381430889771613beaabf1177805910bbd34e4b4840320914690@mainnet-bootnodes.hsk.xyz:30615,enode://bd244da2a066e15f82d4bfb7f2732c5b5bac44cefb36cefef01a4c0e87e72b42004d012c9a294b8402ebf67491777f280ffbcc93a71157921d6d358b19ddac67@mainnet-bootnodes.hsk.xyz:30616,enode://a5bba6459ac3a075a4a8941478a4ef8d167460191c89632004b17e4b2d7beea52cdc1a2d376f35e996ad44ccac8db25f900700aad6991d015bdc4db072832063@mainnet-bootnodes.hsk.xyz:30617
+      - GETH_OVERRIDE_HOLOCENE=1785306600
+      - GETH_OVERRIDE_ISTHMUS=1785306900
+      - GETH_OVERRIDE_JOVIAN=1785307200
      - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
      - GETH_ROLLUP_SEQUENCERHTTP=https://mainnet.hsk.xyz
    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 "$@"' --
--- a/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-archive-leveldb-hash.yml
@@ -54,6 +54,9 @@ services:
      - 8551
    environment:
      - GETH_BOOTNODES=enode://5ecd6d2054a58fa00729b73396044a35e6aceeafe58373d2f26b3f50a3934175fb56f8efa538381430889771613beaabf1177805910bbd34e4b4840320914690@mainnet-bootnodes.hsk.xyz:30615,enode://bd244da2a066e15f82d4bfb7f2732c5b5bac44cefb36cefef01a4c0e87e72b42004d012c9a294b8402ebf67491777f280ffbcc93a71157921d6d358b19ddac67@mainnet-bootnodes.hsk.xyz:30616,enode://a5bba6459ac3a075a4a8941478a4ef8d167460191c89632004b17e4b2d7beea52cdc1a2d376f35e996ad44ccac8db25f900700aad6991d015bdc4db072832063@mainnet-bootnodes.hsk.xyz:30617
+      - GETH_OVERRIDE_HOLOCENE=1785306600
+      - GETH_OVERRIDE_ISTHMUS=1785306900
+      - GETH_OVERRIDE_JOVIAN=1785307200
      - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
      - GETH_ROLLUP_SEQUENCERHTTP=https://mainnet.hsk.xyz
    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 "$@"' --
@@ -128,6 +131,9 @@ services:
      - OP_NODE_METRICS_ADDR=0.0.0.0
      - OP_NODE_METRICS_ENABLED=true
      - OP_NODE_METRICS_PORT=7300
+      - OP_NODE_OVERRIDE_HOLOCENE=1785306600
+      - OP_NODE_OVERRIDE_ISTHMUS=1785306900
+      - OP_NODE_OVERRIDE_JOVIAN=1785307200
      - OP_NODE_P2P_ADVERTISE_IP=${IP}
      - OP_NODE_P2P_LISTEN_IP=0.0.0.0
      - OP_NODE_P2P_LISTEN_TCP_PORT=19113
--- a/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path--kona.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path--kona.yml
@@ -54,6 +54,9 @@ services:
      - 8551
    environment:
      - GETH_BOOTNODES=enode://5ecd6d2054a58fa00729b73396044a35e6aceeafe58373d2f26b3f50a3934175fb56f8efa538381430889771613beaabf1177805910bbd34e4b4840320914690@mainnet-bootnodes.hsk.xyz:30615,enode://bd244da2a066e15f82d4bfb7f2732c5b5bac44cefb36cefef01a4c0e87e72b42004d012c9a294b8402ebf67491777f280ffbcc93a71157921d6d358b19ddac67@mainnet-bootnodes.hsk.xyz:30616,enode://a5bba6459ac3a075a4a8941478a4ef8d167460191c89632004b17e4b2d7beea52cdc1a2d376f35e996ad44ccac8db25f900700aad6991d015bdc4db072832063@mainnet-bootnodes.hsk.xyz:30617
+      - GETH_OVERRIDE_HOLOCENE=1785306600
+      - GETH_OVERRIDE_ISTHMUS=1785306900
+      - GETH_OVERRIDE_JOVIAN=1785307200
      - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
      - GETH_ROLLUP_SEQUENCERHTTP=https://mainnet.hsk.xyz
    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 "$@"' --
--- a/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/hashkeychain-mainnet-op-geth-pruned-pebble-path.yml
@@ -54,6 +54,9 @@ services:
      - 8551
    environment:
      - GETH_BOOTNODES=enode://5ecd6d2054a58fa00729b73396044a35e6aceeafe58373d2f26b3f50a3934175fb56f8efa538381430889771613beaabf1177805910bbd34e4b4840320914690@mainnet-bootnodes.hsk.xyz:30615,enode://bd244da2a066e15f82d4bfb7f2732c5b5bac44cefb36cefef01a4c0e87e72b42004d012c9a294b8402ebf67491777f280ffbcc93a71157921d6d358b19ddac67@mainnet-bootnodes.hsk.xyz:30616,enode://a5bba6459ac3a075a4a8941478a4ef8d167460191c89632004b17e4b2d7beea52cdc1a2d376f35e996ad44ccac8db25f900700aad6991d015bdc4db072832063@mainnet-bootnodes.hsk.xyz:30617
+      - GETH_OVERRIDE_HOLOCENE=1785306600
+      - GETH_OVERRIDE_ISTHMUS=1785306900
+      - GETH_OVERRIDE_JOVIAN=1785307200
      - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
      - GETH_ROLLUP_SEQUENCERHTTP=https://mainnet.hsk.xyz
    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 "$@"' --
@@ -128,6 +131,9 @@ services:
      - OP_NODE_METRICS_ADDR=0.0.0.0
      - OP_NODE_METRICS_ENABLED=true
      - OP_NODE_METRICS_PORT=7300
+      - OP_NODE_OVERRIDE_HOLOCENE=1785306600
+      - OP_NODE_OVERRIDE_ISTHMUS=1785306900
+      - OP_NODE_OVERRIDE_JOVIAN=1785307200
      - OP_NODE_P2P_ADVERTISE_IP=${IP}
      - OP_NODE_P2P_LISTEN_IP=0.0.0.0
      - OP_NODE_P2P_LISTEN_TCP_PORT=17188
--- a/op/geth/metal-sepolia-op-geth-archive-leveldb-hash--kona.yml
+++ b/op/geth/metal-sepolia-op-geth-archive-leveldb-hash--kona.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 14770:14770
+      - 14770:14770/udp
    expose:
      - 8545
      - 6060
@@ -62,7 +65,8 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=14770
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=hash
@@ -126,7 +130,7 @@ services:
      - KONA_NODE_P2P_LISTEN_UDP_PORT=19770
      - KONA_NODE_RPC_ADDR=0.0.0.0
      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
--- a/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/metal-sepolia-op-geth-archive-leveldb-hash.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 14770:14770
+      - 14770:14770/udp
    expose:
      - 8545
      - 6060
@@ -62,7 +65,8 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=14770
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=hash
@@ -131,7 +135,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/metal-sepolia-op-geth-pruned-pebble-path--kona.yml
+++ b/op/geth/metal-sepolia-op-geth-pruned-pebble-path--kona.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 14701:14701
+      - 14701:14701/udp
    expose:
      - 8545
      - 6060
@@ -62,11 +65,12 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=14701
      - --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
@@ -126,7 +130,7 @@ services:
      - KONA_NODE_P2P_LISTEN_UDP_PORT=19701
      - KONA_NODE_RPC_ADDR=0.0.0.0
      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
--- a/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/metal-sepolia-op-geth-pruned-pebble-path.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 14701:14701
+      - 14701:14701/udp
    expose:
      - 8545
      - 6060
@@ -62,11 +65,12 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=14701
      - --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
@@ -131,7 +135,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/mode-sepolia-op-geth-archive-leveldb-hash--kona.yml
+++ b/op/geth/mode-sepolia-op-geth-archive-leveldb-hash--kona.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 12835:12835
+      - 12835:12835/udp
    expose:
      - 8545
      - 6060
@@ -62,7 +65,8 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=12835
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=hash
@@ -126,7 +130,7 @@ services:
      - KONA_NODE_P2P_LISTEN_UDP_PORT=17835
      - KONA_NODE_RPC_ADDR=0.0.0.0
      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
--- a/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/mode-sepolia-op-geth-archive-leveldb-hash.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 12835:12835
+      - 12835:12835/udp
    expose:
      - 8545
      - 6060
@@ -62,7 +65,8 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=12835
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=hash
@@ -132,7 +136,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/mode-sepolia-op-geth-pruned-pebble-hash--kona.yml
+++ b/op/geth/mode-sepolia-op-geth-pruned-pebble-hash--kona.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 13454:13454
+      - 13454:13454/udp
    expose:
      - 8545
      - 6060
@@ -62,7 +65,8 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=13454
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=hash
@@ -126,7 +130,7 @@ services:
      - KONA_NODE_P2P_LISTEN_UDP_PORT=18454
      - KONA_NODE_RPC_ADDR=0.0.0.0
      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
--- a/op/geth/mode-sepolia-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/mode-sepolia-op-geth-pruned-pebble-hash.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 13454:13454
+      - 13454:13454/udp
    expose:
      - 8545
      - 6060
@@ -62,7 +65,8 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=13454
      - --rpc.gascap=600000000
      - --rpc.txfeecap=0
      - --state.scheme=hash
@@ -132,7 +136,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/mode-sepolia-op-geth-pruned-pebble-path--kona.yml
+++ b/op/geth/mode-sepolia-op-geth-pruned-pebble-path--kona.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 13308:13308
+      - 13308:13308/udp
    expose:
      - 8545
      - 6060
@@ -62,11 +65,12 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=13308
      - --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
@@ -126,7 +130,7 @@ services:
      - KONA_NODE_P2P_LISTEN_UDP_PORT=18308
      - KONA_NODE_RPC_ADDR=0.0.0.0
      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=consensus-layer
+      - OP_NODE_SYNCMODE=execution-layer
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
--- a/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/mode-sepolia-op-geth-pruned-pebble-path.yml
@@ -45,6 +45,9 @@ services:
    ulimits:
      nofile: 1048576    # Max open files (for RPC/WS connections)
    user: root
+    ports:
+      - 13308:13308
+      - 13308:13308/udp
    expose:
      - 8545
      - 6060
@@ -62,11 +65,12 @@ services:
      - --metrics
      - --metrics.addr=0.0.0.0
      - --metrics.port=6060
-      - --nodiscover
+      - --nat=extip:${IP}
+      - --port=13308
      - --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
@@ -132,7 +136,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/hashkeychain/mainnet/genesis.json
+++ b/op/hashkeychain/mainnet/genesis.json
@@ -25,6 +25,7 @@
    "graniteTime": 0,
    "holoceneTime": 1785306600,
    "isthmusTime": 1785306900,
+    "pragueTime": 1785306900,
    "jovianTime": 1785307200,
    "terminalTotalDifficulty": 0,
    "terminalTotalDifficultyPassed": true,
--- a/op/reth/hashkeychain-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/hashkeychain-mainnet-op-reth-pruned-trace.yml
@@ -134,6 +134,9 @@ services:
      - OP_NODE_METRICS_ADDR=0.0.0.0
      - OP_NODE_METRICS_ENABLED=true
      - OP_NODE_METRICS_PORT=7300
+      - OP_NODE_OVERRIDE_HOLOCENE=1785306600
+      - OP_NODE_OVERRIDE_ISTHMUS=1785306900
+      - OP_NODE_OVERRIDE_JOVIAN=1785307200
      - OP_NODE_P2P_ADVERTISE_IP=${IP}
      - OP_NODE_P2P_LISTEN_IP=0.0.0.0
      - OP_NODE_P2P_LISTEN_TCP_PORT=17151
--- a/op/reth/ink-mainnet-op-reth-archive-trace--kona.yml
+++ b/op/reth/ink-mainnet-op-reth-archive-trace--kona.yml
@@ -1,191 +0,0 @@
---
-x-logging-defaults: &logging-defaults
-  driver: json-file
-  options:
-    max-size: "512m"
-    max-file: "2"
-
-# Usage:
-#
-# mkdir rpc && cd rpc
-#
-# git init
-# git remote add origin https://github.com/StakeSquid/ethereum-rpc-docker.git
-# git fetch origin vibe
-# git checkout origin/vibe
-#
-# docker run --rm alpine sh -c "printf '0x'; head -c32 /dev/urandom | xxd -p -c 64" > .jwtsecret
-#
-# env
-# ...
-# IP=$(curl ipinfo.io/ip)
-# DOMAIN=${IP}.traefik.me
-# COMPOSE_FILE=base.yml:rpc.yml:op/reth/ink-mainnet-op-reth-archive-trace--kona.yml
-#
-# docker compose up -d
-#
-# curl -X POST https://${IP}.traefik.me/ink-mainnet-archive \
-#   -H "Content-Type: application/json" \
-#   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
-
-services:
-  ink-mainnet-archive:
-    image: ${INK_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${INK_MAINNET_RETH_VERSION:-v2.3.3}
-    sysctls:
-      # TCP Performance
-      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
-      net.ipv4.tcp_no_metrics_save: 1             # Disable metrics cache
-      net.ipv4.tcp_rmem: 4096 87380 16777216      # Increase TCP read buffers
-      net.ipv4.tcp_wmem: 4096 87380 16777216      # Increase TCP write buffers
-      net.core.somaxconn: 32768                   # Higher connection queue
-      # Memory/Connection Management
-      # net.core.netdev_max_backlog: 50000          # Increase network buffer
-      net.ipv4.tcp_max_syn_backlog: 30000         # More SYN requests
-      net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
-    ulimits:
-      nofile: 1048576    # Max open files (for RPC/WS connections)
-      memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
-    user: root
-    ports:
-      - 11634:11634
-      - 11634:11634/udp
-    expose:
-      - 8545
-      - 9001
-      - 8551
-    entrypoint: [op-reth, node]
-    command:
-      - --chain=/config/genesis.json
-      - --config=/config/reth/reth.toml
-      - --datadir=/root/.local/share/reth
-      - --discovery.addr=0.0.0.0
-      - --discovery.port=11634
-      - --discovery.v5.addr=0.0.0.0
-      - --discovery.v5.port=11634
-      - --engine.cross-block-cache-size=${INK_MAINNET_RETH_STATE_CACHE:-4096}
-      - --max-inbound-peers=50
-      - --max-outbound-peers=50
-      - --metrics=0.0.0.0:9001
-      - --nat=extip:${IP}
-      - --port=11634
-      - --rollup.sequencer-http=https://rpc-gel.inkonchain.com
-      - --rpc-cache.max-blocks=10000
-      - --rpc-cache.max-concurrent-db-requests=2048
-      - --rpc.gascap=600000000
-      - --rpc.max-blocks-per-filter=0
-      - --rpc.max-connections=50000
-      - --rpc.max-logs-per-response=0
-      - --rpc.max-trace-filter-blocks=10000
-      - --http
-      - --http.addr=0.0.0.0
-      - --http.api=admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,mev
-      - --http.corsdomain=*
-      - --http.port=8545
-      - --ws
-      - --ws.addr=0.0.0.0
-      - --ws.api=admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,mev
-      - --ws.origins=*
-      - --ws.port=8545
-      - --authrpc.addr=0.0.0.0
-      - --authrpc.jwtsecret=/jwtsecret
-    restart: unless-stopped
-    stop_grace_period: 5m
-    networks:
-      - chains
-    volumes:
-      - ${INK_MAINNET_OP_RETH_ARCHIVE_TRACE_DATA:-ink-mainnet-op-reth-archive-trace}:/root/.local/share/reth
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-      - /slowdisk:/slowdisk
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=9001
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/ink-mainnet-archive
-      - traefik.http.services.ink-mainnet-op-reth-archive-trace.loadbalancer.server.port=8545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-mainnet-archive`) || Path(`/ink-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-reth-archive-trace.rule=Path(`/ink-mainnet-archive`) || Path(`/ink-mainnet-archive/`)}
-      - traefik.http.routers.ink-mainnet-op-reth-archive-trace.middlewares=ink-mainnet-op-reth-archive-trace-stripprefix, ipallowlist
-    shm_size: 2gb
-
-  ink-mainnet-archive-node:
-    image: ${INK_KONA_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/kona-node}:${INK_MAINNET_KONA_VERSION:-v1.6.2}
-    ports:
-      - 16634:16634
-      - 16634:16634/udp
-    environment:
-      - KONA_METRICS_ADDR=0.0.0.0
-      - KONA_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - KONA_NODE_L1_ETH_RPC=${INK_MAINNET_L1_EXECUTION_RPC:-${ETHEREUM_MAINNET_EXECUTION_RPC}}
-      - KONA_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
-      - KONA_NODE_L2_CHAIN_ID=57073
-      - KONA_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - KONA_NODE_L2_ENGINE_RPC=http://ink-mainnet-archive:8551
-      - KONA_NODE_L2_ENGINE_TIMEOUT=120000
-      - KONA_NODE_L2_TRUST_RPC=true
-      - KONA_NODE_METRICS_PORT=7300
-      - KONA_NODE_MODE=Validator
-      - KONA_NODE_P2P_ADVERTISE_IP=${IP}
-      - KONA_NODE_P2P_BOOTNODES=enode://92534205dd72a8787df902c89a775d9a45882739a973a7030d4d338c9b65387cfb77629907f9b6afb4e2bd98d9e6d2ccfde02d8a968b4fbccb68f0f4db5f4d83@34.13.199.202:30305?discport=30305,enode://26b0306725a78a8d193c2074bfd9e71233dbd3b75ab74be0ab555f72865fd88a285774526243f36653844eb95d62108c35f8c2723656b2c9568716ee2463f8d7@34.7.48.80:30305?discport=30305,enode://0c7bbb6bca9ce80952d8d8f8ba966e6b9e80faf75a165f320a53722f32b51c4b1da16ba59ab14f5194e51095a2755d8d3086a0220e34d88729cc8f4cc5499116@35.204.27.165:30305?discport=30305,enode://869d07b5932f17e8490990f75a3f94195e9504ddb6b85f7189e5a9c0a8fff8b00aecf6f3ac450ecba6cdabdb5858788a94bde2b613e0f2d82e9b395355f76d1a@34.65.67.101:30305?discport=30305,enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:30305?discport=30305,enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305?discport=30305
-      - KONA_NODE_P2P_LISTEN_IP=0.0.0.0
-      - KONA_NODE_P2P_LISTEN_TCP_PORT=16634
-      - KONA_NODE_P2P_LISTEN_UDP_PORT=16634
-      - KONA_NODE_RPC_ADDR=0.0.0.0
-      - KONA_NODE_RPC_PORT=9545
-      - OP_NODE_SYNCMODE=execution-layer
-    entrypoint: [kona-node, node]
-    restart: unless-stopped
-    depends_on:
-      ink-mainnet-archive:
-        condition: service_started
-        restart: true
-    networks:
-      - chains
-    volumes:
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=7300
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ink-mainnet-archive/node
-      - traefik.http.services.ink-mainnet-op-reth-archive-trace-node.loadbalancer.server.port=9545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-mainnet-archive/node`)}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.rule=PathPrefix(`/ink-mainnet-archive/node`)}
-      - traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.middlewares=ink-mainnet-op-reth-archive-trace-node-stripprefix, ipallowlist
-
-volumes:
-  ink-mainnet-op-reth-archive-trace:
-
-x-upstreams:
-  - id: $${ID}
-    labels:
-      provider: $${PROVIDER}
-    connection:
-      generic:
-        rpc:
-          url: $${RPC_URL}
-        ws:
-          frameSize: 20Mb
-          msgSize: 50Mb
-          url: $${WS_URL}
-    chain: ink
-    method-groups:
-      enabled:
-        - debug
-        - filter
-        - trace
-    methods:
-      disabled:
-        - name: eth_maxPriorityFeePerGas
-      enabled:
-        - name: txpool_content # TODO: should be disabled for rollup nodes
-...
--- a/op/reth/ink-mainnet-op-reth-archive-trace.yml
+++ b/op/reth/ink-mainnet-op-reth-archive-trace.yml
@@ -1,191 +0,0 @@
---
-x-logging-defaults: &logging-defaults
-  driver: json-file
-  options:
-    max-size: "512m"
-    max-file: "2"
-
-# Usage:
-#
-# mkdir rpc && cd rpc
-#
-# git init
-# git remote add origin https://github.com/StakeSquid/ethereum-rpc-docker.git
-# git fetch origin vibe
-# git checkout origin/vibe
-#
-# docker run --rm alpine sh -c "printf '0x'; head -c32 /dev/urandom | xxd -p -c 64" > .jwtsecret
-#
-# env
-# ...
-# IP=$(curl ipinfo.io/ip)
-# DOMAIN=${IP}.traefik.me
-# COMPOSE_FILE=base.yml:rpc.yml:op/reth/ink-mainnet-op-reth-archive-trace.yml
-#
-# docker compose up -d
-#
-# curl -X POST https://${IP}.traefik.me/ink-mainnet-archive \
-#   -H "Content-Type: application/json" \
-#   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
-
-services:
-  ink-mainnet-archive:
-    image: ${INK_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${INK_MAINNET_RETH_VERSION:-v2.3.3}
-    sysctls:
-      # TCP Performance
-      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
-      net.ipv4.tcp_no_metrics_save: 1             # Disable metrics cache
-      net.ipv4.tcp_rmem: 4096 87380 16777216      # Increase TCP read buffers
-      net.ipv4.tcp_wmem: 4096 87380 16777216      # Increase TCP write buffers
-      net.core.somaxconn: 32768                   # Higher connection queue
-      # Memory/Connection Management
-      # net.core.netdev_max_backlog: 50000          # Increase network buffer
-      net.ipv4.tcp_max_syn_backlog: 30000         # More SYN requests
-      net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
-    ulimits:
-      nofile: 1048576    # Max open files (for RPC/WS connections)
-      memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
-    user: root
-    expose:
-      - 8545
-      - 9001
-      - 8551
-    entrypoint: [op-reth, node]
-    command:
-      - --chain=/config/genesis.json
-      - --config=/config/reth/reth.toml
-      - --datadir=/root/.local/share/reth
-      - --disable-discovery
-      - --engine.cross-block-cache-size=${INK_MAINNET_RETH_STATE_CACHE:-4096}
-      - --max-inbound-peers=50
-      - --max-outbound-peers=50
-      - --metrics=0.0.0.0:9001
-      - --rollup.sequencer-http=https://rpc-gel.inkonchain.com
-      - --rpc-cache.max-blocks=10000
-      - --rpc-cache.max-concurrent-db-requests=2048
-      - --rpc.gascap=600000000
-      - --rpc.max-blocks-per-filter=0
-      - --rpc.max-connections=50000
-      - --rpc.max-logs-per-response=0
-      - --rpc.max-trace-filter-blocks=10000
-      - --http
-      - --http.addr=0.0.0.0
-      - --http.api=admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,mev
-      - --http.corsdomain=*
-      - --http.port=8545
-      - --ws
-      - --ws.addr=0.0.0.0
-      - --ws.api=admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,mev
-      - --ws.origins=*
-      - --ws.port=8545
-      - --authrpc.addr=0.0.0.0
-      - --authrpc.jwtsecret=/jwtsecret
-    restart: unless-stopped
-    stop_grace_period: 5m
-    networks:
-      - chains
-    volumes:
-      - ${INK_MAINNET_OP_RETH_ARCHIVE_TRACE_DATA:-ink-mainnet-op-reth-archive-trace}:/root/.local/share/reth
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-      - /slowdisk:/slowdisk
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=9001
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/ink-mainnet-archive
-      - traefik.http.services.ink-mainnet-op-reth-archive-trace.loadbalancer.server.port=8545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-mainnet-archive`) || Path(`/ink-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-reth-archive-trace.rule=Path(`/ink-mainnet-archive`) || Path(`/ink-mainnet-archive/`)}
-      - traefik.http.routers.ink-mainnet-op-reth-archive-trace.middlewares=ink-mainnet-op-reth-archive-trace-stripprefix, ipallowlist
-    shm_size: 2gb
-
-  ink-mainnet-archive-node:
-    image: ${INK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${INK_MAINNET_NODE_VERSION:-v1.19.2}
-    ports:
-      - 16634:16634
-      - 16634:16634/udp
-    environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${INK_MAINNET_L1_EXECUTION_RPC:-${ETHEREUM_MAINNET_EXECUTION_RPC}}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-standard}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
-      - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://ink-mainnet-archive:8551
-      - OP_NODE_L2_ENGINE_RPC_TIMEOUT=120s
-      - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
-      - OP_NODE_LOG_LEVEL=info
-      - OP_NODE_METRICS_ADDR=0.0.0.0
-      - OP_NODE_METRICS_ENABLED=true
-      - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=ink-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
-      - OP_NODE_P2P_BOOTNODES=enode://92534205dd72a8787df902c89a775d9a45882739a973a7030d4d338c9b65387cfb77629907f9b6afb4e2bd98d9e6d2ccfde02d8a968b4fbccb68f0f4db5f4d83@34.13.199.202:30305?discport=30305,enode://26b0306725a78a8d193c2074bfd9e71233dbd3b75ab74be0ab555f72865fd88a285774526243f36653844eb95d62108c35f8c2723656b2c9568716ee2463f8d7@34.7.48.80:30305?discport=30305,enode://0c7bbb6bca9ce80952d8d8f8ba966e6b9e80faf75a165f320a53722f32b51c4b1da16ba59ab14f5194e51095a2755d8d3086a0220e34d88729cc8f4cc5499116@35.204.27.165:30305?discport=30305,enode://869d07b5932f17e8490990f75a3f94195e9504ddb6b85f7189e5a9c0a8fff8b00aecf6f3ac450ecba6cdabdb5858788a94bde2b613e0f2d82e9b395355f76d1a@34.65.67.101:30305?discport=30305,enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:30305?discport=30305,enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305?discport=30305
-      - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=16634
-      - OP_NODE_P2P_LISTEN_UDP_PORT=16634
-      - OP_NODE_P2P_STATIC=/ip4/34.6.118.237/tcp/9003/p2p/16Uiu2HAmKjbznKezrhsXMXVT3tSwviv8jojmfLeY9Zd53VvLmGsn,/ip4/34.178.43.233/tcp/9003/p2p/16Uiu2HAm27U7EgvM6C7N2Y3152ysiEd7K3YGXVzZ2ypsnu5ZE4cY,/ip4/34.6.162.247/tcp/9003/p2p/16Uiu2HAmDhreSpDkx8F78jiJPRV9Npm6VoNB2trgNBNWBreLsBmH
-      - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
-      - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
-    restart: unless-stopped
-    depends_on:
-      ink-mainnet-archive:
-        condition: service_started
-        restart: true
-    networks:
-      - chains
-    volumes:
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=7300
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ink-mainnet-archive/node
-      - traefik.http.services.ink-mainnet-op-reth-archive-trace-node.loadbalancer.server.port=9545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-mainnet-archive/node`)}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.rule=PathPrefix(`/ink-mainnet-archive/node`)}
-      - traefik.http.routers.ink-mainnet-op-reth-archive-trace-node.middlewares=ink-mainnet-op-reth-archive-trace-node-stripprefix, ipallowlist
-
-volumes:
-  ink-mainnet-op-reth-archive-trace:
-
-x-upstreams:
-  - id: $${ID}
-    labels:
-      provider: $${PROVIDER}
-    connection:
-      generic:
-        rpc:
-          url: $${RPC_URL}
-        ws:
-          frameSize: 20Mb
-          msgSize: 50Mb
-          url: $${WS_URL}
-    chain: ink
-    method-groups:
-      enabled:
-        - debug
-        - filter
-        - trace
-    methods:
-      disabled:
-        - name: eth_maxPriorityFeePerGas
-      enabled:
-        - name: txpool_content # TODO: should be disabled for rollup nodes
-...
--- a/op/reth/ink-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/ink-mainnet-op-reth-pruned-trace.yml
@@ -1,192 +0,0 @@
---
-x-logging-defaults: &logging-defaults
-  driver: json-file
-  options:
-    max-size: "512m"
-    max-file: "2"
-
-# Usage:
-#
-# mkdir rpc && cd rpc
-#
-# git init
-# git remote add origin https://github.com/StakeSquid/ethereum-rpc-docker.git
-# git fetch origin vibe
-# git checkout origin/vibe
-#
-# docker run --rm alpine sh -c "printf '0x'; head -c32 /dev/urandom | xxd -p -c 64" > .jwtsecret
-#
-# env
-# ...
-# IP=$(curl ipinfo.io/ip)
-# DOMAIN=${IP}.traefik.me
-# COMPOSE_FILE=base.yml:rpc.yml:op/reth/ink-mainnet-op-reth-pruned-trace.yml
-#
-# docker compose up -d
-#
-# curl -X POST https://${IP}.traefik.me/ink-mainnet \
-#   -H "Content-Type: application/json" \
-#   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
-
-services:
-  ink-mainnet:
-    image: ${INK_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${INK_MAINNET_RETH_VERSION:-v2.3.3}
-    sysctls:
-      # TCP Performance
-      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
-      net.ipv4.tcp_no_metrics_save: 1             # Disable metrics cache
-      net.ipv4.tcp_rmem: 4096 87380 16777216      # Increase TCP read buffers
-      net.ipv4.tcp_wmem: 4096 87380 16777216      # Increase TCP write buffers
-      net.core.somaxconn: 32768                   # Higher connection queue
-      # Memory/Connection Management
-      # net.core.netdev_max_backlog: 50000          # Increase network buffer
-      net.ipv4.tcp_max_syn_backlog: 30000         # More SYN requests
-      net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
-    ulimits:
-      nofile: 1048576    # Max open files (for RPC/WS connections)
-      memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
-    user: root
-    expose:
-      - 8545
-      - 9001
-      - 8551
-    entrypoint: [op-reth, node]
-    command:
-      - --chain=/config/genesis.json
-      - --config=/config/reth/reth.toml
-      - --datadir=/root/.local/share/reth
-      - --disable-discovery
-      - --engine.cross-block-cache-size=${INK_MAINNET_RETH_STATE_CACHE:-4096}
-      - --full
-      - --max-inbound-peers=50
-      - --max-outbound-peers=50
-      - --metrics=0.0.0.0:9001
-      - --rollup.sequencer-http=https://rpc-gel.inkonchain.com
-      - --rpc-cache.max-blocks=10000
-      - --rpc-cache.max-concurrent-db-requests=2048
-      - --rpc.gascap=600000000
-      - --rpc.max-blocks-per-filter=0
-      - --rpc.max-connections=50000
-      - --rpc.max-logs-per-response=0
-      - --rpc.max-trace-filter-blocks=10000
-      - --http
-      - --http.addr=0.0.0.0
-      - --http.api=admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,mev
-      - --http.corsdomain=*
-      - --http.port=8545
-      - --ws
-      - --ws.addr=0.0.0.0
-      - --ws.api=admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,mev
-      - --ws.origins=*
-      - --ws.port=8545
-      - --authrpc.addr=0.0.0.0
-      - --authrpc.jwtsecret=/jwtsecret
-    restart: unless-stopped
-    stop_grace_period: 5m
-    networks:
-      - chains
-    volumes:
-      - ${INK_MAINNET_OP_RETH_PRUNED_TRACE_DATA:-ink-mainnet-op-reth-pruned-trace}:/root/.local/share/reth
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-      - /slowdisk:/slowdisk
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=9001
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ink-mainnet
-      - traefik.http.services.ink-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-pruned-trace.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-mainnet`) || Path(`/ink-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-reth-pruned-trace.rule=Path(`/ink-mainnet`) || Path(`/ink-mainnet/`)}
-      - traefik.http.routers.ink-mainnet-op-reth-pruned-trace.middlewares=ink-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
-    shm_size: 2gb
-
-  ink-mainnet-node:
-    image: ${INK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${INK_MAINNET_NODE_VERSION:-v1.19.2}
-    ports:
-      - 19845:19845
-      - 19845:19845/udp
-    environment:
-      - OP_NODE_L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST}
-      - OP_NODE_L1_BEACON_ARCHIVER=${ETHEREUM_MAINNET_BEACON_ARCHIVER}
-      - OP_NODE_L1_ETH_RPC=${INK_MAINNET_L1_EXECUTION_RPC:-${ETHEREUM_MAINNET_EXECUTION_RPC}}
-      - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-standard}
-      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
-      - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://ink-mainnet:8551
-      - OP_NODE_L2_ENGINE_RPC_TIMEOUT=120s
-      - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
-      - OP_NODE_LOG_LEVEL=info
-      - OP_NODE_METRICS_ADDR=0.0.0.0
-      - OP_NODE_METRICS_ENABLED=true
-      - OP_NODE_METRICS_PORT=7300
-      - OP_NODE_NETWORK=ink-mainnet
-      - OP_NODE_P2P_ADVERTISE_IP=${IP}
-      - OP_NODE_P2P_BOOTNODES=enode://92534205dd72a8787df902c89a775d9a45882739a973a7030d4d338c9b65387cfb77629907f9b6afb4e2bd98d9e6d2ccfde02d8a968b4fbccb68f0f4db5f4d83@34.13.199.202:30305?discport=30305,enode://26b0306725a78a8d193c2074bfd9e71233dbd3b75ab74be0ab555f72865fd88a285774526243f36653844eb95d62108c35f8c2723656b2c9568716ee2463f8d7@34.7.48.80:30305?discport=30305,enode://0c7bbb6bca9ce80952d8d8f8ba966e6b9e80faf75a165f320a53722f32b51c4b1da16ba59ab14f5194e51095a2755d8d3086a0220e34d88729cc8f4cc5499116@35.204.27.165:30305?discport=30305,enode://869d07b5932f17e8490990f75a3f94195e9504ddb6b85f7189e5a9c0a8fff8b00aecf6f3ac450ecba6cdabdb5858788a94bde2b613e0f2d82e9b395355f76d1a@34.65.67.101:30305?discport=30305,enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:30305?discport=30305,enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305?discport=30305
-      - OP_NODE_P2P_LISTEN_IP=0.0.0.0
-      - OP_NODE_P2P_LISTEN_TCP_PORT=19845
-      - OP_NODE_P2P_LISTEN_UDP_PORT=19845
-      - OP_NODE_P2P_STATIC=/ip4/34.6.118.237/tcp/9003/p2p/16Uiu2HAmKjbznKezrhsXMXVT3tSwviv8jojmfLeY9Zd53VvLmGsn,/ip4/34.178.43.233/tcp/9003/p2p/16Uiu2HAm27U7EgvM6C7N2Y3152ysiEd7K3YGXVzZ2ypsnu5ZE4cY,/ip4/34.6.162.247/tcp/9003/p2p/16Uiu2HAmDhreSpDkx8F78jiJPRV9Npm6VoNB2trgNBNWBreLsBmH
-      - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
-      - 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_VERIFIER_L1_CONFS=0
-    entrypoint: [op-node]
-    restart: unless-stopped
-    depends_on:
-      ink-mainnet:
-        condition: service_started
-        restart: true
-    networks:
-      - chains
-    volumes:
-      - ./op/ink/mainnet:/config
-      - .jwtsecret:/jwtsecret:ro
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=true
-      - prometheus-scrape.port=7300
-      - prometheus-scrape.path=/metrics
-      - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ink-mainnet/node
-      - traefik.http.services.ink-mainnet-op-reth-pruned-trace-node.loadbalancer.server.port=9545
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-pruned-trace-node.entrypoints=websecure}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ink-mainnet/node`)}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/ink-mainnet/node`)}
-      - traefik.http.routers.ink-mainnet-op-reth-pruned-trace-node.middlewares=ink-mainnet-op-reth-pruned-trace-node-stripprefix, ipallowlist
-
-volumes:
-  ink-mainnet-op-reth-pruned-trace:
-
-x-upstreams:
-  - id: $${ID}
-    labels:
-      provider: $${PROVIDER}
-    connection:
-      generic:
-        rpc:
-          url: $${RPC_URL}
-        ws:
-          frameSize: 20Mb
-          msgSize: 50Mb
-          url: $${WS_URL}
-    chain: ink
-    method-groups:
-      enabled:
-        - debug
-        - filter
-        - trace
-    methods:
-      disabled:
-        - name: eth_maxPriorityFeePerGas
-      enabled:
-        - name: txpool_content # TODO: should be disabled for rollup nodes
-...
--- a/op/reth/soneium-mainnet-op-reth-archive-trace--kona.yml
+++ b/op/reth/soneium-mainnet-op-reth-archive-trace--kona.yml
@@ -24,12 +24,12 @@ x-logging-defaults: &logging-defaults
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/soneium-mainnet-op-reth \
+# curl -X POST https://${IP}.traefik.me/soneium-mainnet-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'

 services:
-  soneium-mainnet-op-reth:
+  soneium-mainnet-archive:
    image: ${SONEIUM_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${SONEIUM_MAINNET_RETH_VERSION:-v2.3.3}
    sysctls:
      # TCP Performance
@@ -101,16 +101,16 @@ services:
      - prometheus-scrape.port=9001
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth
+      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet-archive
      - traefik.http.services.soneium-mainnet-op-reth-archive-trace.loadbalancer.server.port=8545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet-op-reth`) || Path(`/soneium-mainnet-op-reth/`))}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Path(`/soneium-mainnet-op-reth`) || Path(`/soneium-mainnet-op-reth/`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet-archive`) || Path(`/soneium-mainnet-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Path(`/soneium-mainnet-archive`) || Path(`/soneium-mainnet-archive/`)}
      - traefik.http.routers.soneium-mainnet-op-reth-archive-trace.middlewares=soneium-mainnet-op-reth-archive-trace-stripprefix, ipallowlist
    shm_size: 2gb

-  soneium-mainnet-op-reth-node:
+  soneium-mainnet-archive-node:
    image: ${SONEIUM_KONA_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/kona-node}:${SONEIUM_MAINNET_KONA_VERSION:-v1.6.2}
    ports:
      - 19133:19133
@@ -122,7 +122,7 @@ services:
      - KONA_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
      - KONA_NODE_L2_CHAIN_ID=1868
      - KONA_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - KONA_NODE_L2_ENGINE_RPC=http://soneium-mainnet-op-reth:8551
+      - KONA_NODE_L2_ENGINE_RPC=http://soneium-mainnet-archive:8551
      - KONA_NODE_L2_ENGINE_TIMEOUT=120000
      - KONA_NODE_L2_TRUST_RPC=true
      - KONA_NODE_METRICS_PORT=7300
@@ -137,7 +137,7 @@ services:
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
-      soneium-mainnet-op-reth:
+      soneium-mainnet-archive:
        condition: service_started
        restart: true
    networks:
@@ -150,12 +150,12 @@ services:
      - prometheus-scrape.port=7300
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth/node
+      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet-archive/node
      - traefik.http.services.soneium-mainnet-op-reth-archive-trace-node.loadbalancer.server.port=9545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet-op-reth/node`)}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=PathPrefix(`/soneium-mainnet-op-reth/node`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet-archive/node`)}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=PathPrefix(`/soneium-mainnet-archive/node`)}
      - traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.middlewares=soneium-mainnet-op-reth-archive-trace-node-stripprefix, ipallowlist

 volumes:
--- a/op/reth/soneium-mainnet-op-reth-archive-trace.yml
+++ b/op/reth/soneium-mainnet-op-reth-archive-trace.yml
@@ -24,12 +24,12 @@ x-logging-defaults: &logging-defaults
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/soneium-mainnet-op-reth \
+# curl -X POST https://${IP}.traefik.me/soneium-mainnet-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'

 services:
-  soneium-mainnet-op-reth:
+  soneium-mainnet-archive:
    image: ${SONEIUM_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${SONEIUM_MAINNET_RETH_VERSION:-v2.3.3}
    sysctls:
      # TCP Performance
@@ -101,16 +101,16 @@ services:
      - prometheus-scrape.port=9001
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth
+      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet-archive
      - traefik.http.services.soneium-mainnet-op-reth-archive-trace.loadbalancer.server.port=8545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet-op-reth`) || Path(`/soneium-mainnet-op-reth/`))}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Path(`/soneium-mainnet-op-reth`) || Path(`/soneium-mainnet-op-reth/`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet-archive`) || Path(`/soneium-mainnet-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace.rule=Path(`/soneium-mainnet-archive`) || Path(`/soneium-mainnet-archive/`)}
      - traefik.http.routers.soneium-mainnet-op-reth-archive-trace.middlewares=soneium-mainnet-op-reth-archive-trace-stripprefix, ipallowlist
    shm_size: 2gb

-  soneium-mainnet-op-reth-node:
+  soneium-mainnet-archive-node:
    image: ${SONEIUM_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${SONEIUM_MAINNET_NODE_VERSION:-v1.19.2}
    ports:
      - 19133:19133
@@ -123,7 +123,7 @@ services:
      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
      - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://soneium-mainnet-op-reth:8551
+      - OP_NODE_L2_ENGINE_RPC=http://soneium-mainnet-archive:8551
      - OP_NODE_L2_ENGINE_RPC_TIMEOUT=120s
      - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
      - OP_NODE_LOG_LEVEL=info
@@ -144,7 +144,7 @@ services:
    entrypoint: [op-node]
    restart: unless-stopped
    depends_on:
-      soneium-mainnet-op-reth:
+      soneium-mainnet-archive:
        condition: service_started
        restart: true
    networks:
@@ -157,12 +157,12 @@ services:
      - prometheus-scrape.port=7300
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth/node
+      - traefik.http.middlewares.soneium-mainnet-op-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet-archive/node
      - traefik.http.services.soneium-mainnet-op-reth-archive-trace-node.loadbalancer.server.port=9545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet-op-reth/node`)}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=PathPrefix(`/soneium-mainnet-op-reth/node`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet-archive/node`)}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.rule=PathPrefix(`/soneium-mainnet-archive/node`)}
      - traefik.http.routers.soneium-mainnet-op-reth-archive-trace-node.middlewares=soneium-mainnet-op-reth-archive-trace-node-stripprefix, ipallowlist

 volumes:
--- a/op/reth/soneium-mainnet-op-reth-pruned-trace--kona.yml
+++ b/op/reth/soneium-mainnet-op-reth-pruned-trace--kona.yml
@@ -24,12 +24,12 @@ x-logging-defaults: &logging-defaults
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/soneium-mainnet-op-reth-pruned \
+# curl -X POST https://${IP}.traefik.me/soneium-mainnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'

 services:
-  soneium-mainnet-op-reth-pruned:
+  soneium-mainnet:
    image: ${SONEIUM_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${SONEIUM_MAINNET_RETH_VERSION:-v2.3.3}
    sysctls:
      # TCP Performance
@@ -102,16 +102,16 @@ services:
      - prometheus-scrape.port=9001
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth-pruned
+      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet
      - traefik.http.services.soneium-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet-op-reth-pruned`) || Path(`/soneium-mainnet-op-reth-pruned/`))}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Path(`/soneium-mainnet-op-reth-pruned`) || Path(`/soneium-mainnet-op-reth-pruned/`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet`) || Path(`/soneium-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Path(`/soneium-mainnet`) || Path(`/soneium-mainnet/`)}
      - traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.middlewares=soneium-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
    shm_size: 2gb

-  soneium-mainnet-op-reth-pruned-node:
+  soneium-mainnet-node:
    image: ${SONEIUM_KONA_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/kona-node}:${SONEIUM_MAINNET_KONA_VERSION:-v1.6.2}
    ports:
      - 16080:16080
@@ -123,7 +123,7 @@ services:
      - KONA_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
      - KONA_NODE_L2_CHAIN_ID=1868
      - KONA_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - KONA_NODE_L2_ENGINE_RPC=http://soneium-mainnet-op-reth-pruned:8551
+      - KONA_NODE_L2_ENGINE_RPC=http://soneium-mainnet:8551
      - KONA_NODE_L2_ENGINE_TIMEOUT=120000
      - KONA_NODE_L2_TRUST_RPC=true
      - KONA_NODE_METRICS_PORT=7300
@@ -138,7 +138,7 @@ services:
    entrypoint: [kona-node, node]
    restart: unless-stopped
    depends_on:
-      soneium-mainnet-op-reth-pruned:
+      soneium-mainnet:
        condition: service_started
        restart: true
    networks:
@@ -151,12 +151,12 @@ services:
      - prometheus-scrape.port=7300
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth-pruned/node
+      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet/node
      - traefik.http.services.soneium-mainnet-op-reth-pruned-trace-node.loadbalancer.server.port=9545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet-op-reth-pruned/node`)}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/soneium-mainnet-op-reth-pruned/node`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet/node`)}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/soneium-mainnet/node`)}
      - traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.middlewares=soneium-mainnet-op-reth-pruned-trace-node-stripprefix, ipallowlist

 volumes:
--- a/op/reth/soneium-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/soneium-mainnet-op-reth-pruned-trace.yml
@@ -24,12 +24,12 @@ x-logging-defaults: &logging-defaults
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/soneium-mainnet-op-reth-pruned \
+# curl -X POST https://${IP}.traefik.me/soneium-mainnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'

 services:
-  soneium-mainnet-op-reth-pruned:
+  soneium-mainnet:
    image: ${SONEIUM_RETH_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-reth}:${SONEIUM_MAINNET_RETH_VERSION:-v2.3.3}
    sysctls:
      # TCP Performance
@@ -102,16 +102,16 @@ services:
      - prometheus-scrape.port=9001
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth-pruned
+      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/soneium-mainnet
      - traefik.http.services.soneium-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet-op-reth-pruned`) || Path(`/soneium-mainnet-op-reth-pruned/`))}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Path(`/soneium-mainnet-op-reth-pruned`) || Path(`/soneium-mainnet-op-reth-pruned/`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-mainnet`) || Path(`/soneium-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.rule=Path(`/soneium-mainnet`) || Path(`/soneium-mainnet/`)}
      - traefik.http.routers.soneium-mainnet-op-reth-pruned-trace.middlewares=soneium-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
    shm_size: 2gb

-  soneium-mainnet-op-reth-pruned-node:
+  soneium-mainnet-node:
    image: ${SONEIUM_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${SONEIUM_MAINNET_NODE_VERSION:-v1.19.2}
    ports:
      - 16080:16080
@@ -124,7 +124,7 @@ services:
      - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
      - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
      - OP_NODE_L2_ENGINE_KIND=reth
-      - OP_NODE_L2_ENGINE_RPC=http://soneium-mainnet-op-reth-pruned:8551
+      - OP_NODE_L2_ENGINE_RPC=http://soneium-mainnet:8551
      - OP_NODE_L2_ENGINE_RPC_TIMEOUT=120s
      - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
      - OP_NODE_LOG_LEVEL=info
@@ -145,7 +145,7 @@ services:
    entrypoint: [op-node]
    restart: unless-stopped
    depends_on:
-      soneium-mainnet-op-reth-pruned:
+      soneium-mainnet:
        condition: service_started
        restart: true
    networks:
@@ -158,12 +158,12 @@ services:
      - prometheus-scrape.port=7300
      - prometheus-scrape.path=/metrics
      - traefik.enable=true
-      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet-op-reth-pruned/node
+      - traefik.http.middlewares.soneium-mainnet-op-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/soneium-mainnet/node
      - traefik.http.services.soneium-mainnet-op-reth-pruned-trace-node.loadbalancer.server.port=9545
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.entrypoints=websecure}
      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet-op-reth-pruned/node`)}
-      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/soneium-mainnet-op-reth-pruned/node`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/soneium-mainnet/node`)}
+      - ${NO_SSL:+traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.rule=PathPrefix(`/soneium-mainnet/node`)}
      - traefik.http.routers.soneium-mainnet-op-reth-pruned-trace-node.middlewares=soneium-mainnet-op-reth-pruned-trace-node-stripprefix, ipallowlist

 volumes:
--- a/peer-capture.sh
+++ b/peer-capture.sh
@@ -78,16 +78,21 @@ CLIENT_NAME="$(echo "$INFO" | jq -r '.result.name // empty' 2>/dev/null || true)
 PEERS_JSON="$(rpc admin_peers)"
 PEER_COUNT="$(echo "$PEERS_JSON" | jq -r '.result | length' 2>/dev/null || echo 0)"

-# Detect client type (connect-peers.sh logic)
+# Detect client type (connect-peers.sh logic).
+# op-geth often still reports as "Geth/…" — prefer compose path for op-geth.
 NAME_LC="$(echo "$CLIENT_NAME" | tr '[:upper:]' '[:lower:]')"
 CLIENT_TYPE="unknown"
 case "$NAME_LC" in
+    *op-geth*) CLIENT_TYPE="op-geth" ;;
    *geth*) CLIENT_TYPE="geth" ;;
    *reth*) CLIENT_TYPE="reth" ;;
    *erigon*) CLIENT_TYPE="erigon" ;;
    *nethermind*) CLIENT_TYPE="nethermind" ;;
    *besu*) CLIENT_TYPE="besu" ;;
 esac
+case "$COMPOSE_PATH" in
+    *op-geth*) CLIENT_TYPE="op-geth" ;;
+esac

 TS="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
 echo "$PEERS_JSON" | jq -c --arg path "$COMPOSE_PATH" --arg ts "$TS" \
--- a/peer-reinject.sh
+++ b/peer-reinject.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 # peer-reinject.sh — generic .after-start hook: re-seed peers from peer-capture state.
-# Uses admin_addStaticPeer for geth, admin_addPeer otherwise (connect-peers.sh).
-# In-network vantage (rpc_chains). Idempotent; best-effort (never fails the restart).
+# Uses admin_addStaticPeer for vanilla geth, admin_addPeer for op-geth and others
+# (connect-peers.sh). In-network vantage (rpc_chains). Idempotent; best-effort
+# (never fails the restart).
 #
 # Seed order (one path for us and customers):
 #   1. Own persisted peerset (peer-state/<compose>.json from peer-capture)
@@ -68,6 +69,12 @@ if [ "${#ENODES[@]}" -eq 0 ]; then
    exit 0
 fi

+# op-geth lacks admin_addStaticPeer; compose path wins over stale capture state
+# that classified the node as plain "geth" (admin_nodeInfo often still says Geth).
+case "$COMPOSE_PATH" in
+    *op-geth*) CLIENT_TYPE="op-geth" ;;
+esac
+
 BASE="$(basename "$COMPOSE_PATH" | sed 's/--.*//')"
 EL=""
 # wait briefly for container after recreate
@@ -120,6 +127,7 @@ done
 add_peer() {
    local enode="$1"
    local method
+    # Only vanilla geth supports admin_addStaticPeer; op-geth must use admin_addPeer
    if [ "$CLIENT_TYPE" = "geth" ]; then
        method="admin_addStaticPeer"
    else
@@ -132,7 +140,8 @@ add_peer() {
    resp="$(docker exec peer-hook-probe curl -s --max-time 8 -X POST \
        -H 'Content-Type: application/json' --data "$payload" \
        "http://${IP}:8545" 2>/dev/null || true)"
-    if echo "$resp" | grep -qi 'method not found'; then
+    # go-ethereum-style: "the method X does not exist/is not available" (not "method not found")
+    if echo "$resp" | grep -qiE 'method not found|does not exist|not available|-32601'; then
        if [ "$method" = "admin_addStaticPeer" ]; then
            method="admin_addPeer"
        else
--- a/polygon/bor/polygon-amoy-bor-archive-pebble-path.yml
+++ b/polygon/bor/polygon-amoy-bor-archive-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  polygon-amoy-archive:
-    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.8.3}
+    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.9.0}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -54,6 +54,8 @@ services:
    entrypoint: [bor, server]
    command:
      - --bor.heimdall=https://heimdall-api-amoy.polygon.technology
+      - --cache.gomemlimit=${POLYGON_AMOY_BOR_ARCHIVE_PEBBLE_PATH_CACHE_GOMEMLIMIT:-}
+      - --cache=${POLYGON_AMOY_BOR_ARCHIVE_PEBBLE_PATH_CACHE:-1024}
      - --chain=amoy
      - --datadir=/root/.bor/
      - --db.engine=pebble
--- a/polygon/bor/polygon-amoy-bor-pruned-pebble-path.yml
+++ b/polygon/bor/polygon-amoy-bor-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults

 services:
  polygon-amoy:
-    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.8.3}
+    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.9.0}
    sysctls:
      # TCP Performance
      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -54,6 +54,8 @@ services:
    entrypoint: [bor, server]
    command:
      - --bor.heimdall=https://heimdall-api-amoy.polygon.technology
+      - --cache.gomemlimit=${POLYGON_AMOY_BOR_PRUNED_PEBBLE_PATH_CACHE_GOMEMLIMIT:-}
+      - --cache=${POLYGON_AMOY_BOR_PRUNED_PEBBLE_PATH_CACHE:-1024}
      - --chain=amoy
      - --datadir=/root/.bor/
      - --db.engine=pebble
--- a/polygon/bor/polygon-mainnet-bor-archive-pebble-path.yml
+++ b/polygon/bor/polygon-mainnet-bor-archive-pebble-path.yml
@@ -55,6 +55,8 @@ services:
    command:
      - --bootnodes=enode://07bc4cf87ff8f4e7dc51280991809940f26e846c944609ae4726309be73742a830040cd783989f6941e1b41c02405834bc6365059403a59ca9255ac695156235@34.89.75.187:30303,enode://2c3be2e637a68dc694498a44b6e0d57b5c762925ea97f941079a91f8a080b032fe2eb9e6c3230076e9fb046f626b5dcd3fb045dc9c194689a359aa7167ae0f6c@34.142.43.249:30303,enode://a0bc4dd2b59370d5a375a7ef9ac06cf531571005ae8b2ead2e9aaeb8205168919b169451fb0ef7061e0d80592e6ed0720f559bd1be1c4efb6e6c4381f1bdb986@35.246.99.203:30303,enode://f2b0d50e0b843d38ddcab59614f93065e2c82130100032f86ae193eb874505de12fcaf12502dfd88e339b817c0b374fa4b4f7c4d5a4d1aa04f29c503d95e0228@35.197.233.240:30303,enode://8a3f21c293c913a1148116a295aa69fdf41b9c5b0b0628d49be751aa8c025ae2ec1973d6d84cea8e2aba5541b5d76219dfaae41a124d42d0f56d4e1af50b74f8@35.246.95.65:30303,enode://f5cfe35f47ed928d5403aa28ee616fd64ed7daa527b5ae6a7bc412ca25eaad9b6bf2f776144fd9f8e7e9c80b5360a9c03b67f1d47ea88767def7d391cc7e0cd1@34.105.180.11:30303,enode://fc7624241515f9d5e599a396362c29de92b13a048ad361c90dd72286aa4cca835ba65e140a46ace70cc4dcb18472a476963750b3b69d958c5f546d48675880a8@34.147.169.102:30303,enode://7400e4bc70c56de26d5d240474a1b78af0bf8f0db567edfa851c9724ed697ca7692a92483369e9633d4342a036d10223958007160765d0317a1073f86f2a80c8@34.89.55.74:30303,enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303,enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303,enode://0e50fdcc2106b0c4e4d9ffbd7798ceda9432e680723dc7b7b4627e384078850c1c4a3e67f17ef2c484201ae6ee7c491cbf5e189b8ffee3948252e9bef59fc54e@35.234.148.172:30303,enode://72c3176693f7100dfedc8a37909120fea16971260a5d95ceff49affbc0e23968c35655fee75734736f0b038147645e8ceeee59af68859b3f5bf91fe249be6259@35.246.95.65:30303,enode://f0e44769385aea31de930d3f4796e3e348962221063bb9f681106d832d13f70e5543d652d30e819812104f1b1ffdd7585977b46bf802ed5a52cf731de8c48dbd@34.105.180.11:30303,enode://198896e373735ba38a0313d073137a413787ece791fbc0d0be0f9f6b9d9dd00ee0841f46519904d666d7f1cdfce5532b093e3a1574b34eb64224f57b9b7fce7b@34.89.55.74:30303
      - --bor.heimdall=https://polygon-heimdall-rest.publicnode.com
+      - --cache.gomemlimit=${POLYGON_MAINNET_BOR_ARCHIVE_PEBBLE_PATH_CACHE_GOMEMLIMIT:-}
+      - --cache=${POLYGON_MAINNET_BOR_ARCHIVE_PEBBLE_PATH_CACHE:-1024}
      - --chain=mainnet
      - --datadir=/root/.bor/
      - --db.engine=pebble
--- a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
+++ b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
@@ -56,6 +56,8 @@ services:
    command:
      - --bootnodes=enode://07bc4cf87ff8f4e7dc51280991809940f26e846c944609ae4726309be73742a830040cd783989f6941e1b41c02405834bc6365059403a59ca9255ac695156235@34.89.75.187:30303,enode://2c3be2e637a68dc694498a44b6e0d57b5c762925ea97f941079a91f8a080b032fe2eb9e6c3230076e9fb046f626b5dcd3fb045dc9c194689a359aa7167ae0f6c@34.142.43.249:30303,enode://a0bc4dd2b59370d5a375a7ef9ac06cf531571005ae8b2ead2e9aaeb8205168919b169451fb0ef7061e0d80592e6ed0720f559bd1be1c4efb6e6c4381f1bdb986@35.246.99.203:30303,enode://f2b0d50e0b843d38ddcab59614f93065e2c82130100032f86ae193eb874505de12fcaf12502dfd88e339b817c0b374fa4b4f7c4d5a4d1aa04f29c503d95e0228@35.197.233.240:30303,enode://8a3f21c293c913a1148116a295aa69fdf41b9c5b0b0628d49be751aa8c025ae2ec1973d6d84cea8e2aba5541b5d76219dfaae41a124d42d0f56d4e1af50b74f8@35.246.95.65:30303,enode://f5cfe35f47ed928d5403aa28ee616fd64ed7daa527b5ae6a7bc412ca25eaad9b6bf2f776144fd9f8e7e9c80b5360a9c03b67f1d47ea88767def7d391cc7e0cd1@34.105.180.11:30303,enode://fc7624241515f9d5e599a396362c29de92b13a048ad361c90dd72286aa4cca835ba65e140a46ace70cc4dcb18472a476963750b3b69d958c5f546d48675880a8@34.147.169.102:30303,enode://7400e4bc70c56de26d5d240474a1b78af0bf8f0db567edfa851c9724ed697ca7692a92483369e9633d4342a036d10223958007160765d0317a1073f86f2a80c8@34.89.55.74:30303,enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303,enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303,enode://0e50fdcc2106b0c4e4d9ffbd7798ceda9432e680723dc7b7b4627e384078850c1c4a3e67f17ef2c484201ae6ee7c491cbf5e189b8ffee3948252e9bef59fc54e@35.234.148.172:30303,enode://72c3176693f7100dfedc8a37909120fea16971260a5d95ceff49affbc0e23968c35655fee75734736f0b038147645e8ceeee59af68859b3f5bf91fe249be6259@35.246.95.65:30303,enode://f0e44769385aea31de930d3f4796e3e348962221063bb9f681106d832d13f70e5543d652d30e819812104f1b1ffdd7585977b46bf802ed5a52cf731de8c48dbd@34.105.180.11:30303,enode://198896e373735ba38a0313d073137a413787ece791fbc0d0be0f9f6b9d9dd00ee0841f46519904d666d7f1cdfce5532b093e3a1574b34eb64224f57b9b7fce7b@34.89.55.74:30303
      - --bor.heimdall=https://polygon-heimdall-rest.publicnode.com
+      - --cache.gomemlimit=${POLYGON_MAINNET_BOR_PRUNED_PEBBLE_PATH_CACHE_GOMEMLIMIT:-}
+      - --cache=${POLYGON_MAINNET_BOR_PRUNED_PEBBLE_PATH_CACHE:-1024}
      - --chain=mainnet
      - --datadir=/root/.bor/
      - --db.engine=pebble
--- a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path.yml
+++ b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path.yml
@@ -55,6 +55,8 @@ services:
    command:
      - --bootnodes=enode://07bc4cf87ff8f4e7dc51280991809940f26e846c944609ae4726309be73742a830040cd783989f6941e1b41c02405834bc6365059403a59ca9255ac695156235@34.89.75.187:30303,enode://2c3be2e637a68dc694498a44b6e0d57b5c762925ea97f941079a91f8a080b032fe2eb9e6c3230076e9fb046f626b5dcd3fb045dc9c194689a359aa7167ae0f6c@34.142.43.249:30303,enode://a0bc4dd2b59370d5a375a7ef9ac06cf531571005ae8b2ead2e9aaeb8205168919b169451fb0ef7061e0d80592e6ed0720f559bd1be1c4efb6e6c4381f1bdb986@35.246.99.203:30303,enode://f2b0d50e0b843d38ddcab59614f93065e2c82130100032f86ae193eb874505de12fcaf12502dfd88e339b817c0b374fa4b4f7c4d5a4d1aa04f29c503d95e0228@35.197.233.240:30303,enode://8a3f21c293c913a1148116a295aa69fdf41b9c5b0b0628d49be751aa8c025ae2ec1973d6d84cea8e2aba5541b5d76219dfaae41a124d42d0f56d4e1af50b74f8@35.246.95.65:30303,enode://f5cfe35f47ed928d5403aa28ee616fd64ed7daa527b5ae6a7bc412ca25eaad9b6bf2f776144fd9f8e7e9c80b5360a9c03b67f1d47ea88767def7d391cc7e0cd1@34.105.180.11:30303,enode://fc7624241515f9d5e599a396362c29de92b13a048ad361c90dd72286aa4cca835ba65e140a46ace70cc4dcb18472a476963750b3b69d958c5f546d48675880a8@34.147.169.102:30303,enode://7400e4bc70c56de26d5d240474a1b78af0bf8f0db567edfa851c9724ed697ca7692a92483369e9633d4342a036d10223958007160765d0317a1073f86f2a80c8@34.89.55.74:30303,enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303,enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303,enode://0e50fdcc2106b0c4e4d9ffbd7798ceda9432e680723dc7b7b4627e384078850c1c4a3e67f17ef2c484201ae6ee7c491cbf5e189b8ffee3948252e9bef59fc54e@35.234.148.172:30303,enode://72c3176693f7100dfedc8a37909120fea16971260a5d95ceff49affbc0e23968c35655fee75734736f0b038147645e8ceeee59af68859b3f5bf91fe249be6259@35.246.95.65:30303,enode://f0e44769385aea31de930d3f4796e3e348962221063bb9f681106d832d13f70e5543d652d30e819812104f1b1ffdd7585977b46bf802ed5a52cf731de8c48dbd@34.105.180.11:30303,enode://198896e373735ba38a0313d073137a413787ece791fbc0d0be0f9f6b9d9dd00ee0841f46519904d666d7f1cdfce5532b093e3a1574b34eb64224f57b9b7fce7b@34.89.55.74:30303
      - --bor.heimdall=https://polygon-heimdall-rest.publicnode.com
+      - --cache.gomemlimit=${POLYGON_MAINNET_BOR_PRUNED_PEBBLE_PATH_CACHE_GOMEMLIMIT:-}
+      - --cache=${POLYGON_MAINNET_BOR_PRUNED_PEBBLE_PATH_CACHE:-1024}
      - --chain=mainnet
      - --datadir=/root/.bor/
      - --db.engine=pebble
--- a/reference-rpc-endpoint.json
+++ b/reference-rpc-endpoint.json
@@ -2989,7 +2989,7 @@
    "lagging_lag": 10,
    "syncing_lag": 20,
    "urls": [
-      "https://mainnet.storyrpc.io",
+      "https://mainnet.datarpc.io",
      "https://story.drpc.org"
    ]
  },
@@ -3011,7 +3011,7 @@
    "lagging_lag": 10,
    "syncing_lag": 20,
    "urls": [
-      "https://aeneid.storyrpc.io",
+      "https://aeneid.datarpc.io",
      "https://story-aeneid-testnet.drpc.org"
    ]
  },
Author	SHA1	Message	Date
Claude Agent	a7135129eb	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
Claude Agent	4806a8ad1b	deploy: regenerate compose from vibe-node main 47bb3d78e3c1	2026-07-30 08:05:17 +00:00
Claude Agent	7b05a14515	drpc: bump default dshackle image to 0.79.11-ss2 ss1 shipped without drpcorg public-submodule resources and crash-loops at boot (compatible-clients.yaml missing); ss2 is the boot-verified fix. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-30 07:51:24 +00:00
Claude Agent	bab834dcde	drpc: default dshackle image to stakesquid fork 0.79.11-ss1 Fleet-wide default is now stakesquid/dshackle:0.79.11-ss1 (digest-pinned); DSHACKLE_IMAGE env escape hatch retained for rollback to upstream. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-30 07:29:36 +00:00
Claude Agent	76dfdfe2a2	drpc: allow per-host DSHACKLE_IMAGE override for canary fork rollout Default remains drpcorg/dshackle:0.79.10; canary hosts can set DSHACKLE_IMAGE via host_vars env_overrides without editing compose. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-30 07:25:54 +00:00
Claude Agent	03b9aff1e9	deploy: regenerate compose from vibe-node main ed19fc13dd0f	2026-07-29 12:27:48 +00:00
rob	fa7ae58f6c	hashkey mainnet genesis: add pragueTime = isthmusTime (fork-fix) HSK's published mainnet genesis sets isthmusTime but omits pragueTime; op-geth's OP-Stack validation rejects it ('PragueTime (<nil>) must equal IsthmusTime'), so geth init aborts and the EL runs on a stale chainconfig. testnet genesis correctly sets pragueTime=isthmusTime. Adding it here makes init pass. (Runtime fork activation is handled by GETH_OVERRIDE_* in vibe-node geth.env; this fixes init + matches testnet.) Co-Authored-By: Claude <noreply@anthropic.com>	2026-07-29 12:24:54 +00:00
Claude Agent	7b87130e4f	deploy: regenerate compose from vibe-node main a319d697a820	2026-07-29 11:47:54 +00:00
Claude Agent	fbf6963ca7	deploy: regenerate compose from vibe-node main 2c49f032cd65	2026-07-29 02:47:11 +00:00
sebastian	de0e7614a6	Merge pull request 'ink-mainnet: delete 9 orphaned compose files, keep single reth variant' (#46 ) from issue-2053 into main Reviewed-on: #46	2026-07-29 02:41:48 +00:00
rob	d0529bb551	polygon/bor: regenerate with --cache and --cache.gomemlimit knobs From vibe-node c6d5fed (bor.yml). Both empty/1024-default, no runtime behavior change until a host sets an override.	2026-07-29 02:01:04 +00:00
Claude Agent	580ece7b9c	ink-mainnet: drop all compose variants except op-reth pruned-trace--kona Orphaned op-geth files (already removed from config.yml) plus sibling op-reth/op-erigon profiles still share Traefik service names/paths under COMPOSE_FILE. Keep only ink-mainnet-op-reth-pruned-trace--kona.yml as the single active /ink-mainnet route.	2026-07-28 11:49:27 +00:00