waku-org
/
nwaku
mirror of https://github.com/waku-org/nwaku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: handle errors w.r.t. configured cluster-id and pubsub topics (#2368)

This commit is contained in:
Simon-Pierre Vivier 2024-01-30 07:15:23 -05:00 committed by GitHub
parent 573788739b
commit e04e35e229
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/wakunode2/app.nim
View File

@ -49,7 +49,7 @@ import
../../waku/waku_api/jsonrpc/store/handlers as rpc_store_api, ../../waku/waku_api/jsonrpc/store/handlers as rpc_store_api,
../../waku/waku_archive, ../../waku/waku_archive,
../../waku/waku_dnsdisc, ../../waku/waku_dnsdisc,
../../waku/waku_enr, ../../waku/waku_enr/sharding,
../../waku/waku_discv5, ../../waku/waku_discv5,
../../waku/waku_peer_exchange, ../../waku/waku_peer_exchange,
../../waku/waku_rln_relay, ../../waku/waku_rln_relay,
@ -128,19 +128,8 @@ proc init*(T: type App, rng: ref HmacDrbgContext, conf: WakuNodeConf): T =
quit(QuitFailure) quit(QuitFailure)
else: recordRes.get() else: recordRes.get()
# Check the ENR sharding info for matching config cluster id if isClusterMismatched(record, conf.clusterId):
if conf.clusterId != 0: error "cluster id mismatch configured shards"
let res = record.toTyped()
if res.isErr():
error "ENR setup failed", error = $res.get()
quit(QuitFailure)
let relayShard = res.get().relaySharding().valueOr:
error "no sharding info"
quit(QuitFailure)
if conf.clusterId != relayShard.clusterId:
error "cluster id mismatch"
quit(QuitFailure) quit(QuitFailure)
App( App(
@ -368,15 +357,8 @@ proc updateEnr(app: var App): AppResult[void] =
let record = enrConfiguration(app.conf, app.netConf, app.key).valueOr: let record = enrConfiguration(app.conf, app.netConf, app.key).valueOr:
return err("ENR setup failed: " & error) return err("ENR setup failed: " & error)
if app.conf.clusterId != 0: if isClusterMismatched(record, app.conf.clusterId):
let tRecord = record.toTyped().valueOr: return err("cluster id mismatch configured shards")
return err("ENR setup failed: " & $error)
let relayShard = tRecord.relaySharding().valueOr:
return err("ENR setup failed: no sharding info")
if app.conf.clusterId != relayShard.clusterId:
return err("ENR setup failed: cluster id mismatch")
app.record = record app.record = record
app.node.enr = record app.node.enr = record

8
waku/waku_enr/sharding.nim
View File

@ -254,3 +254,11 @@ proc containsShard*(r: Record, topic: PubsubTopic|string): bool =
return false return false
containsShard(r, parseRes.value) containsShard(r, parseRes.value)
proc isClusterMismatched*(record: Record, clusterId: uint32): bool =
## Check the ENR sharding info for matching cluster id
if (let typedRecord = record.toTyped(); typedRecord.isOk()):
if (let relayShard = typedRecord.get().relaySharding(); relayShard.isSome()):
return relayShard.get().clusterId != clusterId
return false