h_test_1 0.0.22 → 0.0.24

package/data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../functions/web3/etherFunctions.cjs"),c=require("../../crypto/poseidon.cjs"),i=require("./MerkleTree.cjs"),u=(r,n,o,t)=>{if(!t||o){const e=i.MerkleTree.create(c.poseidonFunction,0n);return e.insert(BigInt(n),e.getStartIndex()),t||e.insert(s.randomBigInt(31),e.getStartIndex()+1n),e}return r};exports.getPatchedAccessTokenMerkleTree=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../functions/web3/etherFunctions.cjs"),s=require("../../crypto/poseidon.cjs"),l=require("./MerkleTree.cjs"),g=(n,o,r,t)=>{if(console.log("getPatchedAccessTokenMerkleTree a1",{merkleTreeAccessToken:n,accessKey:o,patchAccessTokenMerkleTree:r,kycRequired:t}),!t||r){const e=l.MerkleTree.create(s.poseidonFunction,0n);return console.log("getPatchedAccessTokenMerkleTree a2",{tree:e}),e.insert(BigInt(o),e.getStartIndex()),t||(e.insert(c.randomBigInt(31),e.getStartIndex()+1n),console.log("getPatchedAccessTokenMerkleTree a3",{tree:e})),console.log("getPatchedAccessTokenMerkleTree a4",{tree:e}),e}return n};exports.getPatchedAccessTokenMerkleTree=g;

package/data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs

@@ -1,13 +1,18 @@
-import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
-import { poseidonFunction as m } from "../../crypto/poseidon.mjs";
+import { randomBigInt as c } from "../../functions/web3/etherFunctions.mjs";
+import { poseidonFunction as g } from "../../crypto/poseidon.mjs";
 import { MerkleTree as s } from "./MerkleTree.mjs";
-const g = (r, n, o, t) => {
-  if (!t || o) {
-    const e = s.create(m, 0n);
-    return e.insert(BigInt(n), e.getStartIndex()), t || e.insert(i(31), e.getStartIndex() + 1n), e;
+const d = (o, r, n, t) => {
+  if (console.log("getPatchedAccessTokenMerkleTree a1", {
+    merkleTreeAccessToken: o,
+    accessKey: r,
+    patchAccessTokenMerkleTree: n,
+    kycRequired: t
+  }), !t || n) {
+    const e = s.create(g, 0n);
+    return console.log("getPatchedAccessTokenMerkleTree a2", { tree: e }), e.insert(BigInt(r), e.getStartIndex()), t || (e.insert(c(31), e.getStartIndex() + 1n), console.log("getPatchedAccessTokenMerkleTree a3", { tree: e })), console.log("getPatchedAccessTokenMerkleTree a4", { tree: e }), e;
   }
-  return r;
+  return o;
 };
 export {
-  g as getPatchedAccessTokenMerkleTree
+  d as getPatchedAccessTokenMerkleTree
 };

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("../../data-structures/merkle-tree/MerkleTree.cjs"),C=require("../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs"),g=require("../../webworker/performTaskWithWorker.cjs"),m=require("../../webworker/worker.registry.cjs"),h=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),A=require("./fetchMerkleTreeSiblings.cjs"),H=require("../utils/amounts.utils.cjs"),P=require("../../crypto/poseidon.cjs"),W=require("../../constants/vite.constants.cjs"),_=require("./fetchOnChainRootHashes.cjs"),p=async(e,a)=>{const s=e.getRootHash();if(s===void 0)throw new Error("Root hash not available from patched merkle tree");const o=await g.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{accessKey:a,merkleTreeAccessTokenSerialized:e.toJSON()}}});return{accessTokenSiblings:o.accessTokenSiblings,accessTokenSiblingSides:o.accessTokenSiblingSides,rootHashAccessToken:s}},N=async(e,a,s,o,i,n)=>{console.log("hinkalDeposit sa5");const r=s.getAccessKey();console.log("hinkalDeposit sa6",{accessKey:r});const t=C.getPatchedAccessTokenMerkleTree(a,r,i,n),k=e.getRootHash();if(k===void 0)throw new Error("Root hash not available from hinkal merkle tree");let l,c;return W.isNode?(l=await p(t,r),c=await g.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:o,merkleTreeSerialized:e.toJSON()}}})):[l,c]=await Promise.all([p(t,r),g.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:o,merkleTreeSerialized:e.toJSON()}}})]),{inCommitmentSiblings:c.inCommitmentSiblings,inCommitmentSiblingSides:c.inCommitmentSiblingSides,accessTokenSiblings:l.accessTokenSiblings,accessTokenSiblingSides:l.accessTokenSiblingSides,rootHashHinkal:k,rootHashAccessToken:l.rootHashAccessToken}},R=async(e,a,s,o,i)=>{console.log("hinkalDeposit sa3");const n=a.getAccessKey();if(console.log("hinkalDeposit sa4",{accessKey:n}),!i||o){const k=u.MerkleTree.create(P.poseidonFunction,0n),l=C.getPatchedAccessTokenMerkleTree(k,n,o,i),[c,S]=await Promise.all([p(l,n),A.fetchMerkleTreeSiblings(e,s,n)]);return{inCommitmentSiblings:S.inCommitmentSiblings,inCommitmentSiblingSides:S.inCommitmentSiblingSides,accessTokenSiblings:c.accessTokenSiblings,accessTokenSiblingSides:c.accessTokenSiblingSides,rootHashHinkal:H.toBigInt(S.rootHashHinkal),rootHashAccessToken:c.rootHashAccessToken}}const t=await A.fetchMerkleTreeSiblings(e,s,n);return{inCommitmentSiblings:t.inCommitmentSiblings,inCommitmentSiblingSides:t.inCommitmentSiblingSides,accessTokenSiblings:t.accessTokenSiblings,accessTokenSiblingSides:t.accessTokenSiblingSides,rootHashHinkal:H.toBigInt(t.rootHashHinkal),rootHashAccessToken:H.toBigInt(t.rootHashAccessToken)}},I=async(e,a,s)=>{if(!a||!s)return!1;try{const o=a.getRootHash(),i=s.getRootHash();if(!o||!i)return!1;const{hinkalRootHash:n,accessTokenRootHash:r}=await _.fetchOnChainRootHashes(e);return o===n&&i===r}catch{return!1}},y=async(e,a,s,o,i,n,r)=>{const t=await I(e,n,r);return console.log("hinkalDeposit sa2",{isLocalFresh:t}),t?N(n,r,a,s,o,i):R(e,a,s,o,i)},M=async(e,a,s,o,i,n,r,t,k)=>{if(W.isNode){const{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:S,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d}=await y(e,o,i,n,r,a,s),f=await g.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:i,onChainCreation:t,proverVersion:k}}});return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:S,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}else{const[{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:S,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d},f]=await Promise.all([y(e,o,i,n,r,a,s),g.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:i,onChainCreation:t,proverVersion:k}}})]);return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:S,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}};exports.getDataFromWorkers=M;exports.getMerkleTreeSiblingsAndRootHashes=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const W=require("../../data-structures/merkle-tree/MerkleTree.cjs"),A=require("../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs"),S=require("../../webworker/performTaskWithWorker.cjs"),m=require("../../webworker/worker.registry.cjs"),h=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),u=require("./fetchMerkleTreeSiblings.cjs"),H=require("../utils/amounts.utils.cjs"),R=require("../../crypto/poseidon.cjs"),C=require("../../constants/vite.constants.cjs"),_=require("./fetchOnChainRootHashes.cjs"),p=async(e,r)=>{const o=e.getRootHash();if(console.log("pre calculate access token siblings and root hash",{rootHash:o,patchedMerkleTree:e}),o===void 0)throw new Error("Root hash not available from patched merkle tree");const s=await S.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{accessKey:r,merkleTreeAccessTokenSerialized:e.toJSON()}}});return{accessTokenSiblings:s.accessTokenSiblings,accessTokenSiblingSides:s.accessTokenSiblingSides,rootHashAccessToken:o}},N=async(e,r,o,s,i,n)=>{console.log("hinkalDeposit sa5");const t=o.getAccessKey();console.log("hinkalDeposit sa6",{accessKey:t});const a=A.getPatchedAccessTokenMerkleTree(r,t,i,n),k=e.getRootHash();if(k===void 0)throw new Error("Root hash not available from hinkal merkle tree");let l,c;return C.isNode?(l=await p(a,t),c=await S.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:s,merkleTreeSerialized:e.toJSON()}}})):[l,c]=await Promise.all([p(a,t),S.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:s,merkleTreeSerialized:e.toJSON()}}})]),{inCommitmentSiblings:c.inCommitmentSiblings,inCommitmentSiblingSides:c.inCommitmentSiblingSides,accessTokenSiblings:l.accessTokenSiblings,accessTokenSiblingSides:l.accessTokenSiblingSides,rootHashHinkal:k,rootHashAccessToken:l.rootHashAccessToken}},P=async(e,r,o,s,i)=>{console.log("hinkalDeposit sa3");const n=r.getAccessKey();console.log("hinkalDeposit sa4",{accessKey:n});const t=!i||s;if(console.log("ba4",{needsPatching:t}),t){console.log("ba5");const k=W.MerkleTree.create(R.poseidonFunction,0n);console.log("ba6",{emptyMerkleTreeAccessToken:k});const l=A.getPatchedAccessTokenMerkleTree(k,n,s,i);console.log("pre calculating access token siblings and root hash",{accessKey:n});const[c,g]=await Promise.all([p(l,n),u.fetchMerkleTreeSiblings(e,o,n)]);return console.log("post calculating access token siblings and root hash",{accessTokenResult:c,siblingsResponse:g}),{inCommitmentSiblings:g.inCommitmentSiblings,inCommitmentSiblingSides:g.inCommitmentSiblingSides,accessTokenSiblings:c.accessTokenSiblings,accessTokenSiblingSides:c.accessTokenSiblingSides,rootHashHinkal:H.toBigInt(g.rootHashHinkal),rootHashAccessToken:c.rootHashAccessToken}}console.log("kaksk",{chainId:e,inputUtxosSerialized:o,accessKey:n});const a=await u.fetchMerkleTreeSiblings(e,o,n);return{inCommitmentSiblings:a.inCommitmentSiblings,inCommitmentSiblingSides:a.inCommitmentSiblingSides,accessTokenSiblings:a.accessTokenSiblings,accessTokenSiblingSides:a.accessTokenSiblingSides,rootHashHinkal:H.toBigInt(a.rootHashHinkal),rootHashAccessToken:H.toBigInt(a.rootHashAccessToken)}},I=async(e,r,o)=>{if(!r||!o)return!1;try{const s=r.getRootHash(),i=o.getRootHash();if(!s||!i)return!1;const{hinkalRootHash:n,accessTokenRootHash:t}=await _.fetchOnChainRootHashes(e);return s===n&&i===t}catch{return!1}},y=async(e,r,o,s,i,n,t)=>{const a=await I(e,n,t);return console.log("hinkalDeposit sa2",{isLocalFresh:a}),a?N(n,t,r,o,s,i):P(e,r,o,s,i)},M=async(e,r,o,s,i,n,t,a,k)=>{if(C.isNode){const{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:g,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d}=await y(e,s,i,n,t,r,o),f=await S.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:i,onChainCreation:a,proverVersion:k}}});return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:g,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}else{const[{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:g,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d},f]=await Promise.all([y(e,s,i,n,t,r,o),S.performTaskWithWorker({type:m.WorkerVariant.ZKProof,payload:{type:h.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:i,onChainCreation:a,proverVersion:k}}})]);return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:g,accessTokenSiblingSides:T,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}};exports.getDataFromWorkers=M;exports.getMerkleTreeSiblingsAndRootHashes=y;

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.mjs

@@ -2,57 +2,57 @@ import { MerkleTree as R } from "../../data-structures/merkle-tree/MerkleTree.mj
 import { getPatchedAccessTokenMerkleTree as A } from "../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs";
 import { performTaskWithWorker as g } from "../../webworker/performTaskWithWorker.mjs";
 import { WorkerVariant as k } from "../../webworker/worker.registry.mjs";
-import { ZKProofWorkerActionType as h } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { ZKProofWorkerActionType as b } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 import { fetchMerkleTreeSiblings as C } from "./fetchMerkleTreeSiblings.mjs";
-import { toBigInt as d } from "../utils/amounts.utils.mjs";
-import { poseidonFunction as I } from "../../crypto/poseidon.mjs";
+import { toBigInt as p } from "../utils/amounts.utils.mjs";
+import { poseidonFunction as _ } from "../../crypto/poseidon.mjs";
 import { isNode as N } from "../../constants/vite.constants.mjs";
-import { fetchOnChainRootHashes as _ } from "./fetchOnChainRootHashes.mjs";
-const p = async (o, a) => {
-  const e = o.getRootHash();
-  if (e === void 0)
+import { fetchOnChainRootHashes as I } from "./fetchOnChainRootHashes.mjs";
+const d = async (o, c) => {
+  const s = o.getRootHash();
+  if (console.log("pre calculate access token siblings and root hash", { rootHash: s, patchedMerkleTree: o }), s === void 0)
     throw new Error("Root hash not available from patched merkle tree");
-  const s = await g({
+  const e = await g({
     type: k.ZKProof,
     payload: {
-      type: h.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
+      type: b.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
       data: {
-        accessKey: a,
+        accessKey: c,
         merkleTreeAccessTokenSerialized: o.toJSON()
       }
     }
   });
   return {
-    accessTokenSiblings: s.accessTokenSiblings,
-    accessTokenSiblingSides: s.accessTokenSiblingSides,
-    rootHashAccessToken: e
+    accessTokenSiblings: e.accessTokenSiblings,
+    accessTokenSiblingSides: e.accessTokenSiblingSides,
+    rootHashAccessToken: s
   };
-}, w = async (o, a, e, s, i, n) => {
+}, w = async (o, c, s, e, i, n) => {
   console.log("hinkalDeposit sa5");
-  const c = e.getAccessKey();
-  console.log("hinkalDeposit sa6", { accessKey: c });
-  const t = A(
-    a,
+  const t = s.getAccessKey();
+  console.log("hinkalDeposit sa6", { accessKey: t });
+  const a = A(
     c,
+    t,
     i,
     n
   ), m = o.getRootHash();
   if (m === void 0)
     throw new Error("Root hash not available from hinkal merkle tree");
   let r, l;
-  return N ? (r = await p(t, c), l = await g({
+  return N ? (r = await d(a, t), l = await g({
     type: k.ZKProof,
     payload: {
-      type: h.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-      data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
+      type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+      data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
     }
   })) : [r, l] = await Promise.all([
-    p(t, c),
+    d(a, t),
     g({
       type: k.ZKProof,
       payload: {
-        type: h.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-        data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
+        type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+        data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
       }
     })
   ]), {
@@ -63,88 +63,96 @@ const p = async (o, a) => {
     rootHashHinkal: m,
     rootHashAccessToken: r.rootHashAccessToken
   };
-}, D = async (o, a, e, s, i) => {
+}, D = async (o, c, s, e, i) => {
   console.log("hinkalDeposit sa3");
-  const n = a.getAccessKey();
-  if (console.log("hinkalDeposit sa4", { accessKey: n }), !i || s) {
-    const m = R.create(I, 0n), r = A(
+  const n = c.getAccessKey();
+  console.log("hinkalDeposit sa4", { accessKey: n });
+  const t = !i || e;
+  if (console.log("ba4", { needsPatching: t }), t) {
+    console.log("ba5");
+    const m = R.create(_, 0n);
+    console.log("ba6", { emptyMerkleTreeAccessToken: m });
+    const r = A(
       m,
       n,
-      s,
+      e,
       i
-    ), [l, S] = await Promise.all([
-      p(r, n),
-      C(o, e, n)
+    );
+    console.log("pre calculating access token siblings and root hash", { accessKey: n });
+    const [l, S] = await Promise.all([
+      d(r, n),
+      C(o, s, n)
     ]);
-    return {
+    return console.log("post calculating access token siblings and root hash", { accessTokenResult: l, siblingsResponse: S }), {
       inCommitmentSiblings: S.inCommitmentSiblings,
       inCommitmentSiblingSides: S.inCommitmentSiblingSides,
       accessTokenSiblings: l.accessTokenSiblings,
       accessTokenSiblingSides: l.accessTokenSiblingSides,
-      rootHashHinkal: d(S.rootHashHinkal),
+      rootHashHinkal: p(S.rootHashHinkal),
       rootHashAccessToken: l.rootHashAccessToken
     };
   }
-  const t = await C(o, e, n);
+  console.log("kaksk", { chainId: o, inputUtxosSerialized: s, accessKey: n });
+  const a = await C(o, s, n);
   return {
-    inCommitmentSiblings: t.inCommitmentSiblings,
-    inCommitmentSiblingSides: t.inCommitmentSiblingSides,
-    accessTokenSiblings: t.accessTokenSiblings,
-    accessTokenSiblingSides: t.accessTokenSiblingSides,
-    rootHashHinkal: d(t.rootHashHinkal),
-    rootHashAccessToken: d(t.rootHashAccessToken)
+    inCommitmentSiblings: a.inCommitmentSiblings,
+    inCommitmentSiblingSides: a.inCommitmentSiblingSides,
+    accessTokenSiblings: a.accessTokenSiblings,
+    accessTokenSiblingSides: a.accessTokenSiblingSides,
+    rootHashHinkal: p(a.rootHashHinkal),
+    rootHashAccessToken: p(a.rootHashAccessToken)
   };
-}, L = async (o, a, e) => {
-  if (!a || !e)
+}, L = async (o, c, s) => {
+  if (!c || !s)
     return !1;
   try {
-    const s = a.getRootHash(), i = e.getRootHash();
-    if (!s || !i)
+    const e = c.getRootHash(), i = s.getRootHash();
+    if (!e || !i)
       return !1;
-    const { hinkalRootHash: n, accessTokenRootHash: c } = await _(o);
-    return s === n && i === c;
+    const { hinkalRootHash: n, accessTokenRootHash: t } = await I(o);
+    return e === n && i === t;
   } catch {
     return !1;
   }
-}, y = async (o, a, e, s, i, n, c) => {
-  const t = await L(o, n, c);
-  return console.log("hinkalDeposit sa2", { isLocalFresh: t }), t ? w(
+}, y = async (o, c, s, e, i, n, t) => {
+  const a = await L(o, n, t);
+  return console.log("hinkalDeposit sa2", { isLocalFresh: a }), a ? w(
     n,
+    t,
     c,
-    a,
-    e,
     s,
+    e,
     i
-  ) : D(o, a, e, s, i);
-}, v = async (o, a, e, s, i, n, c, t, m) => {
+  ) : D(o, c, s, e, i);
+}, v = async (o, c, s, e, i, n, t, a, m) => {
   if (N) {
     const {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
       accessTokenSiblings: S,
-      accessTokenSiblingSides: b,
+      accessTokenSiblingSides: h,
       rootHashHinkal: T,
       rootHashAccessToken: f
     } = await y(
       o,
-      s,
+      e,
       i,
       n,
+      t,
       c,
-      a,
-      e
+      s
     ), H = await g({
       type: k.ZKProof,
       payload: {
-        type: h.BUILD_IN_NULLIFIERS,
-        data: { inputUtxosSerialized: i, onChainCreation: t, proverVersion: m }
+        type: b.BUILD_IN_NULLIFIERS,
+        data: { inputUtxosSerialized: i, onChainCreation: a, proverVersion: m }
       }
     });
     return {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
       accessTokenSiblings: S,
-      accessTokenSiblingSides: b,
+      accessTokenSiblingSides: h,
       rootHashHinkal: T,
       rootHashAccessToken: f,
       inNullifiers: H
@@ -155,7 +163,7 @@ const p = async (o, a) => {
         inCommitmentSiblings: r,
         inCommitmentSiblingSides: l,
         accessTokenSiblings: S,
-        accessTokenSiblingSides: b,
+        accessTokenSiblingSides: h,
         rootHashHinkal: T,
         rootHashAccessToken: f
       },
@@ -163,18 +171,18 @@ const p = async (o, a) => {
     ] = await Promise.all([
       y(
         o,
-        s,
+        e,
         i,
         n,
+        t,
         c,
-        a,
-        e
+        s
       ),
       g({
         type: k.ZKProof,
         payload: {
-          type: h.BUILD_IN_NULLIFIERS,
-          data: { inputUtxosSerialized: i, onChainCreation: t, proverVersion: m }
+          type: b.BUILD_IN_NULLIFIERS,
+          data: { inputUtxosSerialized: i, onChainCreation: a, proverVersion: m }
         }
       })
     ]);
@@ -182,7 +190,7 @@ const p = async (o, a) => {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
       accessTokenSiblings: S,
-      accessTokenSiblingSides: b,
+      accessTokenSiblingSides: h,
       rootHashHinkal: T,
       rootHashAccessToken: f,
       inNullifiers: H

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h_test_1",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"

package/webworker/zkProofWorker/zkProofWorkerLauncher.cjs

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

package/webworker/zkProofWorker/zkProofWorkerLauncher.mjs

@@ -1,4 +1,4 @@
-const r = "" + new URL("../../assets/zkProofWorkerLauncher-2cfKnA2L.js", import.meta.url).href;
+const r = "" + new URL("../../assets/zkProofWorkerLauncher-2a1CGTor.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"),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(o=>o.map(l=>new S.Utxo(l))),{inCommitmentSiblings:n,inCommitmentSiblingSides:s}=m.calcCommitmentsSiblingAndSides(i,c);t.postMessageToMainThread({inCommitmentSiblings:n,inCommitmentSiblingSides:s})},T=r=>{const{accessKey:e,merkleTreeAccessTokenSerialized:a}=r.data,c=u.contructMerkleTreeFromSerialized(a),{accessTokenSiblings:i,accessTokenSiblingSides:n}=m.calcAccessTokenSiblingsAndSides(e,c);t.postMessageToMainThread({accessTokenSiblings:i,accessTokenSiblingSides:n})},k=r=>{const{inputUtxosSerialized:e,onChainCreation:a,proverVersion:c}=r.data,i=e.map(s=>s.map(o=>new S.Utxo(o)));let n=[];c==="v1x0"?n=i.map((s,o)=>s.map(l=>a[o]?"0":l.getNullifier())):n=i.map(s=>s.map(o=>o.amount===0n?"0":o.getNullifier())),t.postMessageToMainThread(n)},g=async r=>{try{await A.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:T(r.payload);return;case d.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS:k(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=k;exports.handleCalcAccessTokenSiblingAndSides=T;exports.handleCalcCommitmentsSiblingAndSides=p;exports.onWorkerMessage=g;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const A=require("../../crypto/preProcessing.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"),c=new C.WorkerProxy,k=o=>{const{inputUtxosSerialized:e,merkleTreeSerialized:t}=o.data,a=u.contructMerkleTreeFromSerialized(t),s=e.map(n=>n.map(l=>new S.Utxo(l))),{inCommitmentSiblings:r,inCommitmentSiblingSides:i}=m.calcCommitmentsSiblingAndSides(s,a);c.postMessageToMainThread({inCommitmentSiblings:r,inCommitmentSiblingSides:i})},p=o=>{const{accessKey:e,merkleTreeAccessTokenSerialized:t}=o.data;console.log("worker code a1",{accessKey:e,merkleTreeAccessTokenSerialized:t});const a=u.contructMerkleTreeFromSerialized(t);console.log("worker code a2",{merkleTree:a});const{accessTokenSiblings:s,accessTokenSiblingSides:r}=m.calcAccessTokenSiblingsAndSides(e,a);console.log("worker code a3",{accessTokenSiblings:s,accessTokenSiblingSides:r}),c.postMessageToMainThread({accessTokenSiblings:s,accessTokenSiblingSides:r})},T=o=>{const{inputUtxosSerialized:e,onChainCreation:t,proverVersion:a}=o.data,s=e.map(i=>i.map(n=>new S.Utxo(n)));let r=[];a==="v1x0"?r=s.map((i,n)=>i.map(l=>t[n]?"0":l.getNullifier())):r=s.map(i=>i.map(n=>n.amount===0n?"0":n.getNullifier())),c.postMessageToMainThread(r)},g=async o=>{try{await A.preProcessing();const{type:e}=o.payload;switch(e){case d.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES:k(o.payload);return;case d.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES:p(o.payload);return;case d.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS:T(o.payload);return;default:throw Error(`Unknown worker message type ${e}`)}}catch(e){console.error(e),c.postErrorToMainThread(e)}};c.attachWorkerSideOnMessage(g);exports.default=c;exports.handleBuildInNullifiers=T;exports.handleCalcAccessTokenSiblingAndSides=p;exports.handleCalcCommitmentsSiblingAndSides=k;exports.onWorkerMessage=g;

package/webworker/zkProofWorker/zkProofWorkerLogic.mjs

@@ -1,25 +1,29 @@
 import { preProcessing as S } from "../../crypto/preProcessing.mjs";
-import { Utxo as p } from "../../data-structures/utxo/Utxo.mjs";
+import { Utxo as d } from "../../data-structures/utxo/Utxo.mjs";
 import { calcCommitmentsSiblingAndSides as T, calcAccessTokenSiblingsAndSides as g } from "../../functions/snarkjs/common.snarkjs.mjs";
 import { WorkerProxy as k } from "../workerProxy.mjs";
 import { ZKProofWorkerActionType as m } from "./zkProofWorker.types.mjs";
-import { contructMerkleTreeFromSerialized as d } from "../../functions/utils/merkleTree.utils.mjs";
+import { contructMerkleTreeFromSerialized as p } from "../../functions/utils/merkleTree.utils.mjs";
 const c = new k(), u = (o) => {
-  const { inputUtxosSerialized: e, merkleTreeSerialized: t } = o.data, a = d(t), i = e.map(
-    (r) => r.map((l) => new p(l))
-  ), { inCommitmentSiblings: n, inCommitmentSiblingSides: s } = T(i, a);
-  c.postMessageToMainThread({ inCommitmentSiblings: n, inCommitmentSiblingSides: s });
+  const { inputUtxosSerialized: e, merkleTreeSerialized: t } = o.data, a = p(t), s = e.map(
+    (n) => n.map((l) => new d(l))
+  ), { inCommitmentSiblings: r, inCommitmentSiblingSides: i } = T(s, a);
+  c.postMessageToMainThread({ inCommitmentSiblings: r, inCommitmentSiblingSides: i });
 }, C = (o) => {
-  const { accessKey: e, merkleTreeAccessTokenSerialized: t } = o.data, a = d(t), { accessTokenSiblings: i, accessTokenSiblingSides: n } = g(e, a);
-  c.postMessageToMainThread({ accessTokenSiblings: i, accessTokenSiblingSides: n });
+  const { accessKey: e, merkleTreeAccessTokenSerialized: t } = o.data;
+  console.log("worker code a1", { accessKey: e, merkleTreeAccessTokenSerialized: t });
+  const a = p(t);
+  console.log("worker code a2", { merkleTree: a });
+  const { accessTokenSiblings: s, accessTokenSiblingSides: r } = g(e, a);
+  console.log("worker code a3", { accessTokenSiblings: s, accessTokenSiblingSides: r }), c.postMessageToMainThread({ accessTokenSiblings: s, accessTokenSiblingSides: r });
 }, f = (o) => {
-  const { inputUtxosSerialized: e, onChainCreation: t, proverVersion: a } = o.data, i = e.map(
-    (s) => s.map((r) => new p(r))
+  const { inputUtxosSerialized: e, onChainCreation: t, proverVersion: a } = o.data, s = e.map(
+    (i) => i.map((n) => new d(n))
   );
-  let n = [];
-  a === "v1x0" ? n = i.map(
-    (s, r) => s.map((l) => t[r] ? "0" : l.getNullifier())
-  ) : n = i.map((s) => s.map((r) => r.amount === 0n ? "0" : r.getNullifier())), c.postMessageToMainThread(n);
+  let r = [];
+  a === "v1x0" ? r = s.map(
+    (i, n) => i.map((l) => t[n] ? "0" : l.getNullifier())
+  ) : r = s.map((i) => i.map((n) => n.amount === 0n ? "0" : n.getNullifier())), c.postMessageToMainThread(r);
 }, A = async (o) => {
   try {
     await S();