From c7952ff7780fde117a8998fa799e93a8f2d78c32 Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Fri, 10 Nov 2023 18:58:48 +0300
Subject: [PATCH] bump nim-eth to remove ValidIpAddress and replace with
 IpAddress (#5587)

---
 beacon_chain/networking/eth2_discovery.nim | 2 +-
 beacon_chain/networking/eth2_network.nim   | 8 ++++----
 beacon_chain/nimbus_beacon_node.nim        | 2 +-
 ncli/ncli_testnet.nim                      | 2 +-
 tests/test_discovery.nim                   | 8 +-------
 vendor/nim-eth                             | 2 +-
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/beacon_chain/networking/eth2_discovery.nim b/beacon_chain/networking/eth2_discovery.nim
index 040cdb64e..cf29e0d3a 100644
--- a/beacon_chain/networking/eth2_discovery.nim
+++ b/beacon_chain/networking/eth2_discovery.nim
@@ -79,7 +79,7 @@ proc loadBootstrapFile*(bootstrapFile: string,
 
 proc new*(T: type Eth2DiscoveryProtocol,
           config: BeaconNodeConf | LightClientConf,
-          enrIp: Option[ValidIpAddress], enrTcpPort, enrUdpPort: Option[Port],
+          enrIp: Option[IpAddress], enrTcpPort, enrUdpPort: Option[Port],
           pk: PrivateKey,
           enrFields: openArray[(string, seq[byte])], rng: ref HmacDrbgContext):
           T =
diff --git a/beacon_chain/networking/eth2_network.nim b/beacon_chain/networking/eth2_network.nim
index f2c008811..0501bf719 100644
--- a/beacon_chain/networking/eth2_network.nim
+++ b/beacon_chain/networking/eth2_network.nim
@@ -1806,7 +1806,7 @@ proc new(T: type Eth2Node,
          enrForkId: ENRForkID, discoveryForkId: ENRForkID,
          forkDigests: ref ForkDigests, getBeaconTime: GetBeaconTimeFn,
          switch: Switch, pubsub: GossipSub,
-         ip: Option[ValidIpAddress], tcpPort, udpPort: Option[Port],
+         ip: Option[IpAddress], tcpPort, udpPort: Option[Port],
          privKey: keys.PrivateKey, discovery: bool,
          directPeers: DirectPeers,
          rng: ref HmacDrbgContext): T {.raises: [CatchableError].} =
@@ -2304,8 +2304,8 @@ proc createEth2Node*(rng: ref HmacDrbgContext,
       cfg, getBeaconTime().slotOrZero.epoch, genesis_validators_root)
 
     (extIp, extTcpPort, extUdpPort) = try: setupAddress(
-      config.nat, ValidIpAddress.init config.listenAddress, config.tcpPort,
-      config.udpPort, clientId)
+      config.nat, config.listenAddress, config.tcpPort, config.udpPort,
+      clientId)
     except CatchableError as exc: raise exc
     except Exception as exc: raiseAssert exc.msg
 
@@ -2330,7 +2330,7 @@ proc createEth2Node*(rng: ref HmacDrbgContext,
     hostAddress = tcpEndPoint(
       ValidIpAddress.init config.listenAddress, config.tcpPort)
     announcedAddresses = if extIp.isNone() or extTcpPort.isNone(): @[]
-                         else: @[tcpEndPoint(extIp.get(), extTcpPort.get())]
+                         else: @[tcpEndPoint(ValidIpAddress.init(extIp.get()), extTcpPort.get())]
 
   debug "Initializing networking", hostAddress,
                                    network_public_key = netKeys.pubkey,
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index eb1cfedd5..d5f7689ae 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -2132,7 +2132,7 @@ proc doRecord(config: BeaconNodeConf, rng: var HmacDrbgContext) {.
     let record = enr.Record.init(
       config.seqNumber,
       netKeys.seckey.asEthKey,
-      some(ValidIpAddress.init config.ipExt),
+      some(config.ipExt),
       some(config.tcpPortExt),
       some(config.udpPortExt),
       fieldPairs).expect("Record within size limits")
diff --git a/ncli/ncli_testnet.nim b/ncli/ncli_testnet.nim
index c247aefb1..35ac9e665 100644
--- a/ncli/ncli_testnet.nim
+++ b/ncli/ncli_testnet.nim
@@ -377,7 +377,7 @@ proc createEnr(rng: var HmacDrbgContext,
     bootstrapEnr = enr.Record.init(
       1, # sequence number
       networkKeys.seckey.asEthKey,
-      some(ValidIpAddress.init address),
+      some(address),
       some(port),
       some(port),
       [
diff --git a/tests/test_discovery.nim b/tests/test_discovery.nim
index 2c43bc369..60be5177a 100644
--- a/tests/test_discovery.nim
+++ b/tests/test_discovery.nim
@@ -21,13 +21,7 @@ proc new(T: type Eth2DiscoveryProtocol,
     enrFields: openArray[(string, seq[byte])] = [],
     rng: ref HmacDrbgContext):
     T {.raises: [CatchableError].} =
-  let optValidIpAddress =
-    if enrIp.isSome:
-      some ValidIpAddress.init enrIp.get
-    else:
-      none ValidIpAddress
-
-  newProtocol(pk, optValidIpAddress, enrTcpPort, enrUdpPort, enrFields,
+  newProtocol(pk, enrIp, enrTcpPort, enrUdpPort, enrFields,
     bindPort = bindPort, bindIp = bindIp, rng = rng)
 
 proc generateNode(rng: ref HmacDrbgContext, port: Port,
diff --git a/vendor/nim-eth b/vendor/nim-eth
index e34a9c4e5..ca4898e24 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit e34a9c4e5daee654d6ea16f6c4595253548ffb17
+Subproject commit ca4898e24a4ffb61759d57469f208b542123a092