Fix potential ipv6 AnyAddress ending up in ENR (#3783)

kdeme · web-flow · commit 109e4a639141 · 2025-10-22T08:55:48.000Z
diff --git a/execution_chain/networking/eth1_discovery.nim b/execution_chain/networking/eth1_discovery.nim
@@ -117,13 +117,19 @@ func eligibleNode(proto: Eth1Discovery, rec: Record): bool =
 proc new*(
     _: type Eth1Discovery,
     privKey: PrivateKey,
-    address: AddressV4,
+    enrIp: Opt[IpAddress],
+    enrTcpPort, enrUdpPort: Opt[Port],
     bootstrapNodes: BootstrapNodes,
     bindPort: Port,
     bindIp = IPv6_any(),
     rng = newRng(),
     compatibleForkId = CompatibleForkIdProc(nil)
 ): Eth1Discovery =
+  let address = enode.Address(
+      ip: enrIp.valueOr(bindIp),
+      tcpPort: enrTcpPort.valueOr(bindPort),
+      udpPort: enrUdpPort.valueOr(bindPort),
+    )
   Eth1Discovery(
     discv4: discoveryv4.newDiscoveryV4(
       privKey = privKey,
@@ -135,9 +141,9 @@ proc new*(
     ),
     discv5: discoveryv5.newProtocol(
       privKey = privKey,
-      enrIp = Opt.some(address.ip),
-      enrTcpPort = Opt.some(address.tcpPort),
-      enrUdpPort = Opt.some(address.udpPort),
+      enrIp = enrIp,
+      enrTcpPort = enrTcpPort,
+      enrUdpPort = enrUdpPort,
       bootstrapRecords = bootstrapNodes.enrs,
       bindPort = bindPort,
       bindIp = bindIp,
diff --git a/execution_chain/networking/p2p.nim b/execution_chain/networking/p2p.nim
@@ -31,7 +31,8 @@ type
 
 proc newEthereumNode*(
     keys: KeyPair,
-    address: Address,
+    enrIp: Opt[IpAddress],
+    enrTcpPort, enrUdpPort: Opt[Port],
     networkId: NetworkId,
     clientId = "nim-eth-p2p",
     minPeers = 10,
@@ -46,8 +47,13 @@ proc newEthereumNode*(
     raiseAssert "Cannot initialize RNG"
 
   let
+    address = enode.Address(
+      ip: enrIp.valueOr(bindIp),
+      tcpPort: enrTcpPort.valueOr(bindTcpPort),
+      udpPort: enrUdpPort.valueOr(bindUdpPort),
+    )
     discovery = Eth1Discovery.new(
-      keys.seckey, address, bootstrapNodes, bindUdpPort, bindIp, rng, forkIdProcs.compatibleForkId)
+      keys.seckey, enrIp, enrTcpPort, enrUdpPort, bootstrapNodes, bindUdpPort, bindIp, rng, forkIdProcs.compatibleForkId)
     node = EthereumNode(
       keys: keys,
       networkId: networkId,
diff --git a/execution_chain/nimbus_execution_client.nim b/execution_chain/nimbus_execution_client.nim
@@ -105,11 +105,6 @@ proc setupP2P(nimbus: NimbusNode, conf: NimbusConf, com: CommonRef) =
     natId = NimbusName & " " & NimbusVersion
     (extIp, extTcpPort, extUdpPort) =
       setupAddress(conf.nat, conf.listenAddress, conf.tcpPort, conf.udpPort, natId)
-    address = enode.Address(
-      ip: extIp.valueOr(conf.listenAddress),
-      tcpPort: extTcpPort.valueOr(conf.tcpPort),
-      udpPort: extUdpPort.valueOr(conf.udpPort),
-    )
 
     bootstrapNodes = conf.getBootstrapNodes()
     fc = nimbus.fc
@@ -127,7 +122,7 @@ proc setupP2P(nimbus: NimbusNode, conf: NimbusConf, com: CommonRef) =
   )
 
   nimbus.ethNode = newEthereumNode(
-    keypair, address, conf.networkId, conf.agentString,
+    keypair, extIp, extTcpPort, extUdpPort, conf.networkId, conf.agentString,
     minPeers = conf.maxPeers,
     bootstrapNodes = bootstrapNodes,
     bindUdpPort = conf.udpPort, bindTcpPort = conf.tcpPort,
diff --git a/tests/networking/p2p_test_helper.nim b/tests/networking/p2p_test_helper.nim
@@ -46,16 +46,17 @@ proc envConfig(): NimbusConf =
 
 var nextPort = 30303
 
-proc localAddress*(port: int): enode.Address =
-  let port = Port(port)
-  result = enode.Address(udpPort: port, tcpPort: port,
-                   ip: parseIpAddress("127.0.0.1"))
+func localAddress*(port: int): enode.Address =
+  enode.Address(udpPort: Port(port), tcpPort: Port(port), ip: parseIpAddress("127.0.0.1"))
 
 proc setupTestNode(rng: ref HmacDrbgContext): EthereumNode {.gcsafe.} =
   # Don't create new RNG every time in production code!
   let keys1 = KeyPair.random(rng[])
   var node = newEthereumNode(
-    keys1, localAddress(nextPort),
+    keys1,
+    Opt.some(parseIpAddress("127.0.0.1")),
+    Opt.some(Port(nextPort)),
+    Opt.some(Port(nextPort)),
     networkId = 1.u256,
     bindUdpPort = Port(nextPort),
     bindTcpPort = Port(nextPort),
diff --git a/tests/test_helpers.nim b/tests/test_helpers.nim
@@ -154,7 +154,10 @@ proc setupEthNode*(
     ip: conf.listenAddress, tcpPort: conf.tcpPort, udpPort: conf.udpPort)
 
   var node = newEthereumNode(
-    keypair, srvAddress,
+    keypair,
+    Opt.some(conf.listenAddress),
+    Opt.some(conf.tcpPort),
+    Opt.some(conf.udpPort),
     conf.networkId,
     conf.agentString,
     bindUdpPort = conf.udpPort,
