h_test_1 0.0.23 → 0.0.25

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

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.mjs

@@ -1,57 +1,62 @@
 import { MerkleTree as R } from "../../data-structures/merkle-tree/MerkleTree.mjs";
-import { getPatchedAccessTokenMerkleTree as A } from "../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs";
+import { getPatchedAccessTokenMerkleTree as N } 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 H } from "../utils/amounts.utils.mjs";
-import { poseidonFunction as I } from "../../crypto/poseidon.mjs";
-import { isNode as N } from "../../constants/vite.constants.mjs";
-import { fetchOnChainRootHashes as _ } from "./fetchOnChainRootHashes.mjs";
-const p = async (o, a) => {
+import { toBigInt as p } from "../utils/amounts.utils.mjs";
+import { poseidonFunction as _ } from "../../crypto/poseidon.mjs";
+import { isNode as A } from "../../constants/vite.constants.mjs";
+import { fetchOnChainRootHashes as I } from "./fetchOnChainRootHashes.mjs";
+const d = async (o, i) => {
   const s = o.getRootHash();
-  if (console.log("pre calculate access token siblings and root hash", { rootHash: s, patchedMerkleTree: o }), s === void 0)
+  if (console.log("sss pre calculate access token siblings and root hash", {
+    accessKey: i,
+    rootHash: s,
+    patchedMerkleTree: o,
+    tjson: o.toJSON()
+  }), s === void 0)
     throw new Error("Root hash not available from patched merkle tree");
   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: i,
         merkleTreeAccessTokenSerialized: o.toJSON()
       }
     }
   });
-  return {
+  return console.log({ resultFromWorker: e }), {
     accessTokenSiblings: e.accessTokenSiblings,
     accessTokenSiblingSides: e.accessTokenSiblingSides,
     rootHashAccessToken: s
   };
-}, w = async (o, a, s, e, n, i) => {
+}, w = async (o, i, s, e, t, n) => {
   console.log("hinkalDeposit sa5");
-  const c = s.getAccessKey();
-  console.log("hinkalDeposit sa6", { accessKey: c });
-  const t = A(
+  const a = s.getAccessKey();
+  console.log("hinkalDeposit sa6", { accessKey: a });
+  const c = N(
+    i,
     a,
-    c,
-    n,
-    i
-  ), S = o.getRootHash();
-  if (S === void 0)
+    t,
+    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 A ? (r = await d(c, a), l = await g({
     type: k.ZKProof,
     payload: {
-      type: h.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+      type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
       data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
     }
   })) : [r, l] = await Promise.all([
-    p(t, c),
+    d(c, a),
     g({
       type: k.ZKProof,
       payload: {
-        type: h.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+        type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
         data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
       }
     })
@@ -60,138 +65,144 @@ const p = async (o, a) => {
     inCommitmentSiblingSides: l.inCommitmentSiblingSides,
     accessTokenSiblings: r.accessTokenSiblings,
     accessTokenSiblingSides: r.accessTokenSiblingSides,
-    rootHashHinkal: S,
+    rootHashHinkal: m,
     rootHashAccessToken: r.rootHashAccessToken
   };
-}, D = async (o, a, s, e, n) => {
+}, D = async (o, i, s, e, t) => {
   console.log("hinkalDeposit sa3");
-  const i = a.getAccessKey();
-  if (console.log("hinkalDeposit sa4", { accessKey: i }), !n || e) {
-    const S = R.create(I, 0n), r = A(
-      S,
-      i,
+  const n = i.getAccessKey();
+  console.log("hinkalDeposit sa4", { accessKey: n });
+  const a = !t || e;
+  if (console.log("ba4", { needsPatching: a }), a) {
+    console.log("ba5");
+    const m = R.create(_, 0n);
+    console.log("ba6", { emptyMerkleTreeAccessToken: m });
+    const r = N(
+      m,
+      n,
       e,
-      n
+      t
     );
-    console.log("pre calculating access token siblings and root hash", { accessKey: i });
-    const [l, m] = await Promise.all([
-      p(r, i),
-      C(o, s, i)
+    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 console.log("post calculating access token siblings and root hash", { accessTokenResult: l, siblingsResponse: m }), {
-      inCommitmentSiblings: m.inCommitmentSiblings,
-      inCommitmentSiblingSides: m.inCommitmentSiblingSides,
+    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: H(m.rootHashHinkal),
+      rootHashHinkal: p(S.rootHashHinkal),
       rootHashAccessToken: l.rootHashAccessToken
     };
   }
-  const t = await C(o, s, i);
+  console.log("kaksk", { chainId: o, inputUtxosSerialized: s, accessKey: n });
+  const c = await C(o, s, n);
   return {
-    inCommitmentSiblings: t.inCommitmentSiblings,
-    inCommitmentSiblingSides: t.inCommitmentSiblingSides,
-    accessTokenSiblings: t.accessTokenSiblings,
-    accessTokenSiblingSides: t.accessTokenSiblingSides,
-    rootHashHinkal: H(t.rootHashHinkal),
-    rootHashAccessToken: H(t.rootHashAccessToken)
+    inCommitmentSiblings: c.inCommitmentSiblings,
+    inCommitmentSiblingSides: c.inCommitmentSiblingSides,
+    accessTokenSiblings: c.accessTokenSiblings,
+    accessTokenSiblingSides: c.accessTokenSiblingSides,
+    rootHashHinkal: p(c.rootHashHinkal),
+    rootHashAccessToken: p(c.rootHashAccessToken)
   };
-}, L = async (o, a, s) => {
-  if (!a || !s)
+}, L = async (o, i, s) => {
+  if (!i || !s)
     return !1;
   try {
-    const e = a.getRootHash(), n = s.getRootHash();
-    if (!e || !n)
+    const e = i.getRootHash(), t = s.getRootHash();
+    if (!e || !t)
       return !1;
-    const { hinkalRootHash: i, accessTokenRootHash: c } = await _(o);
-    return e === i && n === c;
+    const { hinkalRootHash: n, accessTokenRootHash: a } = await I(o);
+    return e === n && t === a;
   } catch {
     return !1;
   }
-}, y = async (o, a, s, e, n, i, c) => {
-  const t = await L(o, i, c);
-  return console.log("hinkalDeposit sa2", { isLocalFresh: t }), t ? w(
-    i,
-    c,
+}, y = async (o, i, s, e, t, n, a) => {
+  const c = await L(o, n, a);
+  return console.log("hinkalDeposit sa2", { isLocalFresh: c }), c ? w(
+    n,
     a,
+    i,
     s,
     e,
-    n
-  ) : D(o, a, s, e, n);
-}, v = async (o, a, s, e, n, i, c, t, S) => {
-  if (N) {
+    t
+  ) : D(o, i, s, e, t);
+}, J = async (o, i, s, e, t, n, a, c, m) => {
+  if (A) {
     const {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
-      accessTokenSiblings: m,
-      accessTokenSiblingSides: b,
+      accessTokenSiblings: S,
+      accessTokenSiblingSides: h,
       rootHashHinkal: T,
-      rootHashAccessToken: d
+      rootHashAccessToken: f
     } = await y(
       o,
       e,
+      t,
       n,
-      i,
-      c,
       a,
+      i,
       s
-    ), f = await g({
+    ), H = await g({
       type: k.ZKProof,
       payload: {
-        type: h.BUILD_IN_NULLIFIERS,
-        data: { inputUtxosSerialized: n, onChainCreation: t, proverVersion: S }
+        type: b.BUILD_IN_NULLIFIERS,
+        data: { inputUtxosSerialized: t, onChainCreation: c, proverVersion: m }
       }
     });
     return {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
-      accessTokenSiblings: m,
-      accessTokenSiblingSides: b,
+      accessTokenSiblings: S,
+      accessTokenSiblingSides: h,
       rootHashHinkal: T,
-      rootHashAccessToken: d,
-      inNullifiers: f
+      rootHashAccessToken: f,
+      inNullifiers: H
     };
   } else {
     const [
       {
         inCommitmentSiblings: r,
         inCommitmentSiblingSides: l,
-        accessTokenSiblings: m,
-        accessTokenSiblingSides: b,
+        accessTokenSiblings: S,
+        accessTokenSiblingSides: h,
         rootHashHinkal: T,
-        rootHashAccessToken: d
+        rootHashAccessToken: f
       },
-      f
+      H
     ] = await Promise.all([
       y(
         o,
         e,
+        t,
         n,
-        i,
-        c,
         a,
+        i,
         s
       ),
       g({
         type: k.ZKProof,
         payload: {
-          type: h.BUILD_IN_NULLIFIERS,
-          data: { inputUtxosSerialized: n, onChainCreation: t, proverVersion: S }
+          type: b.BUILD_IN_NULLIFIERS,
+          data: { inputUtxosSerialized: t, onChainCreation: c, proverVersion: m }
         }
       })
     ]);
     return {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
-      accessTokenSiblings: m,
-      accessTokenSiblingSides: b,
+      accessTokenSiblings: S,
+      accessTokenSiblingSides: h,
       rootHashHinkal: T,
-      rootHashAccessToken: d,
-      inNullifiers: f
+      rootHashAccessToken: f,
+      inNullifiers: H
     };
   }
 };
 export {
-  v as getDataFromWorkers,
+  J as getDataFromWorkers,
   y as getMerkleTreeSiblingsAndRootHashes
 };

package/package.json

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

package/webworker/performTaskWithWorker.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../constants/chains.constants.cjs"),h=require("../constants/vite.constants.cjs"),w=require("./workerFactory.cjs"),y=async t=>{const e=await w.WorkerFactory.getWebWorker(t.type);return new Promise((r,s)=>{let n={};if(typeof window<"u"&&window.location){const{origin:o,protocol:i,host:c,port:d,hostname:m,href:p}=window.location;n={origin:o,protocol:i,host:c,port:d,hostname:m,href:p}}e.onmessage=o=>{r(o.data),e.terminate()},e.onerror=o=>{s(o),e.terminate()};const a={payload:t.payload,metadata:{hostLocation:n,constants:{chains:{chainIds:l.chainIds},isDevelopment:h.isDevelopment}}};e.postMessage(a)})};exports.performTaskWithWorker=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const W=require("../constants/chains.constants.cjs"),h=require("../constants/vite.constants.cjs"),k=require("./workerFactory.cjs"),d=async r=>{const e=await k.WorkerFactory.getWebWorker(r.type);return console.log("performTaskWithWorker a1",{worker:e,workerData:r}),new Promise((s,a)=>{let t={};if(typeof window<"u"&&window.location){const{origin:o,protocol:i,host:c,port:l,hostname:m,href:p}=window.location;t={origin:o,protocol:i,host:c,port:l,hostname:m,href:p}}e.onmessage=o=>{console.log("performTaskWithWorker a3",{result:o}),s(o.data),e.terminate()},e.onerror=o=>{console.error("performTaskWithWorker a2",{err:o}),a(o),e.terminate()};const n={payload:r.payload,metadata:{hostLocation:t,constants:{chains:{chainIds:W.chainIds},isDevelopment:h.isDevelopment}}};console.log("performTaskWithWorker a4",{message:n}),e.postMessage(n)})};exports.performTaskWithWorker=d;

package/webworker/performTaskWithWorker.mjs

@@ -1,41 +1,41 @@
-import { chainIds as f } from "../constants/chains.constants.mjs";
-import { isDevelopment as w } from "../constants/vite.constants.mjs";
+import { chainIds as W } from "../constants/chains.constants.mjs";
+import { isDevelopment as f } from "../constants/vite.constants.mjs";
 import { WorkerFactory as h } from "./workerFactory.mjs";
-const W = async (e) => {
-  const o = await h.getWebWorker(e.type);
-  return new Promise((n, a) => {
-    let r = {};
+const w = async (r) => {
+  const e = await h.getWebWorker(r.type);
+  return console.log("performTaskWithWorker a1", { worker: e, workerData: r }), new Promise((n, s) => {
+    let t = {};
     if (typeof window < "u" && window.location) {
-      const { origin: t, protocol: i, host: m, port: c, hostname: p, href: d } = window.location;
-      r = {
-        origin: t,
+      const { origin: o, protocol: i, host: m, port: c, hostname: p, href: l } = window.location;
+      t = {
+        origin: o,
         protocol: i,
         host: m,
         port: c,
         hostname: p,
-        href: d
+        href: l
       };
     }
-    o.onmessage = (t) => {
-      n(t.data), o.terminate();
-    }, o.onerror = (t) => {
-      a(t), o.terminate();
+    e.onmessage = (o) => {
+      console.log("performTaskWithWorker a3", { result: o }), n(o.data), e.terminate();
+    }, e.onerror = (o) => {
+      console.error("performTaskWithWorker a2", { err: o }), s(o), e.terminate();
     };
-    const s = {
-      payload: e.payload,
+    const a = {
+      payload: r.payload,
       metadata: {
-        hostLocation: r,
+        hostLocation: t,
         constants: {
           chains: {
-            chainIds: f
+            chainIds: W
           },
-          isDevelopment: w
+          isDevelopment: f
         }
       }
     };
-    o.postMessage(s);
+    console.log("performTaskWithWorker a4", { message: a }), e.postMessage(a);
   });
 };
 export {
-  W as performTaskWithWorker
+  w as performTaskWithWorker
 };

package/webworker/zkProofWorker/zkProofWorkerLauncher.cjs

@@ -1 +1 @@
-"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;
+"use strict";const e=""+(typeof document>"u"?require("url").pathToFileURL(__dirname+"/../../assets/zkProofWorkerLauncher-DQUaX0hI.js").href:new URL("../../assets/zkProofWorkerLauncher-DQUaX0hI.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-2a1CGTor.js", import.meta.url).href;
+const r = "" + new URL("../../assets/zkProofWorkerLauncher-DQUaX0hI.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"),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;
+"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"),k=require("../../functions/utils/merkleTree.utils.cjs"),c=new C.WorkerProxy,u=o=>{const{inputUtxosSerialized:e,merkleTreeSerialized:t}=o.data,a=k.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=k.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})},g=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)},T=async o=>{console.log("worker code onWorkerMessage",{data:o});try{await A.preProcessing();const{type:e}=o.payload;switch(e){case d.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES:u(o.payload);return;case d.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES:p(o.payload);return;case d.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS:g(o.payload);return;default:throw Error(`Unknown worker message type ${e}`)}}catch(e){console.error(e),c.postErrorToMainThread(e)}};c.attachWorkerSideOnMessage(T);exports.default=c;exports.handleBuildInNullifiers=g;exports.handleCalcAccessTokenSiblingAndSides=p;exports.handleCalcCommitmentsSiblingAndSides=u;exports.onWorkerMessage=T;

package/webworker/zkProofWorker/zkProofWorkerLogic.mjs

@@ -1,22 +1,22 @@
 import { preProcessing as S } from "../../crypto/preProcessing.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 { calcCommitmentsSiblingAndSides as g, calcAccessTokenSiblingsAndSides as k } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { WorkerProxy as T } from "../workerProxy.mjs";
 import { ZKProofWorkerActionType as m } from "./zkProofWorker.types.mjs";
 import { contructMerkleTreeFromSerialized as p } from "../../functions/utils/merkleTree.utils.mjs";
-const c = new k(), u = (o) => {
+const c = new T(), u = (o) => {
   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);
+  ), { inCommitmentSiblings: r, inCommitmentSiblingSides: i } = g(s, a);
   c.postMessageToMainThread({ inCommitmentSiblings: r, inCommitmentSiblingSides: i });
 }, C = (o) => {
   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);
+  const { accessTokenSiblings: s, accessTokenSiblingSides: r } = k(e, a);
   console.log("worker code a3", { accessTokenSiblings: s, accessTokenSiblingSides: r }), c.postMessageToMainThread({ accessTokenSiblings: s, accessTokenSiblingSides: r });
-}, f = (o) => {
+}, M = (o) => {
   const { inputUtxosSerialized: e, onChainCreation: t, proverVersion: a } = o.data, s = e.map(
     (i) => i.map((n) => new d(n))
   );
@@ -24,7 +24,8 @@ const c = new k(), u = (o) => {
   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) => {
+}, f = async (o) => {
+  console.log("worker code onWorkerMessage", { data: o });
   try {
     await S();
     const { type: e } = o.payload;
@@ -36,7 +37,7 @@ const c = new k(), u = (o) => {
         C(o.payload);
         return;
       case m.BUILD_IN_NULLIFIERS:
-        f(o.payload);
+        M(o.payload);
         return;
       default:
         throw Error(`Unknown worker message type ${e}`);
@@ -45,11 +46,11 @@ const c = new k(), u = (o) => {
     console.error(e), c.postErrorToMainThread(e);
   }
 };
-c.attachWorkerSideOnMessage(A);
+c.attachWorkerSideOnMessage(f);
 export {
   c as default,
-  f as handleBuildInNullifiers,
+  M as handleBuildInNullifiers,
   C as handleCalcAccessTokenSiblingAndSides,
   u as handleCalcCommitmentsSiblingAndSides,
-  A as onWorkerMessage
+  f as onWorkerMessage
 };