@waku/rln 0.0.1 → 0.0.2-00f2e75.0

package/src/contract/rln_contract.ts

@@ -0,0 +1,972 @@
+/* eslint-disable no-console */
+import { Logger } from "@waku/utils";
+import { hexToBytes } from "@waku/utils/bytes";
+import { ethers } from "ethers";
+
+import type { IdentityCredential } from "../identity.js";
+import type { DecryptedCredentials } from "../keystore/index.js";
+import type { RLNInstance } from "../rln.js";
+import { MerkleRootTracker } from "../root_tracker.js";
+import { zeroPadLE } from "../utils/bytes.js";
+
+import { RLN_ABI } from "./abi.js";
+import { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS } from "./constants.js";
+
+const log = new Logger("waku:rln:contract");
+
+type Member = {
+  idCommitment: string;
+  index: ethers.BigNumber;
+};
+
+interface RLNContractOptions {
+  signer: ethers.Signer;
+  address: string;
+  rateLimit?: number;
+}
+
+interface RLNContractInitOptions extends RLNContractOptions {
+  contract?: ethers.Contract;
+}
+
+export interface MembershipRegisteredEvent {
+  idCommitment: string;
+  membershipRateLimit: ethers.BigNumber;
+  index: ethers.BigNumber;
+}
+
+type FetchMembersOptions = {
+  fromBlock?: number;
+  fetchRange?: number;
+  fetchChunks?: number;
+};
+
+export interface MembershipInfo {
+  index: ethers.BigNumber;
+  idCommitment: string;
+  rateLimit: number;
+  startBlock: number;
+  endBlock: number;
+  state: MembershipState;
+}
+
+export enum MembershipState {
+  Active = "Active",
+  GracePeriod = "GracePeriod",
+  Expired = "Expired",
+  ErasedAwaitsWithdrawal = "ErasedAwaitsWithdrawal"
+}
+
+export class RLNContract {
+  public contract: ethers.Contract;
+  private merkleRootTracker: MerkleRootTracker;
+
+  private deployBlock: undefined | number;
+  private rateLimit: number;
+
+  private _members: Map<number, Member> = new Map();
+  private _membersFilter: ethers.EventFilter;
+  private _membersRemovedFilter: ethers.EventFilter;
+  private _membersExpiredFilter: ethers.EventFilter;
+
+  /**
+   * Asynchronous initializer for RLNContract.
+   * Allows injecting a mocked contract for testing purposes.
+   */
+  public static async init(
+    rlnInstance: RLNInstance,
+    options: RLNContractInitOptions
+  ): Promise<RLNContract> {
+    const rlnContract = new RLNContract(rlnInstance, options);
+
+    await rlnContract.fetchMembers(rlnInstance);
+    rlnContract.subscribeToMembers(rlnInstance);
+
+    return rlnContract;
+  }
+
+  private constructor(
+    rlnInstance: RLNInstance,
+    options: RLNContractInitOptions
+  ) {
+    const {
+      address,
+      signer,
+      rateLimit = DEFAULT_RATE_LIMIT,
+      contract
+    } = options;
+
+    if (
+      rateLimit < RATE_LIMIT_PARAMS.MIN_RATE ||
+      rateLimit > RATE_LIMIT_PARAMS.MAX_RATE
+    ) {
+      throw new Error(
+        `Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE} messages per epoch`
+      );
+    }
+
+    this.rateLimit = rateLimit;
+
+    const initialRoot = rlnInstance.zerokit.getMerkleRoot();
+
+    // Use the injected contract if provided; otherwise, instantiate a new one.
+    this.contract = contract || new ethers.Contract(address, RLN_ABI, signer);
+    this.merkleRootTracker = new MerkleRootTracker(5, initialRoot);
+
+    // Initialize event filters
+    this._membersFilter = this.contract.filters.MembershipRegistered();
+    this._membersRemovedFilter = this.contract.filters.MembershipErased();
+    this._membersExpiredFilter = this.contract.filters.MembershipExpired();
+  }
+
+  /**
+   * Gets the current rate limit for this contract instance
+   */
+  public getRateLimit(): number {
+    return this.rateLimit;
+  }
+
+  /**
+   * Gets the contract address
+   */
+  public get address(): string {
+    return this.contract.address;
+  }
+
+  /**
+   * Gets the contract provider
+   */
+  public get provider(): ethers.providers.Provider {
+    return this.contract.provider;
+  }
+
+  /**
+   * Gets the minimum allowed rate limit from the contract
+   * @returns Promise<number> The minimum rate limit in messages per epoch
+   */
+  public async getMinRateLimit(): Promise<number> {
+    const minRate = await this.contract.minMembershipRateLimit();
+    return minRate.toNumber();
+  }
+
+  /**
+   * Gets the maximum allowed rate limit from the contract
+   * @returns Promise<number> The maximum rate limit in messages per epoch
+   */
+  public async getMaxRateLimit(): Promise<number> {
+    const maxRate = await this.contract.maxMembershipRateLimit();
+    return maxRate.toNumber();
+  }
+
+  /**
+   * Gets the maximum total rate limit across all memberships
+   * @returns Promise<number> The maximum total rate limit in messages per epoch
+   */
+  public async getMaxTotalRateLimit(): Promise<number> {
+    const maxTotalRate = await this.contract.maxTotalRateLimit();
+    return maxTotalRate.toNumber();
+  }
+
+  /**
+   * Gets the current total rate limit usage across all memberships
+   * @returns Promise<number> The current total rate limit usage in messages per epoch
+   */
+  public async getCurrentTotalRateLimit(): Promise<number> {
+    const currentTotal = await this.contract.currentTotalRateLimit();
+    return currentTotal.toNumber();
+  }
+
+  /**
+   * Gets the remaining available total rate limit that can be allocated
+   * @returns Promise<number> The remaining rate limit that can be allocated
+   */
+  public async getRemainingTotalRateLimit(): Promise<number> {
+    // const [maxTotal, currentTotal] = await Promise.all([
+    //   this.contract.maxTotalRateLimit(),
+    //   this.contract.currentTotalRateLimit()
+    // ]);
+    // return maxTotal.sub(currentTotal).toNumber();
+    return 10_000;
+  }
+
+  /**
+   * Updates the rate limit for future registrations
+   * @param newRateLimit The new rate limit to use
+   */
+  public async setRateLimit(newRateLimit: number): Promise<void> {
+    this.rateLimit = newRateLimit;
+  }
+
+  public get members(): Member[] {
+    const sortedMembers = Array.from(this._members.values()).sort(
+      (left, right) => left.index.toNumber() - right.index.toNumber()
+    );
+    return sortedMembers;
+  }
+
+  private get membersFilter(): ethers.EventFilter {
+    if (!this._membersFilter) {
+      throw Error("Members filter was not initialized.");
+    }
+    return this._membersFilter;
+  }
+
+  private get membersRemovedFilter(): ethers.EventFilter {
+    if (!this._membersRemovedFilter) {
+      throw Error("MembersErased filter was not initialized.");
+    }
+    return this._membersRemovedFilter;
+  }
+
+  private get membersExpiredFilter(): ethers.EventFilter {
+    if (!this._membersExpiredFilter) {
+      throw Error("MembersExpired filter was not initialized.");
+    }
+    return this._membersExpiredFilter;
+  }
+
+  public async fetchMembers(
+    rlnInstance: RLNInstance,
+    options: FetchMembersOptions = {}
+  ): Promise<void> {
+    const registeredMemberEvents = await queryFilter(this.contract, {
+      fromBlock: this.deployBlock,
+      ...options,
+      membersFilter: this.membersFilter
+    });
+    const removedMemberEvents = await queryFilter(this.contract, {
+      fromBlock: this.deployBlock,
+      ...options,
+      membersFilter: this.membersRemovedFilter
+    });
+    const expiredMemberEvents = await queryFilter(this.contract, {
+      fromBlock: this.deployBlock,
+      ...options,
+      membersFilter: this.membersExpiredFilter
+    });
+
+    const events = [
+      ...registeredMemberEvents,
+      ...removedMemberEvents,
+      ...expiredMemberEvents
+    ];
+    this.processEvents(rlnInstance, events);
+  }
+
+  public processEvents(rlnInstance: RLNInstance, events: ethers.Event[]): void {
+    const toRemoveTable = new Map<number, number[]>();
+    const toInsertTable = new Map<number, ethers.Event[]>();
+
+    events.forEach((evt) => {
+      if (!evt.args) {
+        return;
+      }
+
+      if (
+        evt.event === "MembershipErased" ||
+        evt.event === "MembershipExpired"
+      ) {
+        // Both MembershipErased and MembershipExpired events should remove members
+        let index = evt.args.index;
+
+        if (!index) {
+          return;
+        }
+
+        // Convert index to ethers.BigNumber if it's not already
+        if (typeof index === "number" || typeof index === "string") {
+          index = ethers.BigNumber.from(index);
+        }
+
+        const toRemoveVal = toRemoveTable.get(evt.blockNumber);
+        if (toRemoveVal != undefined) {
+          toRemoveVal.push(index.toNumber());
+          toRemoveTable.set(evt.blockNumber, toRemoveVal);
+        } else {
+          toRemoveTable.set(evt.blockNumber, [index.toNumber()]);
+        }
+      } else if (evt.event === "MembershipRegistered") {
+        let eventsPerBlock = toInsertTable.get(evt.blockNumber);
+        if (eventsPerBlock == undefined) {
+          eventsPerBlock = [];
+        }
+
+        eventsPerBlock.push(evt);
+        toInsertTable.set(evt.blockNumber, eventsPerBlock);
+      }
+    });
+
+    this.removeMembers(rlnInstance, toRemoveTable);
+    this.insertMembers(rlnInstance, toInsertTable);
+  }
+
+  private insertMembers(
+    rlnInstance: RLNInstance,
+    toInsert: Map<number, ethers.Event[]>
+  ): void {
+    toInsert.forEach((events: ethers.Event[], blockNumber: number) => {
+      events.forEach((evt) => {
+        if (!evt.args) return;
+
+        const _idCommitment = evt.args.idCommitment as string;
+        let index = evt.args.index;
+
+        // Ensure index is an ethers.BigNumber
+        if (!_idCommitment || !index) {
+          return;
+        }
+
+        // Convert index to ethers.BigNumber if it's not already
+        if (typeof index === "number" || typeof index === "string") {
+          index = ethers.BigNumber.from(index);
+        }
+
+        const idCommitment = zeroPadLE(hexToBytes(_idCommitment), 32);
+        rlnInstance.zerokit.insertMember(idCommitment);
+
+        // Always store the numeric index as the key, but the BigNumber as the value
+        const numericIndex = index.toNumber();
+        this._members.set(numericIndex, {
+          index, // This is always a BigNumber
+          idCommitment: _idCommitment
+        });
+      });
+
+      const currentRoot = rlnInstance.zerokit.getMerkleRoot();
+      this.merkleRootTracker.pushRoot(blockNumber, currentRoot);
+    });
+  }
+
+  private removeMembers(
+    rlnInstance: RLNInstance,
+    toRemove: Map<number, number[]>
+  ): void {
+    const removeDescending = new Map([...toRemove].reverse());
+    removeDescending.forEach((indexes: number[], blockNumber: number) => {
+      indexes.forEach((index) => {
+        if (this._members.has(index)) {
+          this._members.delete(index);
+          rlnInstance.zerokit.deleteMember(index);
+        }
+      });
+
+      this.merkleRootTracker.backFill(blockNumber);
+    });
+  }
+
+  public subscribeToMembers(rlnInstance: RLNInstance): void {
+    this.contract.on(
+      this.membersFilter,
+      (
+        _idCommitment: string,
+        _membershipRateLimit: ethers.BigNumber,
+        _index: ethers.BigNumber,
+        event: ethers.Event
+      ) => {
+        this.processEvents(rlnInstance, [event]);
+      }
+    );
+
+    this.contract.on(
+      this.membersRemovedFilter,
+      (
+        _idCommitment: string,
+        _membershipRateLimit: ethers.BigNumber,
+        _index: ethers.BigNumber,
+        event: ethers.Event
+      ) => {
+        this.processEvents(rlnInstance, [event]);
+      }
+    );
+
+    this.contract.on(
+      this.membersExpiredFilter,
+      (
+        _idCommitment: string,
+        _membershipRateLimit: ethers.BigNumber,
+        _index: ethers.BigNumber,
+        event: ethers.Event
+      ) => {
+        this.processEvents(rlnInstance, [event]);
+      }
+    );
+  }
+
+  public async registerWithIdentity(
+    identity: IdentityCredential
+  ): Promise<DecryptedCredentials | undefined> {
+    try {
+      console.log("registerWithIdentity - starting registration process");
+      console.log("registerWithIdentity - identity:", identity);
+      console.log(
+        "registerWithIdentity - IDCommitmentBigInt:",
+        identity.IDCommitmentBigInt.toString()
+      );
+      console.log("registerWithIdentity - rate limit:", this.rateLimit);
+
+      log.info(
+        `Registering identity with rate limit: ${this.rateLimit} messages/epoch`
+      );
+
+      // Check if the ID commitment is already registered
+      const existingIndex = await this.getMemberIndex(
+        identity.IDCommitmentBigInt.toString()
+      );
+      if (existingIndex) {
+        console.error(
+          `ID commitment is already registered with index ${existingIndex}`
+        );
+        throw new Error(
+          `ID commitment is already registered with index ${existingIndex}`
+        );
+      }
+
+      // Check if there's enough remaining rate limit
+      const remainingRateLimit = await this.getRemainingTotalRateLimit();
+      if (remainingRateLimit < this.rateLimit) {
+        console.error(
+          `Not enough remaining rate limit. Requested: ${this.rateLimit}, Available: ${remainingRateLimit}`
+        );
+        throw new Error(
+          `Not enough remaining rate limit. Requested: ${this.rateLimit}, Available: ${remainingRateLimit}`
+        );
+      }
+
+      console.log("registerWithIdentity - calling contract.register");
+      // Estimate gas for the transaction
+      const estimatedGas = await this.contract.estimateGas.register(
+        identity.IDCommitmentBigInt,
+        this.rateLimit,
+        []
+      );
+      const gasLimit = estimatedGas.add(10000);
+
+      const txRegisterResponse: ethers.ContractTransaction =
+        await this.contract.register(
+          identity.IDCommitmentBigInt,
+          this.rateLimit,
+          [],
+          { gasLimit }
+        );
+      console.log(
+        "registerWithIdentity - txRegisterResponse:",
+        txRegisterResponse
+      );
+      console.log("registerWithIdentity - hash:", txRegisterResponse.hash);
+      console.log(
+        "registerWithIdentity - waiting for transaction confirmation..."
+      );
+
+      const txRegisterReceipt = await txRegisterResponse.wait();
+      console.log(
+        "registerWithIdentity - txRegisterReceipt:",
+        txRegisterReceipt
+      );
+      console.log(
+        "registerWithIdentity - transaction status:",
+        txRegisterReceipt.status
+      );
+      console.log(
+        "registerWithIdentity - block number:",
+        txRegisterReceipt.blockNumber
+      );
+      console.log(
+        "registerWithIdentity - gas used:",
+        txRegisterReceipt.gasUsed.toString()
+      );
+
+      // Check transaction status
+      if (txRegisterReceipt.status === 0) {
+        console.error("Transaction failed on-chain");
+        throw new Error("Transaction failed on-chain");
+      }
+
+      const memberRegistered = txRegisterReceipt.events?.find(
+        (event) => event.event === "MembershipRegistered"
+      );
+      console.log(
+        "registerWithIdentity - memberRegistered event:",
+        memberRegistered
+      );
+
+      if (!memberRegistered || !memberRegistered.args) {
+        console.log(
+          "registerWithIdentity - ERROR: no memberRegistered event found"
+        );
+        console.log(
+          "registerWithIdentity - all events:",
+          txRegisterReceipt.events
+        );
+        console.error(
+          "Failed to register membership: No MembershipRegistered event found"
+        );
+        return undefined;
+      }
+
+      console.log(
+        "registerWithIdentity - memberRegistered args:",
+        memberRegistered.args
+      );
+      const decodedData: MembershipRegisteredEvent = {
+        idCommitment: memberRegistered.args.idCommitment,
+        membershipRateLimit: memberRegistered.args.membershipRateLimit,
+        index: memberRegistered.args.index
+      };
+      console.log("registerWithIdentity - decodedData:", decodedData);
+      console.log(
+        "registerWithIdentity - index:",
+        decodedData.index.toString()
+      );
+      console.log(
+        "registerWithIdentity - membershipRateLimit:",
+        decodedData.membershipRateLimit.toString()
+      );
+
+      log.info(
+        `Successfully registered membership with index ${decodedData.index} ` +
+          `and rate limit ${decodedData.membershipRateLimit}`
+      );
+
+      console.log("registerWithIdentity - getting network information");
+      const network = await this.contract.provider.getNetwork();
+      console.log("registerWithIdentity - network:", network);
+      console.log("registerWithIdentity - chainId:", network.chainId);
+
+      const address = this.contract.address;
+      console.log("registerWithIdentity - contract address:", address);
+
+      const membershipId = Number(decodedData.index);
+      console.log("registerWithIdentity - membershipId:", membershipId);
+
+      const result = {
+        identity,
+        membership: {
+          address,
+          treeIndex: membershipId,
+          chainId: network.chainId
+        }
+      };
+      console.log("registerWithIdentity - returning result:", result);
+
+      return result;
+    } catch (error) {
+      console.log("registerWithIdentity - ERROR:", error);
+
+      // Improved error handling to decode contract errors
+      if (error instanceof Error) {
+        const errorMessage = error.message;
+        console.log("registerWithIdentity - error message:", errorMessage);
+        console.log("registerWithIdentity - error stack:", error.stack);
+
+        // Try to extract more specific error information
+        if (errorMessage.includes("CannotExceedMaxTotalRateLimit")) {
+          console.error(
+            "Registration failed: Cannot exceed maximum total rate limit"
+          );
+        } else if (errorMessage.includes("InvalidIdCommitment")) {
+          console.error("Registration failed: Invalid ID commitment");
+        } else if (errorMessage.includes("InvalidMembershipRateLimit")) {
+          console.error("Registration failed: Invalid membership rate limit");
+        } else if (errorMessage.includes("execution reverted")) {
+          // Generic revert
+          console.error(
+            "Contract execution reverted. Check contract requirements."
+          );
+        } else {
+          console.error(`Error in registerWithIdentity: ${errorMessage}`);
+        }
+      } else {
+        console.error("Unknown error in registerWithIdentity");
+      }
+
+      // Re-throw the error to allow callers to handle it
+      throw error;
+    }
+  }
+
+  /**
+   * 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, rateLimit.sub(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 registerWithPermitAndErase(
+    identity: IdentityCredential,
+    permit: {
+      owner: string;
+      deadline: number;
+      v: number;
+      r: string;
+      s: string;
+    },
+    idCommitmentsToErase: string[]
+  ): Promise<DecryptedCredentials | undefined> {
+    try {
+      log.info(
+        `Registering identity with permit and rate limit: ${this.rateLimit} messages/epoch`
+      );
+
+      const txRegisterResponse: ethers.ContractTransaction =
+        await this.contract.registerWithPermit(
+          permit.owner,
+          permit.deadline,
+          permit.v,
+          permit.r,
+          permit.s,
+          identity.IDCommitmentBigInt,
+          this.rateLimit,
+          idCommitmentsToErase.map((id) => ethers.BigNumber.from(id))
+        );
+      const txRegisterReceipt = await txRegisterResponse.wait();
+
+      const memberRegistered = txRegisterReceipt.events?.find(
+        (event) => event.event === "MembershipRegistered"
+      );
+
+      if (!memberRegistered || !memberRegistered.args) {
+        log.error(
+          "Failed to register membership with permit: No MembershipRegistered event found"
+        );
+        return undefined;
+      }
+
+      const decodedData: MembershipRegisteredEvent = {
+        idCommitment: memberRegistered.args.idCommitment,
+        membershipRateLimit: memberRegistered.args.membershipRateLimit,
+        index: memberRegistered.args.index
+      };
+
+      log.info(
+        `Successfully registered membership with permit. Index: ${decodedData.index}, ` +
+          `Rate limit: ${decodedData.membershipRateLimit}, Erased ${idCommitmentsToErase.length} commitments`
+      );
+
+      const network = await this.contract.provider.getNetwork();
+      const address = this.contract.address;
+      const membershipId = Number(decodedData.index);
+
+      return {
+        identity,
+        membership: {
+          address,
+          treeIndex: membershipId,
+          chainId: network.chainId
+        }
+      };
+    } catch (error) {
+      log.error(
+        `Error in registerWithPermitAndErase: ${(error as Error).message}`
+      );
+      return undefined;
+    }
+  }
+
+  public roots(): Uint8Array[] {
+    return this.merkleRootTracker.roots();
+  }
+
+  public async withdraw(token: string, holder: string): Promise<void> {
+    try {
+      const tx = await this.contract.withdraw(token, { from: holder });
+      await tx.wait();
+    } catch (error) {
+      log.error(`Error in withdraw: ${(error as Error).message}`);
+    }
+  }
+
+  public async getMembershipInfo(
+    idCommitment: string
+  ): Promise<MembershipInfo | undefined> {
+    try {
+      const [startBlock, endBlock, rateLimit] =
+        await this.contract.getMembershipInfo(idCommitment);
+      const currentBlock = await this.contract.provider.getBlockNumber();
+
+      let state: MembershipState;
+      if (currentBlock < startBlock) {
+        state = MembershipState.Active;
+      } else if (currentBlock < endBlock) {
+        state = MembershipState.GracePeriod;
+      } else {
+        state = MembershipState.Expired;
+      }
+
+      const index = await this.getMemberIndex(idCommitment);
+      if (!index) return undefined;
+
+      return {
+        index,
+        idCommitment,
+        rateLimit: rateLimit.toNumber(),
+        startBlock: startBlock.toNumber(),
+        endBlock: endBlock.toNumber(),
+        state
+      };
+    } catch (error) {
+      return undefined;
+    }
+  }
+
+  public async extendMembership(
+    idCommitment: string
+  ): Promise<ethers.ContractReceipt> {
+    const tx = await this.contract.extendMemberships([idCommitment]);
+    return await tx.wait();
+  }
+
+  public async eraseMembership(
+    idCommitment: string,
+    eraseFromMembershipSet: boolean = true
+  ): Promise<ethers.ContractReceipt> {
+    const tx = await this.contract.eraseMemberships(
+      [idCommitment],
+      eraseFromMembershipSet
+    );
+    return await tx.wait();
+  }
+
+  public async registerMembership(
+    idCommitment: string,
+    rateLimit: number = DEFAULT_RATE_LIMIT
+  ): Promise<ethers.ContractTransaction> {
+    try {
+      if (
+        rateLimit < RATE_LIMIT_PARAMS.MIN_RATE ||
+        rateLimit > RATE_LIMIT_PARAMS.MAX_RATE
+      ) {
+        throw new Error(
+          `Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE}`
+        );
+      }
+
+      // Try to register
+      return this.contract.register(idCommitment, rateLimit, []);
+    } catch (error) {
+      console.error("Error in registerMembership:", error);
+
+      // Run debug to help diagnose the issue
+      await this.debugRegistration(idCommitment, rateLimit);
+
+      // Re-throw the error
+      throw error;
+    }
+  }
+
+  private async getMemberIndex(
+    idCommitment: string
+  ): Promise<ethers.BigNumber | undefined> {
+    try {
+      const events = await this.contract.queryFilter(
+        this.contract.filters.MembershipRegistered(idCommitment)
+      );
+      if (events.length === 0) return undefined;
+
+      // Get the most recent registration event
+      const event = events[events.length - 1];
+      return event.args?.index;
+    } catch (error) {
+      return undefined;
+    }
+  }
+
+  /**
+   * Debug function to check why a registration might fail
+   * @param idCommitment The ID commitment to check
+   * @param rateLimit The rate limit to check
+   */
+  public async debugRegistration(
+    idCommitment: string,
+    rateLimit: number
+  ): Promise<void> {
+    console.log("=== DEBUG REGISTRATION ===");
+    console.log(`ID Commitment: ${idCommitment}`);
+    console.log(`Rate Limit: ${rateLimit}`);
+
+    // Check if ID commitment is already registered
+    try {
+      const existingIndex = await this.getMemberIndex(idCommitment);
+      if (existingIndex) {
+        console.error(
+          `ERROR: ID commitment is already registered with index ${existingIndex}`
+        );
+      } else {
+        console.log("ID commitment is not yet registered ✓");
+      }
+    } catch (error) {
+      console.error("Error checking if ID commitment is registered:", error);
+    }
+
+    // Check rate limit constraints
+    try {
+      const minRateLimit = await this.getMinRateLimit();
+      const maxRateLimit = await this.getMaxRateLimit();
+      const maxTotalRateLimit = await this.getMaxTotalRateLimit();
+      const currentTotalRateLimit = await this.getCurrentTotalRateLimit();
+      const remainingRateLimit = await this.getRemainingTotalRateLimit();
+
+      console.log(`Min Rate Limit: ${minRateLimit}`);
+      console.log(`Max Rate Limit: ${maxRateLimit}`);
+      console.log(`Max Total Rate Limit: ${maxTotalRateLimit}`);
+      console.log(`Current Total Rate Limit: ${currentTotalRateLimit}`);
+      console.log(`Remaining Rate Limit: ${remainingRateLimit}`);
+
+      if (rateLimit < minRateLimit) {
+        console.error(
+          `ERROR: Rate limit ${rateLimit} is below minimum ${minRateLimit}`
+        );
+      }
+      if (rateLimit > maxRateLimit) {
+        console.error(
+          `ERROR: Rate limit ${rateLimit} exceeds maximum ${maxRateLimit}`
+        );
+      }
+      if (rateLimit > remainingRateLimit) {
+        console.error(
+          `ERROR: Rate limit ${rateLimit} exceeds remaining capacity ${remainingRateLimit}`
+        );
+      }
+    } catch (error) {
+      console.error("Error checking rate limit constraints:", error);
+    }
+
+    // Try to estimate gas for the transaction to see if it would revert
+    try {
+      await this.contract.estimateGas.register(idCommitment, rateLimit, []);
+      console.log("Transaction gas estimation succeeded ✓");
+    } catch (error) {
+      console.error("Transaction would revert with error:", error);
+
+      // Try to extract more specific error information
+      const errorMessage = (error as Error).message;
+      if (errorMessage.includes("CannotExceedMaxTotalRateLimit")) {
+        console.error("Cannot exceed maximum total rate limit");
+      } else if (errorMessage.includes("InvalidIdCommitment")) {
+        console.error("Invalid ID commitment format");
+      } else if (errorMessage.includes("InvalidMembershipRateLimit")) {
+        console.error("Invalid membership rate limit");
+      }
+    }
+
+    console.log("=== END DEBUG ===");
+  }
+}
+
+interface CustomQueryOptions extends FetchMembersOptions {
+  membersFilter: ethers.EventFilter;
+}
+
+// These values should be tested on other networks
+const FETCH_CHUNK = 5;
+const BLOCK_RANGE = 3000;
+
+async function queryFilter(
+  contract: ethers.Contract,
+  options: CustomQueryOptions
+): Promise<ethers.Event[]> {
+  const {
+    fromBlock,
+    membersFilter,
+    fetchRange = BLOCK_RANGE,
+    fetchChunks = FETCH_CHUNK
+  } = options;
+
+  if (fromBlock === undefined) {
+    return contract.queryFilter(membersFilter);
+  }
+
+  if (!contract.provider) {
+    throw Error("No provider found on the contract.");
+  }
+
+  const toBlock = await contract.provider.getBlockNumber();
+
+  if (toBlock - fromBlock < fetchRange) {
+    return contract.queryFilter(membersFilter, fromBlock, toBlock);
+  }
+
+  const events: ethers.Event[][] = [];
+  const chunks = splitToChunks(fromBlock, toBlock, fetchRange);
+
+  for (const portion of takeN<[number, number]>(chunks, fetchChunks)) {
+    const promises = portion.map(([left, right]) =>
+      ignoreErrors(contract.queryFilter(membersFilter, left, right), [])
+    );
+    const fetchedEvents = await Promise.all(promises);
+    events.push(fetchedEvents.flatMap((v) => v));
+  }
+
+  return events.flatMap((v) => v);
+}
+
+function splitToChunks(
+  from: number,
+  to: number,
+  step: number
+): Array<[number, number]> {
+  const chunks: Array<[number, number]> = [];
+
+  let left = from;
+  while (left < to) {
+    const right = left + step < to ? left + step : to;
+
+    chunks.push([left, right] as [number, number]);
+
+    left = right;
+  }
+
+  return chunks;
+}
+
+function* takeN<T>(array: T[], size: number): Iterable<T[]> {
+  let start = 0;
+
+  while (start < array.length) {
+    const portion = array.slice(start, start + size);
+
+    yield portion;
+
+    start += size;
+  }
+}
+
+async function ignoreErrors<T>(
+  promise: Promise<T>,
+  defaultValue: T
+): Promise<T> {
+  try {
+    return await promise;
+  } catch (err: unknown) {
+    if (err instanceof Error) {
+      log.info(`Ignoring an error during query: ${err.message}`);
+    } else {
+      log.info(`Ignoring an unknown error during query`);
+    }
+    return defaultValue;
+  }
+}