h_test_1 0.0.21 → 0.0.23

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../constants/chains.constants.cjs"),i=require("../../constants/protocol.constants.cjs"),ee=require("../../data-structures/utxo/Utxo.cjs"),ne=require("../web3/etherFunctions.cjs"),r=require("./common.snarkjs.cjs"),te=require("./generateCircomData.cjs"),ae=require("./generateZkProof.cjs"),se=require("../../types/hinkal.types.cjs"),oe=require("../utils/fees.utils.cjs"),b=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),re=require("../../error-handling/logger.cjs"),ce=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),ie=async(m,M,W,n,a,c,q,z,l,P,G,D=i.zeroAddress,d=T.chainIds.localhost,k=n.map(()=>!1),R=n.map(()=>0n),p=void 0,v=!1,s=void 0,g,u=void 0,J,y=i.defaultSignatureData,w)=>{const _=r.calcAmountChanges(n,a),A=n.map(e=>e[0].erc20TokenAddress),h=r.calcEncryptedOutputs(a),f=c.getShieldedPrivateKey(),O=ee.Utxo.findCorrectRandomization(ne.randomBigInt(31),f),C=T.isTronLike(d)?await b.hinkalCheckTronTokenRegistry(A,r.calcAmountChanges(n,a,!0),d):await b.hinkalCheckTokenRegistry(J??b.createHinkalHelperFromData(d),A,r.calcAmountChanges(n,a,!0)),Z=T.isTronLike(d)?v||C:v,Q=n.map(e=>e.map(t=>t.getConstructableParams()));console.log("hinkalDeposit sa1",{userKeys:c});const{inCommitmentSiblings:X,inCommitmentSiblingSides:Y,accessTokenSiblings:$,accessTokenSiblingSides:K,rootHashHinkal:B,rootHashAccessToken:F,inNullifiers:I}=await ce.getDataFromWorkers(d,M,W,c,Q,Z,C,k,m);console.log("hinkalDeposit y1",{userKeys:c,effectivePatchAccessTokenMerkleTree:Z,kycRequired:C});const j=r.buildOutCommitments(m,a,k),o={rootHashHinkal:B,shieldedPrivateKey:f,erc20TokenAddresses:A,inAmounts:n.map(e=>e.map(t=>t.amount.toString())),inTimeStamps:n.map(e=>e.map(t=>t.timeStamp)),inRandomizations:n.map(e=>e.map(t=>t.randomization)),inNullifiers:I,inCommitmentSiblings:X,inCommitmentSiblingSides:Y,outAmounts:a.map(e=>e.map(t=>t.amount.toString())),outTimeStamp:BigInt(a[0][0].timeStamp),outPublicKeys:a.map(e=>e.map(t=>t.getStealthAddress())),extraRandomization:O,amountChanges:_,outCommitments:j,rootHashAccessToken:F,accessTokenSiblings:$,accessTokenSiblingSides:K,calldataHash:0n},S=n.map(e=>e[0].tokenId??0),E=S.reduce((e,t)=>e+t,0)>0?S.length:0;E>0&&(o.tokenIds=S);const H=r.calcPublicSignalCount(q,o.erc20TokenAddresses,o.amountChanges,o.inNullifiers,o.outCommitments,E);if(!s){s=se.defaultHinkalLogicArgs(_.length,c),s.interactionAddress=l??i.zeroAddress;const e=c.getInHinkalAddress(s.interactionAddress);s.inHinkalAddress=e}if(m==="v1x1"){if(o.interactionAddress=s?.interactionAddress??l??i.zeroAddress,c.getInHinkalAddress(o.interactionAddress)!==s.inHinkalAddress)throw new Error("inHinkalAddress mismatch");o.externalApprovalAddresses=s.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??[i.zeroAddress,i.zeroAddress,i.zeroAddress]}u||(u=oe.generateFeeStructure(R,n.map(e=>e[0].erc20TokenAddress)));const N=r.calcAmountChanges(n,a,!0);g||(g=r.getSlippageValues(N,s)),re.Logger.log({publicSignalCount:H}),o.calldataHash=r.createCallDataHash(m,H,D,l,z,P,h,R,p,g,k,s,u,y,w);const{zkCallData:L}=await ae.generateZkProof(m,d,q,o,G),V=r.calcStealthAddressStructure(O,f),U=te.generateCircomData(j,I,B,F,N,A,a,h,H,z,l,P,D,o.calldataHash,S,V,k,p,void 0,s,g,u,y,w),x={tokenNumber:n.length,nullifierAmount:n[0].length,outputAmount:a[0].length};return{zkCallData:L,circomData:U,dimData:x,encryptedOutputs:h}};exports.constructZkProof=ie;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../constants/chains.constants.cjs"),c=require("../../constants/protocol.constants.cjs"),ee=require("../../data-structures/utxo/Utxo.cjs"),ne=require("../web3/etherFunctions.cjs"),r=require("./common.snarkjs.cjs"),te=require("./generateCircomData.cjs"),ae=require("./generateZkProof.cjs"),se=require("../../types/hinkal.types.cjs"),oe=require("../utils/fees.utils.cjs"),b=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),re=require("../../error-handling/logger.cjs"),ie=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),ce=async(m,W,G,n,s,i,p,q,l,z,D,P=c.zeroAddress,d=T.chainIds.localhost,k=n.map(()=>!1),v=n.map(()=>0n),R=void 0,w=!1,o=void 0,g,u=void 0,J,y=c.defaultSignatureData,_)=>{const O=r.calcAmountChanges(n,s),A=n.map(e=>e[0].erc20TokenAddress),S=r.calcEncryptedOutputs(s),f=i.getShieldedPrivateKey(),Z=ee.Utxo.findCorrectRandomization(ne.randomBigInt(31),f),C=T.isTronLike(d)?await b.hinkalCheckTronTokenRegistry(A,r.calcAmountChanges(n,s,!0),d):await b.hinkalCheckTokenRegistry(J??b.createHinkalHelperFromData(d),A,r.calcAmountChanges(n,s,!0)),B=T.isTronLike(d)?w||C:w,Q=n.map(e=>e.map(t=>t.getConstructableParams()));console.log("hinkalDeposit sa1",{userKeys:i});const{inCommitmentSiblings:X,inCommitmentSiblingSides:Y,accessTokenSiblings:$,accessTokenSiblingSides:K,rootHashHinkal:F,rootHashAccessToken:I,inNullifiers:j}=await ie.getDataFromWorkers(d,W,G,i,Q,B,C,k,m);console.log("hinkalDeposit y1",{userKeys:i,effectivePatchAccessTokenMerkleTree:B,kycRequired:C});const E=r.buildOutCommitments(m,s,k),a={rootHashHinkal:F,shieldedPrivateKey:f,erc20TokenAddresses:A,inAmounts:n.map(e=>e.map(t=>t.amount.toString())),inTimeStamps:n.map(e=>e.map(t=>t.timeStamp)),inRandomizations:n.map(e=>e.map(t=>t.randomization)),inNullifiers:j,inCommitmentSiblings:X,inCommitmentSiblingSides:Y,outAmounts:s.map(e=>e.map(t=>t.amount.toString())),outTimeStamp:BigInt(s[0][0].timeStamp),outPublicKeys:s.map(e=>e.map(t=>t.getStealthAddress())),extraRandomization:Z,amountChanges:O,outCommitments:E,rootHashAccessToken:I,accessTokenSiblings:$,accessTokenSiblingSides:K,calldataHash:0n},h=n.map(e=>e[0].tokenId??0),N=h.reduce((e,t)=>e+t,0)>0?h.length:0;N>0&&(a.tokenIds=h);const H=r.calcPublicSignalCount(p,a.erc20TokenAddresses,a.amountChanges,a.inNullifiers,a.outCommitments,N);if(!o){o=se.defaultHinkalLogicArgs(O.length,i),o.interactionAddress=l??c.zeroAddress;const e=i.getInHinkalAddress(o.interactionAddress);o.inHinkalAddress=e}if(m==="v1x1"){if(a.interactionAddress=o?.interactionAddress??l??c.zeroAddress,i.getInHinkalAddress(a.interactionAddress)!==o.inHinkalAddress)throw new Error("inHinkalAddress mismatch");a.externalApprovalAddresses=o.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??[c.zeroAddress,c.zeroAddress,c.zeroAddress]}u||(u=oe.generateFeeStructure(v,n.map(e=>e[0].erc20TokenAddress)));const M=r.calcAmountChanges(n,s,!0);g||(g=r.getSlippageValues(M,o)),re.Logger.log({publicSignalCount:H}),a.calldataHash=r.createCallDataHash(m,H,P,l,q,z,S,v,R,g,k,o,u,y,_),console.log("hinkalDeposit k2 pre proof",{input:a,generateProofRemotely:D});const{zkCallData:L}=await ae.generateZkProof(m,d,p,a,D);console.log("hinkalDeposit k2 post proof");const V=r.calcStealthAddressStructure(Z,f),U=te.generateCircomData(E,j,F,I,M,A,s,S,H,q,l,z,P,a.calldataHash,h,V,k,R,void 0,o,g,u,y,_),x={tokenNumber:n.length,nullifierAmount:n[0].length,outputAmount:s[0].length};return{zkCallData:L,circomData:U,dimData:x,encryptedOutputs:S}};exports.constructZkProof=ce;

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,138 +1,140 @@
-import { isTronLike as W, chainIds as x } from "../../constants/chains.constants.mjs";
+import { isTronLike as j, chainIds as x } from "../../constants/chains.constants.mjs";
 import { zeroAddress as s, defaultSignatureData as tt } from "../../constants/protocol.constants.mjs";
 import { Utxo as at } from "../../data-structures/utxo/Utxo.mjs";
 import { randomBigInt as et } from "../web3/etherFunctions.mjs";
-import { calcAmountChanges as H, calcEncryptedOutputs as mt, buildOutCommitments as nt, calcPublicSignalCount as ot, getSlippageValues as it, createCallDataHash as rt, calcStealthAddressStructure as st } from "./common.snarkjs.mjs";
+import { calcAmountChanges as g, calcEncryptedOutputs as nt, buildOutCommitments as ot, calcPublicSignalCount as mt, getSlippageValues as it, createCallDataHash as rt, calcStealthAddressStructure as st } from "./common.snarkjs.mjs";
 import { generateCircomData as dt } from "./generateCircomData.mjs";
 import { generateZkProof as ct } from "./generateZkProof.mjs";
 import { defaultHinkalLogicArgs as lt } from "../../types/hinkal.types.mjs";
-import { generateFeeStructure as ft } from "../utils/fees.utils.mjs";
-import { hinkalCheckTronTokenRegistry as kt, hinkalCheckTokenRegistry as St, createHinkalHelperFromData as pt } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
-import { Logger as Ht } from "../../error-handling/logger.mjs";
-import { getDataFromWorkers as gt } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-const yt = async (d, j, G, a, m, i, h, b, c, D, J, P = s, r = x.localhost, l = a.map(() => !1), z = a.map(() => 0n), v = void 0, w = !1, n = void 0, f, k = void 0, Q, R = tt, u) => {
-  const y = H(a, m), S = a.map((t) => t[0].erc20TokenAddress), g = mt(m), A = i.getShieldedPrivateKey(), B = at.findCorrectRandomization(et(31), A), T = W(r) ? await kt(S, H(a, m, !0), r) : await St(
-    Q ?? pt(r),
-    S,
-    H(a, m, !0)
-  ), I = W(r) ? w || T : w, X = a.map((t) => t.map((e) => e.getConstructableParams()));
+import { generateFeeStructure as kt } from "../utils/fees.utils.mjs";
+import { hinkalCheckTronTokenRegistry as ft, hinkalCheckTokenRegistry as pt, createHinkalHelperFromData as St } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
+import { Logger as gt } from "../../error-handling/logger.mjs";
+import { getDataFromWorkers as Ht } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+const Bt = async (d, G, J, a, o, i, C, D, c, b, P, z = s, r = x.localhost, l = a.map(() => !1), v = a.map(() => 0n), w = void 0, R = !1, m = void 0, k, f = void 0, Q, u = tt, B) => {
+  const I = g(a, o), p = a.map((t) => t[0].erc20TokenAddress), H = nt(o), A = i.getShieldedPrivateKey(), O = at.findCorrectRandomization(et(31), A), h = j(r) ? await ft(p, g(a, o, !0), r) : await pt(
+    Q ?? St(r),
+    p,
+    g(a, o, !0)
+  ), y = j(r) ? R || h : R, X = a.map((t) => t.map((e) => e.getConstructableParams()));
   console.log("hinkalDeposit sa1", { userKeys: i });
   const {
     inCommitmentSiblings: Y,
     inCommitmentSiblingSides: _,
     accessTokenSiblings: $,
     accessTokenSiblingSides: M,
-    rootHashHinkal: O,
-    rootHashAccessToken: E,
-    inNullifiers: F
-  } = await gt(
+    rootHashHinkal: E,
+    rootHashAccessToken: F,
+    inNullifiers: N
+  } = await Ht(
     r,
-    j,
     G,
+    J,
     i,
     X,
-    I,
-    T,
+    y,
+    h,
     l,
     d
   );
-  console.log("hinkalDeposit y1", { userKeys: i, effectivePatchAccessTokenMerkleTree: I, kycRequired: T });
-  const N = nt(d, m, l), o = {
-    rootHashHinkal: O,
+  console.log("hinkalDeposit y1", { userKeys: i, effectivePatchAccessTokenMerkleTree: y, kycRequired: h });
+  const Z = ot(d, o, l), n = {
+    rootHashHinkal: E,
     shieldedPrivateKey: A,
-    erc20TokenAddresses: S,
+    erc20TokenAddresses: p,
     inAmounts: a.map((t) => t.map((e) => e.amount.toString())),
     inTimeStamps: a.map((t) => t.map((e) => e.timeStamp)),
     inRandomizations: a.map((t) => t.map((e) => e.randomization)),
-    inNullifiers: F,
+    inNullifiers: N,
     inCommitmentSiblings: Y,
     inCommitmentSiblingSides: _,
-    outAmounts: m.map((t) => t.map((e) => e.amount.toString())),
-    outTimeStamp: BigInt(m[0][0].timeStamp),
-    outPublicKeys: m.map((t) => t.map((e) => e.getStealthAddress())),
-    extraRandomization: B,
-    amountChanges: y,
-    outCommitments: N,
-    rootHashAccessToken: E,
+    outAmounts: o.map((t) => t.map((e) => e.amount.toString())),
+    outTimeStamp: BigInt(o[0][0].timeStamp),
+    outPublicKeys: o.map((t) => t.map((e) => e.getStealthAddress())),
+    extraRandomization: O,
+    amountChanges: I,
+    outCommitments: Z,
+    rootHashAccessToken: F,
     accessTokenSiblings: $,
     accessTokenSiblingSides: M,
     calldataHash: 0n
-  }, p = a.map((t) => t[0].tokenId ?? 0), Z = p.reduce((t, e) => t + e, 0) > 0 ? p.length : 0;
-  Z > 0 && (o.tokenIds = p);
-  const C = ot(
-    h,
-    o.erc20TokenAddresses,
-    o.amountChanges,
-    o.inNullifiers,
-    o.outCommitments,
-    Z
+  }, S = a.map((t) => t[0].tokenId ?? 0), q = S.reduce((t, e) => t + e, 0) > 0 ? S.length : 0;
+  q > 0 && (n.tokenIds = S);
+  const T = mt(
+    C,
+    n.erc20TokenAddresses,
+    n.amountChanges,
+    n.inNullifiers,
+    n.outCommitments,
+    q
   );
-  if (!n) {
-    n = lt(y.length, i), n.interactionAddress = c ?? s;
-    const t = i.getInHinkalAddress(n.interactionAddress);
-    n.inHinkalAddress = t;
+  if (!m) {
+    m = lt(I.length, i), m.interactionAddress = c ?? s;
+    const t = i.getInHinkalAddress(m.interactionAddress);
+    m.inHinkalAddress = t;
   }
   if (d === "v1x1") {
-    if (o.interactionAddress = n?.interactionAddress ?? c ?? s, i.getInHinkalAddress(o.interactionAddress) !== n.inHinkalAddress)
+    if (n.interactionAddress = m?.interactionAddress ?? c ?? s, i.getInHinkalAddress(n.interactionAddress) !== m.inHinkalAddress)
       throw new Error("inHinkalAddress mismatch");
-    o.externalApprovalAddresses = n.useApprovalUtxoData?.map(
+    n.externalApprovalAddresses = m.useApprovalUtxoData?.map(
       ({ externalApprovalAddresses: t }) => t
     ) ?? [s, s, s];
   }
-  k || (k = ft(
-    z,
+  f || (f = kt(
+    v,
     a.map((t) => t[0].erc20TokenAddress)
   ));
-  const q = H(a, m, !0);
-  f || (f = it(q, n)), Ht.log({ publicSignalCount: C }), o.calldataHash = rt(
+  const W = g(a, o, !0);
+  k || (k = it(W, m)), gt.log({ publicSignalCount: T }), n.calldataHash = rt(
     d,
-    C,
-    P,
+    T,
+    z,
     c,
-    b,
     D,
-    g,
-    z,
+    b,
+    H,
     v,
-    f,
-    l,
-    n,
+    w,
     k,
-    R,
-    u
-  );
-  const { zkCallData: K } = await ct(d, r, h, o, J), V = st(B, A), L = dt(
+    l,
+    m,
+    f,
+    u,
+    B
+  ), console.log("hinkalDeposit k2 pre proof", { input: n, generateProofRemotely: P });
+  const { zkCallData: K } = await ct(d, r, C, n, P);
+  console.log("hinkalDeposit k2 post proof");
+  const V = st(O, A), L = dt(
+    Z,
     N,
-    F,
-    O,
     E,
-    q,
-    S,
-    m,
-    g,
-    C,
-    b,
-    c,
-    D,
-    P,
-    o.calldataHash,
+    F,
+    W,
     p,
+    o,
+    H,
+    T,
+    D,
+    c,
+    b,
+    z,
+    n.calldataHash,
+    S,
     V,
     l,
-    v,
+    w,
     void 0,
-    n,
-    f,
+    m,
     k,
-    R,
-    u
+    f,
+    u,
+    B
   ), U = {
     tokenNumber: a.length,
     nullifierAmount: a[0].length,
-    outputAmount: m[0].length
+    outputAmount: o[0].length
   };
-  return { zkCallData: K, circomData: L, dimData: U, encryptedOutputs: g };
+  return { zkCallData: K, circomData: L, dimData: U, encryptedOutputs: H };
 };
 export {
-  yt as constructZkProof
+  Bt as constructZkProof
 };

package/functions/snarkjs/generateZkProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("../../error-handling/logger.cjs"),c=require("./generateZkProofEnclave.cjs"),f=require("./generateZkProofSelf.cjs"),l=async(e,r,o,t,n)=>{if(n)try{return await c.generateZkProofEnclave(e,r,o,t)}catch(a){g.Logger.error("enclave proof error",a)}return f.generateZkProofSelf(e,r,o,t)};exports.generateZkProof=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../error-handling/logger.cjs"),c=require("./generateZkProofEnclave.cjs"),g=require("./generateZkProofSelf.cjs"),f=async(e,r,o,t,l)=>{if(l)try{return await c.generateZkProofEnclave(e,r,o,t)}catch(n){console.log("hinkalDeposit k3 enclave proof error",n),a.Logger.error("enclave proof error",n)}return console.log("hinkalDeposit k4 self proof"),g.generateZkProofSelf(e,r,o,t)};exports.generateZkProof=f;

package/functions/snarkjs/generateZkProof.mjs

@@ -1,15 +1,15 @@
 import { Logger as n } from "../../error-handling/logger.mjs";
-import { generateZkProofEnclave as c } from "./generateZkProofEnclave.mjs";
-import { generateZkProofSelf as g } from "./generateZkProofSelf.mjs";
-const p = async (r, o, e, t, f) => {
-  if (f)
+import { generateZkProofEnclave as a } from "./generateZkProofEnclave.mjs";
+import { generateZkProofSelf as c } from "./generateZkProofSelf.mjs";
+const s = async (o, r, e, t, l) => {
+  if (l)
     try {
-      return await c(r, o, e, t);
-    } catch (a) {
-      n.error("enclave proof error", a);
+      return await a(o, r, e, t);
+    } catch (f) {
+      console.log("hinkalDeposit k3 enclave proof error", f), n.error("enclave proof error", f);
     }
-  return g(r, o, e, t);
+  return console.log("hinkalDeposit k4 self proof"), c(o, r, e, t);
 };
 export {
-  p as generateZkProof
+  s as generateZkProof
 };

package/functions/snarkjs/generateZkProofSelf.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./getZKFiles.cjs"),k=require("../../webworker/performTaskWithWorker.cjs"),c=require("../../webworker/snarkjsWorker/snarkjsWorker.types.cjs"),y=require("../../webworker/worker.registry.cjs"),S=async(r,e,t,a)=>{const s=o.getWASMFile(r,t,e),n=o.getZKeyFile(r,t,e),{publicSignals:i,zkCallData:l}=await k.performTaskWithWorker({type:y.WorkerVariant.SnarkJS,payload:{type:c.SnarkJSWorkerActionType.FULL_PROVE,data:{input:a,chainId:e,wasmFilePath:s,zKeyFilePath:n}}});return{zkCallData:l,publicSignals:i}};exports.generateZkProofSelf=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("./getZKFiles.cjs"),k=require("../../webworker/performTaskWithWorker.cjs"),c=require("../../webworker/snarkjsWorker/snarkjsWorker.types.cjs"),y=require("../../webworker/worker.registry.cjs"),g=async(r,e,t,o)=>{const a=l.getWASMFile(r,t,e),s=l.getZKeyFile(r,t,e);console.log("hinkalDeposit k5 self proof",{input:o,wasmFilePath:a,zKeyFilePath:s});const{publicSignals:n,zkCallData:i}=await k.performTaskWithWorker({type:y.WorkerVariant.SnarkJS,payload:{type:c.SnarkJSWorkerActionType.FULL_PROVE,data:{input:o,chainId:e,wasmFilePath:a,zKeyFilePath:s}}});return{zkCallData:i,publicSignals:n}};exports.generateZkProofSelf=g;

package/functions/snarkjs/generateZkProofSelf.mjs

@@ -1,17 +1,19 @@
-import { getWASMFile as m, getZKeyFile as n } from "./getZKFiles.mjs";
-import { performTaskWithWorker as k } from "../../webworker/performTaskWithWorker.mjs";
-import { SnarkJSWorkerActionType as s } from "../../webworker/snarkjsWorker/snarkjsWorker.types.mjs";
-import { WorkerVariant as y } from "../../webworker/worker.registry.mjs";
-const W = async (o, t, r, a) => {
-  const e = m(o, r, t), l = n(o, r, t), { publicSignals: p, zkCallData: i } = await k({
-    type: y.SnarkJS,
+import { getWASMFile as k, getZKeyFile as n } from "./getZKFiles.mjs";
+import { performTaskWithWorker as s } from "../../webworker/performTaskWithWorker.mjs";
+import { SnarkJSWorkerActionType as m } from "../../webworker/snarkjsWorker/snarkjsWorker.types.mjs";
+import { WorkerVariant as f } from "../../webworker/worker.registry.mjs";
+const F = async (t, o, r, e) => {
+  const a = k(t, r, o), l = n(t, r, o);
+  console.log("hinkalDeposit k5 self proof", { input: e, wasmFilePath: a, zKeyFilePath: l });
+  const { publicSignals: p, zkCallData: i } = await s({
+    type: f.SnarkJS,
     payload: {
-      type: s.FULL_PROVE,
-      data: { input: a, chainId: t, wasmFilePath: e, zKeyFilePath: l }
+      type: m.FULL_PROVE,
+      data: { input: e, chainId: o, wasmFilePath: a, zKeyFilePath: l }
     }
   });
   return { zkCallData: i, publicSignals: p };
 };
 export {
-  W as generateZkProofSelf
+  F as generateZkProofSelf
 };

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"),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;

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.mjs

@@ -4,15 +4,15 @@ import { performTaskWithWorker as g } from "../../webworker/performTaskWithWorke
 import { WorkerVariant as k } from "../../webworker/worker.registry.mjs";
 import { ZKProofWorkerActionType as h } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 import { fetchMerkleTreeSiblings as C } from "./fetchMerkleTreeSiblings.mjs";
-import { toBigInt as d } from "../utils/amounts.utils.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) => {
-  const e = o.getRootHash();
-  if (e === void 0)
+  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,
@@ -23,28 +23,28 @@ const p = async (o, a) => {
     }
   });
   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, a, s, e, n, i) => {
   console.log("hinkalDeposit sa5");
-  const c = e.getAccessKey();
+  const c = s.getAccessKey();
   console.log("hinkalDeposit sa6", { accessKey: c });
   const t = A(
     a,
     c,
-    i,
-    n
-  ), m = o.getRootHash();
-  if (m === void 0)
+    n,
+    i
+  ), S = o.getRootHash();
+  if (S === 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({
     type: k.ZKProof,
     payload: {
       type: h.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-      data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
+      data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
     }
   })) : [r, l] = await Promise.all([
     p(t, c),
@@ -52,7 +52,7 @@ const p = async (o, a) => {
       type: k.ZKProof,
       payload: {
         type: h.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-        data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
+        data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
       }
     })
   ]), {
@@ -60,132 +60,134 @@ const p = async (o, a) => {
     inCommitmentSiblingSides: l.inCommitmentSiblingSides,
     accessTokenSiblings: r.accessTokenSiblings,
     accessTokenSiblingSides: r.accessTokenSiblingSides,
-    rootHashHinkal: m,
+    rootHashHinkal: S,
     rootHashAccessToken: r.rootHashAccessToken
   };
-}, D = async (o, a, e, s, i) => {
+}, D = async (o, a, s, e, n) => {
   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(
-      m,
-      n,
-      s,
-      i
-    ), [l, S] = await Promise.all([
-      p(r, n),
-      C(o, e, n)
+  const i = a.getAccessKey();
+  if (console.log("hinkalDeposit sa4", { accessKey: i }), !n || e) {
+    const S = R.create(I, 0n), r = A(
+      S,
+      i,
+      e,
+      n
+    );
+    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)
     ]);
-    return {
-      inCommitmentSiblings: S.inCommitmentSiblings,
-      inCommitmentSiblingSides: S.inCommitmentSiblingSides,
+    return console.log("post calculating access token siblings and root hash", { accessTokenResult: l, siblingsResponse: m }), {
+      inCommitmentSiblings: m.inCommitmentSiblings,
+      inCommitmentSiblingSides: m.inCommitmentSiblingSides,
       accessTokenSiblings: l.accessTokenSiblings,
       accessTokenSiblingSides: l.accessTokenSiblingSides,
-      rootHashHinkal: d(S.rootHashHinkal),
+      rootHashHinkal: H(m.rootHashHinkal),
       rootHashAccessToken: l.rootHashAccessToken
     };
   }
-  const t = await C(o, e, n);
+  const t = await C(o, s, i);
   return {
     inCommitmentSiblings: t.inCommitmentSiblings,
     inCommitmentSiblingSides: t.inCommitmentSiblingSides,
     accessTokenSiblings: t.accessTokenSiblings,
     accessTokenSiblingSides: t.accessTokenSiblingSides,
-    rootHashHinkal: d(t.rootHashHinkal),
-    rootHashAccessToken: d(t.rootHashAccessToken)
+    rootHashHinkal: H(t.rootHashHinkal),
+    rootHashAccessToken: H(t.rootHashAccessToken)
   };
-}, L = async (o, a, e) => {
-  if (!a || !e)
+}, L = async (o, a, s) => {
+  if (!a || !s)
     return !1;
   try {
-    const s = a.getRootHash(), i = e.getRootHash();
-    if (!s || !i)
+    const e = a.getRootHash(), n = s.getRootHash();
+    if (!e || !n)
       return !1;
-    const { hinkalRootHash: n, accessTokenRootHash: c } = await _(o);
-    return s === n && i === c;
+    const { hinkalRootHash: i, accessTokenRootHash: c } = await _(o);
+    return e === i && n === c;
   } catch {
     return !1;
   }
-}, y = async (o, a, e, s, i, n, c) => {
-  const t = await L(o, n, c);
+}, 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(
-    n,
+    i,
     c,
     a,
-    e,
     s,
-    i
-  ) : D(o, a, e, s, i);
-}, v = async (o, a, e, s, i, n, c, t, m) => {
+    e,
+    n
+  ) : D(o, a, s, e, n);
+}, v = async (o, a, s, e, n, i, c, t, S) => {
   if (N) {
     const {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
-      accessTokenSiblings: S,
+      accessTokenSiblings: m,
       accessTokenSiblingSides: b,
       rootHashHinkal: T,
-      rootHashAccessToken: f
+      rootHashAccessToken: d
     } = await y(
       o,
-      s,
-      i,
+      e,
       n,
+      i,
       c,
       a,
-      e
-    ), H = await g({
+      s
+    ), f = await g({
       type: k.ZKProof,
       payload: {
         type: h.BUILD_IN_NULLIFIERS,
-        data: { inputUtxosSerialized: i, onChainCreation: t, proverVersion: m }
+        data: { inputUtxosSerialized: n, onChainCreation: t, proverVersion: S }
       }
     });
     return {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
-      accessTokenSiblings: S,
+      accessTokenSiblings: m,
       accessTokenSiblingSides: b,
       rootHashHinkal: T,
-      rootHashAccessToken: f,
-      inNullifiers: H
+      rootHashAccessToken: d,
+      inNullifiers: f
     };
   } else {
     const [
       {
         inCommitmentSiblings: r,
         inCommitmentSiblingSides: l,
-        accessTokenSiblings: S,
+        accessTokenSiblings: m,
         accessTokenSiblingSides: b,
         rootHashHinkal: T,
-        rootHashAccessToken: f
+        rootHashAccessToken: d
       },
-      H
+      f
     ] = await Promise.all([
       y(
         o,
-        s,
-        i,
+        e,
         n,
+        i,
         c,
         a,
-        e
+        s
       ),
       g({
         type: k.ZKProof,
         payload: {
           type: h.BUILD_IN_NULLIFIERS,
-          data: { inputUtxosSerialized: i, onChainCreation: t, proverVersion: m }
+          data: { inputUtxosSerialized: n, onChainCreation: t, proverVersion: S }
         }
       })
     ]);
     return {
       inCommitmentSiblings: r,
       inCommitmentSiblingSides: l,
-      accessTokenSiblings: S,
+      accessTokenSiblings: m,
       accessTokenSiblingSides: b,
       rootHashHinkal: T,
-      rootHashAccessToken: f,
-      inNullifiers: H
+      rootHashAccessToken: d,
+      inNullifiers: f
     };
   }
 };

package/package.json

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

package/webworker/snarkjsWorker/snarkjsWorkerLauncher.cjs

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

package/webworker/snarkjsWorker/snarkjsWorkerLauncher.mjs

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

package/webworker/snarkjsWorker/snarkjsWorkerLogic.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const M=require("../workerProxy.cjs"),i=require("../../constants/vite.constants.cjs"),O=require("snarkjs"),F=require("../../data-structures/http/HttpClient.cjs");require("axios");const b=require("../../constants/chains.constants.cjs");function S(e){const a=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const t in e)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(a,t,r.get?r:{enumerable:!0,get:()=>e[t]})}}return a.default=e,Object.freeze(a)}const w=S(O),c=new M.WorkerProxy,k=async e=>new Uint8Array(await F.httpClient.get(e,{responseType:"arraybuffer"})),$=async e=>{try{const{input:a,wasmFilePath:t,zKeyFilePath:r,chainId:n}=e.payload.data,{hostLocation:{origin:u},constants:{isDevelopment:v,chains:{chainIds:l}}}=e.metadata;let s=t,o=r,d,h;const f=s.startsWith("https://");if(i.isNode&&!f){i.isWebpack?(s=`libs/hardhat/test/circuits/${t}`,o=`libs/hardhat/test/circuits/${r}`):!i.isWebpack&&v&&(n===b.chainIds.solanaLocalnet?(s=`tests/circuits/${t}`,o=`tests/circuits/${r}`):(s=`test/circuits/${t}`,o=`test/circuits/${r}`));const g=require("path");s=g.resolve(s),o=g.resolve(o)}i.isNode&&f?(d=await k(s),h=await k(o)):(n===l.localhost||n===b.chainIds.solanaLocalnet||n===l.tronLocalnet)&&!i.isNode&&(s=`${u}/${t}`,o=`${u}/${r}`);const{proof:p,publicSignals:y}=await w.groth16.fullProve(a,d??s,h??o,void 0,void 0,i.isNode&&n===l.tronLocalnet?{singleThread:!0}:void 0),P=await w.groth16.exportSolidityCallData(p,y),m=JSON.parse(`[${P}]`);c.postMessageToMainThread({zkCallData:m,proof:p,publicSignals:y})}catch(a){console.error(a),c.postErrorToMainThread(a)}};c.attachWorkerSideOnMessage($);exports.default=c;exports.onWorkerMessage=$;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const j=require("../workerProxy.cjs"),i=require("../../constants/vite.constants.cjs"),M=require("snarkjs"),O=require("../../data-structures/http/HttpClient.cjs");require("axios");const y=require("../../constants/chains.constants.cjs");function W(e){const o=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const t in e)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(o,t,r.get?r:{enumerable:!0,get:()=>e[t]})}}return o.default=e,Object.freeze(o)}const b=W(M),c=new j.WorkerProxy,w=async e=>new Uint8Array(await O.httpClient.get(e,{responseType:"arraybuffer"})),$=async e=>{try{const{input:o,wasmFilePath:t,zKeyFilePath:r,chainId:n}=e.payload.data,{hostLocation:{origin:h},constants:{isDevelopment:v,chains:{chainIds:l}}}=e.metadata;let s=t,a=r,f,g;const u=s.startsWith("https://");if(console.log("hinkalDeposit k6 snarkjs worker logic",{isNode:i.isNode,isOnline:u,isWebpack:i.isWebpack}),i.isNode&&!u){i.isWebpack?(s=`libs/hardhat/test/circuits/${t}`,a=`libs/hardhat/test/circuits/${r}`):!i.isWebpack&&v&&(n===y.chainIds.solanaLocalnet?(s=`tests/circuits/${t}`,a=`tests/circuits/${r}`):(s=`test/circuits/${t}`,a=`test/circuits/${r}`));const k=require("path");s=k.resolve(s),a=k.resolve(a)}i.isNode&&u?(f=await w(s),g=await w(a)):(n===l.localhost||n===y.chainIds.solanaLocalnet||n===l.tronLocalnet)&&!i.isNode&&(s=`${h}/${t}`,a=`${h}/${r}`),console.log("pre pr ",{chainId:n});const{proof:d,publicSignals:p}=await b.groth16.fullProve(o,f??s,g??a,void 0,void 0,i.isNode&&n===l.tronLocalnet?{singleThread:!0}:void 0);console.log("post proof",{proof:d,publicSignals:p});const P=await b.groth16.exportSolidityCallData(d,p),m=JSON.parse(`[${P}]`);c.postMessageToMainThread({zkCallData:m,proof:d,publicSignals:p})}catch(o){console.error("snarkjs worker logic error",o),c.postErrorToMainThread(o)}};c.attachWorkerSideOnMessage($);exports.default=c;exports.onWorkerMessage=$;

package/webworker/snarkjsWorker/snarkjsWorkerLogic.mjs

@@ -1,42 +1,44 @@
 import { WorkerProxy as T } from "../workerProxy.mjs";
-import { isNode as n, isWebpack as w } from "../../constants/vite.constants.mjs";
-import * as $ from "snarkjs";
+import { isNode as s, isWebpack as f } from "../../constants/vite.constants.mjs";
+import * as w from "snarkjs";
 import { httpClient as b } from "../../data-structures/http/HttpClient.mjs";
 import "axios";
-import { chainIds as g } from "../../constants/chains.constants.mjs";
-const c = new T(), k = async (o) => new Uint8Array(await b.get(o, { responseType: "arraybuffer" })), z = async (o) => {
+import { chainIds as y } from "../../constants/chains.constants.mjs";
+const d = new T(), $ = async (i) => new Uint8Array(await b.get(i, { responseType: "arraybuffer" })), z = async (i) => {
   try {
-    const { input: i, wasmFilePath: e, zKeyFilePath: s, chainId: r } = o.payload.data, {
-      hostLocation: { origin: h },
+    const { input: l, wasmFilePath: r, zKeyFilePath: a, chainId: o } = i.payload.data, {
+      hostLocation: { origin: u },
       constants: {
         isDevelopment: F,
-        chains: { chainIds: l }
+        chains: { chainIds: n }
       }
-    } = o.metadata;
-    let t = e, a = s, p, f;
-    const d = t.startsWith("https://");
-    if (n && !d) {
-      w ? (t = `libs/hardhat/test/circuits/${e}`, a = `libs/hardhat/test/circuits/${s}`) : !w && F && (r === g.solanaLocalnet ? (t = `tests/circuits/${e}`, a = `tests/circuits/${s}`) : (t = `test/circuits/${e}`, a = `test/circuits/${s}`));
-      const y = require("path");
-      t = y.resolve(t), a = y.resolve(a);
+    } = i.metadata;
+    let t = r, e = a, m, g;
+    const c = t.startsWith("https://");
+    if (console.log("hinkalDeposit k6 snarkjs worker logic", { isNode: s, isOnline: c, isWebpack: f }), s && !c) {
+      f ? (t = `libs/hardhat/test/circuits/${r}`, e = `libs/hardhat/test/circuits/${a}`) : !f && F && (o === y.solanaLocalnet ? (t = `tests/circuits/${r}`, e = `tests/circuits/${a}`) : (t = `test/circuits/${r}`, e = `test/circuits/${a}`));
+      const k = require("path");
+      t = k.resolve(t), e = k.resolve(e);
     }
-    n && d ? (p = await k(t), f = await k(a)) : (r === l.localhost || r === g.solanaLocalnet || r === l.tronLocalnet) && !n && (t = `${h}/${e}`, a = `${h}/${s}`);
-    const { proof: u, publicSignals: m } = await $.groth16.fullProve(
-      i,
-      p ?? t,
-      f ?? a,
+    s && c ? (m = await $(t), g = await $(e)) : (o === n.localhost || o === y.solanaLocalnet || o === n.tronLocalnet) && !s && (t = `${u}/${r}`, e = `${u}/${a}`), console.log("pre pr ", { chainId: o });
+    const { proof: h, publicSignals: p } = await w.groth16.fullProve(
+      l,
+      m ?? t,
+      g ?? e,
       void 0,
       void 0,
-      n && r === l.tronLocalnet ? { singleThread: !0 } : void 0
+      s && o === n.tronLocalnet ? { singleThread: !0 } : void 0
       // snarkjs hangs in tronbox enviroment if singleThread: true is not provided, which is weird, since if incorrect input is provided it will error out
-    ), v = await $.groth16.exportSolidityCallData(u, m), P = JSON.parse(`[${v}]`);
-    c.postMessageToMainThread({ zkCallData: P, proof: u, publicSignals: m });
-  } catch (i) {
-    console.error(i), c.postErrorToMainThread(i);
+    );
+    console.log("post proof", { proof: h, publicSignals: p });
+    const v = await w.groth16.exportSolidityCallData(h, p), P = JSON.parse(`[${v}]`);
+    d.postMessageToMainThread({ zkCallData: P, proof: h, publicSignals: p });
+  } catch (l) {
+    console.error("snarkjs worker logic error", l), d.postErrorToMainThread(l);
   }
 };
-c.attachWorkerSideOnMessage(z);
+d.attachWorkerSideOnMessage(z);
 export {
-  c as default,
+  d as default,
   z as onWorkerMessage
 };

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();