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

resolve merge conflict

Browse Source
This commit is contained in:
stubbsta 2025-03-31 12:20:06 +02:00
commit e711a18557
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/wakucanary/wakucanary.nim
View File

@ -202,13 +202,6 @@ proc main(rng: ref HmacDrbgContext): Future[int] {.async.} =
var enrBuilder = EnrBuilder.init(nodeKey)
let relayShards = RelayShards.init(conf.clusterId, conf.shards).valueOr:
error "Relay shards initialization failed", error = error
return 1
enrBuilder.withWakuRelaySharding(relayShards).isOkOr:
error "Building ENR with relay sharding failed", error = error
return 1
let recordRes = enrBuilder.build()
let record =
if recordRes.isErr():
@ -233,8 +226,6 @@ proc main(rng: ref HmacDrbgContext): Future[int] {.async.} =
)
let node = builder.build().tryGet()
node.mountMetadata(conf.clusterId).isOkOr:
error "failed to mount waku metadata protocol: ", err = error
if conf.ping:
try:

2
waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
View File

@ -525,6 +525,8 @@ method init*(g: OnchainGroupManager): Future[GroupManagerResult[void]] {.async.}
g.rlnRelayMaxMessageLimit =
cast[uint64](await wakuRlnContract.maxMembershipRateLimit().call())
asyncSpawn g.trackRootChanges()
proc onDisconnect() {.async.} =
error "Ethereum client disconnected"
var newEthRpc: Web3