From a76cc9986c546f0840680d83b05ce77aebb8f908 Mon Sep 17 00:00:00 2001
From: Yorick <yorickdowne@gmail.com>
Date: Mon, 30 Sep 2024 16:16:34 +0000
Subject: [PATCH] Fix Lighthouse v6

---
 lighthouse-cl-only.yml          | 4 +++-
 lighthouse.yml                  | 4 +++-
 lighthouse/docker-entrypoint.sh | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml
index 11dcd912..31e0fdd0 100644
--- a/lighthouse-cl-only.yml
+++ b/lighthouse-cl-only.yml
@@ -38,13 +38,15 @@ services:
       - CL_EXTRAS=${CL_EXTRAS:-}
       - ARCHIVE_NODE=${ARCHIVE_NODE:-false}
       - IPV6=${IPV6:-false}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_IPV6_P2P_PORT=${CL_IPV6_P2P_PORT:-9090}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - NETWORK=${NETWORK}
     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:-9090}:${CL_IPV6_P2P_PORT:-9090}/tcp
+      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9090}:${CL_IPV6_P2P_PORT:-9090}/udp
     networks:
       default:
         aliases:
diff --git a/lighthouse.yml b/lighthouse.yml
index 504224cb..5fbb5fc3 100644
--- a/lighthouse.yml
+++ b/lighthouse.yml
@@ -40,13 +40,15 @@ services:
       - CL_EXTRAS=${CL_EXTRAS:-}
       - ARCHIVE_NODE=${ARCHIVE_NODE:-false}
       - IPV6=${IPV6:-false}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_IPV6_P2P_PORT=${CL_IPV6_P2P_PORT:-9090}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - NETWORK=${NETWORK}
     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:-9090}:${CL_IPV6_P2P_PORT:-9090}/tcp
+      - ${HOST_IP:-}:${CL_IPV6_P2P_PORT:-9090}:${CL_IPV6_P2P_PORT:-9090}/udp
     networks:
       default:
         aliases:
diff --git a/lighthouse/docker-entrypoint.sh b/lighthouse/docker-entrypoint.sh
index af7c9262..a6160e32 100755
--- a/lighthouse/docker-entrypoint.sh
+++ b/lighthouse/docker-entrypoint.sh
@@ -87,7 +87,7 @@ fi
 
 if [ "${IPV6}" = "true" ]; then
   echo "Configuring Lighthouse to listen on IPv6 ports"
-  __ipv6="--listen-address :: --port6 ${CL_P2P_PORT:-9000} --quic-port6 ${CL_QUIC_PORT:-9001}"
+  __ipv6="--listen-address :: --port6 ${CL_IPV6_P2P_PORT:-9090}"
 # ENR discovery on v6 is not yet working, likely too few peers. Manual for now
   __ipv6_pattern="^[0-9A-Fa-f]{1,4}:" # Sufficient to check the start
   set +e