@waku/rln 0.1.5-76f86de.0 → 0.1.5-ad0e277.0

package/bundle/index.js

@@ -2,11 +2,13 @@ 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 { RLNLightContract } from './packages/rln/dist/contract/rln_light_contract.js';
 export { createRLN } from './packages/rln/dist/create.js';
 export { IdentityCredential } from './packages/rln/dist/identity.js';
 export { Keystore } from './packages/rln/dist/keystore/keystore.js';
 export { Proof } from './packages/rln/dist/proof.js';
 export { RLNInstance } from './packages/rln/dist/rln.js';
+export { RLNLightInstance } from './packages/rln/dist/rln_light.js';
 export { MerkleRootTracker } from './packages/rln/dist/root_tracker.js';
 export { extractMetaMaskSigner } from './packages/rln/dist/utils/metamask.js';
 import './packages/rln/dist/utils/epoch.js';

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

@@ -1,7 +1,7 @@
 import { RLN_ABI } from './abi.js';
 
 const LINEA_CONTRACT = {
-    chainId: 59141,
+    chainId: "59141",
     address: "0xb9cd878c90e49f797b4431fbf4fb333108cb90e6",
     abi: RLN_ABI
 };

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

@@ -84,7 +84,7 @@ class RLNContract {
      */
     async getMinRateLimit() {
         const minRate = await this.contract.minMembershipRateLimit();
-        return minRate.toNumber();
+        return BigNumber.from(minRate).toNumber();
     }
     /**
      * Gets the maximum allowed rate limit from the contract
@@ -92,7 +92,7 @@ class RLNContract {
      */
     async getMaxRateLimit() {
         const maxRate = await this.contract.maxMembershipRateLimit();
-        return maxRate.toNumber();
+        return BigNumber.from(maxRate).toNumber();
     }
     /**
      * Gets the maximum total rate limit across all memberships
@@ -300,13 +300,13 @@ class RLNContract {
                 `and rate limit ${decodedData.membershipRateLimit}`);
             const network = await this.contract.provider.getNetwork();
             const address = this.contract.address;
-            const membershipId = Number(decodedData.index);
+            const membershipId = decodedData.index.toString();
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: membershipId,
-                    chainId: network.chainId,
+                    treeIndex: parseInt(membershipId),
+                    chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
             };
@@ -380,13 +380,13 @@ class RLNContract {
                 `Rate limit: ${decodedData.membershipRateLimit}, 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.toString();
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: membershipId,
-                    chainId: network.chainId,
+                    treeIndex: parseInt(membershipId),
+                    chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
             };

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

@@ -0,0 +1,477 @@
+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';
+import '../../../../node_modules/multiformats/dist/src/bases/base256emoji.js';
+import '../../../../node_modules/multiformats/dist/src/bases/base32.js';
+import '../../../../node_modules/multiformats/dist/src/bases/base36.js';
+import '../../../../node_modules/multiformats/dist/src/bases/base58.js';
+import '../../../../node_modules/multiformats/dist/src/bases/base64.js';
+import '../../../../node_modules/multiformats/dist/src/bases/base8.js';
+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 { Contract } from '../../../../node_modules/@ethersproject/contracts/lib.esm/index.js';
+import { BigNumber } from '../../../../node_modules/@ethersproject/bignumber/lib.esm/bignumber.js';
+
+const log = new Logger("waku:rln:contract");
+var MembershipState;
+(function (MembershipState) {
+    MembershipState["Active"] = "Active";
+    MembershipState["GracePeriod"] = "GracePeriod";
+    MembershipState["Expired"] = "Expired";
+    MembershipState["ErasedAwaitsWithdrawal"] = "ErasedAwaitsWithdrawal";
+})(MembershipState || (MembershipState = {}));
+class RLNLightContract {
+    contract;
+    deployBlock;
+    rateLimit;
+    _members = new Map();
+    _membersFilter;
+    _membershipErasedFilter;
+    _membersExpiredFilter;
+    /**
+     * Asynchronous initializer for RLNContract.
+     * Allows injecting a mocked contract for testing purposes.
+     */
+    static async init(options) {
+        const rlnContract = new RLNLightContract(options);
+        await rlnContract.fetchMembers();
+        rlnContract.subscribeToMembers();
+        return rlnContract;
+    }
+    constructor(options) {
+        const { address, signer, rateLimit = DEFAULT_RATE_LIMIT, contract } = options;
+        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;
+        // Use the injected contract if provided; otherwise, instantiate a new one.
+        this.contract = contract || new Contract(address, RLN_ABI, signer);
+        // Initialize event filters
+        this._membersFilter = this.contract.filters.MembershipRegistered();
+        this._membershipErasedFilter = this.contract.filters.MembershipErased();
+        this._membersExpiredFilter = this.contract.filters.MembershipExpired();
+    }
+    /**
+     * Gets the current rate limit for this contract instance
+     */
+    getRateLimit() {
+        return this.rateLimit;
+    }
+    /**
+     * Gets the contract address
+     */
+    get address() {
+        return this.contract.address;
+    }
+    /**
+     * Gets the contract provider
+     */
+    get provider() {
+        return this.contract.provider;
+    }
+    /**
+     * Gets the minimum allowed rate limit from the contract
+     * @returns Promise<number> The minimum rate limit in messages per epoch
+     */
+    async getMinRateLimit() {
+        const minRate = await this.contract.minMembershipRateLimit();
+        return BigNumber.from(minRate).toNumber();
+    }
+    /**
+     * Gets the maximum allowed rate limit from the contract
+     * @returns Promise<number> The maximum rate limit in messages per epoch
+     */
+    async getMaxRateLimit() {
+        const maxRate = await this.contract.maxMembershipRateLimit();
+        return BigNumber.from(maxRate).toNumber();
+    }
+    /**
+     * Gets the maximum total rate limit across all memberships
+     * @returns Promise<number> The maximum total rate limit in messages per epoch
+     */
+    async getMaxTotalRateLimit() {
+        const maxTotalRate = await this.contract.maxTotalRateLimit();
+        return BigNumber.from(maxTotalRate).toNumber();
+    }
+    /**
+     * Gets the current total rate limit usage across all memberships
+     * @returns Promise<number> The current total rate limit usage in messages per epoch
+     */
+    async getCurrentTotalRateLimit() {
+        const currentTotal = await this.contract.currentTotalRateLimit();
+        return BigNumber.from(currentTotal).toNumber();
+    }
+    /**
+     * Gets the remaining available total rate limit that can be allocated
+     * @returns Promise<number> The remaining rate limit that can be allocated
+     */
+    async getRemainingTotalRateLimit() {
+        const [maxTotal, currentTotal] = await Promise.all([
+            this.contract.maxTotalRateLimit(),
+            this.contract.currentTotalRateLimit()
+        ]);
+        return BigNumber.from(maxTotal)
+            .sub(BigNumber.from(currentTotal))
+            .toNumber();
+    }
+    /**
+     * Updates the rate limit for future registrations
+     * @param newRateLimit The new rate limit to use
+     */
+    async setRateLimit(newRateLimit) {
+        this.rateLimit = newRateLimit;
+    }
+    get members() {
+        const sortedMembers = Array.from(this._members.values()).sort((left, right) => left.index.toNumber() - right.index.toNumber());
+        return sortedMembers;
+    }
+    get membersFilter() {
+        if (!this._membersFilter) {
+            throw Error("Members filter was not initialized.");
+        }
+        return this._membersFilter;
+    }
+    get membershipErasedFilter() {
+        if (!this._membershipErasedFilter) {
+            throw Error("MembershipErased filter was not initialized.");
+        }
+        return this._membershipErasedFilter;
+    }
+    get membersExpiredFilter() {
+        if (!this._membersExpiredFilter) {
+            throw Error("MembersExpired filter was not initialized.");
+        }
+        return this._membersExpiredFilter;
+    }
+    async fetchMembers(options = {}) {
+        const registeredMemberEvents = await queryFilter(this.contract, {
+            fromBlock: this.deployBlock,
+            ...options,
+            membersFilter: this.membersFilter
+        });
+        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
+        });
+        const events = [
+            ...registeredMemberEvents,
+            ...removedMemberEvents,
+            ...expiredMemberEvents
+        ];
+        this.processEvents(events);
+    }
+    processEvents(events) {
+        const toRemoveTable = new Map();
+        const toInsertTable = new Map();
+        events.forEach((evt) => {
+            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);
+                }
+                const toRemoveVal = toRemoveTable.get(evt.blockNumber);
+                if (toRemoveVal != undefined) {
+                    toRemoveVal.push(index.toNumber());
+                    toRemoveTable.set(evt.blockNumber, toRemoveVal);
+                }
+                else {
+                    toRemoveTable.set(evt.blockNumber, [index.toNumber()]);
+                }
+            }
+            else if (evt.event === "MembershipRegistered") {
+                let eventsPerBlock = toInsertTable.get(evt.blockNumber);
+                if (eventsPerBlock == undefined) {
+                    eventsPerBlock = [];
+                }
+                eventsPerBlock.push(evt);
+                toInsertTable.set(evt.blockNumber, eventsPerBlock);
+            }
+        });
+    }
+    subscribeToMembers() {
+        this.contract.on(this.membersFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+            this.processEvents([event]);
+        });
+        this.contract.on(this.membershipErasedFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+            this.processEvents([event]);
+        });
+        this.contract.on(this.membersExpiredFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
+            this.processEvents([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 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");
+                return undefined;
+            }
+            const decodedData = {
+                idCommitment: memberRegistered.args.idCommitment,
+                membershipRateLimit: memberRegistered.args.membershipRateLimit,
+                index: memberRegistered.args.index
+            };
+            log.info(`Successfully registered membership with index ${decodedData.index} ` +
+                `and rate limit ${decodedData.membershipRateLimit}`);
+            const network = await this.contract.provider.getNetwork();
+            const address = this.contract.address;
+            const membershipId = decodedData.index.toString();
+            return {
+                identity,
+                membership: {
+                    address,
+                    treeIndex: parseInt(membershipId),
+                    chainId: network.chainId.toString(),
+                    rateLimit: decodedData.membershipRateLimit.toNumber()
+                }
+            };
+        }
+        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
+                });
+            }
+        }
+    }
+    /**
+     * 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 registerWithPermitAndErase(identity, permit, idCommitmentsToErase) {
+        try {
+            log.info(`Registering identity with permit and rate limit: ${this.rateLimit} messages/epoch`);
+            const txRegisterResponse = await this.contract.registerWithPermit(permit.owner, permit.deadline, permit.v, permit.r, permit.s, identity.IDCommitmentBigInt, this.rateLimit, idCommitmentsToErase.map((id) => BigNumber.from(id)));
+            const txRegisterReceipt = await txRegisterResponse.wait();
+            const memberRegistered = txRegisterReceipt.events?.find((event) => event.event === "MembershipRegistered");
+            if (!memberRegistered || !memberRegistered.args) {
+                log.error("Failed to register membership with permit: No MembershipRegistered event found");
+                return undefined;
+            }
+            const decodedData = {
+                idCommitment: memberRegistered.args.idCommitment,
+                membershipRateLimit: memberRegistered.args.membershipRateLimit,
+                index: memberRegistered.args.index
+            };
+            log.info(`Successfully registered membership with permit. Index: ${decodedData.index}, ` +
+                `Rate limit: ${decodedData.membershipRateLimit}, Erased ${idCommitmentsToErase.length} commitments`);
+            const network = await this.contract.provider.getNetwork();
+            const address = this.contract.address;
+            const membershipId = decodedData.index.toString();
+            return {
+                identity,
+                membership: {
+                    address,
+                    treeIndex: parseInt(membershipId),
+                    chainId: network.chainId.toString(),
+                    rateLimit: decodedData.membershipRateLimit.toNumber()
+                }
+            };
+        }
+        catch (error) {
+            log.error(`Error in registerWithPermitAndErase: ${error.message}`);
+            return undefined;
+        }
+    }
+    async withdraw(token, holder) {
+        try {
+            const tx = await this.contract.withdraw(token, { from: holder });
+            await tx.wait();
+        }
+        catch (error) {
+            log.error(`Error in withdraw: ${error.message}`);
+        }
+    }
+    async getMembershipInfo(idCommitment) {
+        try {
+            const [startBlock, endBlock, rateLimit] = await this.contract.getMembershipInfo(idCommitment);
+            const currentBlock = await this.contract.provider.getBlockNumber();
+            let state;
+            if (currentBlock < startBlock) {
+                state = MembershipState.Active;
+            }
+            else if (currentBlock < endBlock) {
+                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
+            };
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
+    async extendMembership(idCommitment) {
+        return this.contract.extendMemberships([idCommitment]);
+    }
+    async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
+        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}`);
+        }
+        return this.contract.register(idCommitment, rateLimit, []);
+    }
+    async getMemberIndex(idCommitment) {
+        try {
+            const events = await this.contract.queryFilter(this.contract.filters.MembershipRegistered(idCommitment));
+            if (events.length === 0)
+                return undefined;
+            // Get the most recent registration event
+            const event = events[events.length - 1];
+            return event.args?.index;
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
+}
+// These values should be tested on other networks
+const FETCH_CHUNK = 5;
+const BLOCK_RANGE = 3000;
+async function queryFilter(contract, options) {
+    const { fromBlock, membersFilter, fetchRange = BLOCK_RANGE, fetchChunks = FETCH_CHUNK } = options;
+    if (fromBlock === undefined) {
+        return contract.queryFilter(membersFilter);
+    }
+    if (!contract.provider) {
+        throw Error("No provider found on the contract.");
+    }
+    const toBlock = await contract.provider.getBlockNumber();
+    if (toBlock - fromBlock < fetchRange) {
+        return contract.queryFilter(membersFilter, fromBlock, toBlock);
+    }
+    const events = [];
+    const chunks = splitToChunks(fromBlock, toBlock, fetchRange);
+    for (const portion of takeN(chunks, fetchChunks)) {
+        const promises = portion.map(([left, right]) => ignoreErrors(contract.queryFilter(membersFilter, left, right), []));
+        const fetchedEvents = await Promise.all(promises);
+        events.push(fetchedEvents.flatMap((v) => v));
+    }
+    return events.flatMap((v) => v);
+}
+function splitToChunks(from, to, step) {
+    const chunks = [];
+    let left = from;
+    while (left < to) {
+        const right = left + step < to ? left + step : to;
+        chunks.push([left, right]);
+        left = right;
+    }
+    return chunks;
+}
+function* takeN(array, size) {
+    let start = 0;
+    while (start < array.length) {
+        const portion = array.slice(start, start + size);
+        yield portion;
+        start += size;
+    }
+}
+async function ignoreErrors(promise, defaultValue) {
+    try {
+        return await promise;
+    }
+    catch (err) {
+        if (err instanceof Error) {
+            log.info(`Ignoring an error during query: ${err.message}`);
+        }
+        else {
+            log.info(`Ignoring an unknown error during query`);
+        }
+        return defaultValue;
+    }
+}
+
+export { MembershipState, RLNLightContract };

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

@@ -25,6 +25,14 @@ class IdentityCredential {
         const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment, 32);
         return new IdentityCredential(idTrapdoor, idNullifier, idSecretHash, idCommitment, idCommitmentBigInt);
     }
+    toJSON() {
+        return {
+            idTrapdoor: Array.from(this.IDTrapdoor),
+            idNullifier: Array.from(this.IDNullifier),
+            idSecretHash: Array.from(this.IDSecretHash),
+            idCommitment: Array.from(this.IDCommitment)
+        };
+    }
 }
 
 export { IdentityCredential };

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

@@ -17,6 +17,7 @@ import { Logger } from '../../../utils/dist/logger/index.js';
 import { sha256 } from '../../../../node_modules/ethereum-cryptography/esm/sha256.js';
 import { bytesToUtf8 } from '../../../../node_modules/ethereum-cryptography/esm/utils.js';
 import _ from '../../../../node_modules/lodash/lodash.js';
+import { IdentityCredential } from '../identity.js';
 import { buildBigIntFromUint8Array } from '../utils/bytes.js';
 import { keccak256Checksum, decryptEipKeystore } from './cipher.js';
 import { isKeystoreValid, isCredentialValid } from './schema_validator.js';
@@ -164,20 +165,20 @@ class Keystore {
         try {
             const str = bytesToUtf8(bytes);
             const obj = JSON.parse(str);
-            // TODO: add runtime validation of nwaku credentials
+            // Get identity fields from named object
+            const { idTrapdoor, idNullifier, idSecretHash, idCommitment } = _.get(obj, "identityCredential", {});
+            const idTrapdoorArray = new Uint8Array(idTrapdoor || []);
+            const idNullifierArray = new Uint8Array(idNullifier || []);
+            const idSecretHashArray = new Uint8Array(idSecretHash || []);
+            const idCommitmentArray = new Uint8Array(idCommitment || []);
+            const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitmentArray);
             return {
-                identity: {
-                    IDCommitment: Keystore.fromArraylikeToBytes(_.get(obj, "identityCredential.idCommitment", [])),
-                    IDTrapdoor: Keystore.fromArraylikeToBytes(_.get(obj, "identityCredential.idTrapdoor", [])),
-                    IDNullifier: Keystore.fromArraylikeToBytes(_.get(obj, "identityCredential.idNullifier", [])),
-                    IDCommitmentBigInt: buildBigIntFromUint8Array(Keystore.fromArraylikeToBytes(_.get(obj, "identityCredential.idCommitment", []))),
-                    IDSecretHash: Keystore.fromArraylikeToBytes(_.get(obj, "identityCredential.idSecretHash", []))
-                },
+                identity: new IdentityCredential(idTrapdoorArray, idNullifierArray, idSecretHashArray, idCommitmentArray, idCommitmentBigInt),
                 membership: {
                     treeIndex: _.get(obj, "treeIndex"),
                     chainId: _.get(obj, "membershipContract.chainId"),
                     address: _.get(obj, "membershipContract.address"),
-                    rateLimit: _.get(obj, "membershipContract.rateLimit")
+                    rateLimit: _.get(obj, "userMessageLimit")
                 }
             };
         }
@@ -186,17 +187,6 @@ class Keystore {
             return;
         }
     }
-    static fromArraylikeToBytes(obj) {
-        const bytes = [];
-        let index = 0;
-        let lastElement = obj[index];
-        while (lastElement !== undefined) {
-            bytes.push(lastElement);
-            index += 1;
-            lastElement = obj[index];
-        }
-        return new Uint8Array(bytes);
-    }
     // follows nwaku implementation
     // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L111
     static computeMembershipHash(info) {
@@ -206,17 +196,18 @@ class Keystore {
     // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L98
     static fromIdentityToBytes(options) {
         return utf8ToBytes(JSON.stringify({
-            treeIndex: options.membership.treeIndex,
-            identityCredential: {
-                idCommitment: options.identity.IDCommitment,
-                idNullifier: options.identity.IDNullifier,
-                idSecretHash: options.identity.IDSecretHash,
-                idTrapdoor: options.identity.IDTrapdoor
-            },
             membershipContract: {
                 chainId: options.membership.chainId,
                 address: options.membership.address
-            }
+            },
+            treeIndex: options.membership.treeIndex,
+            identityCredential: {
+                idTrapdoor: Array.from(options.identity.IDTrapdoor),
+                idNullifier: Array.from(options.identity.IDNullifier),
+                idSecretHash: Array.from(options.identity.IDSecretHash),
+                idCommitment: Array.from(options.identity.IDCommitment)
+            },
+            userMessageLimit: options.membership.rateLimit
         }));
     }
 }