From a76cc9986c546f0840680d83b05ce77aebb8f908 Mon Sep 17 00:00:00 2001 From: Yorick Date: Mon, 30 Sep 2024 16:16:34 +0000 Subject: [PATCH 1/3] 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 From 195b8e6c5d4e67ea42bd957d472674eb7d9c59de Mon Sep 17 00:00:00 2001 From: Yorick Date: Mon, 30 Sep 2024 17:35:34 +0000 Subject: [PATCH 2/3] Revert "Fix Lighthouse v6" This reverts commit a76cc9986c546f0840680d83b05ce77aebb8f908. --- lighthouse-cl-only.yml | 4 +--- lighthouse.yml | 4 +--- lighthouse/docker-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml index 31e0fdd0..11dcd912 100644 --- a/lighthouse-cl-only.yml +++ b/lighthouse-cl-only.yml @@ -38,15 +38,13 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-false} - IPV6=${IPV6:-false} - - CL_IPV6_P2P_PORT=${CL_IPV6_P2P_PORT:-9090} + - CL_P2P_PORT=${CL_P2P_PORT:-9000} - 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 5fbb5fc3..504224cb 100644 --- a/lighthouse.yml +++ b/lighthouse.yml @@ -40,15 +40,13 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-false} - IPV6=${IPV6:-false} - - CL_IPV6_P2P_PORT=${CL_IPV6_P2P_PORT:-9090} + - CL_P2P_PORT=${CL_P2P_PORT:-9000} - 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 a6160e32..af7c9262 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_IPV6_P2P_PORT:-9090}" + __ipv6="--listen-address :: --port6 ${CL_P2P_PORT:-9000} --quic-port6 ${CL_QUIC_PORT:-9001}" # 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 From 5f94d79162d151552c25058f80807d06b89a9294 Mon Sep 17 00:00:00 2001 From: Yorick Date: Mon, 30 Sep 2024 17:37:05 +0000 Subject: [PATCH 3/3] LH cl only v6 --- lighthouse-cl-only.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml index 11dcd912..56918b66 100644 --- a/lighthouse-cl-only.yml +++ b/lighthouse-cl-only.yml @@ -63,6 +63,9 @@ services: - 0.0.0.0 - --http-port - ${CL_REST_PORT:-5052} + - --http-allow-origin=* + - --listen-address + - 0.0.0.0 - --port - ${CL_P2P_PORT:-9000} - --quic-port