From 7a8c1d818a835312cc661e941154556ace0d70b4 Mon Sep 17 00:00:00 2001 From: Kim De Mey Date: Tue, 18 Jun 2024 23:46:51 +0200 Subject: [PATCH] Bump nim-eth for Opt changes and make Opt related adjustments (#6369) --- beacon_chain/networking/eth2_discovery.nim | 2 +- beacon_chain/networking/eth2_network.nim | 2 +- beacon_chain/nimbus_beacon_node.nim | 6 +++--- ncli/ncli_testnet.nim | 6 +++--- tests/test_discovery.nim | 4 ++-- vendor/nim-eth | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/beacon_chain/networking/eth2_discovery.nim b/beacon_chain/networking/eth2_discovery.nim index e9495e25a..7ead407f7 100644 --- a/beacon_chain/networking/eth2_discovery.nim +++ b/beacon_chain/networking/eth2_discovery.nim @@ -78,7 +78,7 @@ proc loadBootstrapFile*(bootstrapFile: string, proc new*(T: type Eth2DiscoveryProtocol, config: BeaconNodeConf | LightClientConf, - enrIp: Option[IpAddress], enrTcpPort, enrUdpPort: Option[Port], + enrIp: Opt[IpAddress], enrTcpPort, enrUdpPort: Opt[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 abb900dff..f2f5fd81a 100644 --- a/beacon_chain/networking/eth2_network.nim +++ b/beacon_chain/networking/eth2_network.nim @@ -1765,7 +1765,7 @@ proc new(T: type Eth2Node, enrForkId: ENRForkID, discoveryForkId: ENRForkID, forkDigests: ref ForkDigests, getBeaconTime: GetBeaconTimeFn, switch: Switch, pubsub: GossipSub, - ip: Option[IpAddress], tcpPort, udpPort: Option[Port], + ip: Opt[IpAddress], tcpPort, udpPort: Opt[Port], privKey: keys.PrivateKey, discovery: bool, directPeers: DirectPeers, rng: ref HmacDrbgContext): T {.raises: [CatchableError].} = diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim index 885647b00..e862c31ee 100644 --- a/beacon_chain/nimbus_beacon_node.nim +++ b/beacon_chain/nimbus_beacon_node.nim @@ -2271,9 +2271,9 @@ proc doRecord(config: BeaconNodeConf, rng: var HmacDrbgContext) {. let record = enr.Record.init( config.seqNumber, netKeys.seckey.asEthKey, - some(config.ipExt), - some(config.tcpPortExt), - some(config.udpPortExt), + Opt.some(config.ipExt), + Opt.some(config.tcpPortExt), + Opt.some(config.udpPortExt), fieldPairs).expect("Record within size limits") echo record.toURI() diff --git a/ncli/ncli_testnet.nim b/ncli/ncli_testnet.nim index de8c98b65..4a4d742ea 100644 --- a/ncli/ncli_testnet.nim +++ b/ncli/ncli_testnet.nim @@ -379,9 +379,9 @@ proc createEnr(rng: var HmacDrbgContext, bootstrapEnr = enr.Record.init( 1, # sequence number networkKeys.seckey.asEthKey, - some(address), - some(port), - some(port), + Opt.some(address), + Opt.some(port), + Opt.some(port), [ toFieldPair(enrForkIdField, forkId), toFieldPair(enrAttestationSubnetsField, SSZ.encode(netMetadata.attnets)) diff --git a/tests/test_discovery.nim b/tests/test_discovery.nim index f33ed569a..662e47e73 100644 --- a/tests/test_discovery.nim +++ b/tests/test_discovery.nim @@ -17,7 +17,7 @@ import proc new(T: type Eth2DiscoveryProtocol, pk: keys.PrivateKey, - enrIp: Option[IpAddress], enrTcpPort, enrUdpPort: Option[Port], + enrIp: Opt[IpAddress], enrTcpPort, enrUdpPort: Opt[Port], bindPort: Port, bindIp: IpAddress, enrFields: openArray[(string, seq[byte])] = [], rng: ref HmacDrbgContext): T = @@ -32,7 +32,7 @@ proc generateNode(rng: ref HmacDrbgContext, port: Port, except ValueError: raiseAssert "Argument is a valid IP address" Eth2DiscoveryProtocol.new(keys.PrivateKey.random(rng[]), - some(ip), some(port), some(port), port, ip, enrFields, rng = rng) + Opt.some(ip), Opt.some(port), Opt.some(port), port, ip, enrFields, rng = rng) # TODO: Add tests with a syncnets preference const noSyncnetsPreference = SyncnetBits() diff --git a/vendor/nim-eth b/vendor/nim-eth index f169068df..26212c881 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit f169068df6c11a2aeba27584c60e354e19c42e94 +Subproject commit 26212c881b464ed64cac20442fb45144d3ecd3b3