Merkle provider poc

package.json

@@ -134,6 +134,7 @@
   },
   "dependencies": {
     "@chainsafe/bls-keystore": "^3.0.0",
+    "@noble/curves": "^1.4.0",
     "@waku/core": "^0.0.25",
     "@waku/utils": "^0.0.13",
     "@waku/zerokit-rln-wasm": "^0.0.13",
@@ -143,4 +144,4 @@
     "lodash": "^4.17.21",
     "uuid": "^9.0.1"
   }
-}
+}

src/codec.spec.ts

@@ -54,7 +54,8 @@ describe("RLN codec with version 0", () => {
       encoder: createEncoder({ contentTopic: TestContentTopic }),
       rlnInstance,
       index,
-      credential
+      credential,
+      fetchMembersFromService: false
     });
     const rlnDecoder = createRLNDecoder({
       rlnInstance,
@@ -384,7 +385,8 @@ describe("RLN codec with version 0 and meta setter", () => {
       encoder: createEncoder({ contentTopic: TestContentTopic, metaSetter }),
       rlnInstance,
       index,
-      credential
+      credential,
+      fetchMembersFromService: false
     });
     const rlnDecoder = createRLNDecoder({
       rlnInstance,

src/codec.ts

@@ -16,15 +16,18 @@ const log = debug("waku:rln:encoder");
 
 export class RLNEncoder implements IEncoder {
   private readonly idSecretHash: Uint8Array;
+  private readonly idCommitment: bigint;
 
   constructor(
     private encoder: IEncoder,
     private rlnInstance: RLNInstance,
     private index: number,
-    identityCredential: IdentityCredential
+    identityCredential: IdentityCredential,
+    private readonly fetchMembersFromService: boolean = false
   ) {
     if (index < 0) throw "invalid membership index";
     this.idSecretHash = identityCredential.IDSecretHash;
+    this.idCommitment = identityCredential.IDCommitmentBigInt;
   }
 
   async toWire(message: IMessage): Promise<Uint8Array | undefined> {
@@ -49,7 +52,9 @@ export class RLNEncoder implements IEncoder {
       signal,
       this.index,
       message.timestamp,
-      this.idSecretHash
+      this.idSecretHash,
+      this.idCommitment,
+      this.fetchMembersFromService
     );
     return proof;
   }
@@ -72,14 +77,16 @@ type RLNEncoderOptions = {
   rlnInstance: RLNInstance;
   index: number;
   credential: IdentityCredential;
+  fetchMembersFromService: boolean;
 };
 
 export const createRLNEncoder = (options: RLNEncoderOptions): RLNEncoder => {
   return new RLNEncoder(
     options.encoder,
     options.rlnInstance,
     options.index,
-    options.credential
+    options.credential,
+    options.fetchMembersFromService
   );
 };
 

src/contract/rln_contract.spec.ts

@@ -19,7 +19,8 @@ describe("RLN Contract abstraction", () => {
     const voidSigner = new ethers.VoidSigner(SEPOLIA_CONTRACT.address);
     const rlnContract = new RLNContract(rlnInstance, {
       registryAddress: SEPOLIA_CONTRACT.address,
-      signer: voidSigner
+      signer: voidSigner,
+      fetchMembersFromService: false
     });
 
     rlnContract["storageContract"] = {
@@ -43,7 +44,8 @@ describe("RLN Contract abstraction", () => {
     const voidSigner = new ethers.VoidSigner(SEPOLIA_CONTRACT.address);
     const rlnContract = new RLNContract(rlnInstance, {
       registryAddress: SEPOLIA_CONTRACT.address,
-      signer: voidSigner
+      signer: voidSigner,
+      fetchMembersFromService: false
     });
 
     rlnContract["storageIndex"] = 1;

src/contract/rln_contract.ts

@@ -22,6 +22,7 @@ type Signer = ethers.Signer;
 type RLNContractOptions = {
   signer: Signer;
   registryAddress: string;
+  fetchMembersFromService: boolean;
 };
 
 type RLNStorageOptions = {
@@ -54,7 +55,9 @@ export class RLNContract {
     const rlnContract = new RLNContract(rlnInstance, options);
 
     await rlnContract.initStorageContract(options.signer);
-    await rlnContract.fetchMembers(rlnInstance);
+    if (!options.fetchMembersFromService) {
+      await rlnContract.fetchMembers(rlnInstance);
+    }
     rlnContract.subscribeToMembers(rlnInstance);
 
     return rlnContract;
@@ -80,8 +83,9 @@ export class RLNContract {
   ): Promise<void> {
     const storageIndex = options?.storageIndex
       ? options.storageIndex
-      : await this.registryContract.usingStorageIndex();
-    const storageAddress = await this.registryContract.storages(storageIndex);
+      : await this.registryContract.callStatic.usingStorageIndex();
+    const storageAddress =
+      await this.registryContract.callStatic.storages(storageIndex);
 
     if (!storageAddress || storageAddress === ethers.constants.AddressZero) {
       throw Error("No RLN Storage initialized on registry contract.");
@@ -95,7 +99,8 @@ export class RLNContract {
     );
     this._membersFilter = this.storageContract.filters.MemberRegistered();
 
-    this.deployBlock = await this.storageContract.deployedBlockNumber();
+    this.deployBlock =
+      await this.storageContract.callStatic.deployedBlockNumber();
   }
 
   public get registry(): ethers.Contract {

src/identity.ts

@@ -1,4 +1,4 @@
-import { buildBigIntFromUint8Array } from "./utils/index.js";
+import { uint256FromBytes } from "./utils/bytes.js";
 
 export class IdentityCredential {
   constructor(
@@ -14,7 +14,7 @@ export class IdentityCredential {
     const idNullifier = memKeys.subarray(32, 64);
     const idSecretHash = memKeys.subarray(64, 96);
     const idCommitment = memKeys.subarray(96);
-    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment);
+    const idCommitmentBigInt = uint256FromBytes(idCommitment);
 
     return new IdentityCredential(
       idTrapdoor,

src/keystore/keystore.ts

@@ -14,7 +14,7 @@ import {
 import _ from "lodash";
 import { v4 as uuidV4 } from "uuid";
 
-import { buildBigIntFromUint8Array } from "../utils/bytes.js";
+import { uint256FromBytes } from "../utils/bytes.js";
 
 import { decryptEipKeystore, keccak256Checksum } from "./cipher.js";
 import { isCredentialValid, isKeystoreValid } from "./schema_validator.js";
@@ -262,7 +262,7 @@ export class Keystore {
           IDNullifier: Keystore.fromArraylikeToBytes(
             _.get(obj, "identityCredential.idNullifier", [])
           ),
-          IDCommitmentBigInt: buildBigIntFromUint8Array(
+          IDCommitmentBigInt: uint256FromBytes(
             Keystore.fromArraylikeToBytes(
               _.get(obj, "identityCredential.idCommitment", [])
             )

src/proof.ts

@@ -30,7 +30,7 @@ export class Proof implements IRateLimitProof {
 
   constructor(proofBytes: Uint8Array) {
     if (proofBytes.length < rlnIdentifierOffset) throw "invalid proof";
-    // parse the proof as proof<128> | share_y<32> | nullifier<32> | root<32> | epoch<32> | share_x<32> | rln_identifier<32>
+    // parse the proof as proof<128> | root<32> | epoch<32> | share_x<32> | share_y<32> | nullifier<32> | rln_identifier<32>
     this.proof = proofBytes.subarray(0, proofOffset);
     this.merkleRoot = proofBytes.subarray(proofOffset, rootOffset);
     this.epoch = proofBytes.subarray(rootOffset, epochOffset);