Deprecate CL P2P TCP port

.github/macos-docker-stub.sh

@@ -13,7 +13,7 @@ node_up() {
 }
 
 # The ENR is fixture_enr from test-port-check.sh: a properly signed record with a private key of 1,
-# 203.0.113.42 and 2001:db8::1, UDP 9000 as CL_P2P_PORT. Compact, the way ethd's sed wants it.
+# 203.0.113.42 and 2001:db8::1, UDP 9000 as CL_DISC_PORT. Compact, the way ethd's sed wants it.
 identity='{"data":{"peer_id":"16Uiu2HAmStubNode","enr":"enr:-Lm4QH2z7bOXo6bYgd6JCZjFF2DzrbFb_OXwGR7Cqse_ytCaSxpqtJ9IO4mO8GB7ryM6T_dptihwtUqUkbJZdqokVwQHgmlkgnY0gmlwhMsAcSqDaXA2kCABDbgAAAAAAAAAAAAAAAGEcXVpY4IjKYVxdWljNoIjjYlzZWNwMjU2azGhAnm-Zn753LusVaBilc6HCwcCm_zbLc4o2VnygVsW-BeYg3RjcIIjKIN1ZHCCIyiEdWRwNoIjjA","p2p_addresses":["/ip4/203.0.113.42/tcp/9000","/ip4/203.0.113.42/udp/9001/quic-v1"],"discovery_addresses":["/ip4/203.0.113.42/udp/9000"],"metadata":{"seq_number":"1","attnets":"0x00","syncnets":"0x00"}}}'
 # No connected inbound peers, as on a CI runner, so the plain output points at --troubleshoot.
 # The disconnected inbound peer is one ethd must not count.

caplin.yml

@@ -3,8 +3,7 @@ services:
   execution:
     ports:
       # Caplin consensus P2P 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_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp"
       - "${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp"
     networks:
       default:

default.env

@@ -171,13 +171,13 @@ DOCKER_EXT_NETWORK=rocketpool_net
 
 # P2P ports you will forward to your staking node. Adjust here if you are
 # going to use something other than defaults.
+# The execution client needs both TCP and UDP forwarded. The consensus client
+# needs UDP only: discovery on CL_DISC_PORT and libp2p over QUIC on CL_QUIC_PORT.
 EL_P2P_PORT=30303
-CL_P2P_PORT=9000
-PRYSM_PORT=9000
-PRYSM_UDP_PORT=9000
+CL_DISC_PORT=9000
 CL_QUIC_PORT=9001
 # Teku needs separate ports for IPv6
-CL_IPV6_P2P_PORT=9010
+CL_IPV6_DISC_PORT=9010
 CL_IPV6_QUIC_PORT=9011
 # Local grafana dashboard port. Do not expose to Internet, it is insecure http
 GRAFANA_PORT=3000
@@ -615,4 +615,4 @@ DOCKER_SOCK=/var/run/docker.sock
 ALLOY_PROJECT_NAME=
 
 # Used by ethd update - please do not adjust
-ENV_VERSION=77
+ENV_VERSION=78

erigon.yml

@@ -32,7 +32,7 @@ services:
       - IPV6=${IPV6:-false}
       - HOST_IP=${HOST_IP:-}
       - COMPOSE_FILE=${COMPOSE_FILE}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_DISC_PORT=${CL_DISC_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - CL_REST_PORT=${CL_REST_PORT:-5052}
       - CL_MAX_PEER_COUNT=${CL_MAX_PEER_COUNT:-128}

erigon/docker-entrypoint.sh

@@ -146,8 +146,8 @@ if [[ ! "${COMPOSE_FILE}" =~ "caplin.yml" ]]; then
   __caplin="--externalcl=true"
 else
   echo "Running Erigon with internal Caplin consensus layer client"
-  __caplin="--caplin.discovery.addr=0.0.0.0 --caplin.discovery.port=${CL_P2P_PORT} --caplin.blobs-immediate-backfill=true"
-  __caplin+=" --caplin.discovery.tcpport=${CL_P2P_PORT} --caplin.discovery.quicport=${CL_QUIC_PORT} --caplin.validator-monitor=true"
+  __caplin="--caplin.discovery.addr=0.0.0.0 --caplin.discovery.port=${CL_DISC_PORT} --caplin.blobs-immediate-backfill=true"
+  __caplin+=" --caplin.discovery.quicport=${CL_QUIC_PORT} --caplin.validator-monitor=true"
   __caplin+=" --caplin.max-peer-count=${CL_MAX_PEER_COUNT}"
   __caplin+=" --beacon.api=beacon,builder,config,debug,events,node,validator,lighthouse"
   __caplin+=" --beacon.api.addr=0.0.0.0 --beacon.api.port=${CL_REST_PORT} --beacon.api.cors.allow-origins=*"

ethd

@@ -2179,7 +2179,7 @@ port-check() {
   var="CL_REST_PORT"
   __get_value_from_env "${var}" "${__env_file}" "__cl_rest_port"
   __cl_rest_port="${__cl_rest_port:-5052}"
-  var="CL_P2P_PORT"
+  var="CL_DISC_PORT"
   __get_value_from_env "${var}" "${__env_file}" "p2p_port"
   p2p_port="${p2p_port:-9000}"
   var="CL_QUIC_PORT"
@@ -2425,7 +2425,7 @@ port-check() {
   if [[ -n "${udp4}" && "${udp4}" != "${p2p_port}" ]]; then
     echo "${cl_client} advertises discv5 UDP ${udp4}, the port its NAT mapping happens"
     echo "to use. That is not the port you forward, and it can change. The port to"
-    echo "forward - and the one this pings - is ${p2p_port}, CL_P2P_PORT in \".env\"."
+    echo "forward - and the one this pings - is ${p2p_port}, CL_DISC_PORT in \".env\"."
     echo
   fi
   if [[ "${probe_ip}" = "${ip4}" ]]; then
@@ -2488,7 +2488,7 @@ port-check() {
   printf '  %-12s %s\n' "Compose" "${COMPOSE_FILE}"
   printf '  %-12s %s\n' "Network" "${network:-unset}"
   printf '  %-12s %s\n' "Env" \
-    "CL_P2P_PORT ${p2p_port}, CL_QUIC_PORT ${quic_port}, CL_REST_PORT ${__cl_rest_port}, IPV6 ${ipv6:-unset}"
+    "CL_DISC_PORT ${p2p_port}, CL_QUIC_PORT ${quic_port}, CL_REST_PORT ${__cl_rest_port}, IPV6 ${ipv6:-unset}"
   printf '  %-12s %s\n' "Aliases" "${__cl_alias} / ${__el_alias}"
   printf '  %-12s %s\n' "Beacon API" "${cl_api_via:-unknown}"
   printf '  %-12s %s\n' "Peer ID" "${peer_id:-none}"
@@ -3094,41 +3094,6 @@ __check_mev_boost() {
 }
 
 
-# Remove after Glamsterdam, with full MPlex deprecation
-__warn_mplex() {
-  local clients
-  local regex
-  local var
-  local quic_port
-  local p2p_port
-  local p2p_disc_port
-
-  clients='prysm|lighthouse|lodestar|nimbus|nimbus-unified|teku|grandine|grandine-plugin|caplin'
-  regex="(${clients})(-cl-only)?(-allin1)?\.yml"  # Would match files that don't exist, which is harmless
-
-  if [[ "${COMPOSE_FILE}" =~ ${regex} ]]; then
-    if [[ "${COMPOSE_FILE}" =~ prysm ]]; then
-      var=PRYSM_PORT
-    else
-      var=CL_P2P_PORT
-    fi
-    __get_value_from_env "${var}" "${__env_file}" "p2p_port"
-    if [[ "${COMPOSE_FILE}" =~ prysm ]]; then
-      var=PRYSM_UDP_PORT
-    else
-      var=CL_P2P_PORT
-    fi
-    __get_value_from_env "${var}" "${__env_file}" "p2p_disc_port"
-    var=CL_QUIC_PORT
-    __get_value_from_env "${var}" "${__env_file}" "quic_port"
-
-    __final_msg+="\nNOTE: Sometime after Glamsterdam, likely Q1 2027, your Consensus Layer Client will drop use of its P2P TCP port and only use QUIC UDP."
-    __final_msg+="\nEnsure that QUIC port ${quic_port} UDP is port-forwarded and allowed by your firewall. Use \"${__me} port-check\" to check incoming QUIC connections."
-    __final_msg+="\nEventually, you won't need MPlex port ${p2p_port} TCP any more, but you still DO need discovery port ${p2p_disc_port} UDP.\n"
-  fi
-}
-
-
 repair-reth() {
   local yn
 
@@ -3658,8 +3623,8 @@ __adjust_epbs_urls() {
 
 
 __migrate_env() {
-  local old_vars=( DDNS_PROXY DDNS_SUBDOMAIN ERA_URL RPC_URL CB_PBS_DOCKER_TAG CB_PBS_DOCKER_REPO MEV_MIN_BID MEV_BUILD_FACTOR )
-  local new_vars=( CF_PROXY DDNS_HOST ERE_URL RPC_URLS CB_DOCKER_TAG CB_DOCKER_REPO EPBS_MIN_BID EPBS_BUILD_FACTOR )
+  local old_vars=( DDNS_PROXY DDNS_SUBDOMAIN ERA_URL RPC_URL CB_PBS_DOCKER_TAG CB_PBS_DOCKER_REPO MEV_MIN_BID MEV_BUILD_FACTOR CL_P2P_PORT CL_IPV6_P2P_PORT )
+  local new_vars=( CF_PROXY DDNS_HOST ERE_URL RPC_URLS CB_DOCKER_TAG CB_DOCKER_REPO EPBS_MIN_BID EPBS_BUILD_FACTOR CL_DISC_PORT CL_IPV6_DISC_PORT )
   local error
   local line
   local index
@@ -3676,6 +3641,7 @@ __migrate_env() {
   local nethermind_flatdb
   local cl_p2p_port
   local prysm_udp_port
+  local quic_port
   local el_archive_node
   local el_minimal_node
   local cl_archive_node
@@ -3987,17 +3953,27 @@ __migrate_env() {
     var=${old_vars[index]}
     __get_value_from_env "${var}" "${__env_file}.source" "value" "found"
     # Remove after Glamsterdam
-    if [[ "${__source_ver}" -lt "67" && "${var}" = "CB_PBS_DOCKER_REPO" && ${value} = "ghcr.io/commit-boost/pbs" ]]; then
+    if [[ "${__source_ver}" -lt "67" && "${var}" = "CB_PBS_DOCKER_REPO" && "${value}" = "ghcr.io/commit-boost/pbs" ]]; then
       value="ghcr.io/commit-boost/commit-boost"
     fi
     # Remove after Glamsterdam
     if [[ "${__source_ver}" -lt "72" && "${var}" = "MEV_BUILD_FACTOR" && "${value}" =~ ^0*100$ ]]; then
       value="always"  # 100 used to mean "always", it now means "maxprofit"
     fi
+    # Remove after Hegotá
+    if [[ "${__source_ver}" -lt "78" && "${var}" = "CL_P2P_PORT" && "${COMPOSE_FILE}" =~ prysm(-cl-only)?\.yml ]]; then
+      __get_value_from_env "PRYSM_UDP_PORT" "${__env_file}.source" "value" "found"
+    fi
     if [[ "${found}" -eq 1 ]]; then
       __update_value_in_env "${new_vars[index]}" "${value}" "${__env_file}"
     fi
   done
+  # Remove after Hegotá
+  if [[ "${__source_ver}" -lt "78" && "${COMPOSE_FILE}" =~ (prysm|lighthouse|lodestar|nimbus|nimbus-unified|teku|grandine|grandine-plugin|caplin)(-cl-only|-allin1)?\.yml ]]; then
+    __get_value_from_env "CL_QUIC_PORT" "${__env_file}" "quic_port"
+    __final_msg+="\nNOTE: Your consensus client no longer uses a P2P TCP port. Make sure QUIC port ${quic_port:-9001} UDP is forwarded"
+    __final_msg+="\nand allowed by your firewall. Use \"${__me} port-check\" to check incoming QUIC connections.\n"
+  fi
 # Check whether we run a CL or VC, if so nag about FEE_RECIPIENT
 # It's CL&VC, CL-only, or VC-only
   if [[ "${COMPOSE_FILE}" =~ (prysm\.yml|lighthouse\.yml|teku\.yml|nimbus\.yml|lodestar\.yml|-cl-only\.yml|-allin1\.yml|-vc-only\.yml) ]]; then
@@ -4617,8 +4593,6 @@ reset to defaults."
   __nag_os_version
   __nag_os_update
   __upgrade_docker
-# Remove after Glamsterdam when fully deprecating MPLex
-  __warn_mplex
 
   unset ETHDSECUNDO
   unset GITEXITCODE

ethlambda-cl-only.yml

@@ -44,7 +44,7 @@ services:
       - RUST_LOG=${LOG_LEVEL:-info}
     ports:
       # discv5 is UDP only. libp2p listens on the QUIC port for both QUIC (UDP) and TCP
-      - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
+      - ${HOST_IP:-}:${CL_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/tcp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
     networks:
@@ -67,7 +67,7 @@ services:
       - --api-port
       - ${CL_REST_PORT:-5052}
       - --discovery.port
-      - ${CL_P2P_PORT:-9000}
+      - ${CL_DISC_PORT:-9000}
       - --gossipsub-port
       - ${CL_QUIC_PORT:-9001}
       - ${CL_MAX_PEER_COUNT:+--discovery.target-peers}

grandine-allin1.yml

@@ -51,15 +51,14 @@ services:
       - NODE_TYPE=${CL_NODE_TYPE:-pruned}
       - IPV6=${IPV6:-false}
       - HOST_IP=${HOST_IP:-}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_DISC_PORT=${CL_DISC_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - NETWORK=${NETWORK}
       - COMPOSE_FILE=${COMPOSE_FILE}
       - LOG_LEVEL=${LOG_LEVEL}
       - RUST_LOG=${LOG_LEVEL:-info}
     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_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
     networks:
       default:
@@ -81,10 +80,8 @@ services:
       - --http-allowed-origins=*
       - --listen-address
       - 0.0.0.0
-      - --libp2p-port
-      - ${CL_P2P_PORT:-9000}
       - --discovery-port
-      - ${CL_P2P_PORT:-9000}
+      - ${CL_DISC_PORT:-9000}
       - --quic-port
       - ${CL_QUIC_PORT:-9001}
       - ${CL_MAX_PEER_COUNT:+--target-peers}

grandine-cl-only.yml

@@ -46,15 +46,14 @@ services:
       - NODE_TYPE=${CL_NODE_TYPE:-pruned}
       - IPV6=${IPV6:-false}
       - HOST_IP=${HOST_IP:-}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_DISC_PORT=${CL_DISC_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - NETWORK=${NETWORK}
       - COMPOSE_FILE=${COMPOSE_FILE}
       - LOG_LEVEL=${LOG_LEVEL}
       - RUST_LOG=${LOG_LEVEL:-info}
     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_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
     networks:
       default:
@@ -76,10 +75,8 @@ services:
       - --http-allowed-origins=*
       - --listen-address
       - 0.0.0.0
-      - --libp2p-port
-      - ${CL_P2P_PORT:-9000}
       - --discovery-port
-      - ${CL_P2P_PORT:-9000}
+      - ${CL_DISC_PORT:-9000}
       - --quic-port
       - ${CL_QUIC_PORT:-9001}
       - ${CL_MAX_PEER_COUNT:+--target-peers}

grandine-plugin-allin1.yml

@@ -3,8 +3,8 @@ services:
   execution:
     ports:
       # Grandine consensus P2P 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_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp"
+      - "${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp"
     environment:
       - CL_NODE_TYPE=${CL_NODE_TYPE:-pruned}
       - CL_EXTRAS=${CL_EXTRAS:-}
@@ -25,7 +25,7 @@ services:
       - DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false}
       - DOPPELGANGER=${DOPPELGANGER:-false}
       - IPV6=${IPV6:-false}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_DISC_PORT=${CL_DISC_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - CL_REST_PORT=${CL_REST_PORT:-5052}
       - CL_MAX_PEER_COUNT=${CL_MAX_PEER_COUNT:-}

grandine-plugin.yml

@@ -3,8 +3,8 @@ services:
   execution:
     ports:
       # Grandine consensus P2P 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_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp"
+      - "${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp"
     environment:
       - CL_NODE_TYPE=${CL_NODE_TYPE:-pruned}
       - CL_EXTRAS=${CL_EXTRAS:-}
@@ -22,7 +22,7 @@ services:
       - DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false}
       - DOPPELGANGER=${DOPPELGANGER:-false}
       - IPV6=${IPV6:-false}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_DISC_PORT=${CL_DISC_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - CL_REST_PORT=${CL_REST_PORT:-5052}
       - CL_MAX_PEER_COUNT=${CL_MAX_PEER_COUNT:-}

grandine/docker-entrypoint.sh

@@ -202,7 +202,7 @@ fi
 if [[ "${IPV6}" = "true" ]]; then
   echo "Configuring Grandine to listen on IPv6 ports"
   echo "IPv6 ENR will be auto-discovered. Please make sure the v6 P2P ports are reachable \"from Internet\""
-  __ipv6="--listen-address-ipv6 :: --libp2p-port-ipv6 ${CL_P2P_PORT:-9000} --discovery-port-ipv6 ${CL_P2P_PORT:-9000} \
+  __ipv6="--listen-address-ipv6 :: --discovery-port-ipv6 ${CL_DISC_PORT:-9000} \
 --quic-port-ipv6 ${CL_QUIC_PORT:-9001}"
 else
   __ipv6=""

lighthouse-cl-only.yml

@@ -43,13 +43,12 @@ services:
       - EL_NODE=${EL_NODE}
       - IPV6=${IPV6:-false}
       - HOST_IP=${HOST_IP:-}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_DISC_PORT=${CL_DISC_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - NETWORK=${NETWORK}
       - COMPOSE_FILE=${COMPOSE_FILE}
     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_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
     networks:
       default:
@@ -73,8 +72,8 @@ services:
       - --http-allow-origin=*
       - --listen-address
       - 0.0.0.0
-      - --port
-      - ${CL_P2P_PORT:-9000}
+      - --discovery-port
+      - ${CL_DISC_PORT:-9000}
       - --quic-port
       - ${CL_QUIC_PORT:-9001}
       - ${CL_MAX_PEER_COUNT:+--target-peers}

lighthouse.yml

@@ -52,13 +52,12 @@ services:
       - EL_NODE=${EL_NODE}
       - IPV6=${IPV6:-false}
       - HOST_IP=${HOST_IP:-}
-      - CL_P2P_PORT=${CL_P2P_PORT:-9000}
+      - CL_DISC_PORT=${CL_DISC_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
       - NETWORK=${NETWORK}
       - COMPOSE_FILE=${COMPOSE_FILE}
     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_DISC_PORT:-9000}:${CL_DISC_PORT:-9000}/udp
       - ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
     networks:
       default:
@@ -82,8 +81,8 @@ services:
       - --http-allow-origin=*
       - --listen-address
       - 0.0.0.0
-      - --port
-      - ${CL_P2P_PORT:-9000}
+      - --discovery-port
+      - ${CL_DISC_PORT:-9000}
       - --quic-port
       - ${CL_QUIC_PORT:-9001}
       - ${CL_MAX_PEER_COUNT:+--target-peers}

lighthouse/docker-entrypoint.sh

@@ -160,7 +160,7 @@ fi
 if [[ "${IPV6}" = "true" ]]; then
   echo "Configuring Lighthouse to listen on IPv6 ports"
   echo "IPv6 ENR will be auto-discovered. Please make sure the v6 P2P ports are reachable \"from Internet\""
-  __ipv6="--listen-address :: --port6 ${CL_P2P_PORT:-9000} --enr-udp6-port ${CL_P2P_PORT:-9000} --quic-port6 ${CL_QUIC_PORT:-9001}"
+  __ipv6="--listen-address :: --discovery-port6 ${CL_DISC_PORT:-9000} --quic-port6 ${CL_QUIC_PORT:-9001}"
 else
   __ipv6=""
 fi