fix: resolve port collisions for polygon-amoy and zircuit-garfield

- polygon-amoy: reassigned from port 12188 (collision with hashkeychain-mainnet)
  to 12190 via salt+2 in generate_ports()
- zircuit-garfield/testnet: fix empty --networkid= (was {{ chain_id }},
  now {{ chainid }})

Co-Authored-By: Claude Agent <claude@stakesquid.eu>

op/geth/zircuit-garfield-op-geth-archive-leveldb-hash.yml

@@ -64,7 +64,7 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --networkid=
+      - --networkid=48898
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

op/geth/zircuit-garfield-op-geth-archive-pebble-hash.yml

@@ -64,7 +64,7 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --networkid=
+      - --networkid=48898
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

op/geth/zircuit-garfield-op-geth-pruned-pebble-hash.yml

@@ -64,7 +64,7 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --networkid=
+      - --networkid=48898
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

op/geth/zircuit-garfield-op-geth-pruned-pebble-path.yml

@@ -64,7 +64,7 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --networkid=
+      - --networkid=48898
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

op/geth/zircuit-testnet-op-geth-archive-leveldb-hash.yml

@@ -67,7 +67,7 @@ services:
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
       - --nat=extip:${IP}
-      - --networkid=
+      - --networkid=48899
       - --port=13095
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

op/geth/zircuit-testnet-op-geth-archive-pebble-hash.yml

@@ -67,7 +67,7 @@ services:
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
       - --nat=extip:${IP}
-      - --networkid=
+      - --networkid=48899
       - --port=11499
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

op/geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml

@@ -67,7 +67,7 @@ services:
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
       - --nat=extip:${IP}
-      - --networkid=
+      - --networkid=48899
       - --port=11357
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

op/geth/zircuit-testnet-op-geth-pruned-pebble-path.yml

@@ -67,7 +67,7 @@ services:
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
       - --nat=extip:${IP}
-      - --networkid=
+      - --networkid=48899
       - --port=12804
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0

polygon/bor/polygon-amoy-bor-pruned-pebble-path.yml

@@ -46,8 +46,8 @@ services:
       nofile: 1048576    # Max open files (for RPC/WS connections)
     user: root
     ports:
-      - 12188:12188
+      - 12190:12190
-      - 12188:12188/udp
+      - 12190:12190/udp
     expose:
       - 8545
       - 6060
@@ -69,7 +69,7 @@ services:
       - --metrics
       - --metrics.prometheus-addr=0.0.0.0:6060
       - --nat=extip:${IP}
-      - --port=12188
+      - --port=12190
       - --rpc.gascap=600000000
       - --rpc.returndatalimit=10000000
       - --rpc.txfeecap=0

polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml

@@ -47,12 +47,12 @@ services:
       memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
     user: root
     ports:
-      - 12377:12377
+      - 12379:12379
-      - 12377:12377/udp
+      - 12379:12379/udp
-      - 32377:32377
+      - 32379:32379
-      - 32377:32377/udp
+      - 32379:32379/udp
-      - 37377:37377
+      - 37379:37379
-      - 37377:37377/udp
+      - 37379:37379/udp
     expose:
       - 8545
     entrypoint: [erigon]
@@ -72,9 +72,9 @@ services:
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
       - --nat=extip:${IP}
-      - --p2p.allowed-ports=32377
+      - --p2p.allowed-ports=32379
-      - --p2p.allowed-ports=37377
+      - --p2p.allowed-ports=37379
-      - --port=12377
+      - --port=12379
       - --prune.mode=archive
       - --rpc.evmtimeout=${POLYGON_AMOY_ERIGON3_ARCHIVE_TRACE_EVMTIMEOUT:-5m0s}
       - --rpc.gascap=6000000000
@@ -82,7 +82,7 @@ services:
       - --rpc.overlay.replayblocktimeout=${POLYGON_AMOY_ERIGON3_ARCHIVE_TRACE_REPLAYBLOCKTIMEOUT:-10s}
       - --rpc.returndata.limit=10000000
       - --torrent.download.rate=${POLYGON_AMOY_ERIGON3_ARCHIVE_TRACE_MAX_DOWNLOAD_RATE:-1000mb}
-      - --torrent.port=27377
+      - --torrent.port=27379
       - --ws
       - --ws.port=8545
     restart: unless-stopped

polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml

@@ -47,12 +47,12 @@ services:
       memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
     user: root
     ports:
-      - 10307:10307
+      - 10309:10309
-      - 10307:10307/udp
+      - 10309:10309/udp
-      - 30307:30307
+      - 30309:30309
-      - 30307:30307/udp
+      - 30309:30309/udp
-      - 35307:35307
+      - 35309:35309
-      - 35307:35307/udp
+      - 35309:35309/udp
     expose:
       - 8545
     entrypoint: [erigon]
@@ -72,10 +72,10 @@ services:
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
       - --nat=extip:${IP}
-      - --p2p.allowed-ports=30307
+      - --p2p.allowed-ports=30309
-      - --p2p.allowed-ports=35307
+      - --p2p.allowed-ports=35309
       - --persist.receipts=false
-      - --port=10307
+      - --port=10309
       - --prune.mode=minimal
       - --rpc.evmtimeout=${POLYGON_AMOY_ERIGON3_MINIMAL_TRACE_EVMTIMEOUT:-5m0s}
       - --rpc.gascap=6000000000
@@ -83,7 +83,7 @@ services:
       - --rpc.overlay.replayblocktimeout=${POLYGON_AMOY_ERIGON3_MINIMAL_TRACE_REPLAYBLOCKTIMEOUT:-10s}
       - --rpc.returndata.limit=10000000
       - --torrent.download.rate=${POLYGON_AMOY_ERIGON3_MINIMAL_TRACE_MAX_DOWNLOAD_RATE:-1000mb}
-      - --torrent.port=25307
+      - --torrent.port=25309
       - --ws
       - --ws.port=8545
     restart: unless-stopped

polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml

@@ -47,12 +47,12 @@ services:
       memlock: -1        # Disable memory locking limits (for in-memory DBs like MDBX)
     user: root
     ports:
-      - 13583:13583
+      - 13585:13585
-      - 13583:13583/udp
+      - 13585:13585/udp
-      - 33583:33583
+      - 33585:33585
-      - 33583:33583/udp
+      - 33585:33585/udp
-      - 38583:38583
+      - 38585:38585
-      - 38583:38583/udp
+      - 38585:38585/udp
     expose:
       - 8545
     entrypoint: [erigon]
@@ -72,10 +72,10 @@ services:
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
       - --nat=extip:${IP}
-      - --p2p.allowed-ports=33583
+      - --p2p.allowed-ports=33585
-      - --p2p.allowed-ports=38583
+      - --p2p.allowed-ports=38585
       - --persist.receipts=false
-      - --port=13583
+      - --port=13585
       - --prune.mode=full
       - --rpc.evmtimeout=${POLYGON_AMOY_ERIGON3_PRUNED_TRACE_EVMTIMEOUT:-5m0s}
       - --rpc.gascap=6000000000
@@ -83,7 +83,7 @@ services:
       - --rpc.overlay.replayblocktimeout=${POLYGON_AMOY_ERIGON3_PRUNED_TRACE_REPLAYBLOCKTIMEOUT:-10s}
       - --rpc.returndata.limit=10000000
       - --torrent.download.rate=${POLYGON_AMOY_ERIGON3_PRUNED_TRACE_MAX_DOWNLOAD_RATE:-1000mb}
-      - --torrent.port=28583
+      - --torrent.port=28585
       - --ws
       - --ws.port=8545
     restart: unless-stopped