h_test_1 0.0.26 → 0.0.28

package/functions/snarkjs/constructGeneralZkProof.mjs

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

package/functions/snarkjs/generateZkProof.cjs

@@ -1 +1 @@
-"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;
+"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;

package/functions/snarkjs/generateZkProof.mjs

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

package/functions/snarkjs/generateZkProofSelf.cjs

@@ -1 +1 @@
-"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;
+"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;

package/functions/snarkjs/generateZkProofSelf.mjs

@@ -1,19 +1,17 @@
-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,
+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,
     payload: {
-      type: m.FULL_PROVE,
-      data: { input: e, chainId: o, wasmFilePath: a, zKeyFilePath: l }
+      type: s.FULL_PROVE,
+      data: { input: a, chainId: t, wasmFilePath: e, zKeyFilePath: l }
     }
   });
   return { zkCallData: i, publicSignals: p };
 };
 export {
-  F as generateZkProofSelf
+  W as generateZkProofSelf
 };

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"),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;
+"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"),m=require("../../webworker/performTaskWithWorker.cjs"),g=require("../../webworker/worker.registry.cjs"),T=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"),y=async(e,i)=>{const s=e.getRootHash();if(s===void 0)throw new Error("Root hash not available from patched merkle tree");const o=await m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{accessKey:i,merkleTreeAccessTokenSerialized:e.toJSON()}}});return{accessTokenSiblings:o.accessTokenSiblings,accessTokenSiblingSides:o.accessTokenSiblingSides,rootHashAccessToken:s}},N=async(e,i,s,o,t,n)=>{const a=s.getAccessKey(),r=C.getPatchedAccessTokenMerkleTree(i,a,t,n),S=e.getRootHash();if(S===void 0)throw new Error("Root hash not available from hinkal merkle tree");let l,c;return W.isNode?(l=await y(r,a),c=await m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:o,merkleTreeSerialized:e.toJSON()}}})):[l,c]=await Promise.all([y(r,a),m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.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:S,rootHashAccessToken:l.rootHashAccessToken}},R=async(e,i,s,o,t)=>{const n=i.getAccessKey();if(!t||o){const S=u.MerkleTree.create(P.poseidonFunction,0n),l=C.getPatchedAccessTokenMerkleTree(S,n,o,t),[c,k]=await Promise.all([y(l,n),A.fetchMerkleTreeSiblings(e,s,n)]);return{inCommitmentSiblings:k.inCommitmentSiblings,inCommitmentSiblingSides:k.inCommitmentSiblingSides,accessTokenSiblings:c.accessTokenSiblings,accessTokenSiblingSides:c.accessTokenSiblingSides,rootHashHinkal:H.toBigInt(k.rootHashHinkal),rootHashAccessToken:c.rootHashAccessToken}}const r=await A.fetchMerkleTreeSiblings(e,s,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(e,i,s)=>{if(!i||!s)return!1;try{const o=i.getRootHash(),t=s.getRootHash();if(!o||!t)return!1;const{hinkalRootHash:n,accessTokenRootHash:a}=await _.fetchOnChainRootHashes(e);return o===n&&t===a}catch{return!1}},p=async(e,i,s,o,t,n,a)=>await I(e,n,a)?N(n,a,i,s,o,t):R(e,i,s,o,t),M=async(e,i,s,o,t,n,a,r,S)=>{if(W.isNode){const{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d}=await p(e,o,t,n,a,i,s),f=await m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:t,onChainCreation:r,proverVersion:S}}});return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}else{const[{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d},f]=await Promise.all([p(e,o,t,n,a,i,s),m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:t,onChainCreation:r,proverVersion:S}}})]);return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}};exports.getDataFromWorkers=M;exports.getMerkleTreeSiblingsAndRootHashes=p;

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.mjs

@@ -1,161 +1,141 @@
 import { MerkleTree as R } from "../../data-structures/merkle-tree/MerkleTree.mjs";
-import { getPatchedAccessTokenMerkleTree as N } from "../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs";
+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 b } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 import { fetchMerkleTreeSiblings as C } from "./fetchMerkleTreeSiblings.mjs";
-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("sss pre calculate access token siblings and root hash", {
-    accessKey: i,
-    rootHash: s,
-    patchedMerkleTree: o,
-    tjson: o.toJSON()
-  }), s === void 0)
+import { toBigInt as d } 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, n) => {
+  const e = o.getRootHash();
+  if (e === void 0)
     throw new Error("Root hash not available from patched merkle tree");
-  const e = await g({
+  const s = await g({
     type: k.ZKProof,
     payload: {
       type: b.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
       data: {
-        accessKey: i,
+        accessKey: n,
         merkleTreeAccessTokenSerialized: o.toJSON()
       }
     }
   });
-  return console.log({ resultFromWorker: e }), {
-    accessTokenSiblings: e.accessTokenSiblings,
-    accessTokenSiblingSides: e.accessTokenSiblingSides,
-    rootHashAccessToken: s
+  return {
+    accessTokenSiblings: s.accessTokenSiblings,
+    accessTokenSiblingSides: s.accessTokenSiblingSides,
+    rootHashAccessToken: e
   };
-}, w = async (o, i, s, e, t, n) => {
-  console.log("hinkalDeposit sa5");
-  const a = s.getAccessKey();
-  console.log("hinkalDeposit sa6", { accessKey: a });
-  const c = N(
+}, L = async (o, n, e, s, i, t) => {
+  const c = e.getAccessKey(), a = A(
+    n,
+    c,
     i,
-    a,
-    t,
-    n
+    t
   ), m = o.getRootHash();
   if (m === void 0)
     throw new Error("Root hash not available from hinkal merkle tree");
-  let r, l;
-  return A ? (r = await d(c, a), l = await g({
+  let l, r;
+  return N ? (l = await p(a, c), r = await g({
     type: k.ZKProof,
     payload: {
       type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-      data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
+      data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
     }
-  })) : [r, l] = await Promise.all([
-    d(c, a),
+  })) : [l, r] = await Promise.all([
+    p(a, c),
     g({
       type: k.ZKProof,
       payload: {
         type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-        data: { inputUtxosSerialized: e, merkleTreeSerialized: o.toJSON() }
+        data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
       }
     })
   ]), {
-    inCommitmentSiblings: l.inCommitmentSiblings,
-    inCommitmentSiblingSides: l.inCommitmentSiblingSides,
-    accessTokenSiblings: r.accessTokenSiblings,
-    accessTokenSiblingSides: r.accessTokenSiblingSides,
+    inCommitmentSiblings: r.inCommitmentSiblings,
+    inCommitmentSiblingSides: r.inCommitmentSiblingSides,
+    accessTokenSiblings: l.accessTokenSiblings,
+    accessTokenSiblingSides: l.accessTokenSiblingSides,
     rootHashHinkal: m,
-    rootHashAccessToken: r.rootHashAccessToken
+    rootHashAccessToken: l.rootHashAccessToken
   };
-}, D = async (o, i, s, e, t) => {
-  console.log("hinkalDeposit sa3");
-  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(
+}, w = async (o, n, e, s, i) => {
+  const t = n.getAccessKey();
+  if (!i || s) {
+    const m = R.create(I, 0n), l = A(
       m,
-      n,
-      e,
-      t
-    );
-    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)
+      t,
+      s,
+      i
+    ), [r, S] = await Promise.all([
+      p(l, t),
+      C(o, e, t)
     ]);
-    return console.log("post calculating access token siblings and root hash", { accessTokenResult: l, siblingsResponse: S }), {
+    return {
       inCommitmentSiblings: S.inCommitmentSiblings,
       inCommitmentSiblingSides: S.inCommitmentSiblingSides,
-      accessTokenSiblings: l.accessTokenSiblings,
-      accessTokenSiblingSides: l.accessTokenSiblingSides,
-      rootHashHinkal: p(S.rootHashHinkal),
-      rootHashAccessToken: l.rootHashAccessToken
+      accessTokenSiblings: r.accessTokenSiblings,
+      accessTokenSiblingSides: r.accessTokenSiblingSides,
+      rootHashHinkal: d(S.rootHashHinkal),
+      rootHashAccessToken: r.rootHashAccessToken
     };
   }
-  console.log("kaksk", { chainId: o, inputUtxosSerialized: s, accessKey: n });
-  const c = await C(o, s, n);
+  const a = await C(o, e, t);
   return {
-    inCommitmentSiblings: c.inCommitmentSiblings,
-    inCommitmentSiblingSides: c.inCommitmentSiblingSides,
-    accessTokenSiblings: c.accessTokenSiblings,
-    accessTokenSiblingSides: c.accessTokenSiblingSides,
-    rootHashHinkal: p(c.rootHashHinkal),
-    rootHashAccessToken: p(c.rootHashAccessToken)
+    inCommitmentSiblings: a.inCommitmentSiblings,
+    inCommitmentSiblingSides: a.inCommitmentSiblingSides,
+    accessTokenSiblings: a.accessTokenSiblings,
+    accessTokenSiblingSides: a.accessTokenSiblingSides,
+    rootHashHinkal: d(a.rootHashHinkal),
+    rootHashAccessToken: d(a.rootHashAccessToken)
   };
-}, L = async (o, i, s) => {
-  if (!i || !s)
+}, P = async (o, n, e) => {
+  if (!n || !e)
     return !1;
   try {
-    const e = i.getRootHash(), t = s.getRootHash();
-    if (!e || !t)
+    const s = n.getRootHash(), i = e.getRootHash();
+    if (!s || !i)
       return !1;
-    const { hinkalRootHash: n, accessTokenRootHash: a } = await I(o);
-    return e === n && t === a;
+    const { hinkalRootHash: t, accessTokenRootHash: c } = await _(o);
+    return s === t && i === c;
   } catch {
     return !1;
   }
-}, 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,
-    t
-  ) : D(o, i, s, e, t);
-}, J = async (o, i, s, e, t, n, a, c, m) => {
-  if (A) {
+}, y = async (o, n, e, s, i, t, c) => await P(o, t, c) ? L(
+  t,
+  c,
+  n,
+  e,
+  s,
+  i
+) : w(o, n, e, s, i), v = async (o, n, e, s, i, t, c, a, m) => {
+  if (N) {
     const {
-      inCommitmentSiblings: r,
-      inCommitmentSiblingSides: l,
+      inCommitmentSiblings: l,
+      inCommitmentSiblingSides: r,
       accessTokenSiblings: S,
       accessTokenSiblingSides: h,
       rootHashHinkal: T,
       rootHashAccessToken: f
     } = await y(
       o,
-      e,
+      s,
+      i,
       t,
+      c,
       n,
-      a,
-      i,
-      s
+      e
     ), H = await g({
       type: k.ZKProof,
       payload: {
         type: b.BUILD_IN_NULLIFIERS,
-        data: { inputUtxosSerialized: t, onChainCreation: c, proverVersion: m }
+        data: { inputUtxosSerialized: i, onChainCreation: a, proverVersion: m }
       }
     });
     return {
-      inCommitmentSiblings: r,
-      inCommitmentSiblingSides: l,
+      inCommitmentSiblings: l,
+      inCommitmentSiblingSides: r,
       accessTokenSiblings: S,
       accessTokenSiblingSides: h,
       rootHashHinkal: T,
@@ -165,8 +145,8 @@ const d = async (o, i) => {
   } else {
     const [
       {
-        inCommitmentSiblings: r,
-        inCommitmentSiblingSides: l,
+        inCommitmentSiblings: l,
+        inCommitmentSiblingSides: r,
         accessTokenSiblings: S,
         accessTokenSiblingSides: h,
         rootHashHinkal: T,
@@ -176,24 +156,24 @@ const d = async (o, i) => {
     ] = await Promise.all([
       y(
         o,
-        e,
+        s,
+        i,
         t,
+        c,
         n,
-        a,
-        i,
-        s
+        e
       ),
       g({
         type: k.ZKProof,
         payload: {
           type: b.BUILD_IN_NULLIFIERS,
-          data: { inputUtxosSerialized: t, onChainCreation: c, proverVersion: m }
+          data: { inputUtxosSerialized: i, onChainCreation: a, proverVersion: m }
         }
       })
     ]);
     return {
-      inCommitmentSiblings: r,
-      inCommitmentSiblingSides: l,
+      inCommitmentSiblings: l,
+      inCommitmentSiblingSides: r,
       accessTokenSiblings: S,
       accessTokenSiblingSides: h,
       rootHashHinkal: T,
@@ -203,6 +183,6 @@ const d = async (o, i) => {
   }
 };
 export {
-  J as getDataFromWorkers,
+  v as getDataFromWorkers,
   y as getMerkleTreeSiblingsAndRootHashes
 };

package/package.json

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