@hinkal/common 0.2.21 → 0.2.23

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,131 +1,129 @@
 import { transactionErrorCodes as p } from "../../error-handling/error-codes.constants.mjs";
 import { constructZkProof as S } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
 import { addPaddingToUtxos as U } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as B } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as M } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getFeeStructure as F } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as V } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { estimateGasRelayer as M } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as F } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { getFeeStructure as V } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as H } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as H } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as K } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as k } from "../../types/hinkal.types.mjs";
-import "../../types/transactions.types.mjs";
+import { ContractType as K } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as O } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as B } from "../../types/hinkal.types.mjs";
 import "../../types/activities.types.mjs";
-import { outputUtxoProcessing as O } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { outputUtxoProcessing as W } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
+import "../../constants/chains.constants.mjs";
+import "../../constants/vite.constants.mjs";
 import "../http/HttpClient.mjs";
 import "axios";
-import "../../constants/vite.constants.mjs";
 import "ethers";
 import "../../constants/token-data/index.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as G } from "../../constants/protocol.constants.mjs";
-import "../../constants/chains.constants.mjs";
-import { outputApprovalDataProcessing as W } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { modifyVolatileTokenAmountChanges as $ } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as q } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as $ } from "../../constants/protocol.constants.mjs";
+import { outputApprovalDataProcessing as q } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { modifyVolatileTokenAmountChanges as z } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as G } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@coral-xyz/anchor";
 import "@solana/web3.js";
 import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
-import "ethers-v6h";
-import "tweetnacl";
-import "bs58";
-import "buffer";
 import "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as z } from "../../functions/utils/time.utils.mjs";
-import { shouldPatchAccessTokenMerkleTree as Y } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as Z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { isValidPrivateAddress as b } from "../../functions/utils/addresses.mjs";
-import { validateAndGetChainId as j } from "../../functions/utils/token-check.utils.mjs";
-const Kt = async (r, i, E, d, y, C, w, I = !1) => {
-  const t = j(i);
-  if (!b(d))
+import "buffer";
+import { getCurrentTimeInSeconds as Y } from "../../functions/utils/time.utils.mjs";
+import { shouldPatchAccessTokenMerkleTree as Z } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as b } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { isValidPrivateAddress as j } from "../../functions/utils/addresses.mjs";
+const St = async (t, i, E, d, C, I, w, R = !1) => {
+  if (!j(d))
     throw Error(p.RECIPIENT_FORMAT_INCORRECT);
-  const a = i.map((o) => o.erc20TokenAddress), e = await $(t, i, E), u = -e[0] * (10000n - G) / 10000n;
+  const e = i.map((r) => r.erc20TokenAddress), o = await z(
+    t.getCurrentChainId(),
+    i,
+    E
+  ), u = -o[0] * (10000n - $) / 10000n;
   if (u <= 0n)
     throw Error(p.RECIPIENT_AMOUNT_INVALID);
-  const A = C ?? await F(t, y, a, K.Transact);
-  if (V(t, a, e, A), !i[0])
+  const A = I ?? await V(t.getCurrentChainId(), C, e, O.Transact);
+  H(t.getCurrentChainId(), e, o, A);
+  const a = t.getCurrentChainId();
+  if (!i[0])
     throw Error("Transfer Action: No Token Found");
-  const n = await r.getRandomRelay(t, !0), m = {
+  const n = await t.getRandomRelay(), m = {
     externalActionId: 0n,
-    externalAddress: n ?? await r.getEthereumAddressByChain(t),
+    externalAddress: n ?? await t.getEthereumAddress(),
     externalActionMetadata: "0x00"
-  }, s = [...await U(r, t, a, e)], h = `swapperM${e.length}x${s[0].length}x2`, f = [], c = k(e.length, r.userKeys), R = z().toString();
-  for (let o = 0; o < a.length; o += 1) {
-    const { outputUtxos: L } = O(
-      r.userKeys,
-      s[o],
-      e[o],
-      R,
+  }, s = [...await U(t, e, o)], y = `swapperM${o.length}x${s[0].length}x2`, f = [], c = B(o.length, t.userKeys), v = Y().toString();
+  for (let r = 0; r < e.length; r += 1) {
+    const { outputUtxos: L } = W(
+      t.userKeys,
+      s[r],
+      o[r],
+      v,
       void 0,
       !1,
       d,
-      o === 0 ? u : 0n
+      r === 0 ? u : 0n
       // first token is which is sent to recipient
     );
     f.push(L);
-    const { useApprovalUtxoData: x } = W(r, t, s[o], e[o]);
-    x && (c.useApprovalUtxoData[o] = x, c.doPreTxApproval = !0);
+    const { useApprovalUtxoData: x } = q(t, s[r], o[r]);
+    x && (c.useApprovalUtxoData[r] = x, c.doPreTxApproval = !0);
   }
   if (!n)
     throw Error(p.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: v, kycRequired: D, hasAccessToken: P } = await Y(
-    r,
+  const { patchAccessTokenMerkleTree: D, kycRequired: P, hasAccessToken: N } = await Z(
     t,
+    e,
+    o
+  ), _ = await b(
     a,
-    e
-  ), N = await Z(
-    t,
-    await r.getEthereumAddressByChain(t),
-    r.userKeys,
-    D,
-    P
-  ), { zkCallData: l, circomData: g, dimData: T } = await S(
+    await t.getEthereumAddress(),
+    t.userKeys,
+    P,
+    N
+  ), { zkCallData: g, circomData: T, dimData: l } = await S(
     "v1x1",
-    r.merkleTreeHinkalByChain[t],
-    r.merkleTreeAccessTokenByChain[t],
+    t.merkleTreeHinkal,
+    t.merkleTreeAccessToken,
     s,
     f,
-    r.userKeys,
-    h,
+    t.userKeys,
+    y,
     m.externalActionId,
     m.externalAddress,
     m.externalActionMetadata,
-    r.generateProofRemotely,
+    t.generateProofRemotely,
     n,
-    t,
+    a,
     void 0,
     void 0,
     void 0,
-    v,
+    D,
     c,
     void 0,
     A,
-    r.getContractWithFetcher(t, H.HinkalHelperContract),
-    N
+    t.getContractWithFetcher(K.HinkalHelperContract),
+    _
   );
-  if (I)
-    return await B(t, l, T, g);
-  const _ = q(
+  if (R)
+    return await M(t, g, l, T);
+  const h = G(
     w,
-    t,
     a,
     e,
-    await r.getEthereumAddressByChain(t)
+    o,
+    await t.getEthereumAddress()
   );
-  return await M(
-    t,
+  return await F(
+    a,
+    g,
     l,
     T,
-    g,
     void 0,
     void 0,
     void 0,
-    _
+    h
   );
 };
 export {
-  Kt as hinkalTransfer
+  St as hinkalTransfer
 };

package/data-structures/Hinkal/hinkalWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../constants/protocol.constants.cjs"),B=require("../../error-handling/error-codes.constants.cjs"),I=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),M=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),R=require("../../functions/web3/events/getShieldedBalance.cjs"),W=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),L=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),N=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),H=require("../../types/external-action.types.cjs"),K=require("../../types/hinkal.types.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),b=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const z=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),$=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");const j=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),Y=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("buffer");require("../crypto-keys/keys.cjs");const J=require("../../functions/utils/time.utils.cjs"),Q=require("../../functions/utils/token-check.utils.cjs"),X=async(t,n,y,w,s,T,C,v,p=!1)=>{const e=Q.validateAndGetChainId(n),a=n.map(r=>r.erc20TokenAddress),o=await j.modifyVolatileTokenAmountChanges(e,n,y);let c;s||(c=C??await V.getFeeStructure(e,T,a,H.ExternalActionId.Transact),b.mergeWithFeeStructure(e,a,o,c));const u=n[0];if(!u)throw Error("Deposit Action: No Token Found");const d={externalActionId:0n,externalAddress:w,externalActionMetadata:"0x00"},i=[...await R.addPaddingToUtxos(t,e,a,o)],D=`swapperM${o.length.toString()}x${i[0].length}x1`,m=[],l=K.defaultHinkalLogicArgs(o.length,t.userKeys),S=J.getCurrentTimeInSeconds().toString();for(let r=0;r<a.length;r+=1){const{outputUtxos:_}=I.outputUtxoProcessing(t.userKeys,i[r],o[r],S,void 0,!1);m.push(_);const{useApprovalUtxoData:h}=G.outputApprovalDataProcessing(t,e,i[r],o[r]);h&&(l.useApprovalUtxoData[r]=h,l.doPreTxApproval=!0)}const x=await t.getRandomRelay(e,!p);if(!s&&!x)throw Error(B.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:E,kycRequired:P,hasAccessToken:k}=await $.shouldPatchAccessTokenMerkleTree(t,e,a,o),f=await Z.getSignatureDataForTransact(e,await t.getEthereumAddressByChain(e),t.userKeys,P,k),{zkCallData:q,circomData:A,dimData:g}=await M.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],i,m,t.userKeys,D,d.externalActionId,d.externalAddress,d.externalActionMetadata,t.generateProofRemotely,s?U.zeroAddress:x,e,void 0,void 0,void 0,E,l,void 0,c,t.getContractWithFetcher(e,z.ContractType.HinkalHelperContract),f,s?await t.getEthereumAddressByChain(e):void 0);if(p)return await W.estimateGasRelayer(e,q,g,A);if(s){if(!u)throw Error("Withdraw Action: No Token Found");return await L.transactCallDirect(t,e,o[0],u,q,A,g)}const F=Y.constructAdminData(v,e,a,o,await t.getEthereumAddressByChain(e));return await N.transactCallRelayer(e,q,g,A,void 0,void 0,void 0,F)};exports.hinkalWithdraw=X;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../constants/protocol.constants.cjs"),_=require("../../error-handling/error-codes.constants.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),R=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),W=require("../../functions/web3/events/getShieldedBalance.cjs"),L=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),H=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),K=require("../../types/external-action.types.cjs"),V=require("../../types/hinkal.types.cjs"),b=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),k=require("../../functions/pre-transaction/getFeeStructure.cjs"),z=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs");require("../../types/activities.types.cjs");const G=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),Z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");const $=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),j=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("../crypto-keys/keys.cjs");require("buffer");const Y=require("../../functions/utils/time.utils.cjs"),J=async(e,n,C,T,a,w,y,D,q=!1)=>{const o=n.map(t=>t.erc20TokenAddress),r=await $.modifyVolatileTokenAmountChanges(e.getCurrentChainId(),n,C);let c;a||(c=y??await k.getFeeStructure(e.getCurrentChainId(),w,o,K.ExternalActionId.Transact),z.mergeWithFeeStructure(e.getCurrentChainId(),o,r,c));const i=n[0];if(!i)throw Error("Deposit Action: No Token Found");const u={externalActionId:0n,externalAddress:T,externalActionMetadata:"0x00"},s=[...await W.addPaddingToUtxos(e,o,r)],v=`swapperM${r.length.toString()}x${s[0].length}x1`,p=[],d=V.defaultHinkalLogicArgs(r.length,e.userKeys),h=Y.getCurrentTimeInSeconds().toString();for(let t=0;t<o.length;t+=1){const{outputUtxos:F}=M.outputUtxoProcessing(e.userKeys,s[t],r[t],h,void 0,!1);p.push(F);const{useApprovalUtxoData:x}=b.outputApprovalDataProcessing(e,s[t],r[t]);x&&(d.useApprovalUtxoData[t]=x,d.doPreTxApproval=!0)}const m=await e.getRandomRelay(!q);if(!a&&!m)throw Error(_.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:S,kycRequired:E,hasAccessToken:I}=await Z.shouldPatchAccessTokenMerkleTree(e,o,r),P=await G.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,E,I),{zkCallData:g,circomData:l,dimData:A}=await R.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,p,e.userKeys,v,u.externalActionId,u.externalAddress,u.externalActionMetadata,e.generateProofRemotely,a?U.zeroAddress:m,e.getCurrentChainId(),void 0,void 0,void 0,S,d,void 0,c,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),P,a?await e.getEthereumAddress():void 0);if(q)return await L.estimateGasRelayer(e,g,A,l);if(a){if(!i)throw Error("Withdraw Action: No Token Found");return await N.transactCallDirect(e,r[0],i,g,l,A)}const f=j.constructAdminData(D,e.getCurrentChainId(),o,r,await e.getEthereumAddress());return await H.transactCallRelayer(e.getCurrentChainId(),g,A,l,void 0,void 0,void 0,f)};exports.hinkalWithdraw=J;

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -5,128 +5,125 @@ import { constructZkProof as K } from "../../functions/snarkjs/constructGeneralZ
 import { addPaddingToUtxos as N } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { estimateGasRelayer as R } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
 import { transactCallDirect as W } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as k } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as z } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as V } from "../../types/hinkal.types.mjs";
-import { outputApprovalDataProcessing as _ } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { getFeeStructure as $ } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as q } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { transactCallRelayer as z } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as V } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as _ } from "../../types/hinkal.types.mjs";
+import { outputApprovalDataProcessing as $ } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { getFeeStructure as q } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as B } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as G } from "../../types/ethereum-network.types.mjs";
-import "../../types/transactions.types.mjs";
+import { ContractType as Y } from "../../types/ethereum-network.types.mjs";
 import "../../types/activities.types.mjs";
-import { getSignatureDataForTransact as Y } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as Z } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as Z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as b } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
+import "../../constants/chains.constants.mjs";
+import "../../constants/vite.constants.mjs";
 import "../http/HttpClient.mjs";
 import "axios";
-import "../../constants/vite.constants.mjs";
 import "ethers";
 import "../../constants/token-data/index.mjs";
-import "../../constants/chains.constants.mjs";
-import { modifyVolatileTokenAmountChanges as b } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as j } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { modifyVolatileTokenAmountChanges as j } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as G } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@coral-xyz/anchor";
 import "@solana/web3.js";
 import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
-import "ethers-v6h";
-import "tweetnacl";
-import "bs58";
-import "buffer";
 import "../crypto-keys/keys.mjs";
+import "buffer";
 import { getCurrentTimeInSeconds as J } from "../../functions/utils/time.utils.mjs";
-import { validateAndGetChainId as Q } from "../../functions/utils/token-check.utils.mjs";
-const kt = async (r, s, T, h, i, v, y, C, f = !1) => {
-  const t = Q(s), a = s.map((o) => o.erc20TokenAddress), e = await b(t, s, T);
+const Lt = async (t, s, w, l, a, T, v, D, A = !1) => {
+  const e = s.map((r) => r.erc20TokenAddress), o = await j(
+    t.getCurrentChainId(),
+    s,
+    w
+  );
   let n;
-  i || (n = y ?? await $(t, v, a, z.Transact), q(t, a, e, n));
-  const c = s[0];
-  if (!c)
+  a || (n = v ?? await q(t.getCurrentChainId(), T, e, V.Transact), B(t.getCurrentChainId(), e, o, n));
+  const m = s[0];
+  if (!m)
     throw Error("Deposit Action: No Token Found");
-  const p = {
+  const c = {
     externalActionId: 0n,
-    externalAddress: h,
+    externalAddress: l,
     externalActionMetadata: "0x00"
-  }, m = [...await N(r, t, a, e)], D = `swapperM${e.length.toString()}x${m[0].length}x1`, l = [], d = V(e.length, r.userKeys), E = J().toString();
-  for (let o = 0; o < a.length; o += 1) {
+  }, i = [...await N(t, e, o)], E = `swapperM${o.length.toString()}x${i[0].length}x1`, f = [], d = _(o.length, t.userKeys), I = J().toString();
+  for (let r = 0; r < e.length; r += 1) {
     const { outputUtxos: F } = H(
-      r.userKeys,
-      m[o],
-      e[o],
-      E,
+      t.userKeys,
+      i[r],
+      o[r],
+      I,
       void 0,
       !1
     );
-    l.push(F);
-    const { useApprovalUtxoData: w } = _(r, t, m[o], e[o]);
-    w && (d.useApprovalUtxoData[o] = w, d.doPreTxApproval = !0);
+    f.push(F);
+    const { useApprovalUtxoData: C } = $(t, i[r], o[r]);
+    C && (d.useApprovalUtxoData[r] = C, d.doPreTxApproval = !0);
   }
-  const x = await r.getRandomRelay(t, !f);
-  if (!i && !x)
+  const x = await t.getRandomRelay(!A);
+  if (!a && !x)
     throw Error(M.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: S, kycRequired: I, hasAccessToken: P } = await Z(
-    r,
+  const { patchAccessTokenMerkleTree: y, kycRequired: S, hasAccessToken: h } = await b(
     t,
-    a,
-    e
-  ), U = await Y(
-    t,
-    await r.getEthereumAddressByChain(t),
-    r.userKeys,
-    I,
-    P
-  ), { zkCallData: u, circomData: A, dimData: g } = await K(
+    e,
+    o
+  ), P = await Z(
+    t.getCurrentChainId(),
+    await t.getEthereumAddress(),
+    t.userKeys,
+    S,
+    h
+  ), { zkCallData: p, circomData: u, dimData: g } = await K(
     "v1x1",
-    r.merkleTreeHinkalByChain[t],
-    r.merkleTreeAccessTokenByChain[t],
-    m,
-    l,
-    r.userKeys,
-    D,
-    p.externalActionId,
-    p.externalAddress,
-    p.externalActionMetadata,
-    r.generateProofRemotely,
-    i ? L : x,
-    t,
+    t.merkleTreeHinkal,
+    t.merkleTreeAccessToken,
+    i,
+    f,
+    t.userKeys,
+    E,
+    c.externalActionId,
+    c.externalAddress,
+    c.externalActionMetadata,
+    t.generateProofRemotely,
+    a ? L : x,
+    t.getCurrentChainId(),
     void 0,
     void 0,
     void 0,
-    S,
+    y,
     d,
     void 0,
     n,
-    r.getContractWithFetcher(t, G.HinkalHelperContract),
-    U,
-    i ? await r.getEthereumAddressByChain(t) : void 0
+    t.getContractWithFetcher(Y.HinkalHelperContract),
+    P,
+    a ? await t.getEthereumAddress() : void 0
   );
-  if (f)
-    return await R(t, u, g, A);
-  if (i) {
-    if (!c)
+  if (A)
+    return await R(t, p, g, u);
+  if (a) {
+    if (!m)
       throw Error("Withdraw Action: No Token Found");
-    return await W(r, t, e[0], c, u, A, g);
+    return await W(t, o[0], m, p, u, g);
   }
-  const B = j(
-    C,
-    t,
-    a,
+  const U = G(
+    D,
+    t.getCurrentChainId(),
     e,
-    await r.getEthereumAddressByChain(t)
+    o,
+    await t.getEthereumAddress()
   );
-  return await k(
-    t,
-    u,
+  return await z(
+    t.getCurrentChainId(),
+    p,
     g,
-    A,
+    u,
     void 0,
     void 0,
     void 0,
-    B
+    U
   );
 };
 export {
-  kt as hinkalWithdraw
+  Lt as hinkalWithdraw
 };

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("../../error-handling/error-codes.constants.cjs"),E=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),B=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),_=require("../../types/external-action.types.cjs"),R=require("../../types/hinkal.types.cjs"),M=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),b=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const K=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const H=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),N=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");const $=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");const O=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("buffer");require("../crypto-keys/keys.cjs");const G=require("../../functions/utils/time.utils.cjs"),Z=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),j=require("../../functions/web3/events/getShieldedBalance.cjs"),z=require("../../functions/utils/encodeTokenWithId.cjs"),V=require("../../API/unspent-utxos-calls.cjs"),Y=require("../../functions/utils/addresses.cjs"),I=require("../../functions/utils/token-check.utils.cjs"),J=async(t,e,A,d,n)=>{const s=[A.erc20TokenAddress],g=A.erc20TokenAddress,u=await W.getFeeStructure(e,g,s,_.ExternalActionId.Transact),q=d-u.flatFee;if(q<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${d}, Fee: ${u.flatFee}`);const r=[-q];b.mergeWithFeeStructure(e,s,r,u);const i={externalActionId:0n,externalAddress:n,externalActionMetadata:"0x00"},c=[...await j.addPaddingToUtxos(t,e,s,r,void 0,void 0,!1,!0)],o=`swapperM${r.length.toString()}x${c[0].length}x1`,l=R.defaultHinkalLogicArgs(r.length,t.userKeys),y=G.getCurrentTimeInSeconds().toString(),m=[];for(let a=0;a<s.length;a+=1){const{outputUtxos:P}=E.outputUtxoProcessing(t.userKeys,c[a],r[a],y,void 0,!1);m.push(P);const{useApprovalUtxoData:T}=M.outputApprovalDataProcessing(t,e,c[a],r[a]);T&&(l.useApprovalUtxoData[a]=T,l.doPreTxApproval=!0)}const x=await t.getRandomRelay(e,!0);if(!x)throw Error(D.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:f,kycRequired:w,hasAccessToken:k}=await N.shouldPatchAccessTokenMerkleTree(t,e,s,r),h=await H.getSignatureDataForTransact(e,await t.getEthereumAddressByChain(e),t.userKeys,w,k),{zkCallData:v,circomData:U,dimData:C}=await B.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],c,m,t.userKeys,o,i.externalActionId,i.externalAddress,i.externalActionMetadata,t.generateProofRemotely,x,e,void 0,void 0,void 0,f,l,void 0,u,t.getContractWithFetcher(e,K.ContractType.HinkalHelperContract),h,void 0,!1),S=O.constructAdminData(L.AdminTransactionType.WithdrawOnChainUtxos,e,s,r,await t.getEthereumAddressByChain(e));return{tx:await F.transactCallRelayer(e,v,C,U,void 0,void 0,void 0,S),amountToRecipient:q}},Q=async(t,e,A)=>{const d=[],n=I.validateAndGetChainId([e]),s=z.encodeTokenWithId(n,{erc20TokenAddress:e.erc20TokenAddress,tokenId:0}),g=await t.getEthereumAddressByChain(n),u=Y.hashEthereumAddress(g);for(;;){const p=((await Z.getInputUtxoAndBalancePerToken({hinkal:t,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:n}))?.get(s)??[]).filter(o=>o.amount>0n).slice(0,6).sort((o,l)=>Number(l.amount-o.amount)),r=$.countTotalAmountInUtxos(p);if(!r)break;const i=p.map(o=>o.nullifier).filter(o=>!!o),{tx:c}=await J(t,n,e,r,A);i.length>0&&await V.deleteUnspentUtxos(n,u,i),d.push(c)}return d};exports.hinkalWithdrawStuckUtxos=Q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../error-handling/error-codes.constants.cjs"),P=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),D=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),E=require("../../types/external-action.types.cjs"),M=require("../../types/hinkal.types.cjs"),R=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),_=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),b=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),L=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");const N=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const H=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const O=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/utils/encodeTokenWithId.cjs"),z=async(e,a,i,d)=>{const r=[a.erc20TokenAddress],l=a.erc20TokenAddress,c=await _.getFeeStructure(e.getCurrentChainId(),l,r,E.ExternalActionId.Transact),u=i-c.flatFee;if(u<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${c.flatFee}`);const t=[-u];W.mergeWithFeeStructure(e.getCurrentChainId(),r,t,c);const o={externalActionId:0n,externalAddress:d,externalActionMetadata:"0x00"},s=[...await Z.addPaddingToUtxos(e,r,t,void 0,void 0,!1,!0)],T=`swapperM${t.length.toString()}x${s[0].length}x1`,A=M.defaultHinkalLogicArgs(t.length,e.userKeys),m=H.getCurrentTimeInSeconds().toString(),q=[];for(let n=0;n<r.length;n+=1){const{outputUtxos:k}=P.outputUtxoProcessing(e.userKeys,s[n],t[n],m,void 0,!1);q.push(k);const{useApprovalUtxoData:x}=R.outputApprovalDataProcessing(e,s[n],t[n]);x&&(A.useApprovalUtxoData[n]=x,A.doPreTxApproval=!0)}const p=await e.getRandomRelay(!0);if(!p)throw Error(U.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:f,kycRequired:y,hasAccessToken:C}=await L.shouldPatchAccessTokenMerkleTree(e,r,t),w=await K.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,y,C),{zkCallData:I,circomData:h,dimData:v}=await D.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,q,e.userKeys,T,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,p,e.getCurrentChainId(),void 0,void 0,void 0,f,A,void 0,c,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),w,void 0,!1),S=$.constructAdminData(b.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),r,t,await e.getEthereumAddress());return{tx:await F.transactCallRelayer(e.getCurrentChainId(),I,v,h,void 0,void 0,void 0,S),amountToRecipient:u}},G=async(e,a,i)=>{const d=[],r=e.getCurrentChainId(),l=j.encodeTokenWithId(r,{erc20TokenAddress:a.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary();const u=((await O.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0}))?.get(l)??[]).filter(o=>o.amount>0n).slice(0,6).sort((o,s)=>Number(s.amount-o.amount)),g=N.countTotalAmountInUtxos(u);if(!g)break;const{tx:t}=await z(e,a,g,i);d.push(t)}return d};exports.hinkalWithdrawStuckUtxos=G;