@waku/rln 0.1.5-1d384f2.0 → 0.1.5-1e590d7.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_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/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

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

@@ -16,8 +16,8 @@ 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 { 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';
+import { Contract } from '@ethersproject/contracts';
+import { BigNumber } from '@ethersproject/bignumber';
 
 const log = new Logger("waku:rln:contract:base");
 class RLNBaseContract {
@@ -33,6 +33,22 @@ class RLNBaseContract {
      * Allows injecting a mocked contract for testing purposes.
      */
     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 +57,10 @@ 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();
+        // Validate rate limit asynchronously
+        this.validateRateLimit(rateLimit).catch((error) => {
+            log.error("Failed to validate initial rate limit", { error });
+        });
     }
     /**
      * Gets the current rate limit for this contract instance
@@ -116,7 +128,7 @@ class RLNBaseContract {
      * @param newRateLimit The new rate limit to use
      */
     async setRateLimit(newRateLimit) {
-        this.validateRateLimit(newRateLimit);
+        await this.validateRateLimit(newRateLimit);
         this.rateLimit = newRateLimit;
     }
     get members() {
@@ -247,75 +259,63 @@ 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) {
+    async getMembershipInfo(idCommitmentBigInt) {
         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) {
-        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) {
+        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, from) {
         try {
-            const tx = await this.contract.withdraw(token, { from: holder });
+            const tx = await this.contract.withdraw(token, from);
             await tx.wait();
         }
         catch (error) {
@@ -326,7 +326,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}`);
             }
@@ -435,10 +435,15 @@ class RLNBaseContract {
      * 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`);
+    async validateRateLimit(rateLimit) {
+        const [minRate, maxRate] = await Promise.all([
+            this.contract.minMembershipRateLimit(),
+            this.contract.maxMembershipRateLimit()
+        ]);
+        const minRateNum = BigNumber.from(minRate).toNumber();
+        const maxRateNum = BigNumber.from(maxRate).toNumber();
+        if (rateLimit < minRateNum || rateLimit > maxRateNum) {
+            throw new Error(`Rate limit must be between ${minRateNum} and ${maxRateNum} messages per epoch`);
         }
     }
     get membersFilter() {
@@ -459,9 +464,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

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

@@ -6,7 +6,7 @@ import { Logger } from '../../../utils/dist/logger/index.js';
 import { MerkleRootTracker } from '../root_tracker.js';
 import { zeroPadLE } from '../utils/bytes.js';
 import { RLNBaseContract } from './rln_base_contract.js';
-import { BigNumber } from '../../../../node_modules/@ethersproject/bignumber/lib.esm/bignumber.js';
+import { BigNumber } from '@ethersproject/bignumber';
 
 const log = new Logger("waku:rln:contract");
 class RLNContract extends RLNBaseContract {

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

@@ -45,8 +45,14 @@ function writeUIntLE(buf, value, offset, byteLength, noAssert) {
  * @returns BigInt
  */
 function buildBigIntFromUint8Array(array, byteOffset = 0) {
-    const dataView = new DataView(array.buffer);
-    return dataView.getBigUint64(byteOffset, true);
+    // Convert byte array to BigInt in big-endian format (to match nwaku)
+    let result = 0n;
+    // Process all 32 bytes (or the available bytes if less)
+    const length = Math.min(array.length - byteOffset, 32);
+    for (let i = 0; i < length; i++) {
+        result = (result << 8n) | BigInt(array[byteOffset + i]);
+    }
+    return result;
 }
 /**
  * Fills with zeros to set length

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

@@ -1,4 +1,4 @@
-import { Web3Provider } from '../../../../node_modules/@ethersproject/providers/lib.esm/web3-provider.js';
+import * as providers from '@ethersproject/providers';
 
 const extractMetaMaskSigner = async () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -7,7 +7,7 @@ const extractMetaMaskSigner = async () => {
         throw Error("Missing or invalid Ethereum provider. Please install a Web3 wallet such as MetaMask.");
     }
     await ethereum.request({ method: "eth_requestAccounts" });
-    const provider = new Web3Provider(ethereum, "any");
+    const provider = new providers.Web3Provider(ethereum, "any");
     return provider.getSigner();
 };
 

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

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

package/bundle/packages/rln/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/packages/rln/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';