cleanup(02-types): drop duplicate-type adapter procs + bump nwaku

waku_client.nim's adapter procs (copying logos_core_client's MerkleNode/
ExternalMerkleProof into the plugin's namesakes) are now trivial — the
types are unified via re-export. Collapse to direct callback assignments.
This commit is contained in:
Arseniy Klempner 2026-05-21 13:25:21 -06:00
parent cbbf4b23ae
commit 4dcd8ff8e2
No known key found for this signature in database
GPG Key ID: 51653F18863BD24B
2 changed files with 3 additions and 23 deletions

View File

@ -332,28 +332,8 @@ proc start*(client: WakuClient) {.async.} =
let lezGm = OnchainLEZGroupManager(gm)
let clientFetchRoots = mix_lez_client.makeFetchLatestRoots()
let clientFetchProof = mix_lez_client.makeFetchMerkleProof()
let fetchRoots: onchain_group_manager.FetchRootsCallback =
proc(): Future[Result[seq[onchain_group_manager.MerkleNode], string]] {.async, gcsafe, raises: [].} =
let res = await clientFetchRoots()
if res.isOk:
var nodes: seq[onchain_group_manager.MerkleNode]
for r in res.get():
nodes.add(onchain_group_manager.MerkleNode(r))
return ok(nodes)
else:
return err(res.error)
let fetchProof: onchain_group_manager.FetchProofCallback =
proc(index: onchain_group_manager.MembershipIndex): Future[Result[onchain_group_manager.ExternalMerkleProof, string]] {.async, gcsafe, raises: [].} =
let res = await clientFetchProof(mix_lez_client.MembershipIndex(index))
if res.isOk:
let p = res.get()
return ok(onchain_group_manager.ExternalMerkleProof(
pathElements: p.pathElements,
identityPathIndex: p.identityPathIndex,
root: onchain_group_manager.MerkleNode(p.root),
))
else:
return err(res.error)
let fetchRoots: onchain_group_manager.FetchRootsCallback = clientFetchRoots
let fetchProof: onchain_group_manager.FetchProofCallback = clientFetchProof
lezGm.setFetchCallbacks(fetchRoots, fetchProof)
mix_lez_client.setGroupManagerRef(cast[pointer](lezGm))
info "Wired LEZ callbacks for mix RLN spam protection"

2
vendor/nwaku vendored

@ -1 +1 @@
Subproject commit f354e9b2367be7a5cf9df352f7321b2283ad1a87
Subproject commit 7978b670bd77f210cef2b45a00959702f06f90f1