@waku/rln 0.1.5-5e19700.0 → 0.1.5-ea6daae.0

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

@@ -1,8 +1,8 @@
 import { RLN_ABI } from './abi.js';
 
-const LINEA_CONTRACT = {
-    chainId: 59141,
-    address: "0xb9cd878c90e49f797b4431fbf4fb333108cb90e6",
+const SEPOLIA_CONTRACT = {
+    chainId: 11155111,
+    address: "0xCB33Aa5B38d79E3D9Fa8B10afF38AA201399a7e3",
     abi: RLN_ABI
 };
 /**
@@ -23,4 +23,4 @@ const RATE_LIMIT_PARAMS = {
 };
 const DEFAULT_RATE_LIMIT = RATE_LIMIT_PARAMS.MAX_RATE;
 
-export { DEFAULT_RATE_LIMIT, LINEA_CONTRACT, RATE_LIMIT_PARAMS, RATE_LIMIT_TIERS };
+export { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS, RATE_LIMIT_TIERS, SEPOLIA_CONTRACT };

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

@@ -25,8 +25,7 @@ class RLNContract {
     rateLimit;
     _members = new Map();
     _membersFilter;
-    _membershipErasedFilter;
-    _membersExpiredFilter;
+    _membersRemovedFilter;
     /**
      * Asynchronous initializer for RLNContract.
      * Allows injecting a mocked contract for testing purposes.
@@ -39,26 +38,18 @@ class RLNContract {
     }
     constructor(rlnInstance, options) {
         const { address, signer, rateLimit = DEFAULT_RATE_LIMIT, contract } = options;
-        this.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`);
+        }
         this.rateLimit = rateLimit;
         const initialRoot = rlnInstance.zerokit.getMerkleRoot();
         // 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
+        // Initialize event filters for MembershipRegistered and MembershipRemoved
         this._membersFilter = this.contract.filters.MembershipRegistered();
-        this._membershipErasedFilter = this.contract.filters.MembershipErased();
-        this._membersExpiredFilter = this.contract.filters.MembershipExpired();
-    }
-    /**
-     * 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`);
-        }
+        this._membersRemovedFilter = this.contract.filters.MembershipRemoved();
     }
     /**
      * Gets the current rate limit for this contract instance
@@ -119,14 +110,13 @@ class RLNContract {
             this.contract.maxTotalRateLimit(),
             this.contract.currentTotalRateLimit()
         ]);
-        return Number(maxTotal) - Number(currentTotal);
+        return maxTotal.sub(currentTotal).toNumber();
     }
     /**
      * 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() {
@@ -139,17 +129,11 @@ class RLNContract {
         }
         return this._membersFilter;
     }
-    get membershipErasedFilter() {
-        if (!this._membershipErasedFilter) {
-            throw Error("MembershipErased filter was not initialized.");
+    get membersRemovedFilter() {
+        if (!this._membersRemovedFilter) {
+            throw Error("MembersRemoved filter was not initialized.");
         }
-        return this._membershipErasedFilter;
-    }
-    get membersExpiredFilter() {
-        if (!this._membersExpiredFilter) {
-            throw Error("MembersExpired filter was not initialized.");
-        }
-        return this._membersExpiredFilter;
+        return this._membersRemovedFilter;
     }
     async fetchMembers(rlnInstance, options = {}) {
         const registeredMemberEvents = await queryFilter(this.contract, {
@@ -160,18 +144,9 @@ class RLNContract {
         const removedMemberEvents = await queryFilter(this.contract, {
             fromBlock: this.deployBlock,
             ...options,
-            membersFilter: this.membershipErasedFilter
-        });
-        const expiredMemberEvents = await queryFilter(this.contract, {
-            fromBlock: this.deployBlock,
-            ...options,
-            membersFilter: this.membersExpiredFilter
+            membersFilter: this.membersRemovedFilter
         });
-        const events = [
-            ...registeredMemberEvents,
-            ...removedMemberEvents,
-            ...expiredMemberEvents
-        ];
+        const events = [...registeredMemberEvents, ...removedMemberEvents];
         this.processEvents(rlnInstance, events);
     }
     processEvents(rlnInstance, events) {
@@ -181,22 +156,8 @@ class RLNContract {
             if (!evt.args) {
                 return;
             }
-            if (evt.event === "MembershipErased" ||
-                evt.event === "MembershipExpired") {
-                let index = evt.args.index;
-                if (!index) {
-                    return;
-                }
-                if (typeof index === "number" || typeof index === "string") {
-                    index = BigNumber.from(index);
-                }
-                else {
-                    log.error("Index is not a number or string", {
-                        index,
-                        event: evt
-                    });
-                    return;
-                }
+            if (evt.event === "MembershipRemoved") {
+                const index = evt.args.index;
                 const toRemoveVal = toRemoveTable.get(evt.blockNumber);
                 if (toRemoveVal != undefined) {
                     toRemoveVal.push(index.toNumber());
@@ -224,17 +185,13 @@ class RLNContract {
                 if (!evt.args)
                     return;
                 const _idCommitment = evt.args.idCommitment;
-                let index = evt.args.index;
+                const index = evt.args.index;
                 if (!_idCommitment || !index) {
                     return;
                 }
-                if (typeof index === "number" || typeof index === "string") {
-                    index = BigNumber.from(index);
-                }
                 const idCommitment = zeroPadLE(hexToBytes(_idCommitment), 32);
                 rlnInstance.zerokit.insertMember(idCommitment);
-                const numericIndex = index.toNumber();
-                this._members.set(numericIndex, {
+                this._members.set(index.toNumber(), {
                     index,
                     idCommitment: _idCommitment
                 });
@@ -256,36 +213,18 @@ class RLNContract {
         });
     }
     subscribeToMembers(rlnInstance) {
-        this.contract.on(this.membersFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
-            this.processEvents(rlnInstance, [event]);
-        });
-        this.contract.on(this.membershipErasedFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+        this.contract.on(this.membersFilter, (_idCommitment, _rateLimit, _index, event) => {
             this.processEvents(rlnInstance, [event]);
         });
-        this.contract.on(this.membersExpiredFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+        this.contract.on(this.membersRemovedFilter, (_idCommitment, _index, event) => {
             this.processEvents(rlnInstance, [event]);
         });
     }
     async registerWithIdentity(identity) {
         try {
             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) {
-                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 txRegisterResponse = await this.contract.register(identity.IDCommitmentBigInt, this.rateLimit, [], { gasLimit: 300000 });
             const txRegisterReceipt = await txRegisterResponse.wait();
-            if (txRegisterReceipt.status === 0) {
-                throw new Error("Transaction failed on-chain");
-            }
             const memberRegistered = txRegisterReceipt.events?.find((event) => event.event === "MembershipRegistered");
             if (!memberRegistered || !memberRegistered.args) {
                 log.error("Failed to register membership: No MembershipRegistered event found");
@@ -293,51 +232,26 @@ class RLNContract {
             }
             const decodedData = {
                 idCommitment: memberRegistered.args.idCommitment,
-                membershipRateLimit: memberRegistered.args.membershipRateLimit,
+                rateLimit: memberRegistered.args.rateLimit,
                 index: memberRegistered.args.index
             };
             log.info(`Successfully registered membership with index ${decodedData.index} ` +
-                `and rate limit ${decodedData.membershipRateLimit}`);
+                `and rate limit ${decodedData.rateLimit}`);
             const network = await this.contract.provider.getNetwork();
             const address = this.contract.address;
-            const membershipId = Number(decodedData.index);
+            const membershipId = decodedData.index.toNumber();
             return {
                 identity,
                 membership: {
                     address,
                     treeIndex: membershipId,
-                    chainId: network.chainId,
-                    rateLimit: decodedData.membershipRateLimit.toNumber()
+                    chainId: network.chainId
                 }
             };
         }
         catch (error) {
-            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
-                });
-            }
+            log.error(`Error in registerWithIdentity: ${error.message}`);
+            return undefined;
         }
     }
     /**
@@ -373,21 +287,20 @@ class RLNContract {
             }
             const decodedData = {
                 idCommitment: memberRegistered.args.idCommitment,
-                membershipRateLimit: memberRegistered.args.membershipRateLimit,
+                rateLimit: memberRegistered.args.rateLimit,
                 index: memberRegistered.args.index
             };
             log.info(`Successfully registered membership with permit. Index: ${decodedData.index}, ` +
-                `Rate limit: ${decodedData.membershipRateLimit}, Erased ${idCommitmentsToErase.length} commitments`);
+                `Rate limit: ${decodedData.rateLimit}, Erased ${idCommitmentsToErase.length} commitments`);
             const network = await this.contract.provider.getNetwork();
             const address = this.contract.address;
-            const membershipId = BigNumber.from(decodedData.index).toNumber();
+            const membershipId = decodedData.index.toNumber();
             return {
                 identity,
                 membership: {
                     address,
                     treeIndex: membershipId,
-                    chainId: network.chainId,
-                    rateLimit: decodedData.membershipRateLimit.toNumber()
+                    chainId: network.chainId
                 }
             };
         }
@@ -444,8 +357,11 @@ class RLNContract {
     async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
         return this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
     }
-    async registerMembership(idCommitment, rateLimit = this.rateLimit) {
-        this.validateRateLimit(rateLimit);
+    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 getMemberIndex(idCommitment) {

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

@@ -1,6 +1,6 @@
-import { cipherDecrypt as cipherDecrypt_1 } from '../../node_modules/@chainsafe/bls-keystore/lib/cipher.js';
-import { kdf as kdf_2 } from '../../node_modules/@chainsafe/bls-keystore/lib/kdf.js';
-import { normalizePassword as normalizePassword_1 } from '../../node_modules/@chainsafe/bls-keystore/lib/password.js';
+import { cipherDecrypt as cipherDecrypt_1 } from '../../../../node_modules/@chainsafe/bls-keystore/lib/cipher.js';
+import { kdf as kdf_2 } from '../../../../node_modules/@chainsafe/bls-keystore/lib/kdf.js';
+import { normalizePassword as normalizePassword_1 } from '../../../../node_modules/@chainsafe/bls-keystore/lib/password.js';
 import { keccak256 } from '../../../../node_modules/ethereum-cryptography/esm/keccak.js';
 import { hexToBytes } from '../../../../node_modules/ethereum-cryptography/esm/utils.js';
 import { concatBytes, bytesToHex } from '../../../../node_modules/@noble/hashes/esm/utils.js';

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

@@ -1,4 +1,4 @@
-import '../../node_modules/@chainsafe/bls-keystore/lib/index.js';
+import '../../../../node_modules/@chainsafe/bls-keystore/lib/index.js';
 import '../../../interfaces/dist/protocols.js';
 import '../../../interfaces/dist/connection_manager.js';
 import '../../../interfaces/dist/health_indicator.js';
@@ -176,8 +176,7 @@ class Keystore {
                 membership: {
                     treeIndex: _.get(obj, "treeIndex"),
                     chainId: _.get(obj, "membershipContract.chainId"),
-                    address: _.get(obj, "membershipContract.address"),
-                    rateLimit: _.get(obj, "membershipContract.rateLimit")
+                    address: _.get(obj, "membershipContract.address")
                 }
             };
         }

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

@@ -21,7 +21,7 @@ import { Logger } from '../../utils/dist/logger/index.js';
 import '../../core/dist/lib/metadata/metadata.js';
 import __wbg_init, { init_panic_hook, newRLN } from '../../../node_modules/@waku/zerokit-rln-wasm/rln_wasm.js';
 import { createRLNEncoder, createRLNDecoder } from './codec.js';
-import { LINEA_CONTRACT, DEFAULT_RATE_LIMIT } from './contract/constants.js';
+import { SEPOLIA_CONTRACT, DEFAULT_RATE_LIMIT } from './contract/constants.js';
 import { RLNContract } from './contract/rln_contract.js';
 import { Keystore } from './keystore/keystore.js';
 import verificationKey from './resources/verification_key.js';
@@ -106,7 +106,7 @@ class RLNInstance {
         this.starting = true;
         try {
             const { credentials, keystore } = await RLNInstance.decryptCredentialsIfNeeded(options.credentials);
-            const { signer, address, rateLimit } = await this.determineStartOptions(options, credentials);
+            const { signer, address } = 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: rateLimit ?? this.zerokit.getRateLimit
+                rateLimit: options.rateLimit ?? this.zerokit.getRateLimit
             });
             this.started = true;
         }
@@ -127,9 +127,9 @@ class RLNInstance {
         let chainId = credentials?.membership.chainId;
         const address = credentials?.membership.address ||
             options.address ||
-            LINEA_CONTRACT.address;
-        if (address === LINEA_CONTRACT.address) {
-            chainId = LINEA_CONTRACT.chainId;
+            SEPOLIA_CONTRACT.address;
+        if (address === SEPOLIA_CONTRACT.address) {
+            chainId = SEPOLIA_CONTRACT.chainId;
         }
         const signer = options.signer || (await extractMetaMaskSigner());
         const currentChainId = await signer.getChainId();