From b97db5e145d3989b61250e0c1e7e38341c0902cf Mon Sep 17 00:00:00 2001 From: darshankabariya Date: Tue, 25 Mar 2025 03:15:59 +0530 Subject: [PATCH] chore: remove inconsistancy --- .../group_manager/on_chain/group_manager.nim | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 0a20b4304..8471fd360 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 @@ -63,7 +63,6 @@ type keystorePath*: Option[string] keystorePassword*: Option[string] registrationHandler*: Option[RegistrationHandler] - validRootBuffer*: Deque[MerkleNode] latestProcessedBlock*: BlockNumber proc setMetadata*( @@ -80,7 +79,7 @@ proc setMetadata*( lastProcessedBlock: normalizedBlock.uint64, chainId: g.chainId, contractAddress: g.ethContractAddress, - validRoots: g.validRootBuffer.toSeq(), + validRoots: g.validRoots.toSeq(), ) ) if metadataSetRes.isErr(): @@ -121,7 +120,7 @@ template retryWrapper( body method validateRoot*(g: OnchainGroupManager, root: MerkleNode): bool = - if g.validRootBuffer.find(root) >= 0: + if g.validRoots.find(root) >= 0: return true return false @@ -143,12 +142,12 @@ proc slideRootQueue*(g: OnchainGroupManager) {.async.} = let merkleRoot = toMerkleNode(rootRes.get()) - let overflowCount = g.validRootBuffer.len - AcceptableRootWindowSize + 1 + let overflowCount = g.validRoots.len - AcceptableRootWindowSize + 1 if overflowCount > 0: for i in 0 ..< overflowCount: - discard g.validRootBuffer.popFirst() + discard g.validRoots.popFirst() - g.validRootBuffer.addLast(merkleRoot) + g.validRoots.addLast(merkleRoot) method atomicBatch*( g: OnchainGroupManager, @@ -375,7 +374,7 @@ method verifyProof*( proofBytes = serialize(normalizedProof, input) proofBuffer = proofBytes.toBuffer() validProof: bool - rootsBytes = serialize(g.validRootBuffer.items().toSeq()) + rootsBytes = serialize(g.validRoots.items().toSeq()) rootsBuffer = rootsBytes.toBuffer() trace "serialized proof", proof = byteutils.toHex(proofBytes)