From 4dcd8ff8e25d1d6a14bd9ef3b027e47719868f37 Mon Sep 17 00:00:00 2001
From: Arseniy Klempner <arseniyk@status.im>
Date: Thu, 21 May 2026 13:25:21 -0600
Subject: [PATCH] cleanup(02-types): drop duplicate-type adapter procs + bump
 nwaku
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 src/chat/delivery/waku_client.nim | 24 ++----------------------
 vendor/nwaku                      |  2 +-
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/chat/delivery/waku_client.nim b/src/chat/delivery/waku_client.nim
index 5949411..f50e25d 100644
--- a/src/chat/delivery/waku_client.nim
+++ b/src/chat/delivery/waku_client.nim
@@ -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"
diff --git a/vendor/nwaku b/vendor/nwaku
index f354e9b..7978b67 160000
--- a/vendor/nwaku
+++ b/vendor/nwaku
@@ -1 +1 @@
-Subproject commit f354e9b2367be7a5cf9df352f7321b2283ad1a87
+Subproject commit 7978b670bd77f210cef2b45a00959702f06f90f1