@hinkal/common 0.2.12 → 0.2.14

package/webworker/utxoWorker/utxoWorkerLogic.mjs

@@ -1,68 +1,76 @@
-import { preProcessing as p } from "../../crypto/preProcessing.mjs";
-import { UserKeys as l } from "../../data-structures/crypto-keys/keys.mjs";
-import { Utxo as h } from "../../data-structures/utxo/Utxo.mjs";
-import { decryptUtxoConstructorArgs as y, decryptUtxo as f } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { decodeUtxoConstructorArgs as m, checkUtxoSignature as g } from "../../data-structures/crypto-keys/decodeUTXO.mjs";
-import { WorkerProxy as x } from "../workerProxy.mjs";
-import { UtxoWorkerActionType as u } from "./utxoWorker.types.mjs";
-const a = new x(), U = async ({ data: e }) => {
-  const { utxos: t, nullifiers: o } = e, s = t.filter((r) => {
-    const i = new h(r);
-    return !o.has(i.getNullifier());
+import { preProcessing as u } from "../../crypto/preProcessing.mjs";
+import { stealthPairCacheDevice as p, stealthAddressCacheDevice as y, UserKeys as h } from "../../data-structures/crypto-keys/keys.mjs";
+import { Utxo as f } from "../../data-structures/utxo/Utxo.mjs";
+import { decryptUtxoConstructorArgs as m, decryptUtxo as g } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
+import { decodeUtxoConstructorArgs as x, checkUtxoSignature as U } from "../../data-structures/crypto-keys/decodeUTXO.mjs";
+import { WorkerProxy as T } from "../workerProxy.mjs";
+import { UtxoWorkerActionType as d } from "./utxoWorker.types.mjs";
+const i = new T(), w = async ({ data: e }) => {
+  const { utxos: r, nullifiers: s } = e, o = r.filter((t) => {
+    const n = new f(t);
+    return !s.has(n.getNullifier());
   });
-  a.postMessageToMainThread(s);
-}, T = async ({ data: e }) => {
-  const t = new l(e.signature), o = t.getShieldedPrivateKey(), s = e.encryptedOutputs.map((r, i) => {
+  i.postMessageToMainThread({
+    utxoConstructors: o,
+    stealthPairCache: p.serialize(),
+    stealthAddressCache: y.serialize()
+  });
+}, P = async ({ data: e }) => {
+  const r = new h(e.signature), s = r.getShieldedPrivateKey(), o = e.encryptedOutputs.map((t) => {
     try {
-      return r.isPositive ? y(Buffer.from(r.value.slice(2), "hex"), t) : m(r.value, o);
+      return t.isPositive ? m(Buffer.from(t.value.slice(2), "hex"), r) : x(t.value, s);
     } catch {
       return;
     }
-  }).filter((r) => r !== void 0);
-  a.postMessageToMainThread(s);
-}, k = async ({ data: e }) => {
-  const t = new l(e.signature), o = [], { encryptedOutputs: s } = e;
-  let { lastOutput: r } = e;
-  const i = t.getShieldedPrivateKey();
-  for (let d = 0; d < s.length; d += 1) {
-    const c = s[d];
-    if (r = c.value, c.isPositive)
+  }).filter((t) => t !== void 0 && t.amount !== 0n);
+  i.postMessageToMainThread(o);
+}, v = async ({ data: e }) => {
+  const r = new h(e.signature), s = [], { encryptedOutputs: o } = e;
+  let { lastOutput: t } = e;
+  const n = r.getShieldedPrivateKey();
+  for (let l = 0; l < o.length; l += 1) {
+    const c = o[l];
+    if (t = c.value, c.isPositive)
       try {
-        const n = f(Buffer.from(r.slice(2), "hex"), t);
-        if (!n.erc20TokenAddress || !n.amount || !n.stealthAddress)
+        const a = g(Buffer.from(t.slice(2), "hex"), r);
+        if (!a.erc20TokenAddress || !a.amount || !a.stealthAddress)
           throw Error("bruh");
-        o.push(c);
+        s.push(c);
       } catch {
       }
     else
       try {
-        g(r, i) && o.push(c);
+        U(t, n) && s.push(c);
       } catch {
       }
   }
-  a.postMessageToMainThread({ additionalEncryptedOutputs: o, lastOutput: r });
-}, v = async (e) => {
-  await p();
-  const { type: t } = e.payload;
-  switch (t) {
-    case u.BATCH_FILTER_UTXOS_WITH_NULLIFIER:
-      U(e.payload);
-      return;
-    case u.BUILD_UTXOS:
-      T(e.payload);
-      return;
-    case u.DECIPHER_OUTPUTS:
-      k(e.payload);
-      return;
-    default:
-      throw Error(`Unknown worker message type ${t}`);
+  i.postMessageToMainThread({ additionalEncryptedOutputs: s, lastOutput: t });
+}, k = async (e) => {
+  try {
+    await u();
+    const { type: r } = e.payload;
+    switch (r) {
+      case d.BATCH_FILTER_UTXOS_WITH_NULLIFIER:
+        await w(e.payload);
+        return;
+      case d.BUILD_UTXOS:
+        await P(e.payload);
+        return;
+      case d.DECIPHER_OUTPUTS:
+        await v(e.payload);
+        return;
+      default:
+        throw Error(`Unknown worker message type ${r}`);
+    }
+  } catch (r) {
+    console.error(r), i.postErrorToMainThread(r);
   }
 };
-a.attachWorkerSideOnMessage(v);
+i.attachWorkerSideOnMessage(k);
 export {
-  a as default,
-  T as handleBuildUtxosMessage,
-  k as handleDecipherMessage,
-  U as handleFilterUtxosWithNullifier,
-  v as onWorkerMessage
+  i as default,
+  P as handleBuildUtxosMessage,
+  v as handleDecipherMessage,
+  w as handleFilterUtxosWithNullifier,
+  k as onWorkerMessage
 };

package/webworker/viteWorkerURL.constant.cjs

@@ -14,8 +14,8 @@
   var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
 
   const n = async () => ({
-    [e.ZKProof]: await getWorkerURL(domain + '/0.1.61/' + 'zkProofWorkerLauncher.js'),
-    [e.SnarkJS]: await getWorkerURL(domain + '/0.1.61/' + 'snarkjsWorkerLauncher.js'),
-    [e.UTXO]: await getWorkerURL(domain + '/0.1.61/' + 'utxoWorkerLauncher.js'),
+    [e.ZKProof]: await getWorkerURL(domain + '/0.2.13/' + 'zkProofWorkerLauncher.js'),
+    [e.SnarkJS]: await getWorkerURL(domain + '/0.2.13/' + 'snarkjsWorkerLauncher.js'),
+    [e.UTXO]: await getWorkerURL(domain + '/0.2.13/' + 'utxoWorkerLauncher.js'),
   });
   exports.getWorkerViteURL = n;

package/webworker/viteWorkerURL.constant.mjs

@@ -14,8 +14,8 @@
   var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
 
   const n = async () => ({
-    [e.ZKProof]: await getWorkerURL(domain + '/0.1.61/' + 'zkProofWorkerLauncher.js'),
-    [e.SnarkJS]: await getWorkerURL(domain + '/0.1.61/' + 'snarkjsWorkerLauncher.js'),
-    [e.UTXO]: await getWorkerURL(domain + '/0.1.61/' + 'utxoWorkerLauncher.js'),
+    [e.ZKProof]: await getWorkerURL(domain + '/0.2.13/' + 'zkProofWorkerLauncher.js'),
+    [e.SnarkJS]: await getWorkerURL(domain + '/0.2.13/' + 'snarkjsWorkerLauncher.js'),
+    [e.UTXO]: await getWorkerURL(domain + '/0.2.13/' + 'utxoWorkerLauncher.js'),
   });
   export { n as getWorkerViteURL };

package/webworker/workerFactory.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../constants/vite.constants.cjs"),r=require("./worker.registry.cjs");class t{constructor(){}static resolveWorkerURL=async e=>{const{getWorkerViteURL:s}=await Promise.resolve().then(()=>require("./viteWorkerURL.constant.cjs"));return(await s())[e]};static createWorker=async e=>{if(i.isNode){let o;return e===r.WorkerVariant.SnarkJS?o=await Promise.resolve().then(()=>require("./snarkjsWorker/snarkjsWorkerLogic.cjs")):e===r.WorkerVariant.ZKProof?o=await Promise.resolve().then(()=>require("./zkProofWorker/zkProofWorkerLogic.cjs")):e===r.WorkerVariant.UTXO&&(o=await Promise.resolve().then(()=>require("./utxoWorker/utxoWorkerLogic.cjs"))),o.default}const s=await t.resolveWorkerURL(e);return new Worker(s,{type:"module"})};static getWebWorker(e){switch(e){case r.WorkerVariant.ZKProof:return t.createWorker(e);case r.WorkerVariant.SnarkJS:return t.createWorker(e);case r.WorkerVariant.UTXO:return t.createWorker(e);default:throw Error(`Unknown worker type: ${e}`)}}}exports.WorkerFactory=t;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../constants/vite.constants.cjs"),r=require("./worker.registry.cjs");class t{constructor(){}static resolveWorkerURL=async e=>{const{getWorkerViteURL:s}=await Promise.resolve().then(()=>require("./viteWorkerURL.constant.cjs"));return(await s())[e]};static createWorker=async e=>{if(i.isNode||i.isSandbox){let o;return e===r.WorkerVariant.SnarkJS?o=await Promise.resolve().then(()=>require("./snarkjsWorker/snarkjsWorkerLogic.cjs")):e===r.WorkerVariant.ZKProof?o=await Promise.resolve().then(()=>require("./zkProofWorker/zkProofWorkerLogic.cjs")):e===r.WorkerVariant.UTXO&&(o=await Promise.resolve().then(()=>require("./utxoWorker/utxoWorkerLogic.cjs"))),o.default}const s=await t.resolveWorkerURL(e);return new Worker(s,{type:"module"})};static getWebWorker(e){switch(e){case r.WorkerVariant.ZKProof:return t.createWorker(e);case r.WorkerVariant.SnarkJS:return t.createWorker(e);case r.WorkerVariant.UTXO:return t.createWorker(e);default:throw Error(`Unknown worker type: ${e}`)}}}exports.WorkerFactory=t;

package/webworker/workerFactory.mjs

@@ -1,4 +1,4 @@
-import { isNode as i } from "../constants/vite.constants.mjs";
+import { isNode as i, isSandbox as c } from "../constants/vite.constants.mjs";
 import { WorkerVariant as r } from "./worker.registry.mjs";
 class o {
   constructor() {
@@ -8,7 +8,7 @@ class o {
     return (await s())[e];
   };
   static createWorker = async (e) => {
-    if (i) {
+    if (i || c) {
       let t;
       return e === r.SnarkJS ? t = await import(
         /* @vite-ignore */

package/webworker/workerProxy.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class s{isNode=!1;onmessage=null;_eventEmitter;get eventEmitter(){if(this._eventEmitter)return this._eventEmitter;const e=require("events");return this._eventEmitter=new e,this._eventEmitter}constructor(){this.isNode=typeof process<"u"&&process.versions!=null&&process.versions.node!=null}terminate(){}postMessage(e){if(this.isNode){this.eventEmitter.emit("message",e);return}else postMessage(e)}postMessageToMainThread(e){if(this.isNode){const t={data:e};this.onmessage&&this.onmessage(t)}else postMessage(e)}attachWorkerSideOnMessage(e){this.isNode&&this.eventEmitter.on("message",t=>{e(t)})}}exports.WorkerProxy=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class s{isNode=!1;isSandbox=!1;onmessage=null;onerror=null;_eventEmitter;get eventEmitter(){if(this._eventEmitter)return this._eventEmitter;if(this.isNode){const e=require("events");this._eventEmitter=new e}else this._eventEmitter=new EventTarget;return this._eventEmitter}constructor(){this.isNode=typeof process<"u"&&process.versions!=null&&process.versions.node!=null,this.isSandbox=typeof window<"u"&&window.origin==="null"}terminate(){}postMessage(e){this.isNode?this.eventEmitter.emit("message",e):this.isSandbox?this.eventEmitter?.dispatchEvent(new CustomEvent("worker-message",{detail:e})):postMessage(e)}postMessageToMainThread(e){const t={data:e};this.onmessage?this.onmessage(t):postMessage(e)}postErrorToMainThread(e){const t={data:{error:e}};this.onerror?this.onerror(t):postMessage(e)}attachWorkerSideOnMessage(e){this.isNode?this.eventEmitter.on("message",t=>{e(t)}):this.isSandbox&&this.eventEmitter.addEventListener("worker-message",t=>{e(t.detail)})}}exports.WorkerProxy=s;

package/webworker/workerProxy.d.ts

@@ -10,6 +10,7 @@
  */
 export declare class WorkerProxy {
     private isNode;
+    private isSandbox;
     /**
      * This allow browser or main thread to listen for worker response message
      * using the normal `worker.onmessage = () => {}` syntax. Is should only be side on the
@@ -18,23 +19,22 @@ export declare class WorkerProxy {
     onmessage: ((e: {
         data: any;
     }) => void) | null;
-    private _eventEmitter;
     /**
-     * Lazy load event emitter so it is only initialize if require/if in node environment
+     * This allow browser or main thread to listen for worker response message
+     * using the normal `worker.onerror = () => {}` syntax. Is should only be side on the
+     * main thread side, not on worker side.
      */
+    onerror: ((e: {
+        data: {
+            error: unknown;
+        };
+    }) => void) | null;
+    private _eventEmitter;
     private get eventEmitter();
     constructor();
     terminate(): void;
-    /**
-     * This postMessage() should only be called when intending to send message from main thread to
-     * worker; In a typical browser environment, this will just act as a normal postMessage() function.
-     */
     postMessage(message: unknown): void;
-    /**
-     * A separate postMessage() is needed because both main thread and worker thread communicate with
-     * each other using postMessage(), but we cannot (and do not) differentiate between the two
-     * while running on main thread on hardhat
-     */
     postMessageToMainThread(message: unknown): void;
+    postErrorToMainThread(error: unknown): void;
     attachWorkerSideOnMessage(fn: (e: any) => void | Promise<void>): void;
 }

package/webworker/workerProxy.mjs

@@ -1,53 +1,51 @@
 class i {
   isNode = !1;
+  isSandbox = !1;
   /**
    * This allow browser or main thread to listen for worker response message
    * using the normal `worker.onmessage = () => {}` syntax. Is should only be side on the
    * main thread side, not on worker side.
    */
   onmessage = null;
-  _eventEmitter;
-  // node EventEmitter
   /**
-   * Lazy load event emitter so it is only initialize if require/if in node environment
+   * This allow browser or main thread to listen for worker response message
+   * using the normal `worker.onerror = () => {}` syntax. Is should only be side on the
+   * main thread side, not on worker side.
    */
+  onerror = null;
+  _eventEmitter;
+  // node EventEmitter
   get eventEmitter() {
     if (this._eventEmitter)
       return this._eventEmitter;
-    const e = require("events");
-    return this._eventEmitter = new e(), this._eventEmitter;
+    if (this.isNode) {
+      const e = require("events");
+      this._eventEmitter = new e();
+    } else
+      this._eventEmitter = new EventTarget();
+    return this._eventEmitter;
   }
   constructor() {
-    this.isNode = typeof process < "u" && process.versions != null && process.versions.node != null;
+    this.isNode = typeof process < "u" && process.versions != null && process.versions.node != null, this.isSandbox = typeof window < "u" && window.origin === "null";
   }
   terminate() {
   }
-  /**
-   * This postMessage() should only be called when intending to send message from main thread to
-   * worker; In a typical browser environment, this will just act as a normal postMessage() function.
-   */
   postMessage(e) {
-    if (this.isNode) {
-      this.eventEmitter.emit("message", e);
-      return;
-    } else
-      postMessage(e);
+    this.isNode ? this.eventEmitter.emit("message", e) : this.isSandbox ? this.eventEmitter?.dispatchEvent(new CustomEvent("worker-message", { detail: e })) : postMessage(e);
   }
-  /**
-   * A separate postMessage() is needed because both main thread and worker thread communicate with
-   * each other using postMessage(), but we cannot (and do not) differentiate between the two
-   * while running on main thread on hardhat
-   */
   postMessageToMainThread(e) {
-    if (this.isNode) {
-      const t = { data: e };
-      this.onmessage && this.onmessage(t);
-    } else
-      postMessage(e);
+    const t = { data: e };
+    this.onmessage ? this.onmessage(t) : postMessage(e);
+  }
+  postErrorToMainThread(e) {
+    const t = { data: { error: e } };
+    this.onerror ? this.onerror(t) : postMessage(e);
   }
   attachWorkerSideOnMessage(e) {
-    this.isNode && this.eventEmitter.on("message", (t) => {
+    this.isNode ? this.eventEmitter.on("message", (t) => {
       e(t);
+    }) : this.isSandbox && this.eventEmitter.addEventListener("worker-message", (t) => {
+      e(t.detail);
     });
   }
 }

package/webworker/zkProofWorker/zkProofWorker.types.d.ts

@@ -1,6 +1,7 @@
 import { IUtxoConstructor } from '../../data-structures/utxo/Utxo';
 import { type MerkleTreeJson } from '../../data-structures/merkle-tree';
 import { WorkerParams, WorkerPayload } from '../worker.types';
+import { ProverVersion } from '../../types/hinkal.types';
 export declare enum ZKProofWorkerActionType {
     CALC_COMMITMENTS_SIBLING_AND_SIDES = 0,
     CALC_ACCESS_TOKEN_SIBLING_AND_SIDES = 1,
@@ -30,6 +31,7 @@ export interface ZKProofWorkerCalcAccessTokenReturn {
 export interface ZKProofWorkerBuildInNullifiersPayload extends WorkerPayload<{
     inputUtxosSerialized: IUtxoConstructor[][];
     onChainCreation: boolean[];
+    proverVersion: ProverVersion;
 }> {
     type: ZKProofWorkerActionType.BUILD_IN_NULLIFIERS;
 }

package/webworker/zkProofWorker/zkProofWorkerLauncher.cjs

@@ -1 +1 @@
-"use strict";const e=""+(typeof document>"u"?require("url").pathToFileURL(__dirname+"/../../assets/zkProofWorkerLauncher-DggSotLy.js").href:new URL("../../assets/zkProofWorkerLauncher-DggSotLy.js",document.currentScript&&document.currentScript.src||document.baseURI).href);module.exports=e;
+"use strict";const e=""+(typeof document>"u"?require("url").pathToFileURL(__dirname+"/../../assets/zkProofWorkerLauncher-WftdKeo_.js").href:new URL("../../assets/zkProofWorkerLauncher-WftdKeo_.js",document.currentScript&&document.currentScript.src||document.baseURI).href);module.exports=e;

package/webworker/zkProofWorker/zkProofWorkerLauncher.mjs

@@ -1,4 +1,4 @@
-const r = "" + new URL("../../assets/zkProofWorkerLauncher-DggSotLy.js", import.meta.url).href;
+const r = "" + new URL("../../assets/zkProofWorkerLauncher-WftdKeo_.js", import.meta.url).href;
 export {
   r as default
 };

package/webworker/zkProofWorker/zkProofWorkerLogic.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const A=require("../../crypto/preProcessing.cjs"),C=require("../../data-structures/crypto-keys/keys.cjs"),p=require("../../data-structures/utxo/Utxo.cjs"),m=require("../../crypto/poseidon.cjs"),g=require("../../data-structures/merkle-tree/MerkleTree.cjs"),k=require("../../functions/snarkjs/common.snarkjs.cjs"),h=require("../workerProxy.cjs"),u=require("./zkProofWorker.types.cjs"),l=new h.WorkerProxy,T=e=>{const{inputUtxosSerialized:r,merkleTreeSerialized:n}=e.data,d=n.tree,s=new Map(Object.entries(d).map(([a,c])=>[BigInt(a),BigInt(c)])),o=g.MerkleTree.createWithData(s,BigInt(n.index),BigInt(n.count),m.poseidonFunction,25n,0n),t=r.map(a=>a.map(c=>new p.Utxo(c))),{inCommitmentSiblings:i,inCommitmentSiblingSides:S}=k.calcCommitmentsSiblingAndSides(t,o);l.postMessageToMainThread({inCommitmentSiblings:i,inCommitmentSiblingSides:S})},I=e=>{const{userSignature:r,merkleTreeAccessTokenSerialized:n}=e.data,d=new C.UserKeys(r),s=n.tree,o=new Map(Object.entries(s).map(([a,c])=>[BigInt(a),BigInt(c)])),t=g.MerkleTree.createWithData(o,BigInt(n.index),BigInt(n.count),m.poseidonFunction,25n,0n),{accessTokenSiblings:i,accessTokenSiblingSides:S}=k.calcAccessTokenSiblingsAndSides(d,t);l.postMessageToMainThread({accessTokenSiblings:i,accessTokenSiblingSides:S})},M=e=>{const{inputUtxosSerialized:r,onChainCreation:n}=e.data,s=r.map(o=>o.map(t=>new p.Utxo(t))).map((o,t)=>o.map(i=>n[t]?"0":i.getNullifier()));l.postMessageToMainThread(s)},y=async e=>{await A.preProcessing();const{type:r}=e.payload;switch(r){case u.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES:T(e.payload);return;case u.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES:I(e.payload);return;case u.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS:M(e.payload);return;default:throw Error(`Unknown worker message type ${r}`)}};l.attachWorkerSideOnMessage(y);exports.default=l;exports.handleBuildInNullifiers=M;exports.handleCalcAccessTokenSiblingAndSides=I;exports.handleCalcCommitmentsSiblingAndSides=T;exports.onWorkerMessage=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const y=require("../../crypto/preProcessing.cjs"),A=require("../../data-structures/crypto-keys/keys.cjs"),S=require("../../data-structures/utxo/Utxo.cjs"),m=require("../../functions/snarkjs/common.snarkjs.cjs"),C=require("../workerProxy.cjs"),d=require("./zkProofWorker.types.cjs"),u=require("../../functions/utils/merkleTree.utils.cjs"),t=new C.WorkerProxy,p=r=>{const{inputUtxosSerialized:e,merkleTreeSerialized:a}=r.data,c=u.contructMerkleTreeFromSerialized(a),i=e.map(n=>n.map(l=>new S.Utxo(l))),{inCommitmentSiblings:s,inCommitmentSiblingSides:o}=m.calcCommitmentsSiblingAndSides(i,c);t.postMessageToMainThread({inCommitmentSiblings:s,inCommitmentSiblingSides:o})},k=r=>{const{userSignature:e,merkleTreeAccessTokenSerialized:a}=r.data,c=new A.UserKeys(e),i=u.contructMerkleTreeFromSerialized(a),{accessTokenSiblings:s,accessTokenSiblingSides:o}=m.calcAccessTokenSiblingsAndSides(c,i);t.postMessageToMainThread({accessTokenSiblings:s,accessTokenSiblingSides:o})},T=r=>{const{inputUtxosSerialized:e,onChainCreation:a,proverVersion:c}=r.data,i=e.map(o=>o.map(n=>new S.Utxo(n)));let s=[];c==="v1x0"?s=i.map((o,n)=>o.map(l=>a[n]?"0":l.getNullifier())):s=i.map(o=>o.map(n=>n.amount===0n?"0":n.getNullifier())),t.postMessageToMainThread(s)},g=async r=>{try{await y.preProcessing();const{type:e}=r.payload;switch(e){case d.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES:p(r.payload);return;case d.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES:k(r.payload);return;case d.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS:T(r.payload);return;default:throw Error(`Unknown worker message type ${e}`)}}catch(e){console.error(e),t.postErrorToMainThread(e)}};t.attachWorkerSideOnMessage(g);exports.default=t;exports.handleBuildInNullifiers=T;exports.handleCalcAccessTokenSiblingAndSides=k;exports.handleCalcCommitmentsSiblingAndSides=p;exports.onWorkerMessage=g;

package/webworker/zkProofWorker/zkProofWorkerLogic.mjs

@@ -1,66 +1,52 @@
-import { preProcessing as u } from "../../crypto/preProcessing.mjs";
-import { UserKeys as I } from "../../data-structures/crypto-keys/keys.mjs";
-import { Utxo as S } from "../../data-structures/utxo/Utxo.mjs";
-import { poseidonFunction as g } from "../../crypto/poseidon.mjs";
-import { MerkleTree as T } from "../../data-structures/merkle-tree/MerkleTree.mjs";
-import { calcCommitmentsSiblingAndSides as k, calcAccessTokenSiblingsAndSides as C } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { WorkerProxy as M } from "../workerProxy.mjs";
-import { ZKProofWorkerActionType as d } from "./zkProofWorker.types.mjs";
-const l = new M(), f = (e) => {
-  const { inputUtxosSerialized: t, merkleTreeSerialized: n } = e.data, m = n.tree, r = new Map(
-    Object.entries(m).map(([a, c]) => [BigInt(a), BigInt(c)])
-  ), o = T.createWithData(
-    r,
-    BigInt(n.index),
-    BigInt(n.count),
-    g,
-    25n,
-    0n
-  ), i = t.map(
-    (a) => a.map((c) => new S(c))
-  ), { inCommitmentSiblings: s, inCommitmentSiblingSides: p } = k(i, o);
-  l.postMessageToMainThread({ inCommitmentSiblings: s, inCommitmentSiblingSides: p });
-}, A = (e) => {
-  const { userSignature: t, merkleTreeAccessTokenSerialized: n } = e.data, m = new I(t), r = n.tree, o = new Map(
-    Object.entries(r).map(([a, c]) => [BigInt(a), BigInt(c)])
-  ), i = T.createWithData(
-    o,
-    BigInt(n.index),
-    BigInt(n.count),
-    g,
-    25n,
-    0n
-  ), { accessTokenSiblings: s, accessTokenSiblingSides: p } = C(m, i);
-  l.postMessageToMainThread({ accessTokenSiblings: s, accessTokenSiblingSides: p });
-}, h = (e) => {
-  const { inputUtxosSerialized: t, onChainCreation: n } = e.data, r = t.map(
-    (o) => o.map((i) => new S(i))
-  ).map(
-    (o, i) => o.map((s) => n[i] ? "0" : s.getNullifier())
+import { preProcessing as d } from "../../crypto/preProcessing.mjs";
+import { UserKeys as T } from "../../data-structures/crypto-keys/keys.mjs";
+import { Utxo as p } from "../../data-structures/utxo/Utxo.mjs";
+import { calcCommitmentsSiblingAndSides as g, calcAccessTokenSiblingsAndSides as u } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { WorkerProxy as k } from "../workerProxy.mjs";
+import { ZKProofWorkerActionType as m } from "./zkProofWorker.types.mjs";
+import { contructMerkleTreeFromSerialized as S } from "../../functions/utils/merkleTree.utils.mjs";
+const c = new k(), C = (r) => {
+  const { inputUtxosSerialized: e, merkleTreeSerialized: t } = r.data, a = S(t), i = e.map(
+    (n) => n.map((l) => new p(l))
+  ), { inCommitmentSiblings: s, inCommitmentSiblingSides: o } = g(i, a);
+  c.postMessageToMainThread({ inCommitmentSiblings: s, inCommitmentSiblingSides: o });
+}, f = (r) => {
+  const { userSignature: e, merkleTreeAccessTokenSerialized: t } = r.data, a = new T(e), i = S(t), { accessTokenSiblings: s, accessTokenSiblingSides: o } = u(a, i);
+  c.postMessageToMainThread({ accessTokenSiblings: s, accessTokenSiblingSides: o });
+}, y = (r) => {
+  const { inputUtxosSerialized: e, onChainCreation: t, proverVersion: a } = r.data, i = e.map(
+    (o) => o.map((n) => new p(n))
   );
-  l.postMessageToMainThread(r);
-}, w = async (e) => {
-  await u();
-  const { type: t } = e.payload;
-  switch (t) {
-    case d.CALC_COMMITMENTS_SIBLING_AND_SIDES:
-      f(e.payload);
-      return;
-    case d.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES:
-      A(e.payload);
-      return;
-    case d.BUILD_IN_NULLIFIERS:
-      h(e.payload);
-      return;
-    default:
-      throw Error(`Unknown worker message type ${t}`);
+  let s = [];
+  a === "v1x0" ? s = i.map(
+    (o, n) => o.map((l) => t[n] ? "0" : l.getNullifier())
+  ) : s = i.map((o) => o.map((n) => n.amount === 0n ? "0" : n.getNullifier())), c.postMessageToMainThread(s);
+}, A = async (r) => {
+  try {
+    await d();
+    const { type: e } = r.payload;
+    switch (e) {
+      case m.CALC_COMMITMENTS_SIBLING_AND_SIDES:
+        C(r.payload);
+        return;
+      case m.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES:
+        f(r.payload);
+        return;
+      case m.BUILD_IN_NULLIFIERS:
+        y(r.payload);
+        return;
+      default:
+        throw Error(`Unknown worker message type ${e}`);
+    }
+  } catch (e) {
+    console.error(e), c.postErrorToMainThread(e);
   }
 };
-l.attachWorkerSideOnMessage(w);
+c.attachWorkerSideOnMessage(A);
 export {
-  l as default,
-  h as handleBuildInNullifiers,
-  A as handleCalcAccessTokenSiblingAndSides,
-  f as handleCalcCommitmentsSiblingAndSides,
-  w as onWorkerMessage
+  c as default,
+  y as handleBuildInNullifiers,
+  f as handleCalcAccessTokenSiblingAndSides,
+  C as handleCalcCommitmentsSiblingAndSides,
+  A as onWorkerMessage
 };

package/functions/utils/memoize.utils.cjs

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./serialize.utils.cjs"),s=i=>{const e=new Map;return(...n)=>{const t=o.CustomJSONStringify(n);if(e.has(t))return e.get(t);const r=i(...n);return e.set(t,r),r}};exports.memoizeFunc=s;

package/functions/utils/memoize.utils.mjs

@@ -1,14 +0,0 @@
-import { CustomJSONStringify as c } from "./serialize.utils.mjs";
-const u = (o) => {
-  const t = /* @__PURE__ */ new Map();
-  return (...n) => {
-    const e = c(n);
-    if (t.has(e))
-      return t.get(e);
-    const r = o(...n);
-    return t.set(e, r), r;
-  };
-};
-export {
-  u as memoizeFunc
-};