@waku/rln 0.0.2-09108d9.0 → 0.0.2-2eccb11.0

package/bundle/packages/rln/dist/contract/constants.js

@@ -1,68 +1,28 @@
-// ref https://github.com/waku-org/waku-rln-contract/blob/19fded82bca07e7b535b429dc507cfb83f10dfcf/deployments/sepolia/WakuRlnRegistry_Implementation.json#L3
-const RLN_REGISTRY_ABI = [
-    "error IncompatibleStorage()",
-    "error IncompatibleStorageIndex()",
-    "error NoStorageContractAvailable()",
-    "error StorageAlreadyExists(address storageAddress)",
-    "event AdminChanged(address previousAdmin, address newAdmin)",
-    "event BeaconUpgraded(address indexed beacon)",
-    "event Initialized(uint8 version)",
-    "event NewStorageContract(uint16 index, address storageAddress)",
-    "event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)",
-    "event Upgraded(address indexed implementation)",
-    "function forceProgress()",
-    "function initialize(address _poseidonHasher)",
-    "function newStorage()",
-    "function nextStorageIndex() view returns (uint16)",
-    "function owner() view returns (address)",
-    "function poseidonHasher() view returns (address)",
-    "function proxiableUUID() view returns (bytes32)",
-    "function register(uint16 storageIndex, uint256 commitment)",
-    "function register(uint256[] commitments)",
-    "function register(uint16 storageIndex, uint256[] commitments)",
-    "function registerStorage(address storageAddress)",
-    "function renounceOwnership()",
-    "function storages(uint16) view returns (address)",
-    "function transferOwnership(address newOwner)",
-    "function upgradeTo(address newImplementation)",
-    "function upgradeToAndCall(address newImplementation, bytes data) payable",
-    "function usingStorageIndex() view returns (uint16)"
-];
-// ref https://github.com/waku-org/waku-rln-contract/blob/19fded82bca07e7b535b429dc507cfb83f10dfcf/deployments/sepolia/WakuRlnStorage_0.json#L3
-const RLN_STORAGE_ABI = [
-    "constructor(address _poseidonHasher, uint16 _contractIndex)",
-    "error DuplicateIdCommitment()",
-    "error FullTree()",
-    "error InvalidIdCommitment(uint256 idCommitment)",
-    "error NotImplemented()",
-    "event MemberRegistered(uint256 idCommitment, uint256 index)",
-    "event MemberWithdrawn(uint256 idCommitment, uint256 index)",
-    "event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)",
-    "function DEPTH() view returns (uint256)",
-    "function MEMBERSHIP_DEPOSIT() view returns (uint256)",
-    "function SET_SIZE() view returns (uint256)",
-    "function contractIndex() view returns (uint16)",
-    "function deployedBlockNumber() view returns (uint32)",
-    "function idCommitmentIndex() view returns (uint256)",
-    "function isValidCommitment(uint256 idCommitment) view returns (bool)",
-    "function memberExists(uint256) view returns (bool)",
-    "function members(uint256) view returns (uint256)",
-    "function owner() view returns (address)",
-    "function poseidonHasher() view returns (address)",
-    "function register(uint256[] idCommitments)",
-    "function register(uint256 idCommitment) payable",
-    "function renounceOwnership()",
-    "function slash(uint256 idCommitment, address receiver, uint256[8] proof) pure",
-    "function stakedAmounts(uint256) view returns (uint256)",
-    "function transferOwnership(address newOwner)",
-    "function verifier() view returns (address)",
-    "function withdraw() pure",
-    "function withdrawalBalance(address) view returns (uint256)"
-];
+import { RLN_ABI } from './abi.js';
+
 const SEPOLIA_CONTRACT = {
-    chainId: 11155111,
-    address: "0xF471d71E9b1455bBF4b85d475afb9BB0954A29c4",
-    abi: RLN_REGISTRY_ABI
+    chainId: 59141,
+    // Implementation contract: 0xde2260ca49300357d5af4153cda0d18f7b3ea9b3
+    address: "0xb9cd878c90e49f797b4431fbf4fb333108cb90e6",
+    abi: RLN_ABI
+};
+/**
+ * Rate limit tiers (messages per epoch)
+ * Each membership can specify a rate limit within these bounds.
+ * @see https://github.com/waku-org/specs/blob/master/standards/core/rln-contract.md#implementation-suggestions
+ */
+const RATE_LIMIT_TIERS = {
+    LOW: 20, // Suggested minimum rate - 20 messages per epoch
+    MEDIUM: 200,
+    HIGH: 600 // Suggested maximum rate - 600 messages per epoch
+};
+// Global rate limit parameters
+const RATE_LIMIT_PARAMS = {
+    MIN_RATE: RATE_LIMIT_TIERS.LOW,
+    MAX_RATE: RATE_LIMIT_TIERS.HIGH,
+    MAX_TOTAL_RATE: 160_000, // Maximum total rate limit across all memberships
+    EPOCH_LENGTH: 600 // Epoch length in seconds (10 minutes)
 };
+const DEFAULT_RATE_LIMIT = RATE_LIMIT_PARAMS.MAX_RATE;
 
-export { RLN_REGISTRY_ABI, RLN_STORAGE_ABI, SEPOLIA_CONTRACT };
+export { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS, RATE_LIMIT_TIERS, SEPOLIA_CONTRACT };

package/bundle/packages/rln/dist/contract/rln_contract.js

@@ -5,56 +5,121 @@ import { hexToBytes } from '../../../utils/dist/bytes/index.js';
 import { Logger } from '../../../utils/dist/logger/index.js';
 import { MerkleRootTracker } from '../root_tracker.js';
 import { zeroPadLE } from '../utils/bytes.js';
-import '../utils/epoch.js';
-import { RLN_REGISTRY_ABI, RLN_STORAGE_ABI } from './constants.js';
+import { RLN_ABI } from './abi.js';
+import { RATE_LIMIT_PARAMS, DEFAULT_RATE_LIMIT } from './constants.js';
 import { Contract } from '../../../../node_modules/@ethersproject/contracts/lib.esm/index.js';
-import { AddressZero } from '../../../../node_modules/@ethersproject/constants/lib.esm/addresses.js';
+import { BigNumber } from '../../../../node_modules/@ethersproject/bignumber/lib.esm/bignumber.js';
 
 const log = new Logger("waku:rln:contract");
+var MembershipState;
+(function (MembershipState) {
+    MembershipState["Active"] = "Active";
+    MembershipState["GracePeriod"] = "GracePeriod";
+    MembershipState["Expired"] = "Expired";
+    MembershipState["ErasedAwaitsWithdrawal"] = "ErasedAwaitsWithdrawal";
+})(MembershipState || (MembershipState = {}));
 class RLNContract {
-    registryContract;
+    contract;
     merkleRootTracker;
     deployBlock;
-    storageIndex;
-    storageContract;
-    _membersFilter;
+    rateLimit;
     _members = new Map();
+    _membersFilter;
+    _membersRemovedFilter;
+    _membersExpiredFilter;
+    /**
+     * Asynchronous initializer for RLNContract.
+     * Allows injecting a mocked contract for testing purposes.
+     */
     static async init(rlnInstance, options) {
         const rlnContract = new RLNContract(rlnInstance, options);
-        await rlnContract.initStorageContract(options.signer);
         await rlnContract.fetchMembers(rlnInstance);
         rlnContract.subscribeToMembers(rlnInstance);
         return rlnContract;
     }
-    constructor(rlnInstance, { registryAddress, signer }) {
+    constructor(rlnInstance, 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;
         const initialRoot = rlnInstance.zerokit.getMerkleRoot();
-        this.registryContract = new Contract(registryAddress, RLN_REGISTRY_ABI, signer);
+        // Use the injected contract if provided; otherwise, instantiate a new one.
+        this.contract = contract || new Contract(address, RLN_ABI, signer);
         this.merkleRootTracker = new MerkleRootTracker(5, initialRoot);
+        // Initialize event filters for all relevant events
+        this._membersFilter = this.contract.filters.MembershipRegistered();
+        this._membersRemovedFilter = this.contract.filters.MembershipErased();
+        this._membersExpiredFilter = this.contract.filters.MembershipExpired();
     }
-    async initStorageContract(signer, options = {}) {
-        const storageIndex = options?.storageIndex
-            ? options.storageIndex
-            : await this.registryContract.usingStorageIndex();
-        const storageAddress = await this.registryContract.storages(storageIndex);
-        if (!storageAddress || storageAddress === AddressZero) {
-            throw Error("No RLN Storage initialized on registry contract.");
-        }
-        this.storageIndex = storageIndex;
-        this.storageContract = new Contract(storageAddress, RLN_STORAGE_ABI, signer);
-        this._membersFilter = this.storageContract.filters.MemberRegistered();
-        this.deployBlock = await this.storageContract.deployedBlockNumber();
+    /**
+     * Gets the current rate limit for this contract instance
+     */
+    getRateLimit() {
+        return this.rateLimit;
     }
-    get registry() {
-        if (!this.registryContract) {
-            throw Error("Registry contract was not initialized");
-        }
-        return this.registryContract;
+    /**
+     * Gets the contract address
+     */
+    get address() {
+        return this.contract.address;
     }
-    get contract() {
-        if (!this.storageContract) {
-            throw Error("Storage contract was not initialized");
-        }
-        return this.storageContract;
+    /**
+     * Gets the contract provider
+     */
+    get 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
+     */
+    async getMinRateLimit() {
+        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
+     */
+    async getMaxRateLimit() {
+        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
+     */
+    async getMaxTotalRateLimit() {
+        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
+     */
+    async getCurrentTotalRateLimit() {
+        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
+     */
+    async getRemainingTotalRateLimit() {
+        const [maxTotal, currentTotal] = await Promise.all([
+            this.contract.maxTotalRateLimit(),
+            this.contract.currentTotalRateLimit()
+        ]);
+        return maxTotal.sub(currentTotal).toNumber();
+    }
+    /**
+     * Updates the rate limit for future registrations
+     * @param newRateLimit The new rate limit to use
+     */
+    async setRateLimit(newRateLimit) {
+        this.rateLimit = newRateLimit;
     }
     get members() {
         const sortedMembers = Array.from(this._members.values()).sort((left, right) => left.index.toNumber() - right.index.toNumber());
@@ -66,13 +131,40 @@ class RLNContract {
         }
         return this._membersFilter;
     }
+    get membersRemovedFilter() {
+        if (!this._membersRemovedFilter) {
+            throw Error("MembersErased filter was not initialized.");
+        }
+        return this._membersRemovedFilter;
+    }
+    get membersExpiredFilter() {
+        if (!this._membersExpiredFilter) {
+            throw Error("MembersExpired filter was not initialized.");
+        }
+        return this._membersExpiredFilter;
+    }
     async fetchMembers(rlnInstance, options = {}) {
         const registeredMemberEvents = await queryFilter(this.contract, {
             fromBlock: this.deployBlock,
             ...options,
             membersFilter: this.membersFilter
         });
-        this.processEvents(rlnInstance, registeredMemberEvents);
+        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);
     }
     processEvents(rlnInstance, events) {
         const toRemoveTable = new Map();
@@ -81,8 +173,18 @@ class RLNContract {
             if (!evt.args) {
                 return;
             }
-            if (evt.removed) {
-                const index = evt.args.index;
+            if (evt.event === "MembershipErased" ||
+                evt.event === "MembershipExpired") {
+                // Both MembershipErased and MembershipExpired events should remove members
+                let index = evt.args.index;
+                // Ensure index is an ethers.BigNumber
+                if (!index) {
+                    return;
+                }
+                // Convert index to ethers.BigNumber if it's not already
+                if (typeof index === "number" || typeof index === "string") {
+                    index = BigNumber.from(index);
+                }
                 const toRemoveVal = toRemoveTable.get(evt.blockNumber);
                 if (toRemoveVal != undefined) {
                     toRemoveVal.push(index.toNumber());
@@ -92,7 +194,7 @@ class RLNContract {
                     toRemoveTable.set(evt.blockNumber, [index.toNumber()]);
                 }
             }
-            else {
+            else if (evt.event === "MembershipRegistered") {
                 let eventsPerBlock = toInsertTable.get(evt.blockNumber);
                 if (eventsPerBlock == undefined) {
                     eventsPerBlock = [];
@@ -100,6 +202,7 @@ class RLNContract {
                 eventsPerBlock.push(evt);
                 toInsertTable.set(evt.blockNumber, eventsPerBlock);
             }
+            // MembershipExtended events don't change the membership set, so we don't need to handle them here
         });
         this.removeMembers(rlnInstance, toRemoveTable);
         this.insertMembers(rlnInstance, toInsertTable);
@@ -107,16 +210,25 @@ class RLNContract {
     insertMembers(rlnInstance, toInsert) {
         toInsert.forEach((events, blockNumber) => {
             events.forEach((evt) => {
-                const _idCommitment = evt?.args?.idCommitment;
-                const index = evt?.args?.index;
+                if (!evt.args)
+                    return;
+                const _idCommitment = evt.args.idCommitment;
+                let index = evt.args.index;
+                // Ensure index is an ethers.BigNumber
                 if (!_idCommitment || !index) {
                     return;
                 }
-                const idCommitment = zeroPadLE(hexToBytes(_idCommitment?._hex), 32);
+                // Convert index to ethers.BigNumber if it's not already
+                if (typeof index === "number" || typeof index === "string") {
+                    index = BigNumber.from(index);
+                }
+                const idCommitment = zeroPadLE(hexToBytes(_idCommitment), 32);
                 rlnInstance.zerokit.insertMember(idCommitment);
-                this._members.set(index.toNumber(), {
-                    index,
-                    idCommitment: _idCommitment?._hex
+                // 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();
@@ -124,7 +236,7 @@ class RLNContract {
         });
     }
     removeMembers(rlnInstance, toRemove) {
-        const removeDescending = new Map([...toRemove].sort().reverse());
+        const removeDescending = new Map([...toRemove].reverse());
         removeDescending.forEach((indexes, blockNumber) => {
             indexes.forEach((index) => {
                 if (this._members.has(index)) {
@@ -136,50 +248,191 @@ class RLNContract {
         });
     }
     subscribeToMembers(rlnInstance) {
-        this.contract.on(this.membersFilter, (_pubkey, _index, event) => this.processEvents(rlnInstance, [event]));
+        this.contract.on(this.membersFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+            this.processEvents(rlnInstance, [event]);
+        });
+        this.contract.on(this.membersRemovedFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+            this.processEvents(rlnInstance, [event]);
+        });
+        this.contract.on(this.membersExpiredFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+            this.processEvents(rlnInstance, [event]);
+        });
     }
     async registerWithIdentity(identity) {
-        if (this.storageIndex === undefined) {
-            throw Error("Cannot register credential, no storage contract index found.");
-        }
-        const txRegisterResponse = await this.registryContract["register(uint16,uint256)"](this.storageIndex, identity.IDCommitmentBigInt, { gasLimit: 100000 });
-        const txRegisterReceipt = await txRegisterResponse.wait();
-        // assumption: register(uint16,uint256) emits one event
-        const memberRegistered = txRegisterReceipt?.events?.[0];
-        if (!memberRegistered) {
+        try {
+            log.info(`Registering identity with rate limit: ${this.rateLimit} messages/epoch`);
+            const txRegisterResponse = await this.contract.register(identity.IDCommitmentBigInt, this.rateLimit, [], { gasLimit: 300000 });
+            const txRegisterReceipt = await txRegisterResponse.wait();
+            const memberRegistered = txRegisterReceipt.events?.find((event) => event.event === "MembershipRegistered");
+            if (!memberRegistered || !memberRegistered.args) {
+                log.error("Failed to register membership: No MembershipRegistered event found");
+                return undefined;
+            }
+            const decodedData = {
+                idCommitment: memberRegistered.args.idCommitment,
+                membershipRateLimit: memberRegistered.args.membershipRateLimit,
+                index: memberRegistered.args.index
+            };
+            log.info(`Successfully registered membership with index ${decodedData.index} ` +
+                `and rate limit ${decodedData.membershipRateLimit}`);
+            const network = await this.contract.provider.getNetwork();
+            const address = this.contract.address;
+            const membershipId = decodedData.index.toNumber();
+            return {
+                identity,
+                membership: {
+                    address,
+                    treeIndex: membershipId,
+                    chainId: network.chainId
+                }
+            };
+        }
+        catch (error) {
+            log.error(`Error in registerWithIdentity: ${error.message}`);
             return undefined;
         }
-        const decodedData = this.contract.interface.decodeEventLog("MemberRegistered", memberRegistered.data);
-        const network = await this.registryContract.provider.getNetwork();
-        const address = this.registryContract.address;
-        const membershipId = decodedData.index.toNumber();
-        return {
-            identity,
-            membership: {
-                address,
-                treeIndex: membershipId,
-                chainId: network.chainId
+    }
+    /**
+     * 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, rateLimit.sub(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`);
+            const txRegisterResponse = await this.contract.registerWithPermit(permit.owner, permit.deadline, permit.v, permit.r, permit.s, identity.IDCommitmentBigInt, this.rateLimit, idCommitmentsToErase.map((id) => 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 = {
+                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 = decodedData.index.toNumber();
+            return {
+                identity,
+                membership: {
+                    address,
+                    treeIndex: membershipId,
+                    chainId: network.chainId
+                }
+            };
+        }
+        catch (error) {
+            log.error(`Error in registerWithPermitAndErase: ${error.message}`);
+            return undefined;
+        }
     }
     roots() {
         return this.merkleRootTracker.roots();
     }
+    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}`);
+        }
+    }
+    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;
+        }
+    }
+    async extendMembership(idCommitment) {
+        const tx = await this.contract.extendMemberships([idCommitment]);
+        return await tx.wait();
+    }
+    async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
+        const tx = await this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
+        return await tx.wait();
+    }
+    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}`);
+        }
+        const tx = await this.contract.register(idCommitment, rateLimit, []);
+        return await tx.wait();
+    }
+    async getMemberIndex(idCommitment) {
+        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;
+        }
+    }
 }
-// these value should be tested on other networks
+// 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) {
+    if (fromBlock === undefined) {
         return contract.queryFilter(membersFilter);
     }
-    if (!contract.signer.provider) {
-        throw Error("No provider found on the contract's signer.");
+    if (!contract.provider) {
+        throw Error("No provider found on the contract.");
     }
-    const toBlock = await contract.signer.provider.getBlockNumber();
+    const toBlock = await contract.provider.getBlockNumber();
     if (toBlock - fromBlock < fetchRange) {
-        return contract.queryFilter(membersFilter);
+        return contract.queryFilter(membersFilter, fromBlock, toBlock);
     }
     const events = [];
     const chunks = splitToChunks(fromBlock, toBlock, fetchRange);
@@ -208,11 +461,19 @@ function* takeN(array, size) {
         start += size;
     }
 }
-function ignoreErrors(promise, defaultValue) {
-    return promise.catch((err) => {
-        log.info(`Ignoring an error during query: ${err?.message}`);
+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;
-    });
+    }
 }
 
-export { RLNContract };
+export { MembershipState, RLNContract };

package/bundle/packages/rln/dist/message.js

@@ -17,7 +17,7 @@ class RlnMessage {
     }
     verify(roots) {
         return this.rateLimitProof
-            ? this.rlnInstance.zerokit.verifyWithRoots(this.rateLimitProof, toRLNSignal(this.msg.contentTopic, this.msg), ...roots) // this.rlnInstance.verifyRLNProof once issue status-im/nwaku#1248 is fixed
+            ? this.rlnInstance.zerokit.verifyWithRoots(this.rateLimitProof, toRLNSignal(this.msg.contentTopic, this.msg), roots) // this.rlnInstance.verifyRLNProof once issue status-im/nwaku#1248 is fixed
             : undefined;
     }
     verifyNoRoot() {