@waku/rln 0.0.2-950aefb.0 → 0.0.2-a3e7f15.0

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

@@ -10,7 +10,6 @@ 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,7 +25,7 @@ class RLNContract {
     rateLimit;
     _members = new Map();
     _membersFilter;
-    _membersRemovedFilter;
+    _membershipErasedFilter;
     _membersExpiredFilter;
     /**
      * Asynchronous initializer for RLNContract.
@@ -51,7 +50,7 @@ class RLNContract {
         this.merkleRootTracker = new MerkleRootTracker(5, initialRoot);
         // Initialize event filters
         this._membersFilter = this.contract.filters.MembershipRegistered();
-        this._membersRemovedFilter = this.contract.filters.MembershipErased();
+        this._membershipErasedFilter = this.contract.filters.MembershipErased();
         this._membersExpiredFilter = this.contract.filters.MembershipExpired();
     }
     /**
@@ -109,12 +108,11 @@ class RLNContract {
      * @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();
-        return 10_000;
+        const [maxTotal, currentTotal] = await Promise.all([
+            this.contract.maxTotalRateLimit(),
+            this.contract.currentTotalRateLimit()
+        ]);
+        return Number(maxTotal) - Number(currentTotal);
     }
     /**
      * Updates the rate limit for future registrations
@@ -133,11 +131,11 @@ class RLNContract {
         }
         return this._membersFilter;
     }
-    get membersRemovedFilter() {
-        if (!this._membersRemovedFilter) {
-            throw Error("MembersErased filter was not initialized.");
+    get membershipErasedFilter() {
+        if (!this._membershipErasedFilter) {
+            throw Error("MembershipErased filter was not initialized.");
         }
-        return this._membersRemovedFilter;
+        return this._membershipErasedFilter;
     }
     get membersExpiredFilter() {
         if (!this._membersExpiredFilter) {
@@ -154,7 +152,7 @@ class RLNContract {
         const removedMemberEvents = await queryFilter(this.contract, {
             fromBlock: this.deployBlock,
             ...options,
-            membersFilter: this.membersRemovedFilter
+            membersFilter: this.membershipErasedFilter
         });
         const expiredMemberEvents = await queryFilter(this.contract, {
             fromBlock: this.deployBlock,
@@ -177,12 +175,10 @@ class RLNContract {
             }
             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);
                 }
@@ -214,20 +210,17 @@ class RLNContract {
                     return;
                 const _idCommitment = evt.args.idCommitment;
                 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);
-                // 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
+                    index,
                     idCommitment: _idCommitment
                 });
             });
@@ -251,7 +244,7 @@ class RLNContract {
         this.contract.on(this.membersFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
             this.processEvents(rlnInstance, [event]);
         });
-        this.contract.on(this.membersRemovedFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+        this.contract.on(this.membershipErasedFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
             this.processEvents(rlnInstance, [event]);
         });
         this.contract.on(this.membersExpiredFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
@@ -260,69 +253,40 @@ class RLNContract {
     }
     async registerWithIdentity(identity) {
         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 = 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");
+                log.error("Failed to register membership: No MembershipRegistered event found");
                 return undefined;
             }
-            console.log("registerWithIdentity - memberRegistered args:", memberRegistered.args);
             const decodedData = {
                 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 = decodedData.index.toNumber();
-            console.log("registerWithIdentity - membershipId:", membershipId);
-            const result = {
+            const membershipId = Number(decodedData.index);
+            return {
                 identity,
                 membership: {
                     address,
@@ -330,39 +294,34 @@ class RLNContract {
                     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);
+                log.error("registerWithIdentity - error message:", errorMessage);
+                log.error("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");
+                    throw new Error("Registration failed: Cannot exceed maximum total rate limit");
                 }
                 else if (errorMessage.includes("InvalidIdCommitment")) {
-                    console.error("Registration failed: Invalid ID commitment");
+                    throw new Error("Registration failed: Invalid ID commitment");
                 }
                 else if (errorMessage.includes("InvalidMembershipRateLimit")) {
-                    console.error("Registration failed: Invalid membership rate limit");
+                    throw new Error("Registration failed: Invalid membership rate limit");
                 }
                 else if (errorMessage.includes("execution reverted")) {
-                    // Generic revert
-                    console.error("Contract execution reverted. Check contract requirements.");
+                    throw new Error("Contract execution reverted. Check contract requirements.");
                 }
                 else {
-                    console.error(`Error in registerWithIdentity: ${errorMessage}`);
+                    throw new Error(`Error in registerWithIdentity: ${errorMessage}`);
                 }
             }
             else {
-                console.error("Unknown error in registerWithIdentity");
+                throw new Error("Unknown error in registerWithIdentity", {
+                    cause: error
+                });
             }
-            // Re-throw the error to allow callers to handle it
-            throw error;
         }
     }
     /**
@@ -405,7 +364,7 @@ class RLNContract {
                 `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();
+            const membershipId = Number(decodedData.index);
             return {
                 identity,
                 membership: {
@@ -463,29 +422,17 @@ class RLNContract {
         }
     }
     async extendMembership(idCommitment) {
-        const tx = await this.contract.extendMemberships([idCommitment]);
-        return await tx.wait();
+        return this.contract.extendMemberships([idCommitment]);
     }
     async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
-        const tx = await this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
-        return await tx.wait();
+        return this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
     }
     async registerMembership(idCommitment, rateLimit = DEFAULT_RATE_LIMIT) {
-        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;
+        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 getMemberIndex(idCommitment) {
         try {
@@ -500,74 +447,6 @@ class RLNContract {
             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
-     */
-    async debugRegistration(idCommitment, rateLimit) {
-        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.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 ===");
-    }
 }
 // These values should be tested on other networks
 const FETCH_CHUNK = 5;

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

@@ -166,8 +166,6 @@ 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.");
         }