From d7c2ac175c1b5db37ec6859805f0951c46dd0db9 Mon Sep 17 00:00:00 2001
From: Yorick Downe <yorickdowne@gmail.com>
Date: Mon, 6 Jul 2026 04:44:11 +0100
Subject: [PATCH] Teku uses same port for IPv4 and IPv6

---
 default.env               | 3 ---
 teku-allin1.yml           | 7 ++-----
 teku-cl-only.yml          | 7 ++-----
 teku.yml                  | 7 ++-----
 teku/docker-entrypoint.sh | 2 +-
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/default.env b/default.env
index f4252e06..92d77b62 100644
--- a/default.env
+++ b/default.env
@@ -164,9 +164,6 @@ CL_P2P_PORT=9000
 PRYSM_PORT=9000
 PRYSM_UDP_PORT=9000
 CL_QUIC_PORT=9001
-# Teku needs separate ports for IPv6
-CL_IPV6_P2P_PORT=9010
-CL_IPV6_QUIC_PORT=9011
 # Local grafana dashboard port. Do not expose to Internet, it is insecure http
 GRAFANA_PORT=3000
 # Local Siren UI port
diff --git a/teku-allin1.yml b/teku-allin1.yml
index 00aaa247..f3676cfa 100644
--- a/teku-allin1.yml
+++ b/teku-allin1.yml
@@ -59,15 +59,12 @@ services:
       - NETWORK=${NETWORK}
       - ENABLE_DIST_ATTESTATION_AGGR=${ENABLE_DIST_ATTESTATION_AGGR:-false}
       - IPV6=${IPV6:-false}
-      - CL_IPV6_P2P_PORT=${CL_IPV6_P2P_PORT:-9010}
-      - CL_IPV6_QUIC_PORT=${CL_IPV6_QUIC_PORT:-9011}
+      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
     ports:
       - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
       - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
-      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9010}:${CL_IPV6_P2P_PORT:-9010}/tcp
-      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9010}:${CL_IPV6_P2P_PORT:-9010}/udp
-      - ${HOST_IP:-}:${CL_IPV6_QUIC_PORT:-9011}:${CL_IPV6_QUIC_PORT:-9011}/udp
     networks:
       default:
         aliases:
diff --git a/teku-cl-only.yml b/teku-cl-only.yml
index d59e6dcc..b8f297f3 100644
--- a/teku-cl-only.yml
+++ b/teku-cl-only.yml
@@ -47,15 +47,12 @@ services:
       - WEB3SIGNER=false
       - NETWORK=${NETWORK}
       - IPV6=${IPV6:-false}
-      - CL_IPV6_P2P_PORT=${CL_IPV6_P2P_PORT:-9010}
-      - CL_IPV6_QUIC_PORT=${CL_IPV6_QUIC_PORT:-9011}
+      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
     ports:
       - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
       - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
-      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9010}:${CL_IPV6_P2P_PORT:-9010}/tcp
-      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9010}:${CL_IPV6_P2P_PORT:-9010}/udp
-      - ${HOST_IP:-}:${CL_IPV6_QUIC_PORT:-9011}:${CL_IPV6_QUIC_PORT:-9011}/udp
     networks:
       default:
         aliases:
diff --git a/teku.yml b/teku.yml
index e5b38508..b60f90e2 100644
--- a/teku.yml
+++ b/teku.yml
@@ -56,15 +56,12 @@ services:
       - EMBEDDED_VC=false
       - NETWORK=${NETWORK}
       - IPV6=${IPV6:-false}
-      - CL_IPV6_P2P_PORT=${CL_IPV6_P2P_PORT:-9010}
-      - CL_IPV6_QUIC_PORT=${CL_IPV6_QUIC_PORT:-9011}
+      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
     ports:
       - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
       - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
-      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9010}:${CL_IPV6_P2P_PORT:-9010}/tcp
-      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9010}:${CL_IPV6_P2P_PORT:-9010}/udp
-      - ${HOST_IP:-}:${CL_IPV6_QUIC_PORT:-9011}:${CL_IPV6_QUIC_PORT:-9011}/udp
     networks:
       default:
         aliases:
diff --git a/teku/docker-entrypoint.sh b/teku/docker-entrypoint.sh
index 528aeb60..4774c110 100755
--- a/teku/docker-entrypoint.sh
+++ b/teku/docker-entrypoint.sh
@@ -191,7 +191,7 @@ fi
 
 if [[ "${IPV6}" = "true" ]]; then
   echo "Configuring Teku to listen on IPv6 ports"
-  __ipv6="--p2p-interface 0.0.0.0,:: --p2p-port-ipv6 ${CL_IPV6_P2P_PORT:-9010} --p2p-quic-port-ipv6 ${CL_IPV6_QUIC_PORT:-9011}"
+  __ipv6="--p2p-interface 0.0.0.0,:: --p2p-port-ipv6 ${CL_P2P_PORT:-9000} --p2p-quic-port-ipv6 ${CL_QUIC_PORT:-9001}"
 else
   __ipv6=""
 fi