@waku/rln 0.1.5-ff0222a.0 → 0.1.6-b7e9b08.0

package/bundle/packages/rln/dist/contract/{rln_light_contract.js → rln_base_contract.js}

@@ -1,6 +1,6 @@
-import '../../../interfaces/dist/protocols.js';
-import '../../../interfaces/dist/connection_manager.js';
-import '../../../interfaces/dist/health_indicator.js';
+import '../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
+import '../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
+import '../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
 import '../../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../../node_modules/multiformats/dist/src/bases/base2.js';
@@ -15,18 +15,12 @@ import '../../../../node_modules/multiformats/dist/src/codecs/json.js';
 import { Logger } from '../../../utils/dist/logger/index.js';
 import { RLN_ABI } from './abi.js';
 import { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS } from './constants.js';
+import { MembershipState } from './types.js';
 import { Contract } from '../../../../node_modules/@ethersproject/contracts/lib.esm/index.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 RLNLightContract {
+const log = new Logger("waku:rln:contract:base");
+class RLNBaseContract {
     contract;
     deployBlock;
     rateLimit;
@@ -35,24 +29,22 @@ 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) {
+        // Initialize members and subscriptions
+        this.fetchMembers()
+            .then(() => {
+            this.subscribeToMembers();
+        })
+            .catch((error) => {
+            log.error("Failed to initialize members", { error });
+        });
         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.
+        this.validateRateLimit(rateLimit);
         this.contract = contract || new Contract(address, RLN_ABI, signer);
+        this.rateLimit = rateLimit;
         // Initialize event filters
         this._membersFilter = this.contract.filters.MembershipRegistered();
         this._membershipErasedFilter = this.contract.filters.MembershipErased();
@@ -98,7 +90,7 @@ class RLNLightContract {
      */
     async getMaxTotalRateLimit() {
         const maxTotalRate = await this.contract.maxTotalRateLimit();
-        return BigNumber.from(maxTotalRate).toNumber();
+        return maxTotalRate.toNumber();
     }
     /**
      * Gets the current total rate limit usage across all memberships
@@ -106,7 +98,7 @@ class RLNLightContract {
      */
     async getCurrentTotalRateLimit() {
         const currentTotal = await this.contract.currentTotalRateLimit();
-        return BigNumber.from(currentTotal).toNumber();
+        return currentTotal.toNumber();
     }
     /**
      * Gets the remaining available total rate limit that can be allocated
@@ -117,51 +109,32 @@ class RLNLightContract {
             this.contract.maxTotalRateLimit(),
             this.contract.currentTotalRateLimit()
         ]);
-        return BigNumber.from(maxTotal)
-            .sub(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) {
+        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
@@ -173,6 +146,29 @@ 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();
@@ -208,6 +204,38 @@ 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]);
@@ -219,6 +247,81 @@ class RLNLightContract {
             this.processEvents([event]);
         });
     }
+    /**
+     * 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, BigNumber.from(rateLimit)
+                .sub(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 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) {
+        return this.contract.extendMemberships([idCommitment]);
+    }
+    async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
+        return this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
+    }
+    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}`);
+        }
+        return this.contract.register(idCommitment, rateLimit, []);
+    }
+    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 registerWithIdentity(identity) {
         try {
             log.info(`Registering identity with rate limit: ${this.rateLimit} messages/epoch`);
@@ -253,12 +356,12 @@ 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: parseInt(membershipId),
+                    treeIndex: membershipId,
                     chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
@@ -293,29 +396,6 @@ 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, BigNumber.from(rateLimit)
-                .sub(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`);
@@ -335,12 +415,12 @@ 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: parseInt(membershipId),
+                    treeIndex: membershipId,
                     chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
@@ -351,57 +431,33 @@ 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
+     */
+    validateRateLimit(rateLimit) {
+        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`);
         }
     }
-    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) {
         try {
@@ -417,61 +473,5 @@ 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;
-    }
-}
 
-export { MembershipState, RLNLightContract };
+export { RLNBaseContract };