@waku/rln 0.1.5-6198efb.0 → 0.1.5-861a776.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_contract.js

@@ -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

@@ -253,13 +253,13 @@ class RLNLightContract {
                 `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()
                 }
             };
@@ -335,13 +335,13 @@ class RLNLightContract {
                 `Rate limit: ${decodedData.membershipRateLimit}, Erased ${idCommitmentsToErase.length} commitments`);
             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()
                 }
             };

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

@@ -25,6 +25,15 @@ 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,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,15 +165,15 @@ class Keystore {
         try {
             const str = bytesToUtf8(bytes);
             const obj = JSON.parse(str);
-            // TODO: add runtime validation of nwaku credentials
+            // 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);
             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"),
@@ -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) {
@@ -207,12 +197,12 @@ class Keystore {
     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
-            },
+            identityCredential: [
+                Array.from(options.identity.IDTrapdoor),
+                Array.from(options.identity.IDNullifier),
+                Array.from(options.identity.IDSecretHash),
+                Array.from(options.identity.IDCommitment)
+            ],
             membershipContract: {
                 chainId: options.membership.chainId,
                 address: options.membership.address

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

@@ -132,7 +132,7 @@ class RLNInstance {
             chainId = LINEA_CONTRACT.chainId;
         }
         const signer = options.signer || (await extractMetaMaskSigner());
-        const currentChainId = await signer.getChainId();
+        const currentChainId = (await signer.getChainId()).toString();
         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;
+        const currentChainId = network.chainId.toString();
         if (chainId !== currentChainId) {
             throw Error(`Failed to verify chain coordinates: credentials chainID=${chainId} is not equal to registryContract chainID=${currentChainId}`);
         }

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

@@ -74,7 +74,7 @@ class RLNLightInstance {
             chainId = LINEA_CONTRACT.chainId;
         }
         const signer = options.signer || (await extractMetaMaskSigner());
-        const currentChainId = await signer.getChainId();
+        const currentChainId = (await signer.getChainId()).toString();
         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}`);
         }