logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-05-17 07:50:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update with new datatype converstion

Browse Source
This commit is contained in:
darshankabariya 2025-04-03 17:18:57 +05:30
parent 2ed114807e
commit 55ecdd55e3
1 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
View File

@ -29,7 +29,10 @@ export group_manager_base
logScope: logScope:
topics = "waku rln_relay onchain_group_manager" topics = "waku rln_relay onchain_group_manager"
type UInt40* = StUint[40] type EthereumUInt40* = StUint[40]
type EthereumUInt32* = StUint[32]
type EthereumUInt16* = StUint[16]
# using the when predicate does not work within the contract macro, hence need to dupe # using the when predicate does not work within the contract macro, hence need to dupe
contract(WakuRlnContract): contract(WakuRlnContract):
# this serves as an entrypoint into the rln membership set # this serves as an entrypoint into the rln membership set
@ -46,9 +49,9 @@ contract(WakuRlnContract):
proc deployedBlockNumber(): UInt256 {.view.} proc deployedBlockNumber(): UInt256 {.view.}
# this constant describes max message limit of rln contract # this constant describes max message limit of rln contract
proc MAX_MESSAGE_LIMIT(): UInt256 {.view.} proc MAX_MESSAGE_LIMIT(): UInt256 {.view.}
# this function returns the merkleProof for a given index # this function returns the merkleProof for a given index
proc merkleProofElements(index: UInt40): seq[UInt256] {.view.} proc merkleProofElements(index: EthereumUInt40): seq[UInt256] {.view.}
# this function returns the Merkle root # this function returns the merkle root
proc root(): Uint256 {.view.} proc root(): Uint256 {.view.}
type type
@ -65,7 +68,7 @@ type
keystorePassword*: Option[string] keystorePassword*: Option[string]
registrationHandler*: Option[RegistrationHandler] registrationHandler*: Option[RegistrationHandler]
latestProcessedBlock*: BlockNumber latestProcessedBlock*: BlockNumber
merkleProofCache*: seq[Uint256] merkleProofCache*: array[20, UInt256]
proc setMetadata*( proc setMetadata*(
g: OnchainGroupManager, lastProcessedBlock = none(BlockNumber) g: OnchainGroupManager, lastProcessedBlock = none(BlockNumber)
@ -90,42 +93,41 @@ proc setMetadata*(
return err("failed to persist rln metadata: " & getCurrentExceptionMsg()) return err("failed to persist rln metadata: " & getCurrentExceptionMsg())
return ok() return ok()
proc fetchMerkleProofElements*( # proc fetchMerkleProofElements*(
g: OnchainGroupManager # g: OnchainGroupManager
): Future[Result[seq[Uint256], string]] {.async.} = # ): Future[Result[seq[Uint256], string]] {.async.} =
let membershipIndex = g.membershipIndex.get() # let membershipIndex = g.membershipIndex.get()
debug " ------ Fetching merkle proof", index = membershipIndex # debug " ------ Fetching merkle proof", index = membershipIndex
try: # try:
# First check if the index is valid # # First check if the index is valid
let commitmentIndexInvocation = g.wakuRlnContract.get().commitmentIndex() # let commitmentIndexInvocation = g.wakuRlnContract.get().commitmentIndex()
let currentCommitmentIndex = await commitmentIndexInvocation.call() # let currentCommitmentIndex = await commitmentIndexInvocation.call()
let membershipIndexUint256 = stuint(membershipIndex, 256) # let membershipIndexUint256 = stuint(membershipIndex, 256)
#
debug " ------ Checking membership index validity", # debug " ------ Checking membership index validity",
membershipIndex = membershipIndex, # membershipIndex = membershipIndex,
membershipIndexAsUint256 = membershipIndexUint256.toHex(), # membershipIndexAsUint256 = membershipIndexUint256.toHex(),
currentCommitmentIndex = currentCommitmentIndex.toHex() # currentCommitmentIndex = currentCommitmentIndex.toHex()
#
# Convert to UInt40 for contract call (merkleProofElements takes UInt40) # # Convert to UInt40 for contract call (merkleProofElements takes UInt40)
let indexUint40 = stuint(membershipIndex, 40) # let indexUint40 = stuint(membershipIndex, 40)
debug " ------ Converting membershipIndex to UInt40", # debug " ------ Converting membershipIndex to UInt40",
originalIndex = membershipIndex, asUint40 = indexUint40.toHex() # originalIndex = membershipIndex, asUint40 = indexUint40.toHex()
#
let merkleProofInvocation = g.wakuRlnContract.get().merkleProofElements(indexUint40) # let merkleProofInvocation = g.wakuRlnContract.get().merkleProofElements(indexUint40)
let merkleProof = await merkleProofInvocation.call() # let merkleProof = await merkleProofInvocation.call()
debug "Successfully fetched merkle proof", elementsCount = merkleProof.len # debug "Successfully fetched merkle proof", elementsCount = merkleProof.len
return ok(merkleProof) # return ok(merkleProof)
except CatchableError: # except CatchableError:
error "Failed to fetch merkle proof", errMsg = getCurrentExceptionMsg() # error "Failed to fetch merkle proof", errMsg = getCurrentExceptionMsg()
# proc fetchMerkleProofElements*( # proc fetchMerkleProofElements*(
# g: OnchainGroupManager # g: OnchainGroupManager
# ): Future[Result[seq[Uint256], string]] {.async.} = # ): Future[Result[seq[Uint256], string]] {.async.} =
# let membershipIndex = g.membershipIndex.get() # let membershipIndex = g.membershipIndex.get()
# debug "Fetching merkle proof", index = membershipIndex # debug " ------Fetching merkle proof", index = membershipIndex
# try: # try:
# let index = stuint(membershipIndex, 40) # let index = stuint(membershipIndex, 40)
#
# let merkleProofInvocation = g.wakuRlnContract.get().merkleProofElements(index) # let merkleProofInvocation = g.wakuRlnContract.get().merkleProofElements(index)
# let merkleProof = await merkleProofInvocation.call() # let merkleProof = await merkleProofInvocation.call()
# debug "Successfully fetched merkle proof", elementsCount = merkleProof.len # debug "Successfully fetched merkle proof", elementsCount = merkleProof.len
@ -133,6 +135,38 @@ proc fetchMerkleProofElements*(
# except CatchableError: # except CatchableError:
# error "Failed to fetch merkle proof", errMsg = getCurrentExceptionMsg() # error "Failed to fetch merkle proof", errMsg = getCurrentExceptionMsg()
proc fetchMerkleProofElements*(
g: OnchainGroupManager
): Future[Result[array[20, UInt256], string]] {.async.} =
try:
let membershipIndex = g.membershipIndex.get()
let ethereumIndex = stuint(membershipIndex, 40).EthereumUInt40
debug "------ Converted index to EthereumUInt40 ------",
originalIndex = membershipIndex, ethereumIndex = ethereumIndex
let merkleProofInvocation =
g.wakuRlnContract.get().merkleProofElements(ethereumIndex)
let merkleProofSeq = await merkleProofInvocation.call()
# Convert sequence to fixed-size array
if merkleProofSeq.len != 20:
return err("Expected proof of length 20, got " & $merkleProofSeq.len)
var merkleProof: array[20, UInt256]
for i in 0 ..< 20:
if i < merkleProofSeq.len:
merkleProof[i] = merkleProofSeq[i]
debug "------ Successfully fetched merkle proof elements ------",
originalIndex = membershipIndex,
ethereumIndex = ethereumIndex,
proofLength = merkleProof.len
return ok(merkleProof)
except CatchableError:
error "Failed to fetch Merkle proof elements",
errMsg = getCurrentExceptionMsg(), index = g.membershipIndex.get()
proc fetchMerkleRoot*( proc fetchMerkleRoot*(
g: OnchainGroupManager g: OnchainGroupManager
): Future[Result[Uint256, string]] {.async.} = ): Future[Result[Uint256, string]] {.async.} =
@ -319,8 +353,8 @@ proc toArray32*(s: seq[byte]): array[32, byte] =
discard output.copyFrom(s) discard output.copyFrom(s)
return output return output
proc toArray32Seq*(values: seq[UInt256]): seq[array[32, byte]] = proc toArray32Seq*(values: array[20, UInt256]): seq[array[32, byte]] =
## Converts a sequence of UInt256 to a sequence of 32-byte arrays ## Converts a fixed-size array of UInt256 to a sequence of 32-byte arrays
result = newSeqOfCap[array[32, byte]](values.len) result = newSeqOfCap[array[32, byte]](values.len)
for value in values: for value in values:
result.add(value.toBytesLE()) result.add(value.toBytesLE())