@waku/rln 0.1.6-b53ba62.0 → 0.1.6-b58de3a.0

package/src/identity.ts

@@ -1,4 +1,4 @@
-import { buildBigIntFromUint8Array } from "./utils/index.js";
+import { buildBigIntFromUint8ArrayLE } from "./utils/index.js";
 
 export class IdentityCredential {
   public constructor(
@@ -18,7 +18,7 @@ export class IdentityCredential {
     const idNullifier = memKeys.subarray(32, 64);
     const idSecretHash = memKeys.subarray(64, 96);
     const idCommitment = memKeys.subarray(96, 128);
-    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment);
+    const idCommitmentBigInt = buildBigIntFromUint8ArrayLE(idCommitment);
 
     return new IdentityCredential(
       idTrapdoor,

package/src/keystore/keystore.ts

@@ -14,7 +14,7 @@ import {
 import _ from "lodash";
 import { v4 as uuidV4 } from "uuid";
 
-import { buildBigIntFromUint8Array } from "../utils/bytes.js";
+import { buildBigIntFromUint8ArrayLE } from "../utils/bytes.js";
 
 import { decryptEipKeystore, keccak256Checksum } from "./cipher.js";
 import { isCredentialValid, isKeystoreValid } from "./schema_validator.js";
@@ -246,6 +246,9 @@ 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);
@@ -253,22 +256,32 @@ export class Keystore {
       // TODO: add runtime validation of nwaku credentials
       return {
         identity: {
-          IDCommitment: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idCommitment", [])
-          ),
-          IDTrapdoor: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idTrapdoor", [])
+          IDCommitment: fromLittleEndian(
+            Keystore.fromArraylikeToBytes(
+              _.get(obj, "identityCredential.idCommitment", [])
+            )
           ),
-          IDNullifier: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idNullifier", [])
+          IDTrapdoor: fromLittleEndian(
+            Keystore.fromArraylikeToBytes(
+              _.get(obj, "identityCredential.idTrapdoor", [])
+            )
           ),
-          IDCommitmentBigInt: buildBigIntFromUint8Array(
+          IDNullifier: fromLittleEndian(
             Keystore.fromArraylikeToBytes(
-              _.get(obj, "identityCredential.idCommitment", [])
+              _.get(obj, "identityCredential.idNullifier", [])
             )
           ),
-          IDSecretHash: Keystore.fromArraylikeToBytes(
-            _.get(obj, "identityCredential.idSecretHash", [])
+          IDCommitmentBigInt: buildBigIntFromUint8ArrayLE(
+            fromLittleEndian(
+              Keystore.fromArraylikeToBytes(
+                _.get(obj, "identityCredential.idCommitment", [])
+              )
+            )
+          ),
+          IDSecretHash: fromLittleEndian(
+            Keystore.fromArraylikeToBytes(
+              _.get(obj, "identityCredential.idSecretHash", [])
+            )
           )
         },
         membership: {
@@ -321,14 +334,21 @@ 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(options.identity.IDCommitment),
-          idNullifier: Array.from(options.identity.IDNullifier),
-          idSecretHash: Array.from(options.identity.IDSecretHash),
-          idTrapdoor: Array.from(options.identity.IDTrapdoor)
+          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))
         },
         membershipContract: {
           chainId: options.membership.chainId,

package/src/message.ts

@@ -1,7 +1,9 @@
+import { message } from "@waku/core";
 import type {
   IDecodedMessage,
   IMessage,
-  IRateLimitProof
+  IRateLimitProof,
+  IRlnMessage
 } from "@waku/interfaces";
 import * as utils from "@waku/utils/bytes";
 
@@ -13,12 +15,13 @@ export function toRLNSignal(contentTopic: string, msg: IMessage): Uint8Array {
   return new Uint8Array([...(msg.payload ?? []), ...contentTopicBytes]);
 }
 
-export class RlnMessage<T extends IDecodedMessage> implements IDecodedMessage {
+export class RlnMessage<T extends IDecodedMessage> implements IRlnMessage {
   public pubsubTopic = "";
+  public version = message.version_0.Version;
 
   public constructor(
-    public rlnInstance: RLNInstance,
-    public msg: T,
+    private rlnInstance: RLNInstance,
+    private msg: T,
     public rateLimitProof: IRateLimitProof | undefined
   ) {}
 

package/src/utils/bytes.ts

@@ -56,17 +56,11 @@ export function writeUIntLE(
   return buf;
 }
 
-/**
- * Transforms Uint8Array into BigInt
- * @param array: Uint8Array
- * @returns BigInt
- */
-export function buildBigIntFromUint8Array(array: Uint8Array): bigint {
-  let hex = "";
-  for (let i = array.length - 1; i >= 0; i--) {
-    hex += array[i].toString(16).padStart(2, "0");
-  }
-  return BigInt("0x" + hex);
+export function buildBigIntFromUint8ArrayLE(bytes: Uint8Array): bigint {
+  return bytes.reduce(
+    (acc, byte, i) => acc + BigInt(byte) * (1n << (8n * BigInt(i))),
+    0n
+  );
 }
 
 /**

package/src/utils/index.ts

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