From afb4a006253f6476b7b00e70f2edaf6b05115c43 Mon Sep 17 00:00:00 2001
From: Fornax <23104993+0xfornax@users.noreply.github.com>
Date: Sun, 4 Oct 2026 20:34:04 -0300
Subject: [PATCH 1/2] Remove ipv6-only bindings

---
 .../assets/install/templates/eth1.tmpl          |  2 +-
 .../assets/install/templates/eth2.tmpl          | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/shared/services/rocketpool/assets/install/templates/eth1.tmpl b/shared/services/rocketpool/assets/install/templates/eth1.tmpl
index 427f695be..beab2cd08 100644
--- a/shared/services/rocketpool/assets/install/templates/eth1.tmpl
+++ b/shared/services/rocketpool/assets/install/templates/eth1.tmpl
@@ -15,7 +15,7 @@ services:
     stop_grace_period: 15m
     {{- $p2p := (or .ExecutionCommon.P2pPort.Value "30303")}}
     {{- $torrent := (or .Erigon.TorrentPort.Value "42069")}}
-    ports: [ "{{if .IsIPv6Enabled}}[::]:{{end}}{{$p2p}}:{{$p2p}}/udp", "{{if .IsIPv6Enabled}}[::]:{{end}}{{$p2p}}:{{$p2p}}/tcp"{{if eq .ExecutionClient.String "erigon"}}, "{{$torrent}}:{{$torrent}}/udp", "{{$torrent}}:{{$torrent}}/tcp"{{end}}{{.GetECOpenAPIPorts}} ]
+    ports: [ "{{$p2p}}:{{$p2p}}/udp", "{{$p2p}}:{{$p2p}}/tcp"{{if eq .ExecutionClient.String "erigon"}}, "{{$torrent}}:{{$torrent}}/udp", "{{$torrent}}:{{$torrent}}/tcp"{{end}}{{.GetECOpenAPIPorts}} ]
     volumes:
       - eth1clientdata:/ethclient
       - {{.RocketPoolDirectory}}/scripts:/setup:ro
diff --git a/shared/services/rocketpool/assets/install/templates/eth2.tmpl b/shared/services/rocketpool/assets/install/templates/eth2.tmpl
index 8d9c50c0b..1cd84b538 100644
--- a/shared/services/rocketpool/assets/install/templates/eth2.tmpl
+++ b/shared/services/rocketpool/assets/install/templates/eth2.tmpl
@@ -33,34 +33,17 @@ services:
     stop_grace_period: 3m
     {{- $p2p := (or .ConsensusCommon.P2pPort.String "9001")}}
     ports:
-      {{- if .IsIPv6Enabled}}
-      - "[::]:{{$p2p}}:{{$p2p}}/udp"
-      - "[::]:{{$p2p}}:{{$p2p}}/tcp"
-      {{- else}}
       - "{{$p2p}}:{{$p2p}}/udp"
       - "{{$p2p}}:{{$p2p}}/tcp"
-      {{- end}}
       {{- if eq .ConsensusClient.String "lighthouse"}}
-      {{- if .IsIPv6Enabled}}
-      - "[::]:{{.Lighthouse.P2pQuicPort}}:{{.Lighthouse.P2pQuicPort}}/udp"
-      {{- else}}
       - "{{.Lighthouse.P2pQuicPort}}:{{.Lighthouse.P2pQuicPort}}/udp"
-      {{- end}}
       {{- else if eq .ConsensusClient.String "prysm"}}
       - "{{.Prysm.P2pQuicPort}}:{{.Prysm.P2pQuicPort}}/udp"
       {{- else if eq .ConsensusClient.String "lodestar"}}
-      {{- if .IsIPv6Enabled}}
-      - "[::]:{{.Lodestar.P2pQuicPort}}:{{.Lodestar.P2pQuicPort}}/udp"
-      {{- else}}
       - "{{.Lodestar.P2pQuicPort}}:{{.Lodestar.P2pQuicPort}}/udp"
-      {{- end}}
       {{- else if eq .ConsensusClient.String "nimbus"}}
-      {{- if .IsIPv6Enabled}}
-      - "[::]:{{.Nimbus.P2pQuicPort}}:{{.Nimbus.P2pQuicPort}}/udp"
-      {{- else}}
       - "{{.Nimbus.P2pQuicPort}}:{{.Nimbus.P2pQuicPort}}/udp"
       {{- end}}
-      {{- end}}
       {{- if eq .ConsensusClient.String "teku"}}
       - "{{.Teku.P2pQuicPort}}:{{.Teku.P2pQuicPort}}/udp"
       {{- if .IsIPv6Enabled}}

From 2bee4c6c9f5aaba4ea8f56f364d8982068ac1cbb Mon Sep 17 00:00:00 2001
From: Fornax <23104993+0xfornax@users.noreply.github.com>
Date: Mon, 5 Oct 2026 14:26:13 -0300
Subject: [PATCH 2/2] ipv6 branch for Reth

---
 .../services/rocketpool/assets/install/scripts/start-ec.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shared/services/rocketpool/assets/install/scripts/start-ec.sh b/shared/services/rocketpool/assets/install/scripts/start-ec.sh
index 33df47587..e1bef7206 100755
--- a/shared/services/rocketpool/assets/install/scripts/start-ec.sh
+++ b/shared/services/rocketpool/assets/install/scripts/start-ec.sh
@@ -525,8 +525,11 @@ if [ "$CLIENT" = "reth" ]; then
         CMD="$CMD --max-inbound-peers=$RETH_MAX_INBOUND_PEERS"
     fi
 
-    if [ ! -z "$EC_P2P_PORT" ]; then
-        CMD="$CMD --port $EC_P2P_PORT"
+    RETH_P2P_PORT=${EC_P2P_PORT:-30303}
+    CMD="$CMD --port $RETH_P2P_PORT --discovery.port $RETH_P2P_PORT --discovery.v5.port $RETH_P2P_PORT"
+
+    if [ "$ENABLE_IPV6" = "true" ]; then
+        CMD="$CMD --addr :: --discovery.v5.port.ipv6 $RETH_P2P_PORT"
     fi
 
     exec ${CMD}