@waku/rln 0.1.5-bc093d3.0 → 0.1.5-d17562d.0

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,12 +12,16 @@ 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
 const RATE_LIMIT_PARAMS = {
     MIN_RATE: RATE_LIMIT_TIERS.LOW,
-    MAX_RATE: RATE_LIMIT_TIERS.HIGH};
+    MAX_RATE: RATE_LIMIT_TIERS.HIGH,
+    MAX_TOTAL_RATE: 160_000, // Maximum total rate limit across all memberships
+    EPOCH_LENGTH: 600 // Epoch length in seconds (10 minutes)
+};
 const DEFAULT_RATE_LIMIT = RATE_LIMIT_PARAMS.MAX_RATE;
 
 export { DEFAULT_RATE_LIMIT, LINEA_CONTRACT, RATE_LIMIT_PARAMS, RATE_LIMIT_TIERS };

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

@@ -16,10 +16,9 @@ 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';
 
-/* eslint-disable no-console */
 const log = new Logger("waku:rln:contract:base");
 class RLNBaseContract {
     contract;
@@ -262,62 +261,61 @@ class RLNBaseContract {
     }
     async getMembershipInfo(idCommitmentBigInt) {
         try {
-            console.log("idCommitmentBigInt", idCommitmentBigInt);
             const membershipData = await this.contract.memberships(idCommitmentBigInt);
             const currentBlock = await this.contract.provider.getBlockNumber();
-            console.log("membershipData", membershipData);
+            const [depositAmount, activeDuration, gracePeriodStartTimestamp, gracePeriodDuration, rateLimit, index, holder, token] = membershipData;
+            const gracePeriodEnd = gracePeriodStartTimestamp.add(gracePeriodDuration);
             let state;
-            const gracePeriodEnd = membershipData.gracePeriodStartTimestamp.add(membershipData.gracePeriodDuration);
-            console.log("gracePeriodEnd", gracePeriodEnd);
-            if (currentBlock < membershipData.gracePeriodStartTimestamp) {
+            if (currentBlock < gracePeriodStartTimestamp.toNumber()) {
                 state = MembershipState.Active;
             }
-            else if (currentBlock < gracePeriodEnd) {
+            else if (currentBlock < gracePeriodEnd.toNumber()) {
                 state = MembershipState.GracePeriod;
             }
             else {
                 state = MembershipState.Expired;
             }
-            console.log("state", state);
-            console.log("membershipData.index", membershipData.index);
-            console.log("membershipData.idCommitment", membershipData.idCommitment);
-            console.log("membershipData.rateLimit", membershipData.rateLimit);
-            console.log("membershipData.gracePeriodStartTimestamp", membershipData.gracePeriodStartTimestamp);
-            console.log("gracePeriodEnd", gracePeriodEnd);
             return {
-                index: membershipData.index,
-                idCommitment: membershipData.idCommitment,
-                rateLimit: membershipData.rateLimit.toNumber(),
-                startBlock: membershipData.gracePeriodStartTimestamp.toNumber(),
+                index,
+                idCommitment: idCommitmentBigInt.toString(),
+                rateLimit: Number(rateLimit),
+                startBlock: gracePeriodStartTimestamp.toNumber(),
                 endBlock: gracePeriodEnd.toNumber(),
                 state,
-                depositAmount: membershipData.depositAmount,
-                activeDuration: membershipData.activeDuration,
-                gracePeriodDuration: membershipData.gracePeriodDuration,
-                holder: membershipData.holder,
-                token: membershipData.token
+                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) {
+        // eslint-disable-next-line no-console
+        console.log(Object.keys(this.contract));
+        const tx = await this.contract.eraseMemberships([idCommitmentBigInt], eraseFromMembershipSet);
+        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) {
+    async withdraw(token, from) {
         try {
-            const tx = await this.contract.withdraw(token);
+            const tx = await this.contract.withdraw(token, from);
             await tx.wait();
         }
         catch (error) {
@@ -328,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}`);
             }
@@ -466,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();
 };