@waku/rln 0.0.2-8a6571f.0 → 0.0.2-a6c9380.0

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

@@ -10,6 +10,7 @@ import { RATE_LIMIT_PARAMS, DEFAULT_RATE_LIMIT } from './constants.js';
 import { Contract } from '../../../../node_modules/@ethersproject/contracts/lib.esm/index.js';
 import { BigNumber } from '../../../../node_modules/@ethersproject/bignumber/lib.esm/bignumber.js';
 
+/* eslint-disable no-console */
 const log = new Logger("waku:rln:contract");
 var MembershipState;
 (function (MembershipState) {
@@ -26,6 +27,7 @@ class RLNContract {
     _members = new Map();
     _membersFilter;
     _membersRemovedFilter;
+    _membersExpiredFilter;
     /**
      * Asynchronous initializer for RLNContract.
      * Allows injecting a mocked contract for testing purposes.
@@ -47,9 +49,10 @@ class RLNContract {
         // 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 MembershipRegistered and MembershipErased
+        // 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
@@ -135,6 +138,12 @@ class RLNContract {
         }
         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,
@@ -146,7 +155,16 @@ class RLNContract {
             ...options,
             membersFilter: this.membersRemovedFilter
         });
-        const events = [...registeredMemberEvents, ...removedMemberEvents];
+        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) {
@@ -156,8 +174,17 @@ class RLNContract {
             if (!evt.args) {
                 return;
             }
-            if (evt.event === "MembershipErased") {
-                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;
+                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());
@@ -185,14 +212,21 @@ class RLNContract {
                 if (!evt.args)
                     return;
                 const _idCommitment = evt.args.idCommitment;
-                const index = evt.args.index;
+                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 = BigNumber.from(index);
+                }
                 const idCommitment = zeroPadLE(hexToBytes(_idCommitment), 32);
                 rlnInstance.zerokit.insertMember(idCommitment);
-                this._members.set(index.toNumber(), {
-                    index,
+                // 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
                 });
             });
@@ -213,33 +247,45 @@ class RLNContract {
         });
     }
     subscribeToMembers(rlnInstance) {
-        this.contract.on(this.membersFilter, (_idCommitment, _rateLimit, _index, 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.membersRemovedFilter, (_idCommitment, _rateLimit, _index, event) => {
+        this.contract.on(this.membersExpiredFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
             this.processEvents(rlnInstance, [event]);
         });
     }
     async registerWithIdentity(identity) {
         try {
+            console.log("registering membership", identity);
             log.info(`Registering identity with rate limit: ${this.rateLimit} messages/epoch`);
             const txRegisterResponse = await this.contract.register(identity.IDCommitmentBigInt, this.rateLimit, [], { gasLimit: 300000 });
+            console.log("txRegisterResponse", txRegisterResponse);
             const txRegisterReceipt = await txRegisterResponse.wait();
+            console.log("txRegisterReceipt", txRegisterReceipt);
             const memberRegistered = txRegisterReceipt.events?.find((event) => event.event === "MembershipRegistered");
+            console.log("memberRegistered", memberRegistered);
             if (!memberRegistered || !memberRegistered.args) {
+                console.log("no memberRegistered");
                 log.error("Failed to register membership: No MembershipRegistered event found");
                 return undefined;
             }
             const decodedData = {
                 idCommitment: memberRegistered.args.idCommitment,
-                rateLimit: memberRegistered.args.rateLimit,
+                membershipRateLimit: memberRegistered.args.membershipRateLimit,
                 index: memberRegistered.args.index
             };
+            console.log("decodedData", decodedData);
             log.info(`Successfully registered membership with index ${decodedData.index} ` +
-                `and rate limit ${decodedData.rateLimit}`);
+                `and rate limit ${decodedData.membershipRateLimit}`);
             const network = await this.contract.provider.getNetwork();
+            console.log("network", network);
             const address = this.contract.address;
+            console.log("address", address);
             const membershipId = decodedData.index.toNumber();
+            console.log("membershipId", membershipId);
             return {
                 identity,
                 membership: {
@@ -287,11 +333,11 @@ class RLNContract {
             }
             const decodedData = {
                 idCommitment: memberRegistered.args.idCommitment,
-                rateLimit: memberRegistered.args.rateLimit,
+                membershipRateLimit: memberRegistered.args.membershipRateLimit,
                 index: memberRegistered.args.index
             };
             log.info(`Successfully registered membership with permit. Index: ${decodedData.index}, ` +
-                `Rate limit: ${decodedData.rateLimit}, Erased ${idCommitmentsToErase.length} commitments`);
+                `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();
@@ -352,17 +398,22 @@ class RLNContract {
         }
     }
     async extendMembership(idCommitment) {
-        return this.contract.extendMemberships([idCommitment]);
+        const tx = await this.contract.extendMemberships([idCommitment]);
+        return await tx.wait();
     }
     async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
-        return this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
+        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}`);
         }
-        return this.contract.register(idCommitment, rateLimit, []);
+        console.log("registering membership", idCommitment, rateLimit);
+        const txn = this.contract.register(idCommitment, rateLimit, []);
+        console.log("txn", txn);
+        return txn;
     }
     async getMemberIndex(idCommitment) {
         try {

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

@@ -100,8 +100,6 @@ class RLNInstance {
         return this._signer;
     }
     async start(options = {}) {
-        // eslint-disable-next-line no-console
-        console.log("starting", options);
         if (this.started || this.starting) {
             return;
         }
@@ -133,12 +131,6 @@ class RLNInstance {
         if (address === SEPOLIA_CONTRACT.address) {
             chainId = SEPOLIA_CONTRACT.chainId;
         }
-        // eslint-disable-next-line no-console
-        console.log({
-            chainId,
-            address,
-            SEPOLIA_CONTRACT
-        });
         const signer = options.signer || (await extractMetaMaskSigner());
         const currentChainId = await signer.getChainId();
         if (chainId && chainId !== currentChainId) {
@@ -174,6 +166,8 @@ class RLNInstance {
         if ("signature" in options) {
             identity = this.zerokit.generateSeededIdentityCredential(options.signature);
         }
+        // eslint-disable-next-line no-console
+        console.log("registering membership", identity);
         if (!identity) {
             throw Error("Missing signature or identity to register membership.");
         }