@hinkal/common 0.1.33 → 0.1.35

package/functions/pre-transaction/getFlatFees.mjs

@@ -6,102 +6,102 @@ import "../../types/curve.types.mjs";
 import { getERC20Token as T } from "../utils/erc20tokenFunctions.mjs";
 import { processGasEstimates as R } from "./process-gas-estimates.mjs";
 import { getInteractionFromAction as A } from "./interaction-to-action.mjs";
-const i = async (_, t, D, N, n, S) => {
+const F = async (t, _, D, N, n, W) => {
   let k;
-  const r = A(D, n);
-  if (r === a.NONE)
+  const P = A(D, n);
+  if (P === a.NONE)
     throw Error("No interaction was choosen");
-  let o, L, b;
-  switch (r) {
+  let L, o, b;
+  switch (P) {
     case a.WITHDRAW:
-      k = T(t[0], _);
+      k = T(_[0], t);
       break;
     case a.SWAP:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.CURVE_DEPOSIT:
-      k = T(t[t.length - 1], _);
+      k = T(_[_.length - 1], t);
       break;
     case a.CURVE_WITHDRAW: {
-      if (b = t.findIndex(
-        (P) => P.toLowerCase() === S?.toLowerCase()
-      ), console.log({ curveWithdrawGasTokenAddress: S, withdrawTokenIndex: b }), b === -1)
+      if (b = _.findIndex(
+        (r) => r.toLowerCase() === W?.toLowerCase()
+      ), b === -1)
         throw Error("Curve Withdraw Token Index not found");
-      k = T(t[b], _);
+      k = T(_[b], t);
       break;
     }
     case a.STAKING:
     case a.UNSTAKING:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.CLAIMING:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.BEEFY:
-      o = f(n) ? 1 : 0, k = T(t[o], _);
+      L = f(n) ? 1 : 0, k = T(_[L], t);
       break;
     case a.BEEFY_STAKE:
     case a.BEEFY_UNSTAKE:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.BEEFY_GET_REWARDS:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.LIDO_STAKE:
-      k = T(t[0], _);
+      k = T(_[0], t);
       break;
     case a.LIDO_REQUEST:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.LIDO_CLAIM:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.PENDLE_TRANSACT:
-      k = T(t[0], _);
+      k = T(_[0], t);
       break;
     case a.PENDLE_YT_IN_SWAP:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.PENDLE_YT_OUT_SWAP:
-      k = T(t[0], _);
+      k = T(_[0], t);
       break;
     case a.PENDLE_PT_SWAP:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.PENDLE_MINT:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.PENDLE_REDEEM:
-      k = T(t[2], _);
+      k = T(_[2], t);
       break;
     case a.PENDLE_CLAIM:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.VOLATILE_WITHDRAW:
-      k = T(t[0], _);
+      k = T(_[0], t);
       break;
     case a.VOLATILE_SWAP:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.PENDLE_LP:
-      L = N.findIndex((P) => P > 0), k = T(t[L], _);
+      o = N.findIndex((r) => r > 0), k = T(_[o], t);
       break;
     case a.PENDLE_LP_CLAIM:
-      k = T(t[1], _);
+      k = T(_[1], t);
       break;
     case a.EMPORIUM:
   }
-  let E, I;
-  const W = N.length;
-  k && ({ priceOfTransactionInToken: E, priceOfTransactionInUSD: I } = await R(
-    _,
+  let E, S;
+  const I = N.length;
+  k && ({ priceOfTransactionInToken: E, priceOfTransactionInUSD: S } = await R(
+    t,
     k,
     D,
     n,
-    W
+    I
   ));
-  const e = new Array(W).fill(0n);
-  switch (r) {
+  const e = new Array(I).fill(0n);
+  switch (P) {
     case a.WITHDRAW:
       e[0] = E || 0n;
       break;
@@ -122,7 +122,7 @@ const i = async (_, t, D, N, n, S) => {
       e[1] = E || 0n;
       break;
     case a.BEEFY:
-      o && (e[o] = E || 0n);
+      L && (e[L] = E || 0n);
       break;
     case a.BEEFY_STAKE:
       e[1] = E || 0n, e[0] = E || 0n;
@@ -167,7 +167,7 @@ const i = async (_, t, D, N, n, S) => {
       e[1] = E || 0n;
       break;
     case a.PENDLE_LP:
-      L !== void 0 && (e[L] = E || 0n);
+      o !== void 0 && (e[o] = E || 0n);
       break;
     case a.PENDLE_LP_CLAIM:
       e[1] = E || 0n;
@@ -175,8 +175,8 @@ const i = async (_, t, D, N, n, S) => {
     case a.EMPORIUM:
       break;
   }
-  return { flatFees: e, priceOfTransactionInToken: E, feeUnit: k, priceOfTransactionInUSD: I };
+  return { flatFees: e, priceOfTransactionInToken: E, feeUnit: k, priceOfTransactionInUSD: S };
 };
 export {
-  i as getFlatFees
+  F as getFlatFees
 };

package/functions/pre-transaction/process-gas-estimates.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("axios");require("../../constants/coingecko.constants.cjs");const m=require("../../API/getGasEstimates.cjs");require("ethers");require("../../types/curve.types.cjs");const o=require("../../error-handling/logError.cjs"),g=require("../utils/amounts.utils.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const E=require("../web3/etherFunctions.cjs"),p=async(a,r,n,c,u,q)=>{let t,s,e;try{({status:t,priceOfTransactionInUSD:s,priceOfTransactionInToken:e}=await m.getGasEstimates(a,r.erc20TokenAddress,n,c,u,q))}catch(l){o.logError("processGasEstimates error:",l)}const i=e?E.getAmountInWei(r,g.getValueFirstNDigit(e,r.decimals)):void 0;return o.logError("processGasEstimates: ",{status:t,priceOfTransactionInUSD:s,priceOfTransactionInTokenEstimate:e,priceOfTransactionInToken:i}),{priceOfTransactionInUSD:s,priceOfTransactionInToken:i}};exports.processGasEstimates=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("axios");require("../../constants/coingecko.constants.cjs");const q=require("../../API/getGasEstimates.cjs");require("ethers");require("../../types/curve.types.cjs");const l=require("../../error-handling/logError.cjs"),m=require("../utils/amounts.utils.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const g=require("../web3/etherFunctions.cjs"),T=async(s,e,i,n,o,a)=>{let t,r;try{({priceOfTransactionInUSD:t,priceOfTransactionInToken:r}=await q.getGasEstimates(s,e.erc20TokenAddress,i,n,o,a))}catch(u){l.logError("processGasEstimates error:",u)}const c=r?g.getAmountInWei(e,m.getValueFirstNDigit(r,e.decimals)):void 0;return{priceOfTransactionInUSD:t,priceOfTransactionInToken:c}};exports.processGasEstimates=T;

package/functions/pre-transaction/process-gas-estimates.mjs

@@ -2,43 +2,34 @@ import "../../constants/chains.constants.mjs";
 import "../../constants/vite.constants.mjs";
 import "axios";
 import "../../constants/coingecko.constants.mjs";
-import { getGasEstimates as T } from "../../API/getGasEstimates.mjs";
+import { getGasEstimates as c } from "../../API/getGasEstimates.mjs";
 import "ethers";
 import "../../types/curve.types.mjs";
-import { logError as e } from "../../error-handling/logError.mjs";
-import { getValueFirstNDigit as l } from "../utils/amounts.utils.mjs";
+import { logError as f } from "../../error-handling/logError.mjs";
+import { getValueFirstNDigit as T } from "../utils/amounts.utils.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
 import "../../constants/axelar.constants.mjs";
 import "../../constants/rewards.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
-import { getAmountInWei as E } from "../web3/etherFunctions.mjs";
-const N = async (m, t, a, p, n, c) => {
-  let i, o, r;
+import { getAmountInWei as g } from "../web3/etherFunctions.mjs";
+const F = async (i, r, e, m, s, p) => {
+  let o, t;
   try {
-    ({
-      status: i,
-      priceOfTransactionInUSD: o,
-      priceOfTransactionInToken: r
-    } = await T(
+    ({ priceOfTransactionInUSD: o, priceOfTransactionInToken: t } = await c(
+      i,
+      r.erc20TokenAddress,
+      e,
       m,
-      t.erc20TokenAddress,
-      a,
-      p,
-      n,
-      c
+      s,
+      p
     ));
-  } catch (f) {
-    e("processGasEstimates error:", f);
+  } catch (n) {
+    f("processGasEstimates error:", n);
   }
-  const s = r ? E(t, l(r, t.decimals)) : void 0;
-  return e("processGasEstimates: ", {
-    status: i,
-    priceOfTransactionInUSD: o,
-    priceOfTransactionInTokenEstimate: r,
-    priceOfTransactionInToken: s
-  }), { priceOfTransactionInUSD: o, priceOfTransactionInToken: s };
+  const a = t ? g(r, T(t, r.decimals)) : void 0;
+  return { priceOfTransactionInUSD: o, priceOfTransactionInToken: a };
 };
 export {
-  N as processGasEstimates
+  F as processGasEstimates
 };

package/functions/protocols/pendle.helpers.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const o=require("../../constants/server.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const i=require("../utils/caseInsensitive.utils.cjs");require("../../types/circom-data.types.cjs");const s=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");const n=require("../../types/pendle.types.cjs");require("../../types/curve.types.cjs");require("ethers");require("circomlibjs");require("../../data-structures/crypto-keys/keys.cjs");require("idb-keyval");require("../utils/external-action.utils.cjs");const c=require("../utils/erc20tokenFunctions.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("axios");require("../utils/userAgent.cjs");require("../../data-structures/custom-token-registry/CustomTokenRegistry.cjs");require("../../data-structures/volatile-helper/VolatileHelper.cjs");const T=require("../utils/enum.utils.cjs");function P(e){if(!e)return;const r=c.getERC20Token(e.address,e.chainId);if(!r?.isVolatile)return r?.symbol.toLowerCase()==="weth"&&console.log("token:",r),r}function w(e,r){if(!e||!r)return;let t;switch(r){case n.PendleAssetType.YT:t=e?.yt;break;case n.PendleAssetType.PT:t=e?.pt;break;case n.PendleAssetType.PENDLE_LP:t=e?.lp;break;case n.PendleAssetType.SY:t=e?.sy;break;default:t=void 0;break}return t}const F=(e,r,t)=>{if(i.caseInsensitiveEqual(e.yt.address,t.erc20TokenAddress))return n.PendleSwapType.SwapExactTokenForYt;if(i.caseInsensitiveEqual(e.pt.address,t.erc20TokenAddress))return n.PendleSwapType.SwapExactTokenForPt;if(i.caseInsensitiveEqual(e.yt.address,r.erc20TokenAddress))return n.PendleSwapType.SwapExactYtForToken;if(i.caseInsensitiveEqual(e.pt.address,r.erc20TokenAddress))return n.PendleSwapType.SwapExactPtForToken},k=e=>{let r;switch(e){case n.PendleSwapType.SwapExactTokenForYt:r=o.API_CONFIG.ROUTES.pendleSwapExactTokenForYT;break;case n.PendleSwapType.SwapExactTokenForPt:r=o.API_CONFIG.ROUTES.pendleSwapExactTokenForPt;break;case n.PendleSwapType.SwapExactYtForToken:r=o.API_CONFIG.ROUTES.pendleSwapExactYtForToken;break;case n.PendleSwapType.SwapExactPtForToken:r=o.API_CONFIG.ROUTES.pendleSwapExactPtForToken;break;default:throw new Error("Cant determine Pendle Swap Type Api Route")}return r},q=(e,r,t,a)=>{if(!T.isInEnum(s.PendleAction,e))throw new Error("getTokenIndexForPendleFlatFee: Invalid Pendle Action");if(a)return t.findIndex(d=>d.toLowerCase()===a?.toLowerCase());const l=r.findIndex(d=>d>0n),p=r.length-1;if(r[p]<=0n)throw new Error("getTokenIndexForPendleFlatFee: Last token in amountChange is not > 0");let u=l;return(e===s.PendleAction.Mint||e===s.PendleAction.Redeem||e===s.PendleAction.PoolRemove)&&(u=l),u};exports.determinePendleSwapType=F;exports.determinePendleSwapTypeApiRoute=k;exports.erc20TokenFromPendleAsset=P;exports.getAssetTypeFromPendleMarket=w;exports.getTokenIndexForPendleFlatFee=q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const o=require("../../constants/server.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const i=require("../utils/caseInsensitive.utils.cjs");require("../../types/circom-data.types.cjs");const s=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");const n=require("../../types/pendle.types.cjs");require("../../types/curve.types.cjs");require("ethers");require("circomlibjs");require("../../data-structures/crypto-keys/keys.cjs");require("idb-keyval");require("../utils/external-action.utils.cjs");const c=require("../utils/erc20tokenFunctions.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("axios");require("../utils/userAgent.cjs");require("../../data-structures/custom-token-registry/CustomTokenRegistry.cjs");require("../../data-structures/volatile-helper/VolatileHelper.cjs");const T=require("../utils/enum.utils.cjs");function P(e){if(!e)return;const r=c.getERC20Token(e.address,e.chainId);if(!r?.isVolatile)return r}function w(e,r){if(!e||!r)return;let t;switch(r){case n.PendleAssetType.YT:t=e?.yt;break;case n.PendleAssetType.PT:t=e?.pt;break;case n.PendleAssetType.PENDLE_LP:t=e?.lp;break;case n.PendleAssetType.SY:t=e?.sy;break;default:t=void 0;break}return t}const F=(e,r,t)=>{if(i.caseInsensitiveEqual(e.yt.address,t.erc20TokenAddress))return n.PendleSwapType.SwapExactTokenForYt;if(i.caseInsensitiveEqual(e.pt.address,t.erc20TokenAddress))return n.PendleSwapType.SwapExactTokenForPt;if(i.caseInsensitiveEqual(e.yt.address,r.erc20TokenAddress))return n.PendleSwapType.SwapExactYtForToken;if(i.caseInsensitiveEqual(e.pt.address,r.erc20TokenAddress))return n.PendleSwapType.SwapExactPtForToken},q=e=>{let r;switch(e){case n.PendleSwapType.SwapExactTokenForYt:r=o.API_CONFIG.ROUTES.pendleSwapExactTokenForYT;break;case n.PendleSwapType.SwapExactTokenForPt:r=o.API_CONFIG.ROUTES.pendleSwapExactTokenForPt;break;case n.PendleSwapType.SwapExactYtForToken:r=o.API_CONFIG.ROUTES.pendleSwapExactYtForToken;break;case n.PendleSwapType.SwapExactPtForToken:r=o.API_CONFIG.ROUTES.pendleSwapExactPtForToken;break;default:throw new Error("Cant determine Pendle Swap Type Api Route")}return r},k=(e,r,t,a)=>{if(!T.isInEnum(s.PendleAction,e))throw new Error("getTokenIndexForPendleFlatFee: Invalid Pendle Action");if(a)return t.findIndex(d=>d.toLowerCase()===a?.toLowerCase());const l=r.findIndex(d=>d>0n),p=r.length-1;if(r[p]<=0n)throw new Error("getTokenIndexForPendleFlatFee: Last token in amountChange is not > 0");let u=l;return(e===s.PendleAction.Mint||e===s.PendleAction.Redeem||e===s.PendleAction.PoolRemove)&&(u=l),u};exports.determinePendleSwapType=F;exports.determinePendleSwapTypeApiRoute=q;exports.erc20TokenFromPendleAsset=P;exports.getAssetTypeFromPendleMarket=w;exports.getTokenIndexForPendleFlatFee=k;

package/functions/protocols/pendle.helpers.mjs

@@ -11,7 +11,7 @@ import { caseInsensitiveEqual as i } from "../utils/caseInsensitive.utils.mjs";
 import "../../types/circom-data.types.mjs";
 import { PendleAction as p } from "../../types/hinkal.types.mjs";
 import "../../types/transactions.types.mjs";
-import { PendleAssetType as d, PendleSwapType as t } from "../../types/pendle.types.mjs";
+import { PendleAssetType as d, PendleSwapType as o } from "../../types/pendle.types.mjs";
 import "../../types/curve.types.mjs";
 import "ethers";
 import "circomlibjs";
@@ -24,77 +24,77 @@ import "axios";
 import "../utils/userAgent.mjs";
 import "../../data-structures/custom-token-registry/CustomTokenRegistry.mjs";
 import "../../data-structures/volatile-helper/VolatileHelper.mjs";
-import { isInEnum as w } from "../utils/enum.utils.mjs";
+import { isInEnum as k } from "../utils/enum.utils.mjs";
 function V(e) {
   if (!e)
     return;
   const r = T(e.address, e.chainId);
   if (!r?.isVolatile)
-    return r?.symbol.toLowerCase() === "weth" && console.log("token:", r), r;
+    return r;
 }
 function j(e, r) {
   if (!e || !r)
     return;
-  let o;
+  let t;
   switch (r) {
     case d.YT:
-      o = e?.yt;
+      t = e?.yt;
       break;
     case d.PT:
-      o = e?.pt;
+      t = e?.pt;
       break;
     case d.PENDLE_LP:
-      o = e?.lp;
+      t = e?.lp;
       break;
     case d.SY:
-      o = e?.sy;
+      t = e?.sy;
       break;
     default:
-      o = void 0;
+      t = void 0;
       break;
   }
-  return o;
+  return t;
 }
-const z = (e, r, o) => {
-  if (i(e.yt.address, o.erc20TokenAddress))
-    return t.SwapExactTokenForYt;
-  if (i(e.pt.address, o.erc20TokenAddress))
-    return t.SwapExactTokenForPt;
+const z = (e, r, t) => {
+  if (i(e.yt.address, t.erc20TokenAddress))
+    return o.SwapExactTokenForYt;
+  if (i(e.pt.address, t.erc20TokenAddress))
+    return o.SwapExactTokenForPt;
   if (i(e.yt.address, r.erc20TokenAddress))
-    return t.SwapExactYtForToken;
+    return o.SwapExactYtForToken;
   if (i(e.pt.address, r.erc20TokenAddress))
-    return t.SwapExactPtForToken;
+    return o.SwapExactPtForToken;
 }, H = (e) => {
   let r;
   switch (e) {
-    case t.SwapExactTokenForYt:
+    case o.SwapExactTokenForYt:
       r = n.ROUTES.pendleSwapExactTokenForYT;
       break;
-    case t.SwapExactTokenForPt:
+    case o.SwapExactTokenForPt:
       r = n.ROUTES.pendleSwapExactTokenForPt;
       break;
-    case t.SwapExactYtForToken:
+    case o.SwapExactYtForToken:
       r = n.ROUTES.pendleSwapExactYtForToken;
       break;
-    case t.SwapExactPtForToken:
+    case o.SwapExactPtForToken:
       r = n.ROUTES.pendleSwapExactPtForToken;
       break;
     default:
       throw new Error("Cant determine Pendle Swap Type Api Route");
   }
   return r;
-}, J = (e, r, o, s) => {
-  if (!w(p, e))
+}, J = (e, r, t, s) => {
+  if (!k(p, e))
     throw new Error("getTokenIndexForPendleFlatFee: Invalid Pendle Action");
   if (s)
-    return o.findIndex(
+    return t.findIndex(
       (a) => a.toLowerCase() === s?.toLowerCase()
     );
-  const l = r.findIndex((a) => a > 0n), m = r.length - 1;
+  const c = r.findIndex((a) => a > 0n), m = r.length - 1;
   if (r[m] <= 0n)
     throw new Error("getTokenIndexForPendleFlatFee: Last token in amountChange is not > 0");
-  let c = l;
-  return (e === p.Mint || e === p.Redeem || e === p.PoolRemove) && (c = l), c;
+  let l = c;
+  return (e === p.Mint || e === p.Redeem || e === p.PoolRemove) && (l = c), l;
 };
 export {
   z as determinePendleSwapType,

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("../../constants/chains.constants.cjs"),G=require("../../constants/protocol.constants.cjs"),J=require("../../data-structures/utxo/Utxo.cjs"),m=require("../../types/hinkal.stake.types.cjs"),S=require("../../webworker/performTaskWithWorker.cjs"),k=require("../../webworker/worker.registry.cjs"),p=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),F=require("../web3/etherFunctions.cjs"),i=require("./common.snarkjs.cjs"),Q=require("./generateCircomData.cjs"),X=require("./generateZkProof.cjs"),Y=async(u,g,a,r,f,h,y,T,C,P=G.zeroAddress,z=j.chainIds.localhost,s=a.map(()=>!1),_=a.map(()=>0n),I=void 0,n)=>{const W=u.getRootHash(),b=g.getRootHash(),H=a.map(e=>e.map(t=>t.getConstructableParams())),D=f.getSignature(),{accessTokenSiblings:Z,accessTokenSiblingSides:K}=await S.performTaskWithWorker({type:k.WorkerVariant.ZKProof,payload:{type:p.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{userSignature:D,merkleTreeAccessTokenSerialized:g.toJSON()}}}),{inCommitmentSiblings:O,inCommitmentSiblingSides:R}=await S.performTaskWithWorker({type:k.WorkerVariant.ZKProof,payload:{type:p.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:H,userSignature:D,merkleTreeSerialized:u.toJSON()}}}),B=i.calcAmountChanges(a,r),d=i.calcEncryptedOutputs(r,(n&&n.mode!==m.HinkalStakeMode.Deposit)??!1),l=f.getShieldedPrivateKey(),N=J.Utxo.findCorrectRandomization(F.randomBigInt(31),l),E=await S.performTaskWithWorker({type:k.WorkerVariant.ZKProof,payload:{type:p.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:H,onChainCreation:s}}}),o={rootHashHinkal:W,shieldedPrivateKey:l,erc20TokenAddresses:a.map(e=>e[0].erc20TokenAddress),inAmounts:a.map(e=>e.map(t=>t.amount.toString())),inTimeStamps:a.map(e=>e.map(t=>t.timeStamp)),inRandomizations:a.map(e=>e.map(t=>t.randomization)),inNullifiers:E,inCommitmentSiblings:O,inCommitmentSiblingSides:R,outAmounts:r.map(e=>e.map(t=>t.amount.toString())),outTimeStamp:BigInt(r[0][0].timeStamp),outPublicKeys:r.map(e=>e.map(t=>t.getStealthAddress())),extraRandomization:N,amountChanges:B,outCommitments:i.buildOutCommitments(r,s),rootHashAccessToken:b,accessTokenSiblings:Z,accessTokenSiblingSides:K,calldataHash:0n};n||(o.onChainCreation=s);const c=a.map(e=>e[0].tokenId??0),q=c.reduce((e,t)=>e+t,0)>0?c.length:0;q>0&&(o.tokenIds=c);const A=i.calcPublicSignalCount(h,o.erc20TokenAddresses,o.amountChanges,o.inNullifiers,o.outCommitments,q);o.calldataHash=i.createCallDataHash(A,P,T,y,C,d,_,I),n&&(n.mode===m.HinkalStakeMode.Deposit&&(o.mode=0),n.mode===m.HinkalStakeMode.Stake&&(o.mode=1),n.mode===m.HinkalStakeMode.Unstake&&(o.mode=2),o.stakedTokenRecipient=n.stakedTokenRecipient,o.stakeBlinding=n.stakeBlinding,o.depositorAddress=n.depositorAddress);const{zkCallData:L,publicSignals:M}=await X.generateZkProof(z,h,o);console.log("publicSignals",M);const w=i.calcStealthAddressStructure(N,l),v=await Q.generateCircomData(W,b,a,r,d,_,A,y,T,C,P,o.calldataHash,c,w,s,I),V={tokenNumber:a.length,nullifierAmount:a[0].length,outputAmount:r[0].length};return{zkCallData:L,circomData:v,dimData:V,encryptedOutputs:d}};exports.constructZkProof=Y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const V=require("../../constants/chains.constants.cjs"),j=require("../../constants/protocol.constants.cjs"),G=require("../../data-structures/utxo/Utxo.cjs"),m=require("../../types/hinkal.stake.types.cjs"),k=require("../../webworker/performTaskWithWorker.cjs"),S=require("../../webworker/worker.registry.cjs"),p=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),J=require("../web3/etherFunctions.cjs"),i=require("./common.snarkjs.cjs"),F=require("./generateCircomData.cjs"),Q=require("./generateZkProof.cjs"),X=async(u,f,a,r,h,g,y,T,C,P=j.zeroAddress,z=V.chainIds.localhost,s=a.map(()=>!1),_=a.map(()=>0n),I=void 0,n)=>{const W=u.getRootHash(),H=f.getRootHash(),b=a.map(e=>e.map(t=>t.getConstructableParams())),D=h.getSignature(),{accessTokenSiblings:Z,accessTokenSiblingSides:K}=await k.performTaskWithWorker({type:S.WorkerVariant.ZKProof,payload:{type:p.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{userSignature:D,merkleTreeAccessTokenSerialized:f.toJSON()}}}),{inCommitmentSiblings:O,inCommitmentSiblingSides:R}=await k.performTaskWithWorker({type:S.WorkerVariant.ZKProof,payload:{type:p.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:b,userSignature:D,merkleTreeSerialized:u.toJSON()}}}),B=i.calcAmountChanges(a,r),d=i.calcEncryptedOutputs(r,(n&&n.mode!==m.HinkalStakeMode.Deposit)??!1),l=h.getShieldedPrivateKey(),N=G.Utxo.findCorrectRandomization(J.randomBigInt(31),l),E=await k.performTaskWithWorker({type:S.WorkerVariant.ZKProof,payload:{type:p.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:b,onChainCreation:s}}}),o={rootHashHinkal:W,shieldedPrivateKey:l,erc20TokenAddresses:a.map(e=>e[0].erc20TokenAddress),inAmounts:a.map(e=>e.map(t=>t.amount.toString())),inTimeStamps:a.map(e=>e.map(t=>t.timeStamp)),inRandomizations:a.map(e=>e.map(t=>t.randomization)),inNullifiers:E,inCommitmentSiblings:O,inCommitmentSiblingSides:R,outAmounts:r.map(e=>e.map(t=>t.amount.toString())),outTimeStamp:BigInt(r[0][0].timeStamp),outPublicKeys:r.map(e=>e.map(t=>t.getStealthAddress())),extraRandomization:N,amountChanges:B,outCommitments:i.buildOutCommitments(r,s),rootHashAccessToken:H,accessTokenSiblings:Z,accessTokenSiblingSides:K,calldataHash:0n};n||(o.onChainCreation=s);const c=a.map(e=>e[0].tokenId??0),q=c.reduce((e,t)=>e+t,0)>0?c.length:0;q>0&&(o.tokenIds=c);const A=i.calcPublicSignalCount(g,o.erc20TokenAddresses,o.amountChanges,o.inNullifiers,o.outCommitments,q);o.calldataHash=i.createCallDataHash(A,P,T,y,C,d,_,I),n&&(n.mode===m.HinkalStakeMode.Deposit&&(o.mode=0),n.mode===m.HinkalStakeMode.Stake&&(o.mode=1),n.mode===m.HinkalStakeMode.Unstake&&(o.mode=2),o.stakedTokenRecipient=n.stakedTokenRecipient,o.stakeBlinding=n.stakeBlinding,o.depositorAddress=n.depositorAddress);const{zkCallData:L}=await Q.generateZkProof(z,g,o),M=i.calcStealthAddressStructure(N,l),w=await F.generateCircomData(W,H,a,r,d,_,A,y,T,C,P,o.calldataHash,c,M,s,I),v={tokenNumber:a.length,nullifierAmount:a[0].length,outputAmount:r[0].length};return{zkCallData:L,circomData:w,dimData:v,encryptedOutputs:d}};exports.constructZkProof=X;

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,21 +1,21 @@
-import { chainIds as J } from "../../constants/chains.constants.mjs";
-import { zeroAddress as V } from "../../constants/protocol.constants.mjs";
-import { Utxo as j } from "../../data-structures/utxo/Utxo.mjs";
-import { HinkalStakeMode as c } from "../../types/hinkal.stake.types.mjs";
+import { chainIds as G } from "../../constants/chains.constants.mjs";
+import { zeroAddress as J } from "../../constants/protocol.constants.mjs";
+import { Utxo as V } from "../../data-structures/utxo/Utxo.mjs";
+import { HinkalStakeMode as d } from "../../types/hinkal.stake.types.mjs";
 import { performTaskWithWorker as l } from "../../webworker/performTaskWithWorker.mjs";
 import { WorkerVariant as p } from "../../webworker/worker.registry.mjs";
 import { ZKProofWorkerActionType as S } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { randomBigInt as q } from "../web3/etherFunctions.mjs";
-import { calcAmountChanges as F, calcEncryptedOutputs as Q, buildOutCommitments as X, calcPublicSignalCount as Y, createCallDataHash as $, calcStealthAddressStructure as U } from "./common.snarkjs.mjs";
-import { generateCircomData as x } from "./generateCircomData.mjs";
-import { generateZkProof as oo } from "./generateZkProof.mjs";
-const So = async (f, g, a, n, h, u, k, C, I, T = V, R = J.localhost, m = a.map(() => !1), y = a.map(() => 0n), b = void 0, i) => {
-  const N = f.getRootHash(), P = g.getRootHash(), D = a.map((o) => o.map((t) => t.getConstructableParams())), _ = h.getSignature(), { accessTokenSiblings: B, accessTokenSiblingSides: E } = await l({
+import { randomBigInt as j } from "../web3/etherFunctions.mjs";
+import { calcAmountChanges as q, calcEncryptedOutputs as F, buildOutCommitments as Q, calcPublicSignalCount as X, createCallDataHash as Y, calcStealthAddressStructure as $ } from "./common.snarkjs.mjs";
+import { generateCircomData as U } from "./generateCircomData.mjs";
+import { generateZkProof as x } from "./generateZkProof.mjs";
+const po = async (f, g, a, n, h, k, u, C, I, T = J, R = G.localhost, m = a.map(() => !1), y = a.map(() => 0n), N = void 0, i) => {
+  const P = f.getRootHash(), D = g.getRootHash(), _ = a.map((o) => o.map((t) => t.getConstructableParams())), b = h.getSignature(), { accessTokenSiblings: B, accessTokenSiblingSides: E } = await l({
     type: p.ZKProof,
     payload: {
       type: S.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
       data: {
-        userSignature: _,
+        userSignature: b,
         merkleTreeAccessTokenSerialized: g.toJSON()
       }
     }
@@ -23,19 +23,19 @@ const So = async (f, g, a, n, h, u, k, C, I, T = V, R = J.localhost, m = a.map((
     type: p.ZKProof,
     payload: {
       type: S.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-      data: { inputUtxosSerialized: D, userSignature: _, merkleTreeSerialized: f.toJSON() }
+      data: { inputUtxosSerialized: _, userSignature: b, merkleTreeSerialized: f.toJSON() }
     }
-  }), O = F(a, n), d = Q(
+  }), O = q(a, n), c = F(
     n,
-    (i && i.mode !== c.Deposit) ?? !1
-  ), s = h.getShieldedPrivateKey(), H = j.findCorrectRandomization(q(31), s), Z = await l({
+    (i && i.mode !== d.Deposit) ?? !1
+  ), s = h.getShieldedPrivateKey(), H = V.findCorrectRandomization(j(31), s), Z = await l({
     type: p.ZKProof,
     payload: {
       type: S.BUILD_IN_NULLIFIERS,
-      data: { inputUtxosSerialized: D, onChainCreation: m }
+      data: { inputUtxosSerialized: _, onChainCreation: m }
     }
   }), e = {
-    rootHashHinkal: N,
+    rootHashHinkal: P,
     shieldedPrivateKey: s,
     erc20TokenAddresses: a.map((o) => o[0].erc20TokenAddress),
     inAmounts: a.map((o) => o.map((t) => t.amount.toString())),
@@ -49,8 +49,8 @@ const So = async (f, g, a, n, h, u, k, C, I, T = V, R = J.localhost, m = a.map((
     outPublicKeys: n.map((o) => o.map((t) => t.getStealthAddress())),
     extraRandomization: H,
     amountChanges: O,
-    outCommitments: X(n, m),
-    rootHashAccessToken: P,
+    outCommitments: Q(n, m),
+    rootHashAccessToken: D,
     accessTokenSiblings: B,
     accessTokenSiblingSides: E,
     calldataHash: 0n
@@ -58,50 +58,48 @@ const So = async (f, g, a, n, h, u, k, C, I, T = V, R = J.localhost, m = a.map((
   i || (e.onChainCreation = m);
   const r = a.map((o) => o[0].tokenId ?? 0), z = r.reduce((o, t) => o + t, 0) > 0 ? r.length : 0;
   z > 0 && (e.tokenIds = r);
-  const A = Y(
-    u,
+  const A = X(
+    k,
     e.erc20TokenAddresses,
     e.amountChanges,
     e.inNullifiers,
     e.outCommitments,
     z
   );
-  e.calldataHash = $(
+  e.calldataHash = Y(
     A,
     T,
     C,
-    k,
+    u,
     I,
-    d,
+    c,
     y,
-    b
-  ), i && (i.mode === c.Deposit && (e.mode = 0), i.mode === c.Stake && (e.mode = 1), i.mode === c.Unstake && (e.mode = 2), e.stakedTokenRecipient = i.stakedTokenRecipient, e.stakeBlinding = i.stakeBlinding, e.depositorAddress = i.depositorAddress);
-  const { zkCallData: w, publicSignals: W } = await oo(R, u, e);
-  console.log("publicSignals", W);
-  const v = U(H, s), M = await x(
-    N,
+    N
+  ), i && (i.mode === d.Deposit && (e.mode = 0), i.mode === d.Stake && (e.mode = 1), i.mode === d.Unstake && (e.mode = 2), e.stakedTokenRecipient = i.stakedTokenRecipient, e.stakeBlinding = i.stakeBlinding, e.depositorAddress = i.depositorAddress);
+  const { zkCallData: w } = await x(R, k, e), W = $(H, s), v = await U(
     P,
+    D,
     a,
     n,
-    d,
+    c,
     y,
     A,
-    k,
+    u,
     C,
     I,
     T,
     e.calldataHash,
     r,
-    v,
+    W,
     m,
-    b
-  ), G = {
+    N
+  ), M = {
     tokenNumber: a.length,
     nullifierAmount: a[0].length,
     outputAmount: n[0].length
   };
-  return { zkCallData: w, circomData: M, dimData: G, encryptedOutputs: d };
+  return { zkCallData: w, circomData: v, dimData: M, encryptedOutputs: c };
 };
 export {
-  So as constructZkProof
+  po as constructZkProof
 };

package/functions/utils/cacheFunctions.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("../../error-handling/logError.cjs"),C=require("./getDataFromTransaction.cjs"),S=require("idb-keyval"),u={encryptedOutputs:[],lastOutput:""},h=(e,t)=>{const r=e.substring(0,25),s=t.substring(0,25);return{shortPublicKey:r,shortHinkalAddress:s}},d=new Map,T=(e,t,r)=>{if(!e||!t||!r)throw Error("GetHinkalCache: incorrect arguments");const{shortPublicKey:s,shortHinkalAddress:a}=h(t,r);return JSON.parse(typeof localStorage<"u"?localStorage.getItem(`hinkalCache-${e}-${s}-${a}`)??JSON.stringify(u):d.get(`hinkalCache-${e}-${s}-${a}`)??JSON.stringify(u))},f=(e,t,r,s)=>{if(!t||!r||!s)throw Error("SetHinkalCache: incorrect arguments");const{shortPublicKey:a,shortHinkalAddress:o}=h(r,s);typeof localStorage<"u"?localStorage.setItem(`hinkalCache-${t}-${a}-${o}`,JSON.stringify(e)):d.set(`hinkalCache-${t}-${a}-${o}`,JSON.stringify(e))},H=(e,t,r)=>{f(u,e,t,r)},x=(e,t,r)=>`txsCache-${e}-${t}-${r}`,m=async(e,t,r,s,a)=>{if(!t||!r||!s)throw Error("saveTxsCache: incorrect arguments");const{shortPublicKey:o,shortHinkalAddress:c}=h(r,s),l=C.serializeDecodedTxs(e);y.logError("saveTxsCache before saving",{serializedTxs:l});const n=x(t,o,c),i=JSON.stringify({serializedTxs:l,lastHash:a});try{await S.set(n,i)}catch{localStorage.setItem(n,i)}},$={serializedTxs:[],lastHash:""},k=async(e,t,r)=>{if(!e||!t||!r)throw Error("loadTxsCache: incorrect arguments");const{shortPublicKey:s,shortHinkalAddress:a}=h(t,r),o=x(e,s,a);let c;try{const g=await S.get(o);if(!g)throw new Error("Empty indexedDB cache");c=g}catch{c=localStorage.getItem(o)}const{serializedTxs:l,lastHash:n}=JSON.parse(c??JSON.stringify($)),i=l.map(g=>C.deserializeDecodedTxs(g));return y.logError("loadTxsCache ",{decodedTxs:i,lastHash:n}),{decodedTxs:i,lastHash:n===""?void 0:n}};exports.getHinkalCache=T;exports.loadTxsCache=k;exports.resetCache=H;exports.saveTxsCache=m;exports.setHinkalCache=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("./getDataFromTransaction.cjs"),C=require("idb-keyval"),u={encryptedOutputs:[],lastOutput:""},l=(e,t)=>{const s=e.substring(0,25),r=t.substring(0,25);return{shortPublicKey:s,shortHinkalAddress:r}},d=new Map,x=(e,t,s)=>{if(!e||!t||!s)throw Error("GetHinkalCache: incorrect arguments");const{shortPublicKey:r,shortHinkalAddress:a}=l(t,s);return JSON.parse(typeof localStorage<"u"?localStorage.getItem(`hinkalCache-${e}-${r}-${a}`)??JSON.stringify(u):d.get(`hinkalCache-${e}-${r}-${a}`)??JSON.stringify(u))},S=(e,t,s,r)=>{if(!t||!s||!r)throw Error("SetHinkalCache: incorrect arguments");const{shortPublicKey:a,shortHinkalAddress:o}=l(s,r);typeof localStorage<"u"?localStorage.setItem(`hinkalCache-${t}-${a}-${o}`,JSON.stringify(e)):d.set(`hinkalCache-${t}-${a}-${o}`,JSON.stringify(e))},H=(e,t,s)=>{S(u,e,t,s)},f=(e,t,s)=>`txsCache-${e}-${t}-${s}`,T=async(e,t,s,r,a)=>{if(!t||!s||!r)throw Error("saveTxsCache: incorrect arguments");const{shortPublicKey:o,shortHinkalAddress:n}=l(s,r),h=y.serializeDecodedTxs(e),c=f(t,o,n),g=JSON.stringify({serializedTxs:h,lastHash:a});try{await C.set(c,g)}catch{localStorage.setItem(c,g)}},m={serializedTxs:[],lastHash:""},$=async(e,t,s)=>{if(!e||!t||!s)throw Error("loadTxsCache: incorrect arguments");const{shortPublicKey:r,shortHinkalAddress:a}=l(t,s),o=f(e,r,a);let n;try{const i=await C.get(o);if(!i)throw new Error("Empty indexedDB cache");n=i}catch{n=localStorage.getItem(o)}const{serializedTxs:h,lastHash:c}=JSON.parse(n??JSON.stringify(m));return{decodedTxs:h.map(i=>y.deserializeDecodedTxs(i)),lastHash:c===""?void 0:c}};exports.getHinkalCache=x;exports.loadTxsCache=$;exports.resetCache=H;exports.saveTxsCache=T;exports.setHinkalCache=S;

package/functions/utils/cacheFunctions.mjs

@@ -1,57 +1,54 @@
-import { logError as f } from "../../error-handling/logError.mjs";
-import { serializeDecodedTxs as m, deserializeDecodedTxs as S } from "./getDataFromTransaction.mjs";
-import { set as p, get as x } from "idb-keyval";
+import { serializeDecodedTxs as C, deserializeDecodedTxs as S } from "./getDataFromTransaction.mjs";
+import { set as d, get as m } from "idb-keyval";
 const y = {
   encryptedOutputs: [],
   lastOutput: ""
-}, h = (e, t) => {
+}, l = (e, t) => {
   const r = e.substring(0, 25), s = t.substring(0, 25);
   return { shortPublicKey: r, shortHinkalAddress: s };
-}, u = /* @__PURE__ */ new Map(), O = (e, t, r) => {
+}, u = /* @__PURE__ */ new Map(), k = (e, t, r) => {
   if (!e || !t || !r)
     throw Error("GetHinkalCache: incorrect arguments");
-  const { shortPublicKey: s, shortHinkalAddress: o } = h(t, r);
+  const { shortPublicKey: s, shortHinkalAddress: o } = l(t, r);
   return JSON.parse(
     typeof localStorage < "u" ? localStorage.getItem(`hinkalCache-${e}-${s}-${o}`) ?? JSON.stringify(y) : u.get(`hinkalCache-${e}-${s}-${o}`) ?? JSON.stringify(y)
   );
-}, d = (e, t, r, s) => {
+}, p = (e, t, r, s) => {
   if (!t || !r || !s)
     throw Error("SetHinkalCache: incorrect arguments");
-  const { shortPublicKey: o, shortHinkalAddress: a } = h(r, s);
+  const { shortPublicKey: o, shortHinkalAddress: a } = l(r, s);
   typeof localStorage < "u" ? localStorage.setItem(`hinkalCache-${t}-${o}-${a}`, JSON.stringify(e)) : u.set(`hinkalCache-${t}-${o}-${a}`, JSON.stringify(e));
-}, w = (e, t, r) => {
-  d(y, e, t, r);
-}, C = (e, t, r) => `txsCache-${e}-${t}-${r}`, J = async (e, t, r, s, o) => {
+}, T = (e, t, r) => {
+  p(y, e, t, r);
+}, f = (e, t, r) => `txsCache-${e}-${t}-${r}`, O = async (e, t, r, s, o) => {
   if (!t || !r || !s)
     throw Error("saveTxsCache: incorrect arguments");
-  const { shortPublicKey: a, shortHinkalAddress: c } = h(r, s), l = m(e);
-  f("saveTxsCache before saving", { serializedTxs: l });
-  const n = C(t, a, c), i = JSON.stringify({ serializedTxs: l, lastHash: o });
+  const { shortPublicKey: a, shortHinkalAddress: n } = l(r, s), g = C(e), c = f(t, a, n), h = JSON.stringify({ serializedTxs: g, lastHash: o });
   try {
-    await p(n, i);
+    await d(c, h);
   } catch {
-    localStorage.setItem(n, i);
+    localStorage.setItem(c, h);
   }
-}, $ = { serializedTxs: [], lastHash: "" }, N = async (e, t, r) => {
+}, x = { serializedTxs: [], lastHash: "" }, w = async (e, t, r) => {
   if (!e || !t || !r)
     throw Error("loadTxsCache: incorrect arguments");
-  const { shortPublicKey: s, shortHinkalAddress: o } = h(t, r), a = C(e, s, o);
-  let c;
+  const { shortPublicKey: s, shortHinkalAddress: o } = l(t, r), a = f(e, s, o);
+  let n;
   try {
-    const g = await x(a);
-    if (!g)
+    const i = await m(a);
+    if (!i)
       throw new Error("Empty indexedDB cache");
-    c = g;
+    n = i;
   } catch {
-    c = localStorage.getItem(a);
+    n = localStorage.getItem(a);
   }
-  const { serializedTxs: l, lastHash: n } = JSON.parse(c ?? JSON.stringify($)), i = l.map((g) => S(g));
-  return f("loadTxsCache ", { decodedTxs: i, lastHash: n }), { decodedTxs: i, lastHash: n === "" ? void 0 : n };
+  const { serializedTxs: g, lastHash: c } = JSON.parse(n ?? JSON.stringify(x));
+  return { decodedTxs: g.map((i) => S(i)), lastHash: c === "" ? void 0 : c };
 };
 export {
-  O as getHinkalCache,
-  N as loadTxsCache,
-  w as resetCache,
-  J as saveTxsCache,
-  d as setHinkalCache
+  k as getHinkalCache,
+  w as loadTxsCache,
+  T as resetCache,
+  O as saveTxsCache,
+  p as setHinkalCache
 };