@waku/rln 0.1.5-6198efb.0 → 0.1.5-861a776.0

package/src/keystore/keystore.ts

@@ -14,6 +14,7 @@ import {
 import _ from "lodash";
 import { v4 as uuidV4 } from "uuid";
 
+import { IdentityCredential } from "../identity.js";
 import { buildBigIntFromUint8Array } from "../utils/bytes.js";
 
 import { decryptEipKeystore, keccak256Checksum } from "./cipher.js";
@@ -250,27 +251,27 @@ export class Keystore {
       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"),
@@ -284,23 +285,6 @@ export class Keystore {
     }
   }
 
-  private static fromArraylikeToBytes(obj: {
-    [key: number]: number;
-  }): Uint8Array {
-    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
   private static computeMembershipHash(info: MembershipInfo): MembershipHash {
@@ -315,12 +299,12 @@ export class Keystore {
     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/src/keystore/types.ts

@@ -8,7 +8,7 @@ export type Password = string | Uint8Array;
 // see reference
 // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L111
 export type MembershipInfo = {
-  chainId: number;
+  chainId: string;
   address: string;
   treeIndex: number;
   rateLimit: number;

package/src/rln.ts

@@ -197,7 +197,7 @@ export class RLNInstance {
     }
 
     const signer = options.signer || (await extractMetaMaskSigner());
-    const currentChainId = await signer.getChainId();
+    const currentChainId = (await signer.getChainId()).toString();
 
     if (chainId && chainId !== currentChainId) {
       throw Error(
@@ -312,7 +312,7 @@ export 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/src/rln_light.ts

@@ -127,7 +127,7 @@ export class RLNLightInstance {
     }
 
     const signer = options.signer || (await extractMetaMaskSigner());
-    const currentChainId = await signer.getChainId();
+    const currentChainId = (await signer.getChainId()).toString();
 
     if (chainId && chainId !== currentChainId) {
       throw Error(