@waku/rln 0.1.6-27c1236.0 → 0.1.6-34d4730.0

package/src/keystore/keystore.ts

@@ -14,7 +14,7 @@ import {
 import _ from "lodash";
 import { v4 as uuidV4 } from "uuid";
 
-import { buildBigIntFromUint8ArrayLE } from "../utils/bytes.js";
+import { buildBigIntFromUint8Array } from "../utils/bytes.js";
 
 import { decryptEipKeystore, keccak256Checksum } from "./cipher.js";
 import { isCredentialValid, isKeystoreValid } from "./schema_validator.js";
@@ -246,37 +246,29 @@ export class Keystore {
   private static fromBytesToIdentity(
     bytes: Uint8Array
   ): undefined | KeystoreEntity {
-    function fromLittleEndian(bytes: Uint8Array): Uint8Array {
-      return new Uint8Array(bytes).reverse();
-    }
     try {
       const str = bytesToUtf8(bytes);
       const obj = JSON.parse(str);
 
-      // Use little-endian bytes directly for BigInt conversion (matches storage and contract expectation)
-      const idCommitmentLE = Keystore.fromArraylikeToBytes(
-        _.get(obj, "identityCredential.idCommitment", [])
-      );
-
+      // TODO: add runtime validation of nwaku credentials
       return {
         identity: {
-          IDCommitment: fromLittleEndian(idCommitmentLE),
-          IDTrapdoor: fromLittleEndian(
-            Keystore.fromArraylikeToBytes(
-              _.get(obj, "identityCredential.idTrapdoor", [])
-            )
+          IDCommitment: Keystore.fromArraylikeToBytes(
+            _.get(obj, "identityCredential.idCommitment", [])
           ),
-          IDNullifier: fromLittleEndian(
-            Keystore.fromArraylikeToBytes(
-              _.get(obj, "identityCredential.idNullifier", [])
-            )
+          IDTrapdoor: Keystore.fromArraylikeToBytes(
+            _.get(obj, "identityCredential.idTrapdoor", [])
           ),
-          // Do NOT reverse for BigInt conversion; use little-endian as stored
-          IDCommitmentBigInt: buildBigIntFromUint8ArrayLE(idCommitmentLE),
-          IDSecretHash: fromLittleEndian(
+          IDNullifier: Keystore.fromArraylikeToBytes(
+            _.get(obj, "identityCredential.idNullifier", [])
+          ),
+          IDCommitmentBigInt: buildBigIntFromUint8Array(
             Keystore.fromArraylikeToBytes(
-              _.get(obj, "identityCredential.idSecretHash", [])
+              _.get(obj, "identityCredential.idCommitment", [])
             )
+          ),
+          IDSecretHash: Keystore.fromArraylikeToBytes(
+            _.get(obj, "identityCredential.idSecretHash", [])
           )
         },
         membership: {
@@ -329,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

@@ -56,11 +56,17 @@ export function writeUIntLE(
   return buf;
 }
 
-export function buildBigIntFromUint8ArrayLE(bytes: Uint8Array): bigint {
-  return bytes.reduce(
-    (acc, byte, i) => acc + BigInt(byte) * (1n << (8n * BigInt(i))),
-    0n
-  );
+/**
+ * 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);
 }
 
 /**

package/src/utils/index.ts

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