@waku/rln 0.1.6-ace7ca2.0 → 0.1.6-b0a2e39.0

package/src/keystore/keystore.ts

@@ -14,6 +14,8 @@ import {
 import _ from "lodash";
 import { v4 as uuidV4 } from "uuid";
 
+import { buildBigIntFromUint8Array } from "../utils/bytes.js";
+
 import { decryptEipKeystore, keccak256Checksum } from "./cipher.js";
 import { isCredentialValid, isKeystoreValid } from "./schema_validator.js";
 import type {
@@ -248,25 +250,26 @@ export class Keystore {
       const str = bytesToUtf8(bytes);
       const obj = JSON.parse(str);
 
-      const idCommitmentLE = Keystore.fromArraylikeToBytes(
-        _.get(obj, "identityCredential.idCommitment", [])
-      );
-      const idTrapdoorLE = Keystore.fromArraylikeToBytes(
-        _.get(obj, "identityCredential.idTrapdoor", [])
-      );
-      const idNullifierLE = Keystore.fromArraylikeToBytes(
-        _.get(obj, "identityCredential.idNullifier", [])
-      );
-      const idSecretHashLE = Keystore.fromArraylikeToBytes(
-        _.get(obj, "identityCredential.idSecretHash", [])
-      );
-
+      // TODO: add runtime validation of nwaku credentials
       return {
         identity: {
-          IDCommitment: idCommitmentLE,
-          IDTrapdoor: idTrapdoorLE,
-          IDNullifier: idNullifierLE,
-          IDSecretHash: idSecretHashLE
+          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"),
@@ -318,21 +321,14 @@ export class Keystore {
   // follows nwaku implementation
   // https://github.com/waku-org/nwaku/blob/f05528d4be3d3c876a8b07f9bb7dfaae8aa8ec6e/waku/waku_keystore/protocol_types.nim#L98
   private static fromIdentityToBytes(options: KeystoreEntity): Uint8Array {
-    function toLittleEndian(bytes: Uint8Array): Uint8Array {
-      return new Uint8Array(bytes).reverse();
-    }
     return utf8ToBytes(
       JSON.stringify({
         treeIndex: options.membership.treeIndex,
         identityCredential: {
-          idCommitment: Array.from(
-            toLittleEndian(options.identity.IDCommitment)
-          ),
-          idNullifier: Array.from(toLittleEndian(options.identity.IDNullifier)),
-          idSecretHash: Array.from(
-            toLittleEndian(options.identity.IDSecretHash)
-          ),
-          idTrapdoor: Array.from(toLittleEndian(options.identity.IDTrapdoor))
+          idCommitment: Array.from(options.identity.IDCommitment),
+          idNullifier: Array.from(options.identity.IDNullifier),
+          idSecretHash: Array.from(options.identity.IDSecretHash),
+          idTrapdoor: Array.from(options.identity.IDTrapdoor)
         },
         membershipContract: {
           chainId: options.membership.chainId,

package/src/utils/bytes.ts

@@ -17,13 +17,18 @@ export function concatenate(...input: Uint8Array[]): Uint8Array {
   return result;
 }
 
-export function switchEndianness(bytes: Uint8Array): Uint8Array {
-  return new Uint8Array(bytes.reverse());
-}
-
-export function buildBigIntFromUint8ArrayBE(bytes: Uint8Array): bigint {
-  // Interpret bytes as big-endian
-  return bytes.reduce((acc, byte) => (acc << 8n) + BigInt(byte), 0n);
+// Adapted from https://github.com/feross/buffer
+function checkInt(
+  buf: Uint8Array,
+  value: number,
+  offset: number,
+  ext: number,
+  max: number,
+  min: number
+): void {
+  if (value > max || value < min)
+    throw new RangeError('"value" argument is out of bounds');
+  if (offset + ext > buf.length) throw new RangeError("Index out of range");
 }
 
 export function writeUIntLE(
@@ -51,6 +56,19 @@ export function writeUIntLE(
   return buf;
 }
 
+/**
+ * Transforms Uint8Array into BigInt
+ * @param array: Uint8Array
+ * @returns BigInt
+ */
+export function buildBigIntFromUint8Array(
+  array: Uint8Array,
+  byteOffset: number = 0
+): bigint {
+  const dataView = new DataView(array.buffer);
+  return dataView.getBigUint64(byteOffset, true);
+}
+
 /**
  * Fills with zeros to set length
  * @param array little endian Uint8Array
@@ -64,17 +82,3 @@ export function zeroPadLE(array: Uint8Array, length: number): Uint8Array {
   }
   return result;
 }
-
-// Adapted from https://github.com/feross/buffer
-function checkInt(
-  buf: Uint8Array,
-  value: number,
-  offset: number,
-  ext: number,
-  max: number,
-  min: number
-): void {
-  if (value > max || value < min)
-    throw new RangeError('"value" argument is out of bounds');
-  if (offset + ext > buf.length) throw new RangeError("Index out of range");
-}

package/src/utils/index.ts

@@ -2,7 +2,7 @@ export { extractMetaMaskSigner } from "./metamask.js";
 export {
   concatenate,
   writeUIntLE,
-  switchEndianness,
+  buildBigIntFromUint8Array,
   zeroPadLE
 } from "./bytes.js";
 export { sha256, poseidonHash } from "./hash.js";