@waku/rln 0.0.2-3670e82.0 → 0.0.2-6661e30.0

package/bundle/_virtual/utils.js

@@ -1,3 +1,3 @@
-var utils = {exports: {}};
+var utils = {};
 
-export { utils as __module };
+export { utils as __exports };

package/bundle/_virtual/utils2.js

@@ -1,3 +1,3 @@
-var utils = {};
+var utils = {exports: {}};
 
-export { utils as __exports };
+export { utils as __module };

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();
     }
     /**
@@ -113,7 +112,7 @@ class RLNContract {
             this.contract.maxTotalRateLimit(),
             this.contract.currentTotalRateLimit()
         ]);
-        return maxTotal.sub(currentTotal).toNumber();
+        return Number(maxTotal) - Number(currentTotal);
     }
     /**
      * Updates the rate limit for future registrations
@@ -132,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) {
@@ -153,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,
@@ -176,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);
                 }
@@ -213,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
                 });
             });
@@ -250,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) => {
@@ -259,49 +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`);
-            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...");
+            // Check if the ID commitment is already registered
+            const existingIndex = await this.getMemberIndex(identity.IDCommitmentBigInt.toString());
+            if (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) {
+                throw new Error(`Not enough remaining rate limit. Requested: ${this.rateLimit}, Available: ${remainingRateLimit}`);
+            }
+            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 });
             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());
+            if (txRegisterReceipt.status === 0) {
+                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);
                 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,
@@ -309,15 +294,34 @@ class RLNContract {
                     chainId: network.chainId
                 }
             };
-            console.log("registerWithIdentity - returning result:", result);
-            return result;
         }
         catch (error) {
-            console.log("registerWithIdentity - ERROR:", error);
-            console.log("registerWithIdentity - error message:", error.message);
-            console.log("registerWithIdentity - error stack:", error.stack);
-            log.error(`Error in registerWithIdentity: ${error.message}`);
-            return undefined;
+            if (error instanceof Error) {
+                const errorMessage = error.message;
+                log.error("registerWithIdentity - error message:", errorMessage);
+                log.error("registerWithIdentity - error stack:", error.stack);
+                // Try to extract more specific error information
+                if (errorMessage.includes("CannotExceedMaxTotalRateLimit")) {
+                    throw new Error("Registration failed: Cannot exceed maximum total rate limit");
+                }
+                else if (errorMessage.includes("InvalidIdCommitment")) {
+                    throw new Error("Registration failed: Invalid ID commitment");
+                }
+                else if (errorMessage.includes("InvalidMembershipRateLimit")) {
+                    throw new Error("Registration failed: Invalid membership rate limit");
+                }
+                else if (errorMessage.includes("execution reverted")) {
+                    throw new Error("Contract execution reverted. Check contract requirements.");
+                }
+                else {
+                    throw new Error(`Error in registerWithIdentity: ${errorMessage}`);
+                }
+            }
+            else {
+                throw new Error("Unknown error in registerWithIdentity", {
+                    cause: error
+                });
+            }
         }
     }
     /**
@@ -360,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: {
@@ -418,22 +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) {
         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}`);
         }
-        console.log("registering membership", idCommitment, rateLimit);
-        const txn = this.contract.register(idCommitment, rateLimit, []);
-        console.log("txn", txn);
-        return txn;
+        return this.contract.register(idCommitment, rateLimit, []);
     }
     async getMemberIndex(idCommitment) {
         try {

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

@@ -106,7 +106,7 @@ class RLNInstance {
         this.starting = true;
         try {
             const { credentials, keystore } = await RLNInstance.decryptCredentialsIfNeeded(options.credentials);
-            const { signer, address } = await this.determineStartOptions(options, credentials);
+            const { signer, address, rateLimit } = await this.determineStartOptions(options, credentials);
             if (keystore) {
                 this.keystore = keystore;
             }
@@ -115,7 +115,7 @@ class RLNInstance {
             this._contract = await RLNContract.init(this, {
                 address: address,
                 signer: signer,
-                rateLimit: options.rateLimit ?? this.zerokit.getRateLimit
+                rateLimit: rateLimit ?? this.zerokit.getRateLimit
             });
             this.started = true;
         }
@@ -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.");
         }

package/bundle/packages/rln/node_modules/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/random.js

@@ -1,6 +1,6 @@
 import { __exports as random } from '../../../../../../../_virtual/random.js';
 import '../../../../@noble/hashes/utils.js';
-import { __exports as utils } from '../../../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../../../_virtual/utils.js';
 
 Object.defineProperty(random, "__esModule", { value: true });
 random.getRandomBytes = random.getRandomBytesSync = undefined;

package/bundle/packages/rln/node_modules/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/utils.js

@@ -1,10 +1,10 @@
 import { commonjsGlobal } from '../../../../../../../_virtual/_commonjsHelpers.js';
 import { commonjsRequire } from '../../../../../../../_virtual/_commonjs-dynamic-modules.js';
-import { __module as utils } from '../../../../../../../_virtual/utils.js';
+import { __module as utils } from '../../../../../../../_virtual/utils2.js';
 import '../../../../@noble/hashes/_assert.js';
 import '../../../../@noble/hashes/utils.js';
 import { __exports as _assert } from '../../../../../../../_virtual/_assert.js';
-import { __exports as utils$1 } from '../../../../../../../_virtual/utils2.js';
+import { __exports as utils$1 } from '../../../../../../../_virtual/utils.js';
 
 utils.exports;
 

package/bundle/packages/rln/node_modules/@noble/hashes/_sha2.js

@@ -2,7 +2,7 @@ import { __exports as _sha2 } from '../../../../../_virtual/_sha2.js';
 import './_assert.js';
 import './utils.js';
 import { __exports as _assert } from '../../../../../_virtual/_assert.js';
-import { __exports as utils } from '../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../_virtual/utils.js';
 
 Object.defineProperty(_sha2, "__esModule", { value: true });
 _sha2.SHA2 = undefined;

package/bundle/packages/rln/node_modules/@noble/hashes/hmac.js

@@ -2,7 +2,7 @@ import { __exports as hmac } from '../../../../../_virtual/hmac.js';
 import './_assert.js';
 import './utils.js';
 import { __exports as _assert } from '../../../../../_virtual/_assert.js';
-import { __exports as utils } from '../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../_virtual/utils.js';
 
 (function (exports) {
 	Object.defineProperty(exports, "__esModule", { value: true });

package/bundle/packages/rln/node_modules/@noble/hashes/pbkdf2.js

@@ -2,7 +2,7 @@ import { __exports as pbkdf2$1 } from '../../../../../_virtual/pbkdf22.js';
 import './_assert.js';
 import './hmac.js';
 import './utils.js';
-import { __exports as utils } from '../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../_virtual/utils.js';
 import { __exports as _assert } from '../../../../../_virtual/_assert.js';
 import { __exports as hmac } from '../../../../../_virtual/hmac.js';
 

package/bundle/packages/rln/node_modules/@noble/hashes/scrypt.js

@@ -3,7 +3,7 @@ import './_assert.js';
 import './sha256.js';
 import './pbkdf2.js';
 import './utils.js';
-import { __exports as utils } from '../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../_virtual/utils.js';
 import { __exports as _assert } from '../../../../../_virtual/_assert.js';
 import { __exports as sha256 } from '../../../../../_virtual/sha2562.js';
 import { __exports as pbkdf2 } from '../../../../../_virtual/pbkdf22.js';

package/bundle/packages/rln/node_modules/@noble/hashes/sha256.js

@@ -2,7 +2,7 @@ import { __exports as sha256 } from '../../../../../_virtual/sha2562.js';
 import './_sha2.js';
 import './utils.js';
 import { __exports as _sha2 } from '../../../../../_virtual/_sha2.js';
-import { __exports as utils } from '../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../_virtual/utils.js';
 
 Object.defineProperty(sha256, "__esModule", { value: true });
 sha256.sha224 = sha256.sha256 = undefined;

package/bundle/packages/rln/node_modules/@noble/hashes/sha512.js

@@ -4,7 +4,7 @@ import './_u64.js';
 import './utils.js';
 import { __exports as _sha2 } from '../../../../../_virtual/_sha2.js';
 import { __exports as _u64 } from '../../../../../_virtual/_u64.js';
-import { __exports as utils } from '../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../_virtual/utils.js';
 
 Object.defineProperty(sha512, "__esModule", { value: true });
 sha512.sha384 = sha512.sha512_256 = sha512.sha512_224 = sha512.sha512 = sha512.SHA512 = undefined;

package/bundle/packages/rln/node_modules/@noble/hashes/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from '../../../../../_virtual/utils2.js';
+import { __exports as utils } from '../../../../../_virtual/utils.js';
 import './cryptoBrowser.js';
 import { __exports as cryptoBrowser } from '../../../../../_virtual/cryptoBrowser.js';