@waku/rln 0.1.6-b7e9b08.0 → 0.1.6-f7778a9.0

package/bundle/_virtual/utils.js

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

package/bundle/_virtual/utils2.js

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

package/bundle/index.js

@@ -1,7 +1,8 @@
 export { RLNDecoder, RLNEncoder } from './packages/rln/dist/codec.js';
 export { RLN_ABI } from './packages/rln/dist/contract/abi.js';
 export { RLNContract } from './packages/rln/dist/contract/rln_contract.js';
-export { LINEA_CONTRACT } from './packages/rln/dist/contract/constants.js';
+export { DEFAULT_Q, DEFAULT_RATE_LIMIT, LINEA_CONTRACT, RATE_LIMIT_PARAMS, RATE_LIMIT_TIERS } from './packages/rln/dist/contract/constants.js';
+export { MembershipState } from './packages/rln/dist/contract/types.js';
 export { RLNBaseContract } from './packages/rln/dist/contract/rln_base_contract.js';
 export { createRLN } from './packages/rln/dist/create.js';
 export { RLNCredentialsManager } from './packages/rln/dist/credentials_manager.js';

package/bundle/node_modules/@chainsafe/bls-keystore/node_modules/@noble/hashes/_sha2.js

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

package/bundle/node_modules/@chainsafe/bls-keystore/node_modules/@noble/hashes/hmac.js

@@ -1,7 +1,7 @@
 import { __exports as hmac } from '../../../../../../_virtual/hmac.js';
 import './_assert.js';
 import './utils.js';
-import { __exports as utils } from '../../../../../../_virtual/utils.js';
+import { __exports as utils } from '../../../../../../_virtual/utils2.js';
 import { __exports as _assert } from '../../../../../../_virtual/_assert.js';
 
 (function (exports) {

package/bundle/node_modules/@chainsafe/bls-keystore/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/utils.js';
+import { __exports as utils } from '../../../../../../_virtual/utils2.js';
 import { __exports as _assert } from '../../../../../../_virtual/_assert.js';
 import { __exports as hmac } from '../../../../../../_virtual/hmac.js';
 

package/bundle/node_modules/@chainsafe/bls-keystore/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/utils.js';
+import { __exports as utils } from '../../../../../../_virtual/utils2.js';
 import { __exports as _assert } from '../../../../../../_virtual/_assert.js';
 import { __exports as pbkdf2 } from '../../../../../../_virtual/pbkdf22.js';
 import { __exports as sha256 } from '../../../../../../_virtual/sha2562.js';

package/bundle/node_modules/@chainsafe/bls-keystore/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/utils.js';
+import { __exports as utils } from '../../../../../../_virtual/utils2.js';
 
 Object.defineProperty(sha256, "__esModule", { value: true });
 sha256.sha224 = sha256.sha256 = void 0;

package/bundle/node_modules/@chainsafe/bls-keystore/node_modules/@noble/hashes/sha512.js

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

package/bundle/node_modules/@chainsafe/bls-keystore/node_modules/@noble/hashes/utils.js

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

package/bundle/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/utils.js';
+import { __exports as utils } from '../../../../../_virtual/utils2.js';
 
 Object.defineProperty(random, "__esModule", { value: true });
 random.getRandomBytes = random.getRandomBytesSync = void 0;

package/bundle/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/utils2.js';
+import { __module as utils } from '../../../../../_virtual/utils.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/utils.js';
+import { __exports as utils$1 } from '../../../../../_virtual/utils2.js';
 
 utils.exports;
 

package/bundle/node_modules/@ethersproject/keccak256/lib.esm/index.js

@@ -1,4 +1,4 @@
-import sha3 from '../node_modules/js-sha3/src/sha3.js';
+import sha3 from '../../../js-sha3/src/sha3.js';
 import { arrayify } from '../../bytes/lib.esm/index.js';
 
 function keccak256(data) {

package/bundle/node_modules/{@ethersproject/keccak256/node_modules/js-sha3 → js-sha3}/src/sha3.js

@@ -1,5 +1,5 @@
-import { getDefaultExportFromCjs, commonjsGlobal } from '../../../../../../_virtual/_commonjsHelpers.js';
-import { __module as sha3$1 } from '../../../../../../_virtual/sha3.js';
+import { getDefaultExportFromCjs, commonjsGlobal } from '../../../_virtual/_commonjsHelpers.js';
+import { __module as sha3$1 } from '../../../_virtual/sha3.js';
 
 /**
  * [js-sha3]{@link https://github.com/emn178/js-sha3}

package/bundle/packages/core/dist/lib/connection_manager/connection_manager.js

@@ -15,9 +15,6 @@ import '../../../../../node_modules/@multiformats/multiaddr/dist/src/multiaddr.j
 import '../../../../interfaces/dist/protocols.js';
 import '../../../../interfaces/dist/connection_manager.js';
 import '../../../../interfaces/dist/health_indicator.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
 import { Logger } from '../../../../utils/dist/logger/index.js';
 import './keep_alive_manager.js';
 

package/bundle/packages/core/dist/lib/connection_manager/keep_alive_manager.js

@@ -1,6 +1,6 @@
-import '../../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
+import '../../../../interfaces/dist/protocols.js';
+import '../../../../interfaces/dist/connection_manager.js';
+import '../../../../interfaces/dist/health_indicator.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base2.js';

package/bundle/packages/core/dist/lib/filter/filter.js

@@ -1,9 +1,6 @@
 import '../../../../interfaces/dist/protocols.js';
 import '../../../../interfaces/dist/connection_manager.js';
 import '../../../../interfaces/dist/health_indicator.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base2.js';

package/bundle/packages/core/dist/lib/light_push/light_push.js

@@ -10,9 +10,6 @@ import '../../../../proto/dist/generated/store_v3.js';
 import '../../../../proto/dist/generated/peer_exchange.js';
 import '../../../../proto/dist/generated/metadata.js';
 import '../../../../proto/dist/generated/sds_message.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base2.js';

package/bundle/packages/core/dist/lib/message/version_0.js

@@ -29,9 +29,6 @@ class DecodedMessage {
     get contentTopic() {
         return this.proto.contentTopic;
     }
-    get _rawTimestamp() {
-        return this.proto.timestamp;
-    }
     get timestamp() {
         // In the case we receive a value that is bigger than JS's max number,
         // we catch the error and return undefined.
@@ -53,7 +50,7 @@ class DecodedMessage {
     get version() {
         // https://rfc.vac.dev/spec/14/
         // > If omitted, the value SHOULD be interpreted as version 0.
-        return this.proto.version ?? 0;
+        return this.proto.version ?? Version;
     }
     get rateLimitProof() {
         return this.proto.rateLimitProof;

package/bundle/packages/core/dist/lib/metadata/metadata.js

@@ -10,9 +10,6 @@ import '../../../../proto/dist/generated/store_v3.js';
 import '../../../../proto/dist/generated/peer_exchange.js';
 import '../../../../proto/dist/generated/metadata.js';
 import '../../../../proto/dist/generated/sds_message.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base2.js';

package/bundle/packages/core/dist/lib/store/store.js

@@ -1,6 +1,6 @@
-import '../../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
+import '../../../../interfaces/dist/protocols.js';
+import '../../../../interfaces/dist/connection_manager.js';
+import '../../../../interfaces/dist/health_indicator.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../../../node_modules/multiformats/dist/src/bases/base2.js';

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

@@ -1,6 +1,6 @@
-import '../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
+import '../../interfaces/dist/protocols.js';
+import '../../interfaces/dist/connection_manager.js';
+import '../../interfaces/dist/health_indicator.js';
 import '../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../node_modules/multiformats/dist/src/bases/base2.js';

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

@@ -12,6 +12,7 @@ const LINEA_CONTRACT = {
  */
 const RATE_LIMIT_TIERS = {
     LOW: 20, // Suggested minimum rate - 20 messages per epoch
+    MEDIUM: 200,
     HIGH: 600 // Suggested maximum rate - 600 messages per epoch
 };
 // Global rate limit parameters
@@ -21,6 +22,12 @@ const RATE_LIMIT_PARAMS = {
     MAX_TOTAL_RATE: 160_000, // Maximum total rate limit across all memberships
     EPOCH_LENGTH: 600 // Epoch length in seconds (10 minutes)
 };
+/**
+ * Default Q value for the RLN contract
+ * This is the upper bound for the ID commitment
+ * @see https://github.com/waku-org/specs/blob/master/standards/core/rln-contract.md#implementation-suggestions
+ */
+const DEFAULT_Q = BigInt("21888242871839275222246405745257275088548364400416034343698204186575808495617");
 const DEFAULT_RATE_LIMIT = RATE_LIMIT_PARAMS.MAX_RATE;
 
-export { DEFAULT_RATE_LIMIT, LINEA_CONTRACT, RATE_LIMIT_PARAMS, RATE_LIMIT_TIERS };
+export { DEFAULT_Q, DEFAULT_RATE_LIMIT, LINEA_CONTRACT, RATE_LIMIT_PARAMS, RATE_LIMIT_TIERS };

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

@@ -1,6 +1,6 @@
-import '../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
+import '../../../interfaces/dist/protocols.js';
+import '../../../interfaces/dist/connection_manager.js';
+import '../../../interfaces/dist/health_indicator.js';
 import '../../../../node_modules/multiformats/dist/src/bases/base10.js';
 import '../../../../node_modules/multiformats/dist/src/bases/base16.js';
 import '../../../../node_modules/multiformats/dist/src/bases/base2.js';
@@ -14,7 +14,7 @@ import '../../../../node_modules/multiformats/dist/src/bases/identity.js';
 import '../../../../node_modules/multiformats/dist/src/codecs/json.js';
 import { Logger } from '../../../utils/dist/logger/index.js';
 import { RLN_ABI } from './abi.js';
-import { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS } from './constants.js';
+import { DEFAULT_Q, DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS } from './constants.js';
 import { MembershipState } from './types.js';
 import { Contract } from '../../../../node_modules/@ethersproject/contracts/lib.esm/index.js';
 import { BigNumber } from '../../../../node_modules/@ethersproject/bignumber/lib.esm/bignumber.js';
@@ -24,15 +24,37 @@ class RLNBaseContract {
     contract;
     deployBlock;
     rateLimit;
+    minRateLimit;
+    maxRateLimit;
+    /**
+     * Default Q value for the RLN contract.
+     * @see https://github.com/waku-org/waku-rlnv2-contract/blob/b7e9a9b1bc69256a2a3076c1f099b50ce84e7eff/src/WakuRlnV2.sol#L25
+     */
+    idCommitmentBigIntLimit = DEFAULT_Q;
     _members = new Map();
     _membersFilter;
     _membershipErasedFilter;
     _membersExpiredFilter;
     /**
-     * Constructor for RLNBaseContract.
-     * Allows injecting a mocked contract for testing purposes.
+     * Private constructor for RLNBaseContract. Use static create() instead.
      */
     constructor(options) {
+        const { address, signer, rateLimit = DEFAULT_RATE_LIMIT, contract } = options;
+        log.info("Initializing RLNBaseContract", { address, rateLimit });
+        this.contract = contract || new Contract(address, RLN_ABI, signer);
+        this.rateLimit = rateLimit;
+        try {
+            log.info("Setting up event filters");
+            // Initialize event filters
+            this._membersFilter = this.contract.filters.MembershipRegistered();
+            this._membershipErasedFilter = this.contract.filters.MembershipErased();
+            this._membersExpiredFilter = this.contract.filters.MembershipExpired();
+            log.info("Event filters initialized successfully");
+        }
+        catch (error) {
+            log.error("Failed to initialize event filters", { error });
+            throw new Error("Failed to initialize event filters: " + error.message);
+        }
         // Initialize members and subscriptions
         this.fetchMembers()
             .then(() => {
@@ -41,14 +63,22 @@ class RLNBaseContract {
             .catch((error) => {
             log.error("Failed to initialize members", { error });
         });
-        const { address, signer, rateLimit = DEFAULT_RATE_LIMIT, contract } = options;
-        this.validateRateLimit(rateLimit);
-        this.contract = contract || new Contract(address, RLN_ABI, signer);
-        this.rateLimit = rateLimit;
-        // Initialize event filters
-        this._membersFilter = this.contract.filters.MembershipRegistered();
-        this._membershipErasedFilter = this.contract.filters.MembershipErased();
-        this._membersExpiredFilter = this.contract.filters.MembershipExpired();
+    }
+    /**
+     * Static async factory to create and initialize RLNBaseContract
+     */
+    static async create(options) {
+        const instance = new RLNBaseContract(options);
+        const [min, max, idCommitmentBigIntLimit] = await Promise.all([
+            instance.contract.minMembershipRateLimit(),
+            instance.contract.maxMembershipRateLimit(),
+            instance.contract.Q()
+        ]);
+        instance.minRateLimit = BigNumber.from(min).toNumber();
+        instance.maxRateLimit = BigNumber.from(max).toNumber();
+        instance.idCommitmentBigIntLimit = BigInt(idCommitmentBigIntLimit.toString());
+        instance.validateRateLimit(instance.rateLimit);
+        return instance;
     }
     /**
      * Gets the current rate limit for this contract instance
@@ -69,20 +99,20 @@ class RLNBaseContract {
         return this.contract.provider;
     }
     /**
-     * Gets the minimum allowed rate limit from the contract
-     * @returns Promise<number> The minimum rate limit in messages per epoch
+     * Gets the minimum allowed rate limit (cached)
      */
-    async getMinRateLimit() {
-        const minRate = await this.contract.minMembershipRateLimit();
-        return BigNumber.from(minRate).toNumber();
+    getMinRateLimit() {
+        if (this.minRateLimit === undefined)
+            throw new Error("minRateLimit not initialized");
+        return this.minRateLimit;
     }
     /**
-     * Gets the maximum allowed rate limit from the contract
-     * @returns Promise<number> The maximum rate limit in messages per epoch
+     * Gets the maximum allowed rate limit (cached)
      */
-    async getMaxRateLimit() {
-        const maxRate = await this.contract.maxMembershipRateLimit();
-        return BigNumber.from(maxRate).toNumber();
+    getMaxRateLimit() {
+        if (this.maxRateLimit === undefined)
+            throw new Error("maxRateLimit not initialized");
+        return this.maxRateLimit;
     }
     /**
      * Gets the maximum total rate limit across all memberships
@@ -115,7 +145,7 @@ class RLNBaseContract {
      * Updates the rate limit for future registrations
      * @param newRateLimit The new rate limit to use
      */
-    async setRateLimit(newRateLimit) {
+    setRateLimit(newRateLimit) {
         this.validateRateLimit(newRateLimit);
         this.rateLimit = newRateLimit;
     }
@@ -247,75 +277,67 @@ class RLNBaseContract {
             this.processEvents([event]);
         });
     }
-    /**
-     * Helper method to get remaining messages in current epoch
-     * @param membershipId The ID of the membership to check
-     * @returns number of remaining messages allowed in current epoch
-     */
-    async getRemainingMessages(membershipId) {
-        try {
-            const [startTime, , rateLimit] = await this.contract.getMembershipInfo(membershipId);
-            // Calculate current epoch
-            const currentTime = Math.floor(Date.now() / 1000);
-            const epochsPassed = Math.floor((currentTime - startTime) / RATE_LIMIT_PARAMS.EPOCH_LENGTH);
-            const currentEpochStart = startTime + epochsPassed * RATE_LIMIT_PARAMS.EPOCH_LENGTH;
-            // Get message count in current epoch using contract's function
-            const messageCount = await this.contract.getMessageCount(membershipId, currentEpochStart);
-            return Math.max(0, BigNumber.from(rateLimit)
-                .sub(BigNumber.from(messageCount))
-                .toNumber());
-        }
-        catch (error) {
-            log.error(`Error getting remaining messages: ${error.message}`);
-            return 0; // Fail safe: assume no messages remaining on error
-        }
-    }
-    async getMembershipInfo(idCommitment) {
+    async getMembershipInfo(idCommitmentBigInt) {
         try {
-            const [startBlock, endBlock, rateLimit] = await this.contract.getMembershipInfo(idCommitment);
+            const membershipData = await this.contract.memberships(idCommitmentBigInt);
             const currentBlock = await this.contract.provider.getBlockNumber();
+            const [depositAmount, activeDuration, gracePeriodStartTimestamp, gracePeriodDuration, rateLimit, index, holder, token] = membershipData;
+            const gracePeriodEnd = gracePeriodStartTimestamp.add(gracePeriodDuration);
             let state;
-            if (currentBlock < startBlock) {
+            if (currentBlock < gracePeriodStartTimestamp.toNumber()) {
                 state = MembershipState.Active;
             }
-            else if (currentBlock < endBlock) {
+            else if (currentBlock < gracePeriodEnd.toNumber()) {
                 state = MembershipState.GracePeriod;
             }
             else {
                 state = MembershipState.Expired;
             }
-            const index = await this.getMemberIndex(idCommitment);
-            if (!index)
-                return undefined;
             return {
                 index,
-                idCommitment,
-                rateLimit: rateLimit.toNumber(),
-                startBlock: startBlock.toNumber(),
-                endBlock: endBlock.toNumber(),
-                state
+                idCommitment: idCommitmentBigInt.toString(),
+                rateLimit: Number(rateLimit),
+                startBlock: gracePeriodStartTimestamp.toNumber(),
+                endBlock: gracePeriodEnd.toNumber(),
+                state,
+                depositAmount,
+                activeDuration,
+                gracePeriodDuration,
+                holder,
+                token
             };
         }
         catch (error) {
+            log.error("Error in getMembershipInfo:", error);
             return undefined;
         }
     }
-    async extendMembership(idCommitment) {
-        return this.contract.extendMemberships([idCommitment]);
+    async extendMembership(idCommitmentBigInt) {
+        const tx = await this.contract.extendMemberships([idCommitmentBigInt]);
+        await tx.wait();
+        return tx;
     }
-    async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
-        return this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
+    async eraseMembership(idCommitmentBigInt, eraseFromMembershipSet = true) {
+        if (!(await this.isExpired(idCommitmentBigInt)) ||
+            !(await this.isInGracePeriod(idCommitmentBigInt))) {
+            throw new Error("Membership is not expired or in grace period");
+        }
+        const estimatedGas = await this.contract.estimateGas["eraseMemberships(uint256[],bool)"]([idCommitmentBigInt], eraseFromMembershipSet);
+        const gasLimit = estimatedGas.add(10000);
+        const tx = await this.contract["eraseMemberships(uint256[],bool)"]([idCommitmentBigInt], eraseFromMembershipSet, { gasLimit });
+        await tx.wait();
+        return tx;
     }
-    async registerMembership(idCommitment, rateLimit = DEFAULT_RATE_LIMIT) {
+    async registerMembership(idCommitmentBigInt, 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, []);
+        return this.contract.register(idCommitmentBigInt, rateLimit, []);
     }
-    async withdraw(token, holder) {
+    async withdraw(token, walletAddress) {
         try {
-            const tx = await this.contract.withdraw(token, { from: holder });
+            const tx = await this.contract.withdraw(token, walletAddress);
             await tx.wait();
         }
         catch (error) {
@@ -326,7 +348,7 @@ class RLNBaseContract {
         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());
+            const existingIndex = await this.getMemberIndex(identity.IDCommitmentBigInt);
             if (existingIndex) {
                 throw new Error(`ID commitment is already registered with index ${existingIndex}`);
             }
@@ -432,13 +454,15 @@ class RLNBaseContract {
         }
     }
     /**
-     * Validates that the rate limit is within the allowed range
+     * Validates that the rate limit is within the allowed range (sync)
      * @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`);
+        if (this.minRateLimit === undefined || this.maxRateLimit === undefined) {
+            throw new Error("Rate limits not initialized");
+        }
+        if (rateLimit < this.minRateLimit || rateLimit > this.maxRateLimit) {
+            throw new Error(`Rate limit must be between ${this.minRateLimit} and ${this.maxRateLimit} messages per epoch`);
         }
     }
     get membersFilter() {
@@ -459,9 +483,9 @@ class RLNBaseContract {
         }
         return this._membersExpiredFilter;
     }
-    async getMemberIndex(idCommitment) {
+    async getMemberIndex(idCommitmentBigInt) {
         try {
-            const events = await this.contract.queryFilter(this.contract.filters.MembershipRegistered(idCommitment));
+            const events = await this.contract.queryFilter(this.contract.filters.MembershipRegistered(idCommitmentBigInt));
             if (events.length === 0)
                 return undefined;
             // Get the most recent registration event
@@ -472,6 +496,45 @@ class RLNBaseContract {
             return undefined;
         }
     }
+    async getMembershipStatus(idCommitment) {
+        const [isExpired, isInGrace] = await Promise.all([
+            this.contract.isExpired(idCommitment),
+            this.contract.isInGracePeriod(idCommitment)
+        ]);
+        if (isExpired)
+            return "expired";
+        if (isInGrace)
+            return "grace";
+        return "active";
+    }
+    /**
+     * Checks if a membership is expired for the given idCommitment
+     * @param idCommitmentBigInt The idCommitment as bigint
+     * @returns Promise<boolean> True if expired, false otherwise
+     */
+    async isExpired(idCommitmentBigInt) {
+        try {
+            return await this.contract.isExpired(idCommitmentBigInt);
+        }
+        catch (error) {
+            log.error("Error in isExpired:", error);
+            return false;
+        }
+    }
+    /**
+     * Checks if a membership is in grace period for the given idCommitment
+     * @param idCommitmentBigInt The idCommitment as bigint
+     * @returns Promise<boolean> True if in grace period, false otherwise
+     */
+    async isInGracePeriod(idCommitmentBigInt) {
+        try {
+            return await this.contract.isInGracePeriod(idCommitmentBigInt);
+        }
+        catch (error) {
+            log.error("Error in isInGracePeriod:", error);
+            return false;
+        }
+    }
 }
 
 export { RLNBaseContract };

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

@@ -1,6 +1,6 @@
-import '../../../utils/node_modules/@waku/interfaces/dist/protocols.js';
-import '../../../utils/node_modules/@waku/interfaces/dist/connection_manager.js';
-import '../../../utils/node_modules/@waku/interfaces/dist/health_indicator.js';
+import '../../../interfaces/dist/protocols.js';
+import '../../../interfaces/dist/connection_manager.js';
+import '../../../interfaces/dist/health_indicator.js';
 import { hexToBytes } from '../../../utils/dist/bytes/index.js';
 import { Logger } from '../../../utils/dist/logger/index.js';
 import { MerkleRootTracker } from '../root_tracker.js';