@waku/rln 0.0.2-b4f5423.0 → 0.0.2-c8128d1.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) {
@@ -48,7 +49,7 @@ 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 all relevant events
+        // Initialize event filters
         this._membersFilter = this.contract.filters.MembershipRegistered();
         this._membersRemovedFilter = this.contract.filters.MembershipErased();
         this._membersExpiredFilter = this.contract.filters.MembershipExpired();
@@ -177,7 +178,6 @@ class RLNContract {
                 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;
                 }
@@ -202,7 +202,6 @@ 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);
@@ -260,25 +259,66 @@ 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");
             const txRegisterResponse = await this.contract.register(identity.IDCommitmentBigInt, this.rateLimit, [], { gasLimit: 300000 });
+            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) {
-                log.error("Failed to register membership: No MembershipRegistered event found");
+                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");
                 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();
-            return {
+            console.log("registerWithIdentity - membershipId:", membershipId);
+            const result = {
                 identity,
                 membership: {
                     address,
@@ -286,10 +326,39 @@ class RLNContract {
                     chainId: network.chainId
                 }
             };
+            console.log("registerWithIdentity - returning result:", result);
+            return result;
         }
         catch (error) {
-            log.error(`Error in registerWithIdentity: ${error.message}`);
-            return undefined;
+            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);
+                // Try to extract more specific error information
+                if (errorMessage.includes("CannotExceedMaxTotalRateLimit")) {
+                    console.error("Registration failed: Cannot exceed maximum total rate limit");
+                }
+                else if (errorMessage.includes("InvalidIdCommitment")) {
+                    console.error("Registration failed: Invalid ID commitment");
+                }
+                else if (errorMessage.includes("InvalidMembershipRateLimit")) {
+                    console.error("Registration failed: Invalid membership rate limit");
+                }
+                else if (errorMessage.includes("execution reverted")) {
+                    // Generic revert
+                    console.error("Contract execution reverted. Check contract requirements.");
+                }
+                else {
+                    console.error(`Error in registerWithIdentity: ${errorMessage}`);
+                }
+            }
+            else {
+                console.error("Unknown error in registerWithIdentity");
+            }
+            // Re-throw the error to allow callers to handle it
+            throw error;
         }
     }
     /**
@@ -390,17 +459,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.");
         }