@waku/rln 0.1.5-9901863.0 → 0.1.5-aaa7a0c.0

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_base_contract.js

@@ -356,12 +356,12 @@ class RLNBaseContract {
                 `and rate limit ${decodedData.membershipRateLimit}`);
             const network = await this.contract.provider.getNetwork();
             const address = this.contract.address;
-            const membershipId = decodedData.index.toString();
+            const membershipId = Number(decodedData.index);
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: parseInt(membershipId),
+                    treeIndex: membershipId,
                     chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
@@ -415,12 +415,12 @@ class RLNBaseContract {
                 `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();
+            const membershipId = Number(decodedData.index);
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: parseInt(membershipId),
+                    treeIndex: membershipId,
                     chainId: network.chainId.toString(),
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }

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

@@ -32,33 +32,15 @@ const log = new Logger("waku:credentials");
 class RLNCredentialsManager {
     started = false;
     starting = false;
-    _contract;
-    _signer;
+    contract;
+    signer;
     keystore = Keystore.create();
-    _credentials;
+    credentials;
     zerokit;
     constructor(zerokit) {
         log.info("RLNCredentialsManager initialized");
         this.zerokit = zerokit;
     }
-    get contract() {
-        return this._contract;
-    }
-    set contract(contract) {
-        this._contract = contract;
-    }
-    get signer() {
-        return this._signer;
-    }
-    set signer(signer) {
-        this._signer = signer;
-    }
-    get credentials() {
-        return this._credentials;
-    }
-    set credentials(credentials) {
-        this._credentials = credentials;
-    }
     get provider() {
         return this.contract?.provider;
     }
@@ -80,12 +62,12 @@ class RLNCredentialsManager {
                 this.keystore = keystore;
                 log.info("Using provided keystore");
             }
-            this._credentials = credentials;
-            this._signer = signer;
-            this._contract = new RLNBaseContract({
+            this.credentials = credentials;
+            this.signer = signer;
+            this.contract = new RLNBaseContract({
                 address: address,
                 signer: signer,
-                rateLimit: rateLimit ?? this.zerokit?.getRateLimit
+                rateLimit: rateLimit ?? this.zerokit?.rateLimit
             });
             log.info("RLNCredentialsManager successfully started");
             this.started = true;
@@ -130,8 +112,8 @@ class RLNCredentialsManager {
      */
     async useCredentials(id, password) {
         log.info(`Attempting to use credentials with ID: ${id}`);
-        this._credentials = await this.keystore?.readCredential(id, password);
-        if (this._credentials) {
+        this.credentials = await this.keystore?.readCredential(id, password);
+        if (this.credentials) {
             log.info("Successfully loaded credentials");
         }
         else {
@@ -144,7 +126,7 @@ class RLNCredentialsManager {
             options.address ||
             LINEA_CONTRACT.address;
         if (address === LINEA_CONTRACT.address) {
-            chainId = LINEA_CONTRACT.chainId;
+            chainId = LINEA_CONTRACT.chainId.toString();
             log.info(`Using Linea contract with chainId: ${chainId}`);
         }
         const signer = options.signer || (await extractMetaMaskSigner());

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

@@ -25,14 +25,6 @@ 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,7 +17,6 @@ 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';
@@ -165,20 +164,20 @@ class Keystore {
         try {
             const str = bytesToUtf8(bytes);
             const obj = JSON.parse(str);
-            // 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);
+            // TODO: add runtime validation of nwaku credentials
             return {
-                identity: new IdentityCredential(idTrapdoorArray, idNullifierArray, idSecretHashArray, idCommitmentArray, idCommitmentBigInt),
+                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", []))
+                },
                 membership: {
                     treeIndex: _.get(obj, "treeIndex"),
                     chainId: _.get(obj, "membershipContract.chainId"),
                     address: _.get(obj, "membershipContract.address"),
-                    rateLimit: _.get(obj, "userMessageLimit")
+                    rateLimit: _.get(obj, "membershipContract.rateLimit")
                 }
             };
         }
@@ -187,6 +186,20 @@ class Keystore {
             return;
         }
     }
+    static fromArraylikeToBytes(obj) {
+        if (Array.isArray(obj)) {
+            return new Uint8Array(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) {
@@ -196,18 +209,17 @@ class Keystore {
     // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L98
     static fromIdentityToBytes(options) {
         return utf8ToBytes(JSON.stringify({
-            membershipContract: {
-                chainId: options.membership.chainId,
-                address: options.membership.address
-            },
             treeIndex: options.membership.treeIndex,
             identityCredential: {
-                idTrapdoor: Array.from(options.identity.IDTrapdoor),
+                idCommitment: Array.from(options.identity.IDCommitment),
                 idNullifier: Array.from(options.identity.IDNullifier),
                 idSecretHash: Array.from(options.identity.IDSecretHash),
-                idCommitment: Array.from(options.identity.IDCommitment)
+                idTrapdoor: Array.from(options.identity.IDTrapdoor)
             },
-            userMessageLimit: options.membership.rateLimit
+            membershipContract: {
+                chainId: options.membership.chainId,
+                address: options.membership.address
+            }
         }));
     }
 }

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

@@ -8,11 +8,11 @@ import { epochIntToBytes, dateToEpoch } from './utils/epoch.js';
 class Zerokit {
     zkRLN;
     witnessCalculator;
-    rateLimit;
-    constructor(zkRLN, witnessCalculator, rateLimit = DEFAULT_RATE_LIMIT) {
+    _rateLimit;
+    constructor(zkRLN, witnessCalculator, _rateLimit = DEFAULT_RATE_LIMIT) {
         this.zkRLN = zkRLN;
         this.witnessCalculator = witnessCalculator;
-        this.rateLimit = rateLimit;
+        this._rateLimit = _rateLimit;
     }
     get getZkRLN() {
         return this.zkRLN;
@@ -20,8 +20,8 @@ class Zerokit {
     get getWitnessCalculator() {
         return this.witnessCalculator;
     }
-    get getRateLimit() {
-        return this.rateLimit;
+    get rateLimit() {
+        return this._rateLimit;
     }
     generateIdentityCredentials() {
         const memKeys = generateExtendedMembershipKey(this.zkRLN); // TODO: rename this function in zerokit rln-wasm