Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: status-im/nimbus-eth2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 378108ae8f8594fcfcc02fcd11dec6efe7b5d03f
Choose a base ref
..
head repository: status-im/nimbus-eth2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e7fafaaaec9abe0571b9cce6dc3c089df6e3bdaf
Choose a head ref
Showing with 9 additions and 15 deletions.
  1. +1 −1 beacon_chain/networking/eth2_discovery.nim
  2. +4 −4 beacon_chain/networking/eth2_network.nim
  3. +1 −1 beacon_chain/nimbus_beacon_node.nim
  4. +1 −1 ncli/ncli_testnet.nim
  5. +1 −7 tests/test_discovery.nim
  6. +1 −1 vendor/nim-eth
2 changes: 1 addition & 1 deletion beacon_chain/networking/eth2_discovery.nim
View file
Original file line number Diff line number Diff line change
@@ -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 =
8 changes: 4 additions & 4 deletions beacon_chain/networking/eth2_network.nim
View file
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion beacon_chain/nimbus_beacon_node.nim
View file
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion ncli/ncli_testnet.nim
View file
Original file line number Diff line number Diff line change
@@ -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),
[
8 changes: 1 addition & 7 deletions tests/test_discovery.nim
View file
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion vendor/nim-eth
Submodule nim-eth updated 26 files
+2 −0 eth/common/eth_types.nim
+3 −0 eth/common/eth_types_rlp.nim
+19 −18 eth/net/nat.nim
+5 −5 eth/net/utils.nim
+3 −19 eth/p2p/bootnodes.nim
+3 −3 eth/p2p/discoveryv5/enr.nim
+2 −2 eth/p2p/discoveryv5/node.nim
+6 −6 eth/p2p/discoveryv5/protocol.nim
+1 −1 eth/p2p/discoveryv5/routing_table.nim
+4 −4 eth/p2p/kademlia.nim
+2 −2 tests/fuzzing/discoveryv5/fuzz_decode_packet.nim
+1 −1 tests/fuzzing/enr/generate.nim
+10 −10 tests/p2p/discv5_test_helper.nim
+1 −1 tests/p2p/eth_protocol.nim
+20 −20 tests/p2p/test_discoveryv5.nim
+4 −4 tests/p2p/test_discoveryv5_encoding.nim
+2 −3 tests/p2p/test_enode.nim
+8 −8 tests/p2p/test_enr.nim
+14 −14 tests/p2p/test_ip_vote.nim
+13 −13 tests/p2p/test_routing_table.nim
+3 −3 tests/utp/test_protocol.nim
+1 −1 tests/utp/test_protocol_integration.nim
+5 −6 tests/utp/test_utp_router.nim
+17 −20 tests/utp/test_utp_socket.nim
+1 −3 tests/utp/test_utp_socket_sack.nim
+3 −3 tools/dcli.nim