Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: improved error handling when config uses cluster-id and pubsub topics #2368

Merged
merged 2 commits into from
Jan 30, 2024
Merged

chore: improved error handling when config uses cluster-id and pubsub topics #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c08e807
prevent some config setup that dont make sense
SionoiS Jan 24, 2024
be15888
added proc
SionoiS Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions apps/wakunode2/app.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import
../../waku/waku_api/jsonrpc/store/handlers as rpc_store_api,
../../waku/waku_archive,
../../waku/waku_dnsdisc,
../../waku/waku_enr,
../../waku/waku_enr/sharding,
../../waku/waku_discv5,
../../waku/waku_peer_exchange,
../../waku/waku_rln_relay,
Expand Down Expand Up @@ -128,20 +128,9 @@ proc init*(T: type App, rng: ref HmacDrbgContext, conf: WakuNodeConf): T =
quit(QuitFailure)
else: recordRes.get()

# Check the ENR sharding info for matching config cluster id
if conf.clusterId != 0:
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)
if isClusterMismatched(record, conf.clusterId):
error "cluster id mismatch configured shards"
quit(QuitFailure)

App(
version: git_version,
Expand Down Expand Up @@ -368,15 +357,8 @@ proc updateEnr(app: var App): AppResult[void] =
let record = enrConfiguration(app.conf, app.netConf, app.key).valueOr:
return err("ENR setup failed: " & error)

if app.conf.clusterId != 0:
let tRecord = record.toTyped().valueOr:
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")
if isClusterMismatched(record, app.conf.clusterId):
return err("cluster id mismatch configured shards")

app.record = record
app.node.enr = record
Expand Down
8 changes: 8 additions & 0 deletions waku/waku_enr/sharding.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,11 @@ proc containsShard*(r: Record, topic: PubsubTopic|string): bool =
return false

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
Loading