From edf847d1fc2a8ec0ddcc0ba578887ee2e26d7663 Mon Sep 17 00:00:00 2001 From: darshankabariya Date: Thu, 3 Apr 2025 01:15:24 +0530 Subject: [PATCH] chore: check membershipIndex isn;t bigger than currentCommentment --- .../group_manager/on_chain/group_manager.nim | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim index 648a79e54..403f60c1f 100644 --- a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim +++ b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim @@ -94,17 +94,45 @@ proc fetchMerkleProofElements*( g: OnchainGroupManager ): Future[Result[seq[Uint256], string]] {.async.} = let membershipIndex = g.membershipIndex.get() - debug "Fetching merkle proof", index = membershipIndex + debug " ------ Fetching merkle proof", index = membershipIndex try: - let index = stuint(membershipIndex, 40) + # First check if the index is valid + let commitmentIndexInvocation = g.wakuRlnContract.get().commitmentIndex() + let currentCommitmentIndex = await commitmentIndexInvocation.call() + let membershipIndexUint256 = stuint(membershipIndex, 256) - let merkleProofInvocation = g.wakuRlnContract.get().merkleProofElements(index) + debug " ------ Checking membership index validity", + membershipIndex = membershipIndex, + membershipIndexAsUint256 = membershipIndexUint256.toHex(), + currentCommitmentIndex = currentCommitmentIndex.toHex() + + # Convert to UInt40 for contract call (merkleProofElements takes UInt40) + let indexUint40 = stuint(membershipIndex, 40) + debug " ------ Converting membershipIndex to UInt40", + originalIndex = membershipIndex, asUint40 = indexUint40.toHex() + + let merkleProofInvocation = g.wakuRlnContract.get().merkleProofElements(indexUint40) let merkleProof = await merkleProofInvocation.call() debug "Successfully fetched merkle proof", elementsCount = merkleProof.len return ok(merkleProof) except CatchableError: error "Failed to fetch merkle proof", errMsg = getCurrentExceptionMsg() +# proc fetchMerkleProofElements*( +# g: OnchainGroupManager +# ): Future[Result[seq[Uint256], string]] {.async.} = +# let membershipIndex = g.membershipIndex.get() +# debug "Fetching merkle proof", index = membershipIndex +# try: +# let index = stuint(membershipIndex, 40) +# +# let merkleProofInvocation = g.wakuRlnContract.get().merkleProofElements(index) +# let merkleProof = await merkleProofInvocation.call() +# debug "Successfully fetched merkle proof", elementsCount = merkleProof.len +# return ok(merkleProof) +# except CatchableError: +# error "Failed to fetch merkle proof", errMsg = getCurrentExceptionMsg() + proc fetchMerkleRoot*( g: OnchainGroupManager ): Future[Result[Uint256, string]] {.async.} =