wip: quic

.github/workflows/ci.yml

@@ -107,6 +107,13 @@ jobs:
           # for miniupnp that runs "wingenminiupnpcstrings.exe" from the current dir
           echo "." >> $GITHUB_PATH
 
+      - name: Install nasm (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          choco install nasm --no-progress -y
+          "C:\Program Files\NASM" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Derive environment variables
         run: |
           if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then

.gitmodules

@@ -237,3 +237,6 @@
 	path = vendor/nim-quic
 	url = https://github.com/vacp2p/nim-quic
 	branch = main
+[submodule "vendor/nim-lsquic"]
+	path = vendor/nim-lsquic
+	url = https://github.com/vacp2p/nim-lsquic.git

Makefile

@@ -91,6 +91,7 @@ TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
 	test \
 	clean \
 	libbacktrace \
+	boringssl-win64 \
 	book \
 	publish-book \
 	dist-amd64 \
@@ -164,7 +165,7 @@ ifeq ($(USE_LIBBACKTRACE), 0)
 NIM_PARAMS += -d:disable_libbacktrace
 endif
 
-deps: | deps-common nat-libs build/generate_makefile
+deps: | deps-common nat-libs build/generate_makefile boringssl-win64
 ifneq ($(USE_LIBBACKTRACE), 0)
 deps: | libbacktrace
 endif
@@ -178,6 +179,9 @@ update: | update-common
 libbacktrace:
 	+ "$(MAKE)" -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0
 
+boringssl-win64:
+	+ "$(MAKE)" -C vendor/nim-lsquic
+
 # Make sure ports don't overlap to support concurrent execution of tests
 # Avoid selecting ephemeral ports that may be used by others; safe = 5001-9999
 # - Port 8301 is used by Consul
@@ -193,11 +197,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 +224,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 +506,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/conf.nim

@@ -36,7 +36,7 @@ from consensus_object_pools/block_pools_types_light_client
 
 export
   uri, nat, enr,
-  defaultEth2TcpPort, enabledLogLevel,
+  defaultEth2TcpPort, defaultEth2QuicPort, enabledLogLevel,
   defs, parseCmdArg, completeCmdArg, network_metadata,
   el_conf, network,
   confTomlDefs, confTomlNet, confTomlUri, jsnet,
@@ -299,6 +299,19 @@ type
         defaultValueDesc: $defaultEth2TcpPortDesc
         name: "tcp-port" .}: Port
 
+      quicEnabled* {.
+        hidden
+        desc: "Enable QUIC transport"
+        defaultValue: true # TODO: set to false by default
+        name: "debug-quic" .}: bool
+
+      quicPort* {.
+        hidden
+        desc: "Listening UDP port for Ethereum LibP2P traffic over QUIC"
+        defaultValue: defaultEth2QuicPort
+        defaultValueDesc: $defaultEth2QuicPortDesc
+        name: "debug-quic-port" .}: Port   
+
       udpPort* {.
         desc: "Listening UDP port for node discovery"
         defaultValue: defaultEth2TcpPort
@@ -811,6 +824,11 @@ type
           desc: "External UDP port"
           name: "udp-port" .}: Port
 
+        quicPortExt* {.
+          hidden
+          desc: "External QUIC port"
+          name: "debug-quic-port" .}: Port
+
         seqNumber* {.
           desc: "Record sequence number"
           defaultValue: 1,

beacon_chain/conf_light_client.nim

@@ -69,6 +69,19 @@ type LightClientConf* = object
     defaultValueDesc: $defaultEth2TcpPortDesc
     name: "tcp-port" .}: Port
 
+  quicEnabled* {.
+    hidden
+    desc: "Enable QUIC transport"
+    defaultValue: true # TODO: set to false by default
+    name: "debug-quic" .}: bool
+
+  quicPort* {.
+    hidden
+    desc: "Listening UDP port for Ethereum LibP2P traffic over QUIC"
+    defaultValue: defaultEth2QuicPort
+    defaultValueDesc: $defaultEth2QuicPortDesc
+    name: "debug-quic-port" .}: Port
+
   udpPort* {.
     desc: "Listening UDP port for node discovery"
     defaultValue: defaultEth2TcpPort

beacon_chain/networking/eth2_discovery.nim

@@ -12,6 +12,7 @@ import
   chronos, chronicles,
   eth/p2p/discoveryv5/[protocol, node, random2],
   ../spec/datatypes/[altair, fulu],
+  ../spec/network,
   ../spec/eth2_ssz_serialization,
   ".."/[conf, conf_light_client]
 
@@ -78,7 +79,7 @@ proc loadBootstrapFile*(bootstrapFile: string,
 
 proc new*(T: type Eth2DiscoveryProtocol,
           config: BeaconNodeConf | LightClientConf,
-          enrIp: Opt[IpAddress], enrTcpPort, enrUdpPort: Opt[Port],
+          enrIp: Opt[IpAddress], enrTcpPort, enrQuicPort, enrUdpPort: Opt[Port],
           pk: PrivateKey,
           enrFields: openArray[(string, seq[byte])], rng: ref HmacDrbgContext):
           T =
@@ -102,8 +103,8 @@ proc new*(T: type Eth2DiscoveryProtocol,
     else:
       Opt.none(IpAddress)
 
-  newProtocol(pk, enrIp, enrTcpPort, enrUdpPort, enrFields, bootstrapEnrs,
-    bindPort = config.udpPort, bindIp = listenAddress,
+  newProtocol(pk, enrIp, enrTcpPort, enrUdpPort, enrQuicPort, enrFields,
+    bootstrapEnrs, bindPort = config.udpPort, bindIp = listenAddress,
     enrAutoUpdate = config.enrAutoUpdate, rng = rng)
 
 func isCompatibleForkId*(discoveryForkId: ENRForkID, peerForkId: ENRForkID): bool =