@waku/rln 0.1.5-cad3e7a.0 → 0.1.5-d0da8f8.0

package/dist/contract/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/contract/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,4CAA4C;IACrD,GAAG,EAAE,OAAO;CACb,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,GAAG,EAAE,EAAE,EAAE,iDAAiD;IAC1D,MAAM,EAAE,GAAG;IACX,IAAI,EAAE,GAAG,CAAC,kDAAkD;CACpD,CAAC;AAEX,+BAA+B;AAC/B,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,gBAAgB,CAAC,GAAG;IAC9B,QAAQ,EAAE,gBAAgB,CAAC,IAAI;IAC/B,cAAc,EAAE,OAAO,EAAE,kDAAkD;IAC3E,YAAY,EAAE,GAAG,CAAC,uCAAuC;CACjD,CAAC;AAEX,MAAM,CAAC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,QAAQ,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/contract/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,4CAA4C;IACrD,GAAG,EAAE,OAAO;CACb,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,GAAG,EAAE,EAAE,EAAE,iDAAiD;IAC1D,MAAM,EAAE,GAAG;IACX,IAAI,EAAE,GAAG,CAAC,kDAAkD;CACpD,CAAC;AAEX,+BAA+B;AAC/B,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,gBAAgB,CAAC,GAAG;IAC9B,QAAQ,EAAE,gBAAgB,CAAC,IAAI;IAC/B,cAAc,EAAE,OAAO,EAAE,kDAAkD;IAC3E,YAAY,EAAE,GAAG,CAAC,uCAAuC;CACjD,CAAC;AAEX,MAAM,CAAC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,QAAQ,CAAC"}

package/dist/contract/index.d.ts

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

package/dist/contract/index.js

@@ -1,3 +1,4 @@
 export { RLNContract } from "./rln_contract.js";
 export * from "./constants.js";
+export * from "./types.js";
 //# sourceMappingURL=index.js.map

package/dist/contract/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/contract/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/contract/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC"}

package/dist/contract/{rln_light_contract.d.ts → rln_base_contract.d.ts}

@@ -1,56 +1,20 @@
 import { ethers } from "ethers";
-import type { IdentityCredential } from "../identity.js";
-import type { DecryptedCredentials } from "../keystore/index.js";
-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 declare enum MembershipState {
-    Active = "Active",
-    GracePeriod = "GracePeriod",
-    Expired = "Expired",
-    ErasedAwaitsWithdrawal = "ErasedAwaitsWithdrawal"
-}
-export declare class RLNLightContract {
+import { IdentityCredential } from "../identity.js";
+import { DecryptedCredentials } from "../keystore/types.js";
+import { CustomQueryOptions, FetchMembersOptions, Member, MembershipInfo, RLNContractInitOptions } from "./types.js";
+export declare class RLNBaseContract {
     contract: ethers.Contract;
     private deployBlock;
     private rateLimit;
-    private _members;
+    protected _members: Map<number, Member>;
     private _membersFilter;
     private _membershipErasedFilter;
     private _membersExpiredFilter;
     /**
-     * Asynchronous initializer for RLNContract.
+     * Constructor for RLNBaseContract.
      * Allows injecting a mocked contract for testing purposes.
      */
-    static init(options: RLNContractInitOptions): Promise<RLNLightContract>;
-    private constructor();
+    constructor(options: RLNContractInitOptions);
     /**
      * Gets the current rate limit for this contract instance
      */
@@ -94,19 +58,19 @@ export declare class RLNLightContract {
      */
     setRateLimit(newRateLimit: number): Promise<void>;
     get members(): Member[];
-    private get membersFilter();
-    private get membershipErasedFilter();
-    private get membersExpiredFilter();
     fetchMembers(options?: FetchMembersOptions): Promise<void>;
+    static queryFilter(contract: ethers.Contract, options: CustomQueryOptions): Promise<ethers.Event[]>;
     processEvents(events: ethers.Event[]): void;
+    static splitToChunks(from: number, to: number, step: number): Array<[number, number]>;
+    static takeN<T>(array: T[], size: number): Iterable<T[]>;
+    static ignoreErrors<T>(promise: Promise<T>, defaultValue: T): Promise<T>;
     subscribeToMembers(): void;
+    getMembershipInfo(idCommitmentBigInt: bigint): Promise<MembershipInfo | undefined>;
+    extendMembership(idCommitmentBigInt: bigint): Promise<ethers.ContractTransaction>;
+    eraseMembership(idCommitmentBigInt: bigint, eraseFromMembershipSet?: boolean): Promise<ethers.ContractTransaction>;
+    registerMembership(idCommitmentBigInt: bigint, rateLimit?: number): Promise<ethers.ContractTransaction>;
+    withdraw(token: string, from: string): Promise<void>;
     registerWithIdentity(identity: IdentityCredential): Promise<DecryptedCredentials | undefined>;
-    /**
-     * 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
-     */
-    getRemainingMessages(membershipId: number): Promise<number>;
     registerWithPermitAndErase(identity: IdentityCredential, permit: {
         owner: string;
         deadline: number;
@@ -114,11 +78,13 @@ export declare class RLNLightContract {
         r: string;
         s: string;
     }, idCommitmentsToErase: string[]): Promise<DecryptedCredentials | undefined>;
-    withdraw(token: string, holder: string): Promise<void>;
-    getMembershipInfo(idCommitment: string): Promise<MembershipInfo | undefined>;
-    extendMembership(idCommitment: string): Promise<ethers.ContractTransaction>;
-    eraseMembership(idCommitment: string, eraseFromMembershipSet?: boolean): Promise<ethers.ContractTransaction>;
-    registerMembership(idCommitment: string, rateLimit?: number): Promise<ethers.ContractTransaction>;
+    /**
+     * Validates that the rate limit is within the allowed range
+     * @throws Error if the rate limit is outside the allowed range
+     */
+    private validateRateLimit;
+    private get membersFilter();
+    private get membershipErasedFilter();
+    private get membersExpiredFilter();
     private getMemberIndex;
 }
-export {};

package/dist/contract/{rln_light_contract.js → rln_base_contract.js}

@@ -2,15 +2,9 @@ import { Logger } from "@waku/utils";
 import { ethers } from "ethers";
 import { RLN_ABI } from "./abi.js";
 import { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS } from "./constants.js";
-const log = new Logger("waku:rln:contract");
-export var MembershipState;
-(function (MembershipState) {
-    MembershipState["Active"] = "Active";
-    MembershipState["GracePeriod"] = "GracePeriod";
-    MembershipState["Expired"] = "Expired";
-    MembershipState["ErasedAwaitsWithdrawal"] = "ErasedAwaitsWithdrawal";
-})(MembershipState || (MembershipState = {}));
-export class RLNLightContract {
+import { MembershipState } from "./types.js";
+const log = new Logger("waku:rln:contract:base");
+export class RLNBaseContract {
     contract;
     deployBlock;
     rateLimit;
@@ -19,28 +13,38 @@ export class RLNLightContract {
     _membershipErasedFilter;
     _membersExpiredFilter;
     /**
-     * Asynchronous initializer for RLNContract.
+     * Constructor for RLNBaseContract.
      * Allows injecting a mocked contract for testing purposes.
      */
-    static async init(options) {
-        const rlnContract = new RLNLightContract(options);
-        await rlnContract.fetchMembers();
-        rlnContract.subscribeToMembers();
-        return rlnContract;
-    }
     constructor(options) {
         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;
-        // Use the injected contract if provided; otherwise, instantiate a new one.
+        log.info("Initializing RLNBaseContract", { address, rateLimit });
         this.contract = contract || new ethers.Contract(address, RLN_ABI, signer);
-        // Initialize event filters
-        this._membersFilter = this.contract.filters.MembershipRegistered();
-        this._membershipErasedFilter = this.contract.filters.MembershipErased();
-        this._membersExpiredFilter = this.contract.filters.MembershipExpired();
+        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.message);
+        }
+        // Initialize members and subscriptions
+        this.fetchMembers()
+            .then(() => {
+            this.subscribeToMembers();
+        })
+            .catch((error) => {
+            log.error("Failed to initialize members", { error });
+        });
+        // Validate rate limit asynchronously
+        this.validateRateLimit(rateLimit).catch((error) => {
+            log.error("Failed to validate initial rate limit", { error });
+        });
     }
     /**
      * Gets the current rate limit for this contract instance
@@ -82,7 +86,7 @@ export class RLNLightContract {
      */
     async getMaxTotalRateLimit() {
         const maxTotalRate = await this.contract.maxTotalRateLimit();
-        return ethers.BigNumber.from(maxTotalRate).toNumber();
+        return maxTotalRate.toNumber();
     }
     /**
      * Gets the current total rate limit usage across all memberships
@@ -90,7 +94,7 @@ export class RLNLightContract {
      */
     async getCurrentTotalRateLimit() {
         const currentTotal = await this.contract.currentTotalRateLimit();
-        return ethers.BigNumber.from(currentTotal).toNumber();
+        return currentTotal.toNumber();
     }
     /**
      * Gets the remaining available total rate limit that can be allocated
@@ -101,51 +105,32 @@ export class RLNLightContract {
             this.contract.maxTotalRateLimit(),
             this.contract.currentTotalRateLimit()
         ]);
-        return ethers.BigNumber.from(maxTotal)
-            .sub(ethers.BigNumber.from(currentTotal))
-            .toNumber();
+        return Number(maxTotal) - Number(currentTotal);
     }
     /**
      * Updates the rate limit for future registrations
      * @param newRateLimit The new rate limit to use
      */
     async setRateLimit(newRateLimit) {
+        await this.validateRateLimit(newRateLimit);
         this.rateLimit = newRateLimit;
     }
     get members() {
         const sortedMembers = Array.from(this._members.values()).sort((left, right) => left.index.toNumber() - right.index.toNumber());
         return sortedMembers;
     }
-    get membersFilter() {
-        if (!this._membersFilter) {
-            throw Error("Members filter was not initialized.");
-        }
-        return this._membersFilter;
-    }
-    get membershipErasedFilter() {
-        if (!this._membershipErasedFilter) {
-            throw Error("MembershipErased filter was not initialized.");
-        }
-        return this._membershipErasedFilter;
-    }
-    get membersExpiredFilter() {
-        if (!this._membersExpiredFilter) {
-            throw Error("MembersExpired filter was not initialized.");
-        }
-        return this._membersExpiredFilter;
-    }
     async fetchMembers(options = {}) {
-        const registeredMemberEvents = await queryFilter(this.contract, {
+        const registeredMemberEvents = await RLNBaseContract.queryFilter(this.contract, {
             fromBlock: this.deployBlock,
             ...options,
             membersFilter: this.membersFilter
         });
-        const removedMemberEvents = await queryFilter(this.contract, {
+        const removedMemberEvents = await RLNBaseContract.queryFilter(this.contract, {
             fromBlock: this.deployBlock,
             ...options,
             membersFilter: this.membershipErasedFilter
         });
-        const expiredMemberEvents = await queryFilter(this.contract, {
+        const expiredMemberEvents = await RLNBaseContract.queryFilter(this.contract, {
             fromBlock: this.deployBlock,
             ...options,
             membersFilter: this.membersExpiredFilter
@@ -157,6 +142,29 @@ export class RLNLightContract {
         ];
         this.processEvents(events);
     }
+    static async queryFilter(contract, options) {
+        const FETCH_CHUNK = 5;
+        const BLOCK_RANGE = 3000;
+        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 = [];
+        const chunks = RLNBaseContract.splitToChunks(fromBlock, toBlock, fetchRange);
+        for (const portion of RLNBaseContract.takeN(chunks, fetchChunks)) {
+            const promises = portion.map(([left, right]) => RLNBaseContract.ignoreErrors(contract.queryFilter(membersFilter, left, right), []));
+            const fetchedEvents = await Promise.all(promises);
+            events.push(fetchedEvents.flatMap((v) => v));
+        }
+        return events.flatMap((v) => v);
+    }
     processEvents(events) {
         const toRemoveTable = new Map();
         const toInsertTable = new Map();
@@ -192,6 +200,38 @@ export class RLNLightContract {
             }
         });
     }
+    static splitToChunks(from, to, step) {
+        const chunks = [];
+        let left = from;
+        while (left < to) {
+            const right = left + step < to ? left + step : to;
+            chunks.push([left, right]);
+            left = right;
+        }
+        return chunks;
+    }
+    static *takeN(array, size) {
+        let start = 0;
+        while (start < array.length) {
+            const portion = array.slice(start, start + size);
+            yield portion;
+            start += size;
+        }
+    }
+    static async ignoreErrors(promise, defaultValue) {
+        try {
+            return await promise;
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                log.info(`Ignoring an error during query: ${err.message}`);
+            }
+            else {
+                log.info(`Ignoring an unknown error during query`);
+            }
+            return defaultValue;
+        }
+    }
     subscribeToMembers() {
         this.contract.on(this.membersFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
             this.processEvents([event]);
@@ -203,11 +243,72 @@ export class RLNLightContract {
             this.processEvents([event]);
         });
     }
+    async getMembershipInfo(idCommitmentBigInt) {
+        try {
+            const membershipData = await this.contract.memberships(idCommitmentBigInt);
+            const currentBlock = await this.contract.provider.getBlockNumber();
+            const [depositAmount, activeDuration, gracePeriodStartTimestamp, gracePeriodDuration, rateLimit, index, holder, token] = membershipData;
+            const gracePeriodEnd = gracePeriodStartTimestamp.add(gracePeriodDuration);
+            let state;
+            if (currentBlock < gracePeriodStartTimestamp.toNumber()) {
+                state = MembershipState.Active;
+            }
+            else if (currentBlock < gracePeriodEnd.toNumber()) {
+                state = MembershipState.GracePeriod;
+            }
+            else {
+                state = MembershipState.Expired;
+            }
+            return {
+                index,
+                idCommitment: idCommitmentBigInt.toString(),
+                rateLimit: Number(rateLimit),
+                startBlock: gracePeriodStartTimestamp.toNumber(),
+                endBlock: gracePeriodEnd.toNumber(),
+                state,
+                depositAmount,
+                activeDuration,
+                gracePeriodDuration,
+                holder,
+                token
+            };
+        }
+        catch (error) {
+            log.error("Error in getMembershipInfo:", error);
+            return undefined;
+        }
+    }
+    async extendMembership(idCommitmentBigInt) {
+        const tx = await this.contract.extendMemberships([idCommitmentBigInt]);
+        await tx.wait();
+        return tx;
+    }
+    async eraseMembership(idCommitmentBigInt, eraseFromMembershipSet = true) {
+        const tx = await this.contract["eraseMemberships(uint256[],bool)"]([idCommitmentBigInt], eraseFromMembershipSet);
+        await tx.wait();
+        return tx;
+    }
+    async registerMembership(idCommitmentBigInt, rateLimit = DEFAULT_RATE_LIMIT) {
+        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}`);
+        }
+        return this.contract.register(idCommitmentBigInt, rateLimit, []);
+    }
+    async withdraw(token, from) {
+        try {
+            const tx = await this.contract.withdraw(token, from);
+            await tx.wait();
+        }
+        catch (error) {
+            log.error(`Error in withdraw: ${error.message}`);
+        }
+    }
     async registerWithIdentity(identity) {
         try {
             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());
+            const existingIndex = await this.getMemberIndex(identity.IDCommitmentBigInt);
             if (existingIndex) {
                 throw new Error(`ID commitment is already registered with index ${existingIndex}`);
             }
@@ -237,12 +338,12 @@ export class RLNLightContract {
                 `and rate limit ${decodedData.membershipRateLimit}`);
             const network = await this.contract.provider.getNetwork();
             const address = this.contract.address;
-            const membershipId = decodedData.index.toString();
+            const membershipId = Number(decodedData.index);
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: `0x${membershipId}`,
+                    treeIndex: membershipId,
                     chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
@@ -277,29 +378,6 @@ export class RLNLightContract {
             }
         }
     }
-    /**
-     * 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
-     */
-    async getRemainingMessages(membershipId) {
-        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.message}`);
-            return 0; // Fail safe: assume no messages remaining on error
-        }
-    }
     async registerWithPermitAndErase(identity, permit, idCommitmentsToErase) {
         try {
             log.info(`Registering identity with permit and rate limit: ${this.rateLimit} messages/epoch`);
@@ -319,12 +397,12 @@ export class RLNLightContract {
                 `Rate limit: ${decodedData.membershipRateLimit}, Erased ${idCommitmentsToErase.length} commitments`);
             const network = await this.contract.provider.getNetwork();
             const address = this.contract.address;
-            const membershipId = decodedData.index.toString();
+            const membershipId = Number(decodedData.index);
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: `0x${membershipId}`,
+                    treeIndex: membershipId,
                     chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
@@ -335,61 +413,42 @@ export class RLNLightContract {
             return undefined;
         }
     }
-    async withdraw(token, holder) {
-        try {
-            const tx = await this.contract.withdraw(token, { from: holder });
-            await tx.wait();
-        }
-        catch (error) {
-            log.error(`Error in withdraw: ${error.message}`);
+    /**
+     * Validates that the rate limit is within the allowed range
+     * @throws Error if the rate limit is outside the allowed range
+     */
+    async validateRateLimit(rateLimit) {
+        const [minRate, maxRate] = await Promise.all([
+            this.contract.minMembershipRateLimit(),
+            this.contract.maxMembershipRateLimit()
+        ]);
+        const minRateNum = ethers.BigNumber.from(minRate).toNumber();
+        const maxRateNum = ethers.BigNumber.from(maxRate).toNumber();
+        if (rateLimit < minRateNum || rateLimit > maxRateNum) {
+            throw new Error(`Rate limit must be between ${minRateNum} and ${maxRateNum} messages per epoch`);
         }
     }
-    async getMembershipInfo(idCommitment) {
-        try {
-            const [startBlock, endBlock, rateLimit] = await this.contract.getMembershipInfo(idCommitment);
-            const currentBlock = await this.contract.provider.getBlockNumber();
-            let state;
-            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;
+    get membersFilter() {
+        if (!this._membersFilter) {
+            throw Error("Members filter was not initialized.");
         }
+        return this._membersFilter;
     }
-    async extendMembership(idCommitment) {
-        return this.contract.extendMemberships([idCommitment]);
-    }
-    async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
-        return this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
+    get membershipErasedFilter() {
+        if (!this._membershipErasedFilter) {
+            throw Error("MembershipErased filter was not initialized.");
+        }
+        return this._membershipErasedFilter;
     }
-    async registerMembership(idCommitment, rateLimit = DEFAULT_RATE_LIMIT) {
-        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}`);
+    get membersExpiredFilter() {
+        if (!this._membersExpiredFilter) {
+            throw Error("MembersExpired filter was not initialized.");
         }
-        return this.contract.register(idCommitment, rateLimit, []);
+        return this._membersExpiredFilter;
     }
-    async getMemberIndex(idCommitment) {
+    async getMemberIndex(idCommitmentBigInt) {
         try {
-            const events = await this.contract.queryFilter(this.contract.filters.MembershipRegistered(idCommitment));
+            const events = await this.contract.queryFilter(this.contract.filters.MembershipRegistered(idCommitmentBigInt));
             if (events.length === 0)
                 return undefined;
             // Get the most recent registration event
@@ -401,60 +460,4 @@ export class RLNLightContract {
         }
     }
 }
-// These values should be tested on other networks
-const FETCH_CHUNK = 5;
-const BLOCK_RANGE = 3000;
-async function queryFilter(contract, options) {
-    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 = [];
-    const chunks = splitToChunks(fromBlock, toBlock, fetchRange);
-    for (const portion of takeN(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, to, step) {
-    const chunks = [];
-    let left = from;
-    while (left < to) {
-        const right = left + step < to ? left + step : to;
-        chunks.push([left, right]);
-        left = right;
-    }
-    return chunks;
-}
-function* takeN(array, size) {
-    let start = 0;
-    while (start < array.length) {
-        const portion = array.slice(start, start + size);
-        yield portion;
-        start += size;
-    }
-}
-async function ignoreErrors(promise, defaultValue) {
-    try {
-        return await promise;
-    }
-    catch (err) {
-        if (err instanceof Error) {
-            log.info(`Ignoring an error during query: ${err.message}`);
-        }
-        else {
-            log.info(`Ignoring an unknown error during query`);
-        }
-        return defaultValue;
-    }
-}
-//# sourceMappingURL=rln_light_contract.js.map
+//# sourceMappingURL=rln_base_contract.js.map