@waku/rln 0.1.5-861a776.0 → 0.1.5-a8ff776.0

package/bundle/index.js

@@ -2,13 +2,11 @@ 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 BigNumber.from(minRate).toNumber();
+        return 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 BigNumber.from(maxRate).toNumber();
+        return 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 = decodedData.index.toString();
+            const membershipId = Number(decodedData.index);
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: parseInt(membershipId),
-                    chainId: network.chainId.toString(),
+                    treeIndex: membershipId,
+                    chainId: network.chainId,
                     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 = decodedData.index.toString();
+            const membershipId = BigNumber.from(decodedData.index).toNumber();
             return {
                 identity,
                 membership: {
                     address,
-                    treeIndex: parseInt(membershipId),
-                    chainId: network.chainId.toString(),
+                    treeIndex: membershipId,
+                    chainId: network.chainId,
                     rateLimit: decodedData.membershipRateLimit.toNumber()
                 }
             };

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

@@ -25,15 +25,6 @@ class IdentityCredential {
         const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment, 32);
         return new IdentityCredential(idTrapdoor, idNullifier, idSecretHash, idCommitment, idCommitmentBigInt);
     }
-    toJSON() {
-        return [
-            Array.from(this.IDTrapdoor),
-            Array.from(this.IDNullifier),
-            Array.from(this.IDSecretHash),
-            Array.from(this.IDCommitment),
-            this.IDCommitmentBigInt.toString()
-        ];
-    }
 }
 
 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,15 +164,15 @@ class Keystore {
         try {
             const str = bytesToUtf8(bytes);
             const obj = JSON.parse(str);
-            // Get identity arrays
-            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"),
@@ -187,6 +186,17 @@ 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) {
@@ -197,12 +207,12 @@ class Keystore {
     static fromIdentityToBytes(options) {
         return utf8ToBytes(JSON.stringify({
             treeIndex: options.membership.treeIndex,
-            identityCredential: [
-                Array.from(options.identity.IDTrapdoor),
-                Array.from(options.identity.IDNullifier),
-                Array.from(options.identity.IDSecretHash),
-                Array.from(options.identity.IDCommitment)
-            ],
+            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

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

@@ -106,7 +106,7 @@ class RLNInstance {
         this.starting = true;
         try {
             const { credentials, keystore } = await RLNInstance.decryptCredentialsIfNeeded(options.credentials);
-            const { signer, address, rateLimit } = await this.determineStartOptions(options, credentials);
+            const { signer, address } = await this.determineStartOptions(options, credentials);
             if (keystore) {
                 this.keystore = keystore;
             }
@@ -115,7 +115,7 @@ class RLNInstance {
             this._contract = await RLNContract.init(this, {
                 address: address,
                 signer: signer,
-                rateLimit: rateLimit ?? this.zerokit.getRateLimit
+                rateLimit: options.rateLimit ?? this.zerokit.getRateLimit
             });
             this.started = true;
         }
@@ -132,7 +132,7 @@ class RLNInstance {
             chainId = LINEA_CONTRACT.chainId;
         }
         const signer = options.signer || (await extractMetaMaskSigner());
-        const currentChainId = (await signer.getChainId()).toString();
+        const currentChainId = await signer.getChainId();
         if (chainId && chainId !== currentChainId) {
             throw Error(`Failed to start RLN contract, chain ID of contract is different from current one: contract-${chainId}, current network-${currentChainId}`);
         }
@@ -204,7 +204,7 @@ class RLNInstance {
         }
         const chainId = credentials.membership.chainId;
         const network = await this._contract.provider.getNetwork();
-        const currentChainId = network.chainId.toString();
+        const currentChainId = network.chainId;
         if (chainId !== currentChainId) {
             throw Error(`Failed to verify chain coordinates: credentials chainID=${chainId} is not equal to registryContract chainID=${currentChainId}`);
         }