@waku/rln 0.1.6-10590da.0 → 0.1.6-383e0b2.0

package/dist/keystore/types.d.ts

@@ -3,7 +3,7 @@ export type MembershipHash = string;
 export type Sha256Hash = string;
 export type Keccak256Hash = string;
 export type Password = string | Uint8Array;
-export type KeystoreMembershipInfo = {
+export type MembershipInfo = {
     chainId: string;
     address: string;
     treeIndex: number;
@@ -11,7 +11,7 @@ export type KeystoreMembershipInfo = {
 };
 export type KeystoreEntity = {
     identity: IdentityCredential;
-    membership: KeystoreMembershipInfo;
+    membership: MembershipInfo;
 };
 export type DecryptedCredentials = KeystoreEntity;
 export type EncryptedCredentials = {

package/dist/utils/bytes.js

@@ -45,12 +45,8 @@ export function writeUIntLE(buf, value, offset, byteLength, noAssert) {
  * @returns BigInt
  */
 export function buildBigIntFromUint8Array(array, byteOffset = 0) {
-    // Use all bytes from byteOffset to the end, big-endian
-    let hex = "";
-    for (let i = byteOffset; i < array.length; i++) {
-        hex += array[i].toString(16).padStart(2, "0");
-    }
-    return BigInt("0x" + hex);
+    const dataView = new DataView(array.buffer);
+    return dataView.getBigUint64(byteOffset, true);
 }
 /**
  * Fills with zeros to set length

package/dist/utils/bytes.js.map

@@ -1 +1 @@
-{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../src/utils/bytes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../src/utils/bytes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,GAAG,KAAmB;IAChD,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,WAAW,IAAI,GAAG,CAAC,MAAM,CAAC;IAC5B,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,gDAAgD;AAChD,SAAS,QAAQ,CACf,GAAe,EACf,KAAa,EACb,MAAc,EACd,GAAW,EACX,GAAW,EACX,GAAW;IAEX,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,GAAG;QAC5B,MAAM,IAAI,UAAU,CAAC,mCAAmC,CAAC,CAAC;IAC5D,IAAI,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM;QAAE,MAAM,IAAI,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,GAAe,EACf,KAAa,EACb,MAAc,EACd,UAAkB,EAClB,QAAkB;IAElB,KAAK,GAAG,CAAC,KAAK,CAAC;IACf,MAAM,GAAG,MAAM,KAAK,CAAC,CAAC;IACtB,UAAU,GAAG,UAAU,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACjD,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,CAAC,GAAG,UAAU,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;QAC1C,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CACvC,KAAiB,EACjB,aAAqB,CAAC;IAEtB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5C,OAAO,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,KAAiB,EAAE,MAAc;IACzD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/package.json

@@ -1 +1 @@
-{"name":"@waku/rln","version":"0.1.6-10590da.0","description":"RLN (Rate Limiting Nullifier) implementation for Waku","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/rln#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","rln","rate-limiting","privacy","web3"],"scripts":{"build":"run-s build:**","build:copy":"mkdir -p dist/resources && cp -r src/resources/* dist/resources/","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint \"src/!(resources)/**/*.{ts,js}\" *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:browser":"karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"devDependencies":{"@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^5.0.1","@types/chai-spies":"^1.0.6","@types/deep-equal-in-any-order":"^1.0.4","@types/lodash":"^4.17.15","@types/sinon":"^17.0.3","@waku/build-utils":"^1.0.0","@waku/message-encryption":"0.0.34-10590da.0","deep-equal-in-any-order":"^2.0.6","fast-check":"^3.23.2","rollup-plugin-copy":"^3.5.0"},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"],"dependencies":{"@chainsafe/bls-keystore":"3.0.0","@waku/core":"0.0.36-10590da.0","@waku/utils":"0.0.24-10590da.0","@noble/hashes":"^1.2.0","@waku/zerokit-rln-wasm":"^0.0.13","ethereum-cryptography":"^3.1.0","ethers":"^5.7.2","lodash":"^4.17.21","uuid":"^11.0.5","chai":"^5.1.2","chai-as-promised":"^8.0.1","chai-spies":"^1.1.0","chai-subset":"^1.6.0","sinon":"^19.0.2"}}
+{"name":"@waku/rln","version":"0.1.6-383e0b2.0","description":"RLN (Rate Limiting Nullifier) implementation for Waku","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/rln#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","rln","rate-limiting","privacy","web3"],"scripts":{"build":"run-s build:**","build:copy":"mkdir -p dist/resources && cp -r src/resources/* dist/resources/","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint \"src/!(resources)/**/*.{ts,js}\" *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:browser":"karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"devDependencies":{"@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^5.0.1","@types/chai-spies":"^1.0.6","@types/deep-equal-in-any-order":"^1.0.4","@types/lodash":"^4.17.15","@types/sinon":"^17.0.3","@waku/build-utils":"^1.0.0","@waku/message-encryption":"0.0.34-383e0b2.0","deep-equal-in-any-order":"^2.0.6","fast-check":"^3.23.2","rollup-plugin-copy":"^3.5.0"},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"],"dependencies":{"@chainsafe/bls-keystore":"3.0.0","@waku/core":"0.0.36-383e0b2.0","@waku/utils":"0.0.24-383e0b2.0","@noble/hashes":"^1.2.0","@waku/zerokit-rln-wasm":"^0.0.13","ethereum-cryptography":"^3.1.0","ethers":"^5.7.2","lodash":"^4.17.21","uuid":"^11.0.5","chai":"^5.1.2","chai-as-promised":"^8.0.1","chai-spies":"^1.1.0","chai-subset":"^1.6.0","sinon":"^19.0.2"}}

package/src/contract/index.ts

@@ -1,3 +1,2 @@
 export { RLNContract } from "./rln_contract.js";
 export * from "./constants.js";
-export * from "./types.js";

package/src/contract/rln_base_contract.ts

@@ -22,8 +22,6 @@ export class RLNBaseContract {
   public contract: ethers.Contract;
   private deployBlock: undefined | number;
   private rateLimit: number;
-  private minRateLimit?: number;
-  private maxRateLimit?: number;
 
   protected _members: Map<number, Member> = new Map();
   private _membersFilter: ethers.EventFilter;
@@ -31,9 +29,19 @@ export class RLNBaseContract {
   private _membersExpiredFilter: ethers.EventFilter;
 
   /**
-   * Private constructor for RLNBaseContract. Use static create() instead.
+   * Constructor for RLNBaseContract.
+   * Allows injecting a mocked contract for testing purposes.
    */
-  protected constructor(options: RLNContractInitOptions) {
+  public constructor(options: RLNContractInitOptions) {
+    // Initialize members and subscriptions
+    this.fetchMembers()
+      .then(() => {
+        this.subscribeToMembers();
+      })
+      .catch((error) => {
+        log.error("Failed to initialize members", { error });
+      });
+
     const {
       address,
       signer,
@@ -41,51 +49,15 @@ export class RLNBaseContract {
       contract
     } = options;
 
-    log.info("Initializing RLNBaseContract", { address, rateLimit });
+    this.validateRateLimit(rateLimit);
 
     this.contract = contract || new ethers.Contract(address, RLN_ABI, signer);
     this.rateLimit = rateLimit;
 
-    try {
-      log.info("Setting up event filters");
-      // Initialize event filters
-      this._membersFilter = this.contract.filters.MembershipRegistered();
-      this._membershipErasedFilter = this.contract.filters.MembershipErased();
-      this._membersExpiredFilter = this.contract.filters.MembershipExpired();
-      log.info("Event filters initialized successfully");
-    } catch (error) {
-      log.error("Failed to initialize event filters", { error });
-      throw new Error(
-        "Failed to initialize event filters: " + (error as Error).message
-      );
-    }
-
-    // Initialize members and subscriptions
-    this.fetchMembers()
-      .then(() => {
-        this.subscribeToMembers();
-      })
-      .catch((error) => {
-        log.error("Failed to initialize members", { error });
-      });
-  }
-
-  /**
-   * Static async factory to create and initialize RLNBaseContract
-   */
-  public static async create(
-    options: RLNContractInitOptions
-  ): Promise<RLNBaseContract> {
-    const instance = new RLNBaseContract(options);
-    const [min, max] = await Promise.all([
-      instance.contract.minMembershipRateLimit(),
-      instance.contract.maxMembershipRateLimit()
-    ]);
-    instance.minRateLimit = ethers.BigNumber.from(min).toNumber();
-    instance.maxRateLimit = ethers.BigNumber.from(max).toNumber();
-
-    instance.validateRateLimit(instance.rateLimit);
-    return instance;
+    // Initialize event filters
+    this._membersFilter = this.contract.filters.MembershipRegistered();
+    this._membershipErasedFilter = this.contract.filters.MembershipErased();
+    this._membersExpiredFilter = this.contract.filters.MembershipExpired();
   }
 
   /**
@@ -110,21 +82,21 @@ export class RLNBaseContract {
   }
 
   /**
-   * Gets the minimum allowed rate limit (cached)
+   * Gets the minimum allowed rate limit from the contract
+   * @returns Promise<number> The minimum rate limit in messages per epoch
    */
-  public getMinRateLimit(): number {
-    if (this.minRateLimit === undefined)
-      throw new Error("minRateLimit not initialized");
-    return this.minRateLimit;
+  public async getMinRateLimit(): Promise<number> {
+    const minRate = await this.contract.minMembershipRateLimit();
+    return ethers.BigNumber.from(minRate).toNumber();
   }
 
   /**
-   * Gets the maximum allowed rate limit (cached)
+   * Gets the maximum allowed rate limit from the contract
+   * @returns Promise<number> The maximum rate limit in messages per epoch
    */
-  public getMaxRateLimit(): number {
-    if (this.maxRateLimit === undefined)
-      throw new Error("maxRateLimit not initialized");
-    return this.maxRateLimit;
+  public async getMaxRateLimit(): Promise<number> {
+    const maxRate = await this.contract.maxMembershipRateLimit();
+    return ethers.BigNumber.from(maxRate).toNumber();
   }
 
   /**
@@ -161,7 +133,7 @@ export class RLNBaseContract {
    * Updates the rate limit for future registrations
    * @param newRateLimit The new rate limit to use
    */
-  public setRateLimit(newRateLimit: number): void {
+  public async setRateLimit(newRateLimit: number): Promise<void> {
     this.validateRateLimit(newRateLimit);
     this.rateLimit = newRateLimit;
   }
@@ -352,7 +324,7 @@ export class RLNBaseContract {
     this.contract.on(
       this.membersFilter,
       (
-        _idCommitment: bigint,
+        _idCommitment: string,
         _membershipRateLimit: ethers.BigNumber,
         _index: ethers.BigNumber,
         event: ethers.Event
@@ -364,7 +336,7 @@ export class RLNBaseContract {
     this.contract.on(
       this.membershipErasedFilter,
       (
-        _idCommitment: bigint,
+        _idCommitment: string,
         _membershipRateLimit: ethers.BigNumber,
         _index: ethers.BigNumber,
         event: ethers.Event
@@ -376,7 +348,7 @@ export class RLNBaseContract {
     this.contract.on(
       this.membersExpiredFilter,
       (
-        _idCommitment: bigint,
+        _idCommitment: string,
         _membershipRateLimit: ethers.BigNumber,
         _index: ethers.BigNumber,
         event: ethers.Event
@@ -386,89 +358,94 @@ export class RLNBaseContract {
     );
   }
 
+  /**
+   * Helper method to get remaining messages in current epoch
+   * @param membershipId The ID of the membership to check
+   * @returns number of remaining messages allowed in current epoch
+   */
+  public async getRemainingMessages(membershipId: number): Promise<number> {
+    try {
+      const [startTime, , rateLimit] =
+        await this.contract.getMembershipInfo(membershipId);
+
+      // Calculate current epoch
+      const currentTime = Math.floor(Date.now() / 1000);
+      const epochsPassed = Math.floor(
+        (currentTime - startTime) / RATE_LIMIT_PARAMS.EPOCH_LENGTH
+      );
+      const currentEpochStart =
+        startTime + epochsPassed * RATE_LIMIT_PARAMS.EPOCH_LENGTH;
+
+      // Get message count in current epoch using contract's function
+      const messageCount = await this.contract.getMessageCount(
+        membershipId,
+        currentEpochStart
+      );
+      return Math.max(
+        0,
+        ethers.BigNumber.from(rateLimit)
+          .sub(ethers.BigNumber.from(messageCount))
+          .toNumber()
+      );
+    } catch (error) {
+      log.error(
+        `Error getting remaining messages: ${(error as Error).message}`
+      );
+      return 0; // Fail safe: assume no messages remaining on error
+    }
+  }
+
   public async getMembershipInfo(
-    idCommitmentBigInt: bigint
+    idCommitment: string
   ): Promise<MembershipInfo | undefined> {
     try {
-      const membershipData =
-        await this.contract.memberships(idCommitmentBigInt);
+      const [startBlock, endBlock, rateLimit] =
+        await this.contract.getMembershipInfo(idCommitment);
       const currentBlock = await this.contract.provider.getBlockNumber();
-      const [
-        depositAmount,
-        activeDuration,
-        gracePeriodStartTimestamp,
-        gracePeriodDuration,
-        rateLimit,
-        index,
-        holder,
-        token
-      ] = membershipData;
-
-      const gracePeriodEnd = gracePeriodStartTimestamp.add(gracePeriodDuration);
 
       let state: MembershipState;
-      if (currentBlock < gracePeriodStartTimestamp.toNumber()) {
+      if (currentBlock < startBlock) {
         state = MembershipState.Active;
-      } else if (currentBlock < gracePeriodEnd.toNumber()) {
+      } else if (currentBlock < endBlock) {
         state = MembershipState.GracePeriod;
       } else {
         state = MembershipState.Expired;
       }
 
+      const index = await this.getMemberIndex(idCommitment);
+      if (!index) return undefined;
+
       return {
         index,
-        idCommitment: idCommitmentBigInt.toString(),
-        rateLimit: Number(rateLimit),
-        startBlock: gracePeriodStartTimestamp.toNumber(),
-        endBlock: gracePeriodEnd.toNumber(),
-        state,
-        depositAmount,
-        activeDuration,
-        gracePeriodDuration,
-        holder,
-        token
+        idCommitment,
+        rateLimit: rateLimit.toNumber(),
+        startBlock: startBlock.toNumber(),
+        endBlock: endBlock.toNumber(),
+        state
       };
     } catch (error) {
-      log.error("Error in getMembershipInfo:", error);
       return undefined;
     }
   }
 
   public async extendMembership(
-    idCommitmentBigInt: bigint
+    idCommitment: string
   ): Promise<ethers.ContractTransaction> {
-    const tx = await this.contract.extendMemberships([idCommitmentBigInt]);
-    await tx.wait();
-    return tx;
+    return this.contract.extendMemberships([idCommitment]);
   }
 
   public async eraseMembership(
-    idCommitmentBigInt: bigint,
+    idCommitment: string,
     eraseFromMembershipSet: boolean = true
   ): Promise<ethers.ContractTransaction> {
-    if (
-      !(await this.isExpired(idCommitmentBigInt)) ||
-      !(await this.isInGracePeriod(idCommitmentBigInt))
-    ) {
-      throw new Error("Membership is not expired or in grace period");
-    }
-
-    const estimatedGas = await this.contract.estimateGas[
-      "eraseMemberships(uint256[],bool)"
-    ]([idCommitmentBigInt], eraseFromMembershipSet);
-    const gasLimit = estimatedGas.add(10000);
-
-    const tx = await this.contract["eraseMemberships(uint256[],bool)"](
-      [idCommitmentBigInt],
-      eraseFromMembershipSet,
-      { gasLimit }
+    return this.contract.eraseMemberships(
+      [idCommitment],
+      eraseFromMembershipSet
     );
-    await tx.wait();
-    return tx;
   }
 
   public async registerMembership(
-    idCommitmentBigInt: bigint,
+    idCommitment: string,
     rateLimit: number = DEFAULT_RATE_LIMIT
   ): Promise<ethers.ContractTransaction> {
     if (
@@ -479,12 +456,12 @@ export class RLNBaseContract {
         `Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE}`
       );
     }
-    return this.contract.register(idCommitmentBigInt, rateLimit, []);
+    return this.contract.register(idCommitment, rateLimit, []);
   }
 
-  public async withdraw(token: string, from: string): Promise<void> {
+  public async withdraw(token: string, holder: string): Promise<void> {
     try {
-      const tx = await this.contract.withdraw(token, from);
+      const tx = await this.contract.withdraw(token, { from: holder });
       await tx.wait();
     } catch (error) {
       log.error(`Error in withdraw: ${(error as Error).message}`);
@@ -501,7 +478,7 @@ export class RLNBaseContract {
 
       // Check if the ID commitment is already registered
       const existingIndex = await this.getMemberIndex(
-        identity.IDCommitmentBigInt
+        identity.IDCommitmentBigInt.toString()
       );
       if (existingIndex) {
         throw new Error(
@@ -539,7 +516,7 @@ export class RLNBaseContract {
       }
 
       const memberRegistered = txRegisterReceipt.events?.find(
-        (event: ethers.Event) => event.event === "MembershipRegistered"
+        (event) => event.event === "MembershipRegistered"
       );
 
       if (!memberRegistered || !memberRegistered.args) {
@@ -633,7 +610,7 @@ export class RLNBaseContract {
       const txRegisterReceipt = await txRegisterResponse.wait();
 
       const memberRegistered = txRegisterReceipt.events?.find(
-        (event: ethers.Event) => event.event === "MembershipRegistered"
+        (event) => event.event === "MembershipRegistered"
       );
 
       if (!memberRegistered || !memberRegistered.args) {
@@ -676,16 +653,16 @@ export class RLNBaseContract {
   }
 
   /**
-   * Validates that the rate limit is within the allowed range (sync)
+   * Validates that the rate limit is within the allowed range
    * @throws Error if the rate limit is outside the allowed range
    */
   private validateRateLimit(rateLimit: number): void {
-    if (this.minRateLimit === undefined || this.maxRateLimit === undefined) {
-      throw new Error("Rate limits not initialized");
-    }
-    if (rateLimit < this.minRateLimit || rateLimit > this.maxRateLimit) {
+    if (
+      rateLimit < RATE_LIMIT_PARAMS.MIN_RATE ||
+      rateLimit > RATE_LIMIT_PARAMS.MAX_RATE
+    ) {
       throw new Error(
-        `Rate limit must be between ${this.minRateLimit} and ${this.maxRateLimit} messages per epoch`
+        `Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE} messages per epoch`
       );
     }
   }
@@ -712,11 +689,11 @@ export class RLNBaseContract {
   }
 
   private async getMemberIndex(
-    idCommitmentBigInt: bigint
+    idCommitment: string
   ): Promise<ethers.BigNumber | undefined> {
     try {
       const events = await this.contract.queryFilter(
-        this.contract.filters.MembershipRegistered(idCommitmentBigInt)
+        this.contract.filters.MembershipRegistered(idCommitment)
       );
       if (events.length === 0) return undefined;
 
@@ -727,45 +704,4 @@ export class RLNBaseContract {
       return undefined;
     }
   }
-
-  public async getMembershipStatus(
-    idCommitment: bigint
-  ): Promise<"expired" | "grace" | "active"> {
-    const [isExpired, isInGrace] = await Promise.all([
-      this.contract.isExpired(idCommitment),
-      this.contract.isInGracePeriod(idCommitment)
-    ]);
-
-    if (isExpired) return "expired";
-    if (isInGrace) return "grace";
-    return "active";
-  }
-
-  /**
-   * Checks if a membership is expired for the given idCommitment
-   * @param idCommitmentBigInt The idCommitment as bigint
-   * @returns Promise<boolean> True if expired, false otherwise
-   */
-  public async isExpired(idCommitmentBigInt: bigint): Promise<boolean> {
-    try {
-      return await this.contract.isExpired(idCommitmentBigInt);
-    } catch (error) {
-      log.error("Error in isExpired:", error);
-      return false;
-    }
-  }
-
-  /**
-   * Checks if a membership is in grace period for the given idCommitment
-   * @param idCommitmentBigInt The idCommitment as bigint
-   * @returns Promise<boolean> True if in grace period, false otherwise
-   */
-  public async isInGracePeriod(idCommitmentBigInt: bigint): Promise<boolean> {
-    try {
-      return await this.contract.isInGracePeriod(idCommitmentBigInt);
-    } catch (error) {
-      log.error("Error in isInGracePeriod:", error);
-      return false;
-    }
-  }
 }

package/src/contract/types.ts

@@ -38,11 +38,6 @@ export interface MembershipInfo {
   startBlock: number;
   endBlock: number;
   state: MembershipState;
-  depositAmount: ethers.BigNumber;
-  activeDuration: number;
-  gracePeriodDuration: number;
-  holder: string;
-  token: string;
 }
 
 export enum MembershipState {

package/src/credentials_manager.ts

@@ -80,7 +80,7 @@ export class RLNCredentialsManager {
 
       this.credentials = credentials;
       this.signer = signer!;
-      this.contract = await RLNBaseContract.create({
+      this.contract = new RLNBaseContract({
         address: address!,
         signer: signer!,
         rateLimit: rateLimit ?? this.zerokit?.rateLimit
@@ -268,14 +268,7 @@ export class RLNCredentialsManager {
     const idCommitment = sha256(idSecretHash);
 
     // Convert IDCommitment to BigInt
-    let idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment);
-    const Q = BigInt(
-      "21888242871839275222246405745257275088548364400416034343698204186575808495617"
-    );
-    if (idCommitmentBigInt >= Q) {
-      log.warn("IDCommitment is greater than Q, truncating");
-      idCommitmentBigInt = idCommitmentBigInt % Q;
-    }
+    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment);
 
     log.info("Successfully generated identity credential");
     return new IdentityCredential(

package/src/identity.ts

@@ -18,7 +18,7 @@ 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);
+    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment, 32);
 
     return new IdentityCredential(
       idTrapdoor,

package/src/index.ts

@@ -34,9 +34,7 @@ export type {
   Keccak256Hash,
   KeystoreEntity,
   MembershipHash,
-  KeystoreMembershipInfo,
+  MembershipInfo,
   Password,
   Sha256Hash
 } from "./keystore/types.js";
-
-export * from "./contract/index.js";

package/src/keystore/keystore.ts

@@ -21,8 +21,8 @@ import { isCredentialValid, isKeystoreValid } from "./schema_validator.js";
 import type {
   Keccak256Hash,
   KeystoreEntity,
-  KeystoreMembershipInfo,
   MembershipHash,
+  MembershipInfo,
   Password,
   Sha256Hash
 } from "./types.js";
@@ -310,9 +310,7 @@ export class Keystore {
 
   // follows nwaku implementation
   // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L111
-  private static computeMembershipHash(
-    info: KeystoreMembershipInfo
-  ): MembershipHash {
+  private static computeMembershipHash(info: MembershipInfo): MembershipHash {
     return bytesToHex(
       sha256(utf8ToBytes(`${info.chainId}${info.address}${info.treeIndex}`))
     ).toUpperCase();

package/src/keystore/types.ts

@@ -7,7 +7,7 @@ export type Password = string | Uint8Array;
 
 // see reference
 // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L111
-export type KeystoreMembershipInfo = {
+export type MembershipInfo = {
   chainId: string;
   address: string;
   treeIndex: number;
@@ -16,7 +16,7 @@ export type KeystoreMembershipInfo = {
 
 export type KeystoreEntity = {
   identity: IdentityCredential;
-  membership: KeystoreMembershipInfo;
+  membership: MembershipInfo;
 };
 
 export type DecryptedCredentials = KeystoreEntity;

package/src/utils/bytes.ts

@@ -65,12 +65,8 @@ export function buildBigIntFromUint8Array(
   array: Uint8Array,
   byteOffset: number = 0
 ): bigint {
-  // Use all bytes from byteOffset to the end, big-endian
-  let hex = "";
-  for (let i = byteOffset; i < array.length; i++) {
-    hex += array[i].toString(16).padStart(2, "0");
-  }
-  return BigInt("0x" + hex);
+  const dataView = new DataView(array.buffer);
+  return dataView.getBigUint64(byteOffset, true);
 }
 
 /**