@waku/rln 0.1.6-16328a3.0 → 0.1.6-2ce706d.0

package/src/contract/rln_base_contract.ts

@@ -79,7 +79,8 @@ export class RLNBaseContract {
     const instance = new RLNBaseContract(options);
     const [min, max] = await Promise.all([
       instance.contract.minMembershipRateLimit(),
-      instance.contract.maxMembershipRateLimit()
+      instance.contract.maxMembershipRateLimit(),
+      instance.contract.Q()
     ]);
     instance.minRateLimit = ethers.BigNumber.from(min).toNumber();
     instance.maxRateLimit = ethers.BigNumber.from(max).toNumber();
@@ -490,7 +491,6 @@ export class RLNBaseContract {
       log.error(`Error in withdraw: ${(error as Error).message}`);
     }
   }
-
   public async registerWithIdentity(
     identity: IdentityCredential
   ): Promise<DecryptedCredentials | undefined> {
@@ -499,10 +499,12 @@ export class RLNBaseContract {
         `Registering identity with rate limit: ${this.rateLimit} messages/epoch`
       );
 
-      // Check if the ID commitment is already registered
-      const existingIndex = await this.getMemberIndex(
-        identity.IDCommitmentBigInt
+      const idCommitmentBigInt = IdentityCredential.getIdCommitmentBigInt(
+        identity.IDCommitment
       );
+
+      // Check if the ID commitment is already registered
+      const existingIndex = await this.getMemberIndex(idCommitmentBigInt);
       if (existingIndex) {
         throw new Error(
           `ID commitment is already registered with index ${existingIndex}`
@@ -518,19 +520,16 @@ export class RLNBaseContract {
       }
 
       const estimatedGas = await this.contract.estimateGas.register(
-        identity.IDCommitmentBigInt,
+        idCommitmentBigInt,
         this.rateLimit,
         []
       );
       const gasLimit = estimatedGas.add(10000);
 
       const txRegisterResponse: ethers.ContractTransaction =
-        await this.contract.register(
-          identity.IDCommitmentBigInt,
-          this.rateLimit,
-          [],
-          { gasLimit }
-        );
+        await this.contract.register(idCommitmentBigInt, this.rateLimit, [], {
+          gasLimit
+        });
 
       const txRegisterReceipt = await txRegisterResponse.wait();
 
@@ -626,7 +625,7 @@ export class RLNBaseContract {
           permit.v,
           permit.r,
           permit.s,
-          identity.IDCommitmentBigInt,
+          IdentityCredential.getIdCommitmentBigInt(identity.IDCommitment),
           this.rateLimit,
           idCommitmentsToErase.map((id) => ethers.BigNumber.from(id))
         );

package/src/credentials_manager.ts

@@ -1,5 +1,5 @@
 import { hmac } from "@noble/hashes/hmac";
-import { sha256 } from "@noble/hashes/sha256";
+import { sha256 } from "@noble/hashes/sha2";
 import { Logger } from "@waku/utils";
 import { ethers } from "ethers";
 
@@ -13,10 +13,7 @@ import type {
 } from "./keystore/index.js";
 import { KeystoreEntity, Password } from "./keystore/types.js";
 import { RegisterMembershipOptions, StartRLNOptions } from "./types.js";
-import {
-  buildBigIntFromUint8Array,
-  extractMetaMaskSigner
-} from "./utils/index.js";
+import { extractMetaMaskSigner, switchEndianness } from "./utils/index.js";
 import { Zerokit } from "./zerokit.js";
 
 const log = new Logger("waku:credentials");
@@ -116,7 +113,9 @@ export class RLNCredentialsManager {
         );
       } else {
         log.info("Using local implementation to generate identity");
-        identity = this.generateSeededIdentityCredential(options.signature);
+        identity = await this.generateSeededIdentityCredential(
+          options.signature
+        );
       }
     }
 
@@ -249,7 +248,9 @@ export class RLNCredentialsManager {
    * @param seed A string seed to generate the identity from
    * @returns IdentityCredential
    */
-  private generateSeededIdentityCredential(seed: string): IdentityCredential {
+  private async generateSeededIdentityCredential(
+    seed: string
+  ): Promise<IdentityCredential> {
     log.info("Generating seeded identity credential");
     // Convert the seed to bytes
     const encoder = new TextEncoder();
@@ -257,26 +258,31 @@ export class RLNCredentialsManager {
 
     // Generate deterministic values using HMAC-SHA256
     // We use different context strings for each component to ensure they're different
-    const idTrapdoor = hmac(sha256, seedBytes, encoder.encode("IDTrapdoor"));
-    const idNullifier = hmac(sha256, seedBytes, encoder.encode("IDNullifier"));
+    const idTrapdoorBE = hmac(sha256, seedBytes, encoder.encode("IDTrapdoor"));
+    const idNullifierBE = hmac(
+      sha256,
+      seedBytes,
+      encoder.encode("IDNullifier")
+    );
 
-    // Generate IDSecretHash as a hash of IDTrapdoor and IDNullifier
-    const combinedBytes = new Uint8Array([...idTrapdoor, ...idNullifier]);
-    const idSecretHash = sha256(combinedBytes);
+    const combinedBytes = new Uint8Array([...idTrapdoorBE, ...idNullifierBE]);
+    const idSecretHashBE = sha256(combinedBytes);
 
-    // Generate IDCommitment as a hash of IDSecretHash
-    const idCommitment = sha256(idSecretHash);
+    const idCommitmentBE = sha256(idSecretHashBE);
 
-    // Convert IDCommitment to BigInt
-    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment);
+    // All hashing functions return big-endian bytes
+    // We need to switch to little-endian for the identity credential
+    const idTrapdoorLE = switchEndianness(idTrapdoorBE);
+    const idNullifierLE = switchEndianness(idNullifierBE);
+    const idSecretHashLE = switchEndianness(idSecretHashBE);
+    const idCommitmentLE = switchEndianness(idCommitmentBE);
 
     log.info("Successfully generated identity credential");
     return new IdentityCredential(
-      idTrapdoor,
-      idNullifier,
-      idSecretHash,
-      idCommitment,
-      idCommitmentBigInt
+      idTrapdoorLE,
+      idNullifierLE,
+      idSecretHashLE,
+      idCommitmentLE
     );
   }
 }

package/src/identity.ts

@@ -1,12 +1,19 @@
-import { buildBigIntFromUint8Array } from "./utils/index.js";
+import { Logger } from "@waku/utils";
+
+import { DEFAULT_Q } from "./contract/constants.js";
+import { buildBigIntFromUint8ArrayBE } from "./utils/bytes.js";
+
+const log = new Logger("waku:rln:identity");
 
 export class IdentityCredential {
+  /**
+   * All variables are in little-endian format
+   */
   public constructor(
     public readonly IDTrapdoor: Uint8Array,
     public readonly IDNullifier: Uint8Array,
     public readonly IDSecretHash: Uint8Array,
-    public readonly IDCommitment: Uint8Array,
-    public readonly IDCommitmentBigInt: bigint
+    public readonly IDCommitment: Uint8Array
   ) {}
 
   public static fromBytes(memKeys: Uint8Array): IdentityCredential {
@@ -18,14 +25,33 @@ export class IdentityCredential {
     const idNullifier = memKeys.subarray(32, 64);
     const idSecretHash = memKeys.subarray(64, 96);
     const idCommitment = memKeys.subarray(96, 128);
-    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment, 32);
 
     return new IdentityCredential(
       idTrapdoor,
       idNullifier,
       idSecretHash,
-      idCommitment,
-      idCommitmentBigInt
+      idCommitment
     );
   }
+
+  /**
+   * Converts an ID commitment from bytes to a BigInt, normalizing it against a limit if needed
+   * @param bytes The ID commitment bytes to convert
+   * @param limit Optional limit to normalize against (Q value)
+   * @returns The ID commitment as a BigInt
+   */
+  public static getIdCommitmentBigInt(
+    bytes: Uint8Array,
+    limit: bigint = DEFAULT_Q
+  ): bigint {
+    let idCommitmentBigIntBE = buildBigIntFromUint8ArrayBE(bytes);
+
+    if (limit && idCommitmentBigIntBE >= limit) {
+      log.warn(
+        `ID commitment is greater than Q, reducing it by Q: ${idCommitmentBigIntBE} % ${limit}`
+      );
+      idCommitmentBigIntBE = idCommitmentBigIntBE % limit;
+    }
+    return idCommitmentBigIntBE;
+  }
 }

package/src/keystore/keystore.ts

@@ -14,8 +14,6 @@ import {
 import _ from "lodash";
 import { v4 as uuidV4 } from "uuid";
 
-import { buildBigIntFromUint8Array } from "../utils/bytes.js";
-
 import { decryptEipKeystore, keccak256Checksum } from "./cipher.js";
 import { isCredentialValid, isKeystoreValid } from "./schema_validator.js";
 import type {
@@ -250,26 +248,25 @@ export class Keystore {
       const str = bytesToUtf8(bytes);
       const obj = JSON.parse(str);
 
-      // TODO: add runtime validation of nwaku credentials
+      const idCommitmentLE = Keystore.fromArraylikeToBytes(
+        _.get(obj, "identityCredential.idCommitment", [])
+      );
+      const idTrapdoorLE = Keystore.fromArraylikeToBytes(
+        _.get(obj, "identityCredential.idTrapdoor", [])
+      );
+      const idNullifierLE = Keystore.fromArraylikeToBytes(
+        _.get(obj, "identityCredential.idNullifier", [])
+      );
+      const idSecretHashLE = Keystore.fromArraylikeToBytes(
+        _.get(obj, "identityCredential.idSecretHash", [])
+      );
+
       return {
         identity: {
-          IDCommitment: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idCommitment", [])
-          ),
-          IDTrapdoor: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idTrapdoor", [])
-          ),
-          IDNullifier: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idNullifier", [])
-          ),
-          IDCommitmentBigInt: buildBigIntFromUint8Array(
-            Keystore.fromArraylikeToBytes(
-              _.get(obj, "identityCredential.idCommitment", [])
-            )
-          ),
-          IDSecretHash: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idSecretHash", [])
-          )
+          IDCommitment: idCommitmentLE,
+          IDTrapdoor: idTrapdoorLE,
+          IDNullifier: idNullifierLE,
+          IDSecretHash: idSecretHashLE
         },
         membership: {
           treeIndex: _.get(obj, "treeIndex"),
@@ -321,14 +318,21 @@ export class Keystore {
   // follows nwaku implementation
   // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L98
   private static fromIdentityToBytes(options: KeystoreEntity): Uint8Array {
+    function toLittleEndian(bytes: Uint8Array): Uint8Array {
+      return new Uint8Array(bytes).reverse();
+    }
     return utf8ToBytes(
       JSON.stringify({
         treeIndex: options.membership.treeIndex,
         identityCredential: {
-          idCommitment: Array.from(options.identity.IDCommitment),
-          idNullifier: Array.from(options.identity.IDNullifier),
-          idSecretHash: Array.from(options.identity.IDSecretHash),
-          idTrapdoor: Array.from(options.identity.IDTrapdoor)
+          idCommitment: Array.from(
+            toLittleEndian(options.identity.IDCommitment)
+          ),
+          idNullifier: Array.from(toLittleEndian(options.identity.IDNullifier)),
+          idSecretHash: Array.from(
+            toLittleEndian(options.identity.IDSecretHash)
+          ),
+          idTrapdoor: Array.from(toLittleEndian(options.identity.IDTrapdoor))
         },
         membershipContract: {
           chainId: options.membership.chainId,

package/src/message.ts

@@ -1,7 +1,9 @@
+import { message } from "@waku/core";
 import type {
   IDecodedMessage,
   IMessage,
-  IRateLimitProof
+  IRateLimitProof,
+  IRlnMessage
 } from "@waku/interfaces";
 import * as utils from "@waku/utils/bytes";
 
@@ -13,12 +15,13 @@ export function toRLNSignal(contentTopic: string, msg: IMessage): Uint8Array {
   return new Uint8Array([...(msg.payload ?? []), ...contentTopicBytes]);
 }
 
-export class RlnMessage<T extends IDecodedMessage> implements IDecodedMessage {
+export class RlnMessage<T extends IDecodedMessage> implements IRlnMessage {
   public pubsubTopic = "";
+  public version = message.version_0.Version;
 
   public constructor(
-    public rlnInstance: RLNInstance,
-    public msg: T,
+    private rlnInstance: RLNInstance,
+    private msg: T,
     public rateLimitProof: IRateLimitProof | undefined
   ) {}
 

package/src/utils/bytes.ts

@@ -17,18 +17,13 @@ export function concatenate(...input: Uint8Array[]): Uint8Array {
   return result;
 }
 
-// Adapted from https://github.com/feross/buffer
-function checkInt(
-  buf: Uint8Array,
-  value: number,
-  offset: number,
-  ext: number,
-  max: number,
-  min: number
-): void {
-  if (value > max || value < min)
-    throw new RangeError('"value" argument is out of bounds');
-  if (offset + ext > buf.length) throw new RangeError("Index out of range");
+export function switchEndianness(bytes: Uint8Array): Uint8Array {
+  return new Uint8Array(bytes.reverse());
+}
+
+export function buildBigIntFromUint8ArrayBE(bytes: Uint8Array): bigint {
+  // Interpret bytes as big-endian
+  return bytes.reduce((acc, byte) => (acc << 8n) + BigInt(byte), 0n);
 }
 
 export function writeUIntLE(
@@ -56,19 +51,6 @@ export function writeUIntLE(
   return buf;
 }
 
-/**
- * Transforms Uint8Array into BigInt
- * @param array: Uint8Array
- * @returns BigInt
- */
-export function buildBigIntFromUint8Array(
-  array: Uint8Array,
-  byteOffset: number = 0
-): bigint {
-  const dataView = new DataView(array.buffer);
-  return dataView.getBigUint64(byteOffset, true);
-}
-
 /**
  * Fills with zeros to set length
  * @param array little endian Uint8Array
@@ -82,3 +64,17 @@ export function zeroPadLE(array: Uint8Array, length: number): Uint8Array {
   }
   return result;
 }
+
+// Adapted from https://github.com/feross/buffer
+function checkInt(
+  buf: Uint8Array,
+  value: number,
+  offset: number,
+  ext: number,
+  max: number,
+  min: number
+): void {
+  if (value > max || value < min)
+    throw new RangeError('"value" argument is out of bounds');
+  if (offset + ext > buf.length) throw new RangeError("Index out of range");
+}

package/src/utils/index.ts

@@ -2,7 +2,7 @@ export { extractMetaMaskSigner } from "./metamask.js";
 export {
   concatenate,
   writeUIntLE,
-  buildBigIntFromUint8Array,
+  switchEndianness,
   zeroPadLE
 } from "./bytes.js";
 export { sha256, poseidonHash } from "./hash.js";

package/dist/contract/test-utils.d.ts

@@ -1,39 +0,0 @@
-import * as ethers from "ethers";
-import sinon from "sinon";
-import type { IdentityCredential } from "../identity.js";
-export declare const mockRateLimits: {
-    minRate: number;
-    maxRate: number;
-    maxTotalRate: number;
-    currentTotalRate: number;
-};
-type MockProvider = {
-    getLogs: () => never[];
-    getBlockNumber: () => Promise<number>;
-    getNetwork: () => Promise<{
-        chainId: number;
-    }>;
-};
-type MockFilters = {
-    MembershipRegistered: () => {
-        address: string;
-    };
-    MembershipErased: () => {
-        address: string;
-    };
-    MembershipExpired: () => {
-        address: string;
-    };
-};
-export declare function createMockProvider(): MockProvider;
-export declare function createMockFilters(): MockFilters;
-type ContractOverrides = Partial<{
-    filters: Record<string, unknown>;
-    [key: string]: unknown;
-}>;
-export declare function createMockRegistryContract(overrides?: ContractOverrides): ethers.Contract;
-export declare function mockRLNRegisteredEvent(idCommitment?: string): ethers.Event;
-export declare function formatIdCommitment(idCommitmentBigInt: bigint): string;
-export declare function createRegisterStub(identity: IdentityCredential): sinon.SinonStub;
-export declare function verifyRegistration(decryptedCredentials: any, identity: IdentityCredential, registerStub: sinon.SinonStub, insertMemberSpy: sinon.SinonStub): void;
-export {};

package/dist/contract/test-utils.js

@@ -1,118 +0,0 @@
-import { hexToBytes } from "@waku/utils/bytes";
-import { expect } from "chai";
-import * as ethers from "ethers";
-import sinon from "sinon";
-import { DEFAULT_RATE_LIMIT, LINEA_CONTRACT } from "./constants.js";
-export const mockRateLimits = {
-    minRate: 20,
-    maxRate: 600,
-    maxTotalRate: 1200,
-    currentTotalRate: 500
-};
-export function createMockProvider() {
-    return {
-        getLogs: () => [],
-        getBlockNumber: () => Promise.resolve(1000),
-        getNetwork: () => Promise.resolve({ chainId: 11155111 })
-    };
-}
-export function createMockFilters() {
-    return {
-        MembershipRegistered: () => ({ address: LINEA_CONTRACT.address }),
-        MembershipErased: () => ({ address: LINEA_CONTRACT.address }),
-        MembershipExpired: () => ({ address: LINEA_CONTRACT.address })
-    };
-}
-export function createMockRegistryContract(overrides = {}) {
-    const filters = {
-        MembershipRegistered: () => ({ address: LINEA_CONTRACT.address }),
-        MembershipErased: () => ({ address: LINEA_CONTRACT.address }),
-        MembershipExpired: () => ({ address: LINEA_CONTRACT.address })
-    };
-    const baseContract = {
-        minMembershipRateLimit: () => Promise.resolve(ethers.BigNumber.from(mockRateLimits.minRate)),
-        maxMembershipRateLimit: () => Promise.resolve(ethers.BigNumber.from(mockRateLimits.maxRate)),
-        maxTotalRateLimit: () => Promise.resolve(ethers.BigNumber.from(mockRateLimits.maxTotalRate)),
-        currentTotalRateLimit: () => Promise.resolve(ethers.BigNumber.from(mockRateLimits.currentTotalRate)),
-        queryFilter: () => [],
-        provider: createMockProvider(),
-        filters,
-        on: () => ({}),
-        removeAllListeners: () => ({}),
-        register: () => ({
-            wait: () => Promise.resolve({
-                events: [mockRLNRegisteredEvent()]
-            })
-        }),
-        estimateGas: {
-            register: () => Promise.resolve(ethers.BigNumber.from(100000))
-        },
-        functions: {
-            register: () => Promise.resolve()
-        },
-        getMemberIndex: () => Promise.resolve(null),
-        interface: {
-            getEvent: (eventName) => ({
-                name: eventName,
-                format: () => { }
-            })
-        },
-        address: LINEA_CONTRACT.address
-    };
-    // Merge overrides while preserving filters
-    const merged = {
-        ...baseContract,
-        ...overrides,
-        filters: { ...filters, ...(overrides.filters || {}) }
-    };
-    return merged;
-}
-export function mockRLNRegisteredEvent(idCommitment) {
-    return {
-        args: {
-            idCommitment: idCommitment ||
-                "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
-            membershipRateLimit: ethers.BigNumber.from(DEFAULT_RATE_LIMIT),
-            index: ethers.BigNumber.from(1)
-        },
-        event: "MembershipRegistered"
-    };
-}
-export function formatIdCommitment(idCommitmentBigInt) {
-    return "0x" + idCommitmentBigInt.toString(16).padStart(64, "0");
-}
-export function createRegisterStub(identity) {
-    return sinon.stub().callsFake(() => ({
-        wait: () => Promise.resolve({
-            events: [
-                {
-                    event: "MembershipRegistered",
-                    args: {
-                        idCommitment: formatIdCommitment(identity.IDCommitmentBigInt),
-                        membershipRateLimit: ethers.BigNumber.from(DEFAULT_RATE_LIMIT),
-                        index: ethers.BigNumber.from(1)
-                    }
-                }
-            ]
-        })
-    }));
-}
-export function verifyRegistration(decryptedCredentials, identity, registerStub, insertMemberSpy) {
-    if (!decryptedCredentials) {
-        throw new Error("Decrypted credentials should not be undefined");
-    }
-    // Verify registration call
-    expect(registerStub.calledWith(sinon.match.same(identity.IDCommitmentBigInt), sinon.match.same(DEFAULT_RATE_LIMIT), sinon.match.array, sinon.match.object)).to.be.true;
-    // Verify credential properties
-    expect(decryptedCredentials).to.have.property("identity");
-    expect(decryptedCredentials).to.have.property("membership");
-    expect(decryptedCredentials.membership).to.include({
-        address: LINEA_CONTRACT.address,
-        treeIndex: 1
-    });
-    // Verify member insertion
-    const expectedIdCommitment = ethers.utils.zeroPad(hexToBytes(formatIdCommitment(identity.IDCommitmentBigInt)), 32);
-    expect(insertMemberSpy.callCount).to.equal(1);
-    expect(insertMemberSpy.getCall(0).args[0]).to.deep.equal(expectedIdCommitment);
-}
-//# sourceMappingURL=test-utils.js.map

package/dist/contract/test-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../src/contract/test-utils.ts"],"names":[],"mappings":"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"}