wip

Author: richard-ramos

.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

beacon_chain/conf.nim

@@ -299,11 +299,18 @@ 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: "quic-port" .}: Port
+        name: "debug-quic-port" .}: Port   
 
       udpPort* {.
         desc: "Listening UDP port for node discovery"

beacon_chain/conf_light_client.nim

@@ -69,11 +69,18 @@ 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: "quic-port" .}: Port
+    name: "debug-quic-port" .}: Port
 
   udpPort* {.
     desc: "Listening UDP port for node discovery"

beacon_chain/networking/eth2_network.nim

@@ -2232,7 +2232,7 @@ template tcpEndPoint(address, port): auto =
   MultiAddress.init(address, tcpProtocol, port)
 
 template quicEndPoint(address, port): auto =
-  MultiAddress.init(address, udpProtocol, port) & MultiAddress.init("/quic-v1")
+  MultiAddress.init(address, udpProtocol, port) & MultiAddress.init("/quic-v1").tryGet()
 
 func initNetKeys(privKey: PrivateKey): NetKeyPair =
   let pubKey = privKey.getPublicKey().expect("working public key from random")
@@ -2338,18 +2338,22 @@ proc newBeaconSwitch(
   var sb = SwitchBuilder.new()
   # Order of multiplexers matters, the first will be default
   try:
-    ok sb
+    sb = sb
     .withPrivateKey(seckey)
     .withAddresses(addresses)
     .withRng(rng)
     .withNoise()
-    .withQuicTransport()
+    # TODO: uncomment the following two lines to enable TCP back
+    #.withMplex(chronos.minutes(5), chronos.minutes(5))
+    #.withTcpTransport({ServerFlags.ReuseAddr})
     .withMaxConnections(config.maxPeers)
     .withAgentVersion(config.agentString)
-    .withMplex(chronos.minutes(5), chronos.minutes(5))
-    .withTcpTransport({ServerFlags.ReuseAddr})
     .withServices(@[service])
-    .build()
+
+    if config.quicEnabled:
+      sb = sb.withQuicTransport()
+        
+    ok sb.build()
   except LPError as exc:
     err(exc.msg)
 
@@ -2373,11 +2377,20 @@ proc createEth2Node*(
       else:
         getAutoAddress(Port(0)).toIpAddress()
 
-    # TODO: setupAddress only receives a single tcpPort and udpPort, 
-    # We need a way to pass the quic port
-    (extIp, extTcpPort, extUdpPort) =
-      setupAddress(config.nat, listenAddress, config.tcpPort,
-                   config.quicPort, config.udpPort, clientId)
+  var ports = newSeq[PortSpec]()
+  ports.add((config.tcpPort, PortProtocol.TCP))
+  ports.add((config.udpPort, PortProtocol.UDP))
+  if config.quicEnabled:
+    ports.add((config.quicPort, PortProtocol.UDP))
+
+  let
+    (extIp, extPorts) = setupAddress(config.nat, listenAddress, ports, clientId)
+
+    # TODO: uncommment this line and remove the next to add back TCP support
+    extTcpPort = Opt.none(Port)
+    # extTcpPort = extPorts[0].toPort()
+    extUdpPort = extPorts[1].toPort()
+    extQuicPort = if config.quicEnabled: extPorts[2].toPort() else: Opt.none(Port)
 
     directPeers = block:
       var res: DirectPeers
@@ -2402,16 +2415,15 @@ proc createEth2Node*(
         info "Adding privileged direct peer", peerId, address
       res
 
-    hostAddress = @[
-      quicEndpoint(listenAddress, config.quicUdpPort),
-      tcpEndPoint(listenAddress, config.tcpPort)
-    ]
+  var hostAddress = @[tcpEndPoint(listenAddress, config.tcpPort)]
 
-  var announcedAddresses = newSeq[Multiaddr]()
-  if not(extIp.isNone() or extTcpPort.isNone()):
-    announcedAddresses.add  tcpEndPoint(extIp.get(), extTcpPort.get())
-  if not(extIp.isNone() or extQuicUdpPort.isNone()):
-    announcedAddresses.add  quicEndpoint(extIp.get(), extQuicUdpPort.get())
+  var announcedAddresses = newSeq[Multiaddress]()
+  # TODO: uncomment the following lines to add back TCP support
+  #if not(extIp.isNone() or extTcpPort.isNone()):
+  #  announcedAddresses.add  tcpEndPoint(extIp.get(), extTcpPort.get().port)
+  if config.quicEnabled and not(extIp.isNone() or extQuicPort.isNone()):
+    hostAddress.add(quicEndpoint(listenAddress, config.quicPort))
+    announcedAddresses.add(quicEndpoint(extIp.get(), extQuicPort.get()))
 
   debug "Initializing networking", hostAddress,
                                    network_public_key = netKeys.pubkey,
@@ -2490,7 +2502,7 @@ proc createEth2Node*(
 
   let node = Eth2Node.new(
     config, cfg, enrForkId, discoveryForkId, forkDigests, getBeaconTime, switch, pubsub, extIp,
-    extTcpPort, extUdpPort, netKeys.seckey.asEthKey,
+    extTcpPort, extQuicPort, extUdpPort, netKeys.seckey.asEthKey,
     discovery = config.discv5Enabled, directPeers, announcedAddresses,
     rng = rng)