logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-07 16:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(jsonrpc): add ENR to debug_v1_info call (#918)

Browse Source
This commit is contained in:
Daniel Kaiser 2022-03-30 15:10:15 +02:00 committed by GitHub
parent 63e23092e0
commit ec0a46b65b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
waku/v2/node/wakunode2.nim
View File

@ -72,6 +72,7 @@ type
WakuInfo* = object WakuInfo* = object
# NOTE One for simplicity, can extend later as needed # NOTE One for simplicity, can extend later as needed
listenAddresses*: seq[string] listenAddresses*: seq[string]
enrUri*: string
#multiaddrStrings*: seq[string] #multiaddrStrings*: seq[string]
# NOTE based on Eth2Node in NBC eth2_network.nim # NOTE based on Eth2Node in NBC eth2_network.nim
@ -449,7 +450,9 @@ proc info*(node: WakuNode): WakuInfo =
for address in node.announcedAddresses: for address in node.announcedAddresses:
var fulladdr = $address & "/p2p/" & $peerInfo.peerId var fulladdr = $address & "/p2p/" & $peerInfo.peerId
listenStr &= fulladdr listenStr &= fulladdr
let wakuInfo = WakuInfo(listenAddresses: listenStr) let enrUri = if node.wakuDiscV5 != nil: node.wakuDiscV5.protocol.localNode.record.toUri()
else: node.enr.toUri()
let wakuInfo = WakuInfo(listenAddresses: listenStr, enrUri: enrUri)
return wakuInfo return wakuInfo
proc mountFilter*(node: WakuNode, filterTimeout: Duration = WakuFilterTimeout) {.raises: [Defect, KeyError, LPError]} = proc mountFilter*(node: WakuNode, filterTimeout: Duration = WakuFilterTimeout) {.raises: [Defect, KeyError, LPError]} =
@ -900,7 +903,7 @@ proc startDiscv5*(node: WakuNode): Future[bool] {.async.} =
asyncSpawn node.runDiscv5Loop() asyncSpawn node.runDiscv5Loop()
debug "Successfully started discovery v5 service" debug "Successfully started discovery v5 service"
info "Discv5: discoverable ENR ", enr = node.wakuDiscV5.protocol.localNode.record.toURI() info "Discv5: discoverable ENR ", enr = node.wakuDiscV5.protocol.localNode.record.toUri()
return true return true
return false return false
@ -936,7 +939,7 @@ proc start*(node: WakuNode) {.async.} =
## XXX: this should be /ip4..., / stripped? ## XXX: this should be /ip4..., / stripped?
info "Listening on", full = listenStr info "Listening on", full = listenStr
info "DNS: discoverable ENR ", enr = node.enr.toURI() info "DNS: discoverable ENR ", enr = node.enr.toUri()
## Update switch peer info with announced addrs ## Update switch peer info with announced addrs
node.updateSwitchPeerInfo() node.updateSwitchPeerInfo()