chore: add quic port to scripts

Author: richard-ramos

Makefile

@@ -193,11 +193,13 @@ libbacktrace:
 #
 # REST tests:
 # - --base-port (REST_TEST_BASE_PORT + 0)
-# - --base-rest-port (REST_TEST_BASE_PORT + 1)
-# - --base-metrics-port (REST_TEST_BASE_PORT + 2)
+# - debug-quic-port (REST_TEST_BASE_PORT + 1)
+# - --base-rest-port (REST_TEST_BASE_PORT + 2)
+# - --base-metrics-port (REST_TEST_BASE_PORT + 3)
 #
 # Local testnets (entire continuous range):
 # - --base-port + [0, --nodes + --light-clients)
+# - debug-quic-port uses (--base-port + 1) + [0, --nodes + --light-clients)
 # - --base-rest-port + [0, --nodes)
 # - --base-metrics-port + [0, --nodes)
 # - --base-vc-keymanager-port + [0, --nodes)
@@ -218,9 +220,9 @@ MAINNET_TESTNET_BASE_PORT := 26501
 restapi-test:
 	./tests/simulation/restapi.sh \
 		--data-dir resttest0_data \
-		--base-port $$(( $(REST_TEST_BASE_PORT) + EXECUTOR_NUMBER * 3 + 0 )) \
-		--base-rest-port $$(( $(REST_TEST_BASE_PORT) + EXECUTOR_NUMBER * 3 + 1 )) \
-		--base-metrics-port $$(( $(REST_TEST_BASE_PORT) + EXECUTOR_NUMBER * 3 + 2 )) \
+		--base-port $$(( $(REST_TEST_BASE_PORT) + EXECUTOR_NUMBER * 4 + 0 )) \
+		--base-rest-port $$(( $(REST_TEST_BASE_PORT) + EXECUTOR_NUMBER * 4 + 2 )) \
+		--base-metrics-port $$(( $(REST_TEST_BASE_PORT) + EXECUTOR_NUMBER * 4 + 3 )) \
 		--resttest-delay 30 \
 		--kill-old-processes
 
@@ -500,6 +502,8 @@ nimbus_beacon_node: force_build_alone_tools
 
 GOERLI_TESTNETS_PARAMS := \
 	--tcp-port=$$(( $(BASE_PORT) + $(NODE_ID) )) \
+	--debug-quic=true \
+	--debug-quic-port=$$(( $(BASE_PORT) + $(NODE_ID) + 1 )) \
 	--udp-port=$$(( $(BASE_PORT) + $(NODE_ID) )) \
 	--metrics \
 	--metrics-port=$$(( $(BASE_METRICS_PORT) + $(NODE_ID) )) \

beacon_chain/networking/eth2_network.nim

@@ -1968,7 +1968,7 @@ proc startListening*(node: Eth2Node) {.async.} =
   try:
     await node.switch.start()
   except CatchableError as exc:
-    fatal "Failed to start LibP2P transport. TCP port may be already in use",
+    fatal "Failed to start LibP2P transport. TCP/QUIC port may be already in use",
           exc = exc.msg
     quit 1
 

docker/dist/README.md.tpl

@@ -42,7 +42,7 @@ To connect to mainnet with default options:
 The script will forward all supplied options to the beacon node executable:
 
 ```bash
-./run-mainnet-beacon-node.sh --log-level=DEBUG --tcp-port=9050
+./run-mainnet-beacon-node.sh --log-level=DEBUG --tcp-port=9050 --debug-quic=true --debug-quic-port=9051
 ```
 
 To monitor the Eth1 validator deposit contract, you'll need to pair

docker/dist/binaries/docker-compose-example1.yml

@@ -15,11 +15,12 @@ services:
     ports:
       - 9000:9000/tcp
       - 9000:9000/udp
+      - 9001:9001/udp
       - 127.0.0.1:5052:5052/tcp
       - 127.0.0.1:8008:8008/tcp
     volumes:
       - ./data:/home/user/nimbus-eth2/build/data
-    # you need to make sure that port 9000 is accesible from outside; no automagic port forwarding here
+    # you need to make sure that ports 9000/9001 are accesible from outside; no automagic port forwarding here
     command: >-
       --network=hoodi
       --data-dir=/home/user/nimbus-eth2/build/data/shared_hoodi_0
@@ -28,6 +29,8 @@ services:
       --log-level=info
       --tcp-port=9000
       --udp-port=9000
+      --debug-quic=true
+      --debug-quic-port=9001
       --rest
       --rest-address=0.0.0.0
       --rest-port=5052

scripts/launch_local_testnet.sh

@@ -439,6 +439,16 @@ kill_by_port() {
         exit 1
       fi
     done
+    for PID in $(lsof -n -i udp:${PORT} -t); do
+      echo -n "Found old process using UDP port ${PORT}, with PID ${PID}. "
+      if [[ "${KILL_OLD_PROCESSES}" == "1" ]]; then
+        echo "Killing it."
+        kill -SIGKILL "${PID}" || true
+      else
+        echo "Aborting."
+        exit 1
+      fi
+    done
   done
 }
 
@@ -515,7 +525,7 @@ if [[ "${OS}" != "windows" ]]; then
 
   # Stop Nimbus CL nodes
   for NUM_NODE in $(seq 1 $NUM_NODES); do
-    for PORT in $(( BASE_PORT + NUM_NODE - 1 )) $(( BASE_METRICS_PORT + NUM_NODE - 1)) $(( BASE_REST_PORT + NUM_NODE - 1)); do
+    for PORT in $(( BASE_PORT + NUM_NODE - 1 )) $(( BASE_PORT + 2000 + NUM_NODE - 1 )) $(( BASE_METRICS_PORT + NUM_NODE - 1)) $(( BASE_REST_PORT + NUM_NODE - 1)); do
       PORTS_TO_KILL+=("${PORT}")
     done
   done
@@ -1136,6 +1146,8 @@ for NUM_NODE in $(seq 1 "${NUM_NODES}"); do
     --config-file="${CLI_CONF_FILE}" \
     --tcp-port=$(( BASE_PORT + NUM_NODE - 1 )) \
     --udp-port=$(( BASE_PORT + NUM_NODE - 1 )) \
+    --debug-quic=true \
+    --debug-quic-port=$(( BASE_PORT + 2000 + NUM_NODE - 1 )) \
     --max-peers=$(( NUM_NODES + LC_NODES - 1 )) \
     --data-dir="${CONTAINER_NODE_DATA_DIR}" \
     ${BOOTSTRAP_ARG} \
@@ -1254,6 +1266,9 @@ if [ "$LC_NODES" -ge "1" ]; then
       WEB3_ARG+=("--web3-url=http://127.0.0.1:${GETH_AUTH_RPC_PORTS[$(( NUM_NODES + NUM_LC - 1 ))]}")
     fi
 
+    TCP_PORT=$(( BASE_PORT + NUM_NODES + NUM_LC - 1 ))
+    QUIC_PORT=$(( TCP_PORT + 1000 ))
+
     ./build/nimbus_light_client \
       --log-level="${LOG_LEVEL}" \
       --log-format="json" \
@@ -1262,6 +1277,8 @@ if [ "$LC_NODES" -ge "1" ]; then
       --bootstrap-node="${LC_BOOTSTRAP_NODE}" \
       --tcp-port=$(( BASE_PORT + NUM_NODES + NUM_LC - 1 )) \
       --udp-port=$(( BASE_PORT + NUM_NODES + NUM_LC - 1 )) \
+      --debug-quic=true \
+      --debug-quic-port=$(( BASE_PORT + 2000 + NUM_NODES + NUM_LC - 1 )) \
       --max-peers=$(( NUM_NODES + LC_NODES - 1 )) \
       --nat="extip:127.0.0.1" \
       --trusted-block-root="${LC_TRUSTED_BLOCK_ROOT}" \

scripts/run-beacon-node.sh

@@ -60,12 +60,17 @@ if [[ "$WEB3_URL" != "" ]]; then
   WEB3_URL_ARG="--web3-url=${WEB3_URL}"
 fi
 
+TCP_PORT=$(( BASE_P2P_PORT + NODE_ID ))
+QUIC_PORT=$(( TCP_PORT + 1 ))
+
 # Allow the binary to receive signals directly.
 exec ${WINPTY} build/${NBC_BINARY} \
   --network=${NETWORK} \
   --data-dir="${DATA_DIR}" \
-  --tcp-port=$(( ${BASE_P2P_PORT} + ${NODE_ID} )) \
-  --udp-port=$(( ${BASE_P2P_PORT} + ${NODE_ID} )) \
+  --tcp-port=${TCP_PORT} \
+  --udp-port=${TCP_PORT} \
+  --debug-quic=true \
+  --debug-quic-port=${QUIC_PORT} \
   --rest \
   --rest-port=$(( ${BASE_REST_PORT} + ${NODE_ID} )) \
   --metrics \

tests/simulation/restapi.sh

@@ -145,7 +145,7 @@ fi
 
 # kill lingering processes from a previous run
 if [[ "${HAVE_LSOF}" == "1" ]]; then
-  for PORT in ${BASE_PORT} ${BASE_METRICS_PORT} ${BASE_REST_PORT}; do
+  for PORT in ${BASE_PORT} ${BASE_PORT + 2000} ${BASE_METRICS_PORT} ${BASE_REST_PORT}; do
     for PID in $(lsof -n -i tcp:${PORT} -sTCP:LISTEN -t); do
       echo -n "Found old process listening on port ${PORT}, with PID ${PID}. "
       if [[ "${KILL_OLD_PROCESSES}" == "1" ]]; then
@@ -156,6 +156,16 @@ if [[ "${HAVE_LSOF}" == "1" ]]; then
 	exit 1
       fi
     done
+    for PID in $(lsof -n -i udp:${PORT} -t); do
+      echo -n "Found old process using UDP port ${PORT}, with PID ${PID}. "
+      if [[ "${KILL_OLD_PROCESSES}" == "1" ]]; then
+        echo "Killing it."
+        kill -9 ${PID} || true
+      else
+        echo "Aborting."
+        exit 1
+      fi
+    done
   done
 fi
 
@@ -239,6 +249,8 @@ rm -rf "${TEST_DIR}/db" "${TEST_DIR}/validators/slashing_protection.sqlite3"
 ${NIMBUS_BEACON_NODE_BIN} \
   --tcp-port=${BASE_PORT} \
   --udp-port=${BASE_PORT} \
+  --debug-quic=true \
+  --debug-quic-port=${BASE_PORT + 2000} \
   --log-level=${LOG_LEVEL:-DEBUG} \
   --network="${TEST_DIR}" \
   --data-dir="${TEST_DIR}" \

tests/test_keymanager_api.nim

@@ -349,6 +349,8 @@ proc initBeaconNode(basePort: int): Future[BeaconNode] {.async: (raises: []).} =
             @[
               "--tcp-port=" & $(basePort + PortKind.PeerToPeer.ord),
               "--udp-port=" & $(basePort + PortKind.PeerToPeer.ord),
+              "--debug-quic=true",
+              "--debug-quic-port=" & $(basePort + PortKind.PeerToPeer.ord + 2000),
               "--discv5=off",
               "--network=" & dataDir,
               "--data-dir=" & nodeDataDir,