Add GetExternalIpv6 for ENR advertisement in Lodestar and Teku

Author: thomaspanf

shared/services/config/rocket-pool-config.go

@@ -1365,6 +1365,20 @@ func (cfg *RocketPoolConfig) GetExternalIp() string {
 	return ip.String()
 }
 
+// Used by text/template to format eth2.yml when IPv6 is enabled.
+// Lodestar requires --enr.ip6 and Teku requires --p2p-advertised-ips to advertise IPv6 in their ENR.
+// Returns the external IPv6 address, or empty string if unavailable.
+func (cfg *RocketPoolConfig) GetExternalIpv6() string {
+	consensusConfig := externalip.ConsensusConfig{Timeout: 3 * time.Second}
+	ip6Consensus := externalip.DefaultConsensus(&consensusConfig, nil)
+	ip6Consensus.UseIPProtocol(6)
+	ip, err := ip6Consensus.ExternalIP()
+	if err != nil || ip.To4() != nil {
+		return ""
+	}
+	return ip.String()
+}
+
 // Gets the tag of the cc container
 // Used by text/template to format eth2.yml
 func (cfg *RocketPoolConfig) GetBeaconContainerTag() (string, error) {

shared/services/rocketpool/assets/install/scripts/start-bn.sh

@@ -100,7 +100,7 @@ if [ "$CC_CLIENT" = "lighthouse" ]; then
     fi
 
     if [ "$ENABLE_IPV6" = "true" ]; then
-        CMD="$CMD --listen-address :: --port6 $BN_P2P_PORT --enr-udp6-port $BN_P2P_PORT --quic-port6 ${BN_P2P_QUIC_PORT:-8001}"
+        CMD="$CMD --listen-address 0.0.0.0 --listen-address :: --port6 $BN_P2P_PORT --enr-udp6-port $BN_P2P_PORT --quic-port6 ${BN_P2P_QUIC_PORT:-8001}"
     fi
 
     exec ${CMD}
@@ -149,7 +149,10 @@ if [ "$CC_CLIENT" = "lodestar" ]; then
     fi
 
     if [ "$ENABLE_IPV6" = "true" ]; then
-        CMD="$CMD --listenAddress6 :: --port6 $BN_P2P_PORT"
+        CMD="$CMD --listenAddress 0.0.0.0 --listenAddress6 :: --port6 $BN_P2P_PORT --quicPort6 ${BN_P2P_QUIC_PORT:-8001}"
+        if [ ! -z "$EXTERNAL_IP6" ]; then
+            CMD="$CMD --enr.ip6 $EXTERNAL_IP6"
+        fi
     fi
 
     if [ ! -z "$CHECKPOINT_SYNC_URL" ]; then
@@ -323,10 +326,8 @@ if [ "$CC_CLIENT" = "teku" ]; then
 
     if [ "$ENABLE_IPV6" = "true" ]; then
         CMD="$CMD --p2p-interface=0.0.0.0,:: --p2p-port-ipv6=$BN_IPV6_P2P_PORT"
-        if [ ! -z "$EXTERNAL_IP" ]; then
-            if expr "$EXTERNAL_IP" : '.*:' >/dev/null; then
-                CMD="$CMD --p2p-advertised-ip=$EXTERNAL_IP"
-            fi
+        if [ ! -z "$EXTERNAL_IP6" ]; then
+            CMD="$CMD --p2p-advertised-ips $EXTERNAL_IP,$EXTERNAL_IP6 --p2p-advertised-port-ipv6=$BN_IPV6_P2P_PORT"
         fi
     fi
 

shared/services/rocketpool/assets/install/templates/eth2.tmpl

@@ -83,6 +83,9 @@ services:
       - ENABLE_METRICS={{.EnableMetrics}}
       - BN_METRICS_PORT={{.BnMetricsPort}}
       - EXTERNAL_IP={{.GetExternalIp}}
+      {{- if .IsIPv6Enabled}}
+      - EXTERNAL_IP6={{.GetExternalIpv6}}
+      {{- end}}
       - ENABLE_IPV6={{.IsIPv6Enabled}}
       - CHECKPOINT_SYNC_URL={{.ConsensusCommon.CheckpointSyncProvider}}
       - DOPPELGANGER_DETECTION={{.IsDoppelgangerEnabled}}