From 8c305b79b9b7ca740b4684e2197a560924a6f4ed Mon Sep 17 00:00:00 2001 From: darshankabariya Date: Tue, 13 Jan 2026 14:42:21 +0530 Subject: [PATCH] make wakunode2 working fine --- Makefile | 3 +++ nimble.lock | 12 ++++++------ waku/waku_filter_v2/client.nim | 2 +- waku/waku_store_sync/reconciliation.nim | 8 ++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d468df704..ff8902d69 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,9 @@ ifeq ($(DEBUG_DISCV5), 1) NIM_PARAMS := $(NIM_PARAMS) -d:debugDiscv5 endif +# Export NIM_PARAMS so nimble can access it +export NIM_PARAMS + ################## ## Dependencies ## ################## diff --git a/nimble.lock b/nimble.lock index acaea44f9..a5ff83031 100644 --- a/nimble.lock +++ b/nimble.lock @@ -143,7 +143,7 @@ }, "chronos": { "version": "4.0.4", - "vcsRevision": "0646c444fce7c7ed08ef6f2c9a7abfd172ffe655", + "vcsRevision": "712f9937e46a9ba1949230e8e119d776aea1c6bb", "url": "https://github.com/status-im/nim-chronos", "downloadMethod": "git", "dependencies": [ @@ -154,7 +154,7 @@ "unittest2" ], "checksums": { - "sha1": "455802a90204d8ad6b31d53f2efff8ebfe4c834a" + "sha1": "03e96742e7148c38767c028c23a99cf316672f1c" } }, "confutils": { @@ -457,7 +457,7 @@ }, "libp2p": { "version": "1.14.3", - "vcsRevision": "e82080f7b1aa61c6d35fa5311b873f41eff4bb52", + "vcsRevision": "eb7e6ff89889e41b57515f891ba82986c54809fb", "url": "https://github.com/vacp2p/nim-libp2p", "downloadMethod": "git", "dependencies": [ @@ -476,12 +476,12 @@ "jwt" ], "checksums": { - "sha1": "3c089f3ccd23aa5a04e5db288cb8eef524938487" + "sha1": "04eed030305ed9ec128b6699066f0988eb75ec89" } }, "lsquic": { "version": "0.0.1", - "vcsRevision": "de410c4f0a29659f677f2ca5d7f4a8e812850082", + "vcsRevision": "f3fe33462601ea34eb2e8e9c357c92e61f8d121b", "url": "https://github.com/vacp2p/nim-lsquic", "downloadMethod": "git", "dependencies": [ @@ -493,7 +493,7 @@ "chronicles" ], "checksums": { - "sha1": "d5b8f3eec178a2a93a862ff67f23bf3a99de3426" + "sha1": "407b39ad3e84ad794b76df8d63ecafb749af6f4f" } }, "presto": { diff --git a/waku/waku_filter_v2/client.nim b/waku/waku_filter_v2/client.nim index c42bca3db..31807eccd 100644 --- a/waku/waku_filter_v2/client.nim +++ b/waku/waku_filter_v2/client.nim @@ -30,7 +30,7 @@ type WakuFilterClient* = ref object of LPProtocol func generateRequestId(rng: ref HmacDrbgContext): string = var bytes: array[10, byte] hmacDrbgGenerate(rng[], bytes) - return toHex(bytes) + return byteutils.toHex(bytes) proc addSubscrObserver*(wfc: WakuFilterClient, obs: SubscriptionObserver) = wfc.subscrObservers.add(obs) diff --git a/waku/waku_store_sync/reconciliation.nim b/waku/waku_store_sync/reconciliation.nim index 0cc15d0df..f18201d0e 100644 --- a/waku/waku_store_sync/reconciliation.nim +++ b/waku/waku_store_sync/reconciliation.nim @@ -79,7 +79,7 @@ proc messageIngress*( let id = SyncID(time: msg.timestamp, hash: msgHash) self.storage.insert(id, pubsubTopic, msg.contentTopic).isOkOr: - error "failed to insert new message", msg_hash = $id.hash.toHex(), error = $error + error "failed to insert new message", msg_hash = byteutils.toHex(id.hash), error = $error proc messageIngress*( self: SyncReconciliation, @@ -87,7 +87,7 @@ proc messageIngress*( pubsubTopic: PubsubTopic, msg: WakuMessage, ) = - trace "message ingress", msg_hash = msgHash.toHex(), msg = msg + trace "message ingress", msg_hash = byteutils.toHex(msgHash), msg = msg if msg.ephemeral: return @@ -95,7 +95,7 @@ proc messageIngress*( let id = SyncID(time: msg.timestamp, hash: msgHash) self.storage.insert(id, pubsubTopic, msg.contentTopic).isOkOr: - error "failed to insert new message", msg_hash = $id.hash.toHex(), error = $error + error "failed to insert new message", msg_hash = byteutils.toHex(id.hash), error = $error proc messageIngress*( self: SyncReconciliation, @@ -104,7 +104,7 @@ proc messageIngress*( contentTopic: ContentTopic, ) = self.storage.insert(id, pubsubTopic, contentTopic).isOkOr: - error "failed to insert new message", msg_hash = $id.hash.toHex(), error = $error + error "failed to insert new message", msg_hash = byteutils.toHex(id.hash), error = $error proc preProcessPayload( self: SyncReconciliation, payload: RangesData