@hinkal/common 0.2.19 → 0.2.21

package/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -30,46 +30,46 @@ import "../../constants/events.constants.mjs";
 import { shouldPatchAccessTokenMerkleTree as j } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { ethers as J } from "ethers";
 import { validateAndGetChainId as Q } from "../../functions/utils/token-check.utils.mjs";
-const Kt = async (t, m, e, c, A, g, p = !1) => {
+const Ct = async (r, m, e, c, A, g, p = !1) => {
   if (p)
     throw new Error("onlyGasEstimate is not supported for Solana withdraw");
-  const r = Q(m), o = m.map((U) => U.erc20TokenAddress), w = await t.getEthereumAddress(), { originalDeployer: d, hinkalIdl: l } = Z[r].contractData;
+  const t = Q(m), o = m.map((U) => U.erc20TokenAddress), w = await r.getEthereumAddressByChain(t), { originalDeployer: d, hinkalIdl: l } = Z[t].contractData;
   if (!d || !l)
     throw new Error("missing data");
-  const { userKeys: f, merkleTreeAccessTokenByChain: h, merkleTreeHinkalByChain: T } = t, i = g ?? await _(r, A, o, b.Transact);
+  const { userKeys: f, merkleTreeAccessTokenByChain: h, merkleTreeHinkalByChain: T } = r, i = g ?? await _(t, A, o, b.Transact);
   e[0] -= i.flatFee;
   const { patchAccessTokenMerkleTree: S, kycRequired: E, hasAccessToken: R } = await j(
-    t,
     r,
+    t,
     o,
     e
   );
   if (o.length > 1)
     throw new Error("Solana Withdraw: Only one mint address is supported");
-  const s = [...await L(t, r, o, e, 6)][0], k = M().toString(), { outputUtxos: a } = z(
-    t.userKeys,
-    s,
+  const a = [...await L(r, t, o, e, 6)][0], k = M().toString(), { outputUtxos: s } = z(
+    r.userKeys,
+    a,
     e[0],
     k,
     void 0,
     !1
-  ), n = await t.getRandomRelay(r, !p);
+  ), n = await r.getRandomRelay(t, !p);
   if (!n)
     throw Error(W.RELAYER_NOT_AVAILABLE);
-  const v = H.findCorrectRandomization(V(31), t.userKeys.getShieldedPrivateKey()), u = {
+  const v = H.findCorrectRandomization(V(31), r.userKeys.getShieldedPrivateKey()), u = {
     tokenNumber: o.length,
-    nullifierAmount: s.length,
-    outputAmount: a.length
-  }, x = t.getSolanaProgram(l), I = q([a])[0][0], y = Array.from(J.utils.arrayify(I)), { proofAArr: P, proofBArr: B, proofCArr: K, publicInputsArr: O } = await G(
-    t.generateProofRemotely,
+    nullifierAmount: a.length,
+    outputAmount: s.length
+  }, x = r.getSolanaProgram(l), I = q([s])[0][0], y = Array.from(J.utils.arrayify(I)), { proofAArr: B, proofBArr: P, proofCArr: C, publicInputsArr: K } = await G(
+    r.generateProofRemotely,
     d,
-    T[r],
-    h[r],
+    T[t],
+    h[t],
     f,
     x,
     [o[0]],
-    [s],
     [a],
+    [s],
     v,
     i.flatFee,
     i.variableRate,
@@ -77,22 +77,22 @@ const Kt = async (t, m, e, c, A, g, p = !1) => {
     n,
     u,
     [y],
-    r,
+    t,
     S
-  ), C = o[0] === D, F = {
+  ), O = o[0] === D, F = {
     recipient: c,
-    mint: C ? void 0 : o[0]
+    mint: O ? void 0 : o[0]
   }, N = {
-    proofAArr: P,
-    proofBArr: B,
-    proofCArr: K,
-    publicInputsArr: O,
+    proofAArr: B,
+    proofBArr: P,
+    proofCArr: C,
+    publicInputsArr: K,
     encryptedOutputs: [y],
     relayerFee: i.flatFee.toString(),
     dimensions: u
   };
   return Y({
-    chainId: r,
+    chainId: t,
     relayAddress: n,
     functionName: "transact",
     args: N,
@@ -104,5 +104,5 @@ const Kt = async (t, m, e, c, A, g, p = !1) => {
   });
 };
 export {
-  Kt as hinkalSolanaWithdraw
+  Ct as hinkalSolanaWithdraw
 };

package/data-structures/Hinkal/hinkalSwap.cjs

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

package/data-structures/Hinkal/hinkalSwap.mjs

@@ -1,6 +1,6 @@
-import { transactionErrorCodes as M } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as _ } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as B } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactionErrorCodes as K } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as M } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
 import { addPaddingToUtxos as F } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { estimateGasRelayer as k } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
 import { transactCallRelayer as N } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
@@ -31,10 +31,14 @@ 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 { validateAndGetChainId as Q } from "../../functions/utils/token-check.utils.mjs";
-const _t = async (r, s, o, n, T, v, w, C, p = !1, R = !1) => {
-  const t = Q(s), a = s.map((e) => e.erc20TokenAddress), d = await r.getEthereumAddress(), f = w ?? await W(
+const Nt = async (r, s, e, c, T, v, w, C, n = !1, h = !1) => {
+  const t = Q(s), a = s.map((o) => o.erc20TokenAddress), d = await r.getEthereumAddressByChain(t), f = w ?? await W(
     t,
     v,
     a,
@@ -42,40 +46,40 @@ const _t = async (r, s, o, n, T, v, w, C, p = !1, R = !1) => {
     void 0,
     j
   );
-  V(t, a, o, f);
-  const h = Z(t, n), c = {
-    externalActionId: n,
-    externalAddress: h,
+  V(t, a, e, f);
+  const R = Z(t, c), m = {
+    externalActionId: c,
+    externalAddress: R,
     externalActionMetadata: T
-  }, i = [...await F(r, t, a, o)], D = `swapperM${o.length.toString()}x${i[0].length}x1`, E = [!1, !0, !1].slice(0, o.length), u = [], m = q(o.length, r.userKeys), S = b().toString();
-  for (let e = 0; e < a.length; e += 1) {
-    const { outputUtxos: K } = _(
+  }, i = [...await F(r, t, a, e)], D = `swapperM${e.length.toString()}x${i[0].length}x1`, E = [!1, !0, !1].slice(0, e.length), u = [], p = q(e.length, r.userKeys), S = b().toString();
+  for (let o = 0; o < a.length; o += 1) {
+    const { outputUtxos: H } = M(
       r.userKeys,
-      i[e],
-      o[e],
+      i[o],
+      e[o],
       S,
       void 0,
       !1
     );
-    u.push(K);
-    const { useApprovalUtxoData: y } = z(r, t, i[e], o[e]);
-    y && (m.useApprovalUtxoData[e] = y, m.doPreTxApproval = !0);
+    u.push(H);
+    const { useApprovalUtxoData: y } = z(r, t, i[o], e[o]);
+    y && (p.useApprovalUtxoData[o] = y, p.doPreTxApproval = !0);
   }
-  const g = await r.getRandomRelay(t, !p);
+  const g = await r.getRandomRelay(t, !n);
   if (!g)
-    throw Error(M.RELAYER_NOT_AVAILABLE);
+    throw Error(K.RELAYER_NOT_AVAILABLE);
   const { patchAccessTokenMerkleTree: P, kycRequired: I, hasAccessToken: L } = await O(
     r,
     t,
     a,
-    o
+    e
   ), U = await Y(
     t,
     d,
     r.userKeys,
     I,
     L
-  ), { zkCallData: l, circomData: A, dimData: x } = await B(
+  ), { zkCallData: l, circomData: A, dimData: x } = await _(
     "v1x1",
     r.merkleTreeHinkalByChain[t],
     r.merkleTreeAccessTokenByChain[t],
@@ -83,9 +87,9 @@ const _t = async (r, s, o, n, T, v, w, C, p = !1, R = !1) => {
     u,
     r.userKeys,
     D,
-    c.externalActionId,
-    c.externalAddress,
-    c.externalActionMetadata,
+    m.externalActionId,
+    m.externalAddress,
+    m.externalActionMetadata,
     r.generateProofRemotely,
     g,
     t,
@@ -93,26 +97,26 @@ const _t = async (r, s, o, n, T, v, w, C, p = !1, R = !1) => {
     void 0,
     void 0,
     P,
-    m,
+    p,
     void 0,
     f,
     r.getContractWithFetcher(t, G.HinkalHelperContract),
     U
   );
-  if (p)
+  if (n)
     return await k(t, l, x, A);
-  const H = J(C, t, a, o, d, s);
+  const B = J(C, t, a, e, d, s);
   return await N(
     t,
     l,
     x,
     A,
-    R,
+    h,
     void 0,
     void 0,
-    H
+    B
   );
 };
 export {
-  _t as hinkalSwap
+  Nt as hinkalSwap
 };

package/data-structures/Hinkal/hinkalTransfer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("../../error-handling/error-codes.constants.cjs"),k=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),F=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),M=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),U=require("../../functions/pre-transaction/getFeeStructure.cjs"),L=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const V=require("../../types/ethereum-network.types.cjs"),B=require("../../types/external-action.types.cjs"),H=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/outputUtxoProcessing.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");const O=require("../../constants/protocol.constants.cjs");require("../../constants/chains.constants.cjs");const G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),b=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");const Z=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),j=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),z=require("../../functions/utils/addresses.cjs"),Y=require("../../functions/utils/token-check.utils.cjs"),J=async(e,s,x,l,y,h,C,f=!1)=>{const t=Y.validateAndGetChainId(s);if(!z.isValidPrivateAddress(l))throw Error(d.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const a=s.map(r=>r.erc20TokenAddress),o=await W.modifyVolatileTokenAmountChanges(t,s,x),A=-o[0]*(10000n-O.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(A<=0n)throw Error(d.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const g=h??await U.getFeeStructure(t,y,a,B.ExternalActionId.Transact);if(L.mergeWithFeeStructure(t,a,o,g),!s[0])throw Error("Transfer Action: No Token Found");const i=await e.getRandomRelay(t,!0),c={externalActionId:0n,externalAddress:i??await e.getEthereumAddress(),externalActionMetadata:"0x00"},n=[...await N.addPaddingToUtxos(e,t,a,o)],w=`swapperM${o.length}x${n[0].length}x2`,q=[],u=H.defaultHinkalLogicArgs(o.length,e.userKeys),R=Z.getCurrentTimeInSeconds().toString();for(let r=0;r<a.length;r+=1){const{outputUtxos:S}=K.outputUtxoProcessing(e.userKeys,n[r],o[r],R,void 0,!1,l,r===0?A:0n);q.push(S);const{useApprovalUtxoData:E}=G.outputApprovalDataProcessing(e,t,n[r],o[r]);E&&(u.useApprovalUtxoData[r]=E,u.doPreTxApproval=!0)}if(!i)throw Error(d.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:v,kycRequired:I,hasAccessToken:_}=await $.shouldPatchAccessTokenMerkleTree(e,t,a,o),D=await j.getSignatureDataForTransact(t,await e.getEthereumAddress(),e.userKeys,I,_),{zkCallData:m,circomData:p,dimData:T}=await k.constructZkProof("v1x1",e.merkleTreeHinkalByChain[t],e.merkleTreeAccessTokenByChain[t],n,q,e.userKeys,w,c.externalActionId,c.externalAddress,c.externalActionMetadata,e.generateProofRemotely,i,t,void 0,void 0,void 0,v,u,void 0,g,e.getContractWithFetcher(t,V.ContractType.HinkalHelperContract),D);if(f)return await F.estimateGasRelayer(t,m,T,p);const P=b.constructAdminData(C,t,a,o,await e.getEthereumAddress());return await M.transactCallRelayer(t,m,T,p,void 0,void 0,void 0,P)};exports.hinkalTransfer=J;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("../../error-handling/error-codes.constants.cjs"),k=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),F=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),M=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),U=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const L=require("../../types/ethereum-network.types.cjs"),V=require("../../types/external-action.types.cjs"),H=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/outputUtxoProcessing.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");const O=require("../../constants/protocol.constants.cjs");require("../../constants/chains.constants.cjs");const G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),b=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 Z=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),j=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),z=require("../../functions/utils/addresses.cjs"),Y=require("../../functions/utils/token-check.utils.cjs"),J=async(t,s,E,l,h,x,C,f=!1)=>{const e=Y.validateAndGetChainId(s);if(!z.isValidPrivateAddress(l))throw Error(d.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const a=s.map(r=>r.erc20TokenAddress),o=await W.modifyVolatileTokenAmountChanges(e,s,E),A=-o[0]*(10000n-O.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(A<=0n)throw Error(d.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const q=x??await U.getFeeStructure(e,h,a,V.ExternalActionId.Transact);if(B.mergeWithFeeStructure(e,a,o,q),!s[0])throw Error("Transfer Action: No Token Found");const i=await t.getRandomRelay(e,!0),c={externalActionId:0n,externalAddress:i??await t.getEthereumAddressByChain(e),externalActionMetadata:"0x00"},n=[...await N.addPaddingToUtxos(t,e,a,o)],w=`swapperM${o.length}x${n[0].length}x2`,g=[],u=H.defaultHinkalLogicArgs(o.length,t.userKeys),R=Z.getCurrentTimeInSeconds().toString();for(let r=0;r<a.length;r+=1){const{outputUtxos:S}=K.outputUtxoProcessing(t.userKeys,n[r],o[r],R,void 0,!1,l,r===0?A:0n);g.push(S);const{useApprovalUtxoData:y}=G.outputApprovalDataProcessing(t,e,n[r],o[r]);y&&(u.useApprovalUtxoData[r]=y,u.doPreTxApproval=!0)}if(!i)throw Error(d.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:v,kycRequired:I,hasAccessToken:_}=await $.shouldPatchAccessTokenMerkleTree(t,e,a,o),D=await j.getSignatureDataForTransact(e,await t.getEthereumAddressByChain(e),t.userKeys,I,_),{zkCallData:m,circomData:p,dimData:T}=await k.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],n,g,t.userKeys,w,c.externalActionId,c.externalAddress,c.externalActionMetadata,t.generateProofRemotely,i,e,void 0,void 0,void 0,v,u,void 0,q,t.getContractWithFetcher(e,L.ContractType.HinkalHelperContract),D);if(f)return await F.estimateGasRelayer(e,m,T,p);const P=b.constructAdminData(C,e,a,o,await t.getEthereumAddressByChain(e));return await M.transactCallRelayer(e,m,T,p,void 0,void 0,void 0,P)};exports.hinkalTransfer=J;

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,14 +1,14 @@
 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 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 { 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 "../../types/circom-data.types.mjs";
-import { ContractType as K } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as k } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as B } from "../../types/hinkal.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 "../../types/activities.types.mjs";
 import { outputUtxoProcessing as O } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
@@ -28,33 +28,37 @@ 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 Ft = async (t, i, E, d, w, y, I, C = !1) => {
-  const r = j(i);
+const Kt = async (r, i, E, d, y, C, w, I = !1) => {
+  const t = j(i);
   if (!b(d))
     throw Error(p.RECIPIENT_FORMAT_INCORRECT);
-  const a = i.map((o) => o.erc20TokenAddress), e = await $(r, i, E), u = -e[0] * (10000n - G) / 10000n;
+  const a = i.map((o) => o.erc20TokenAddress), e = await $(t, i, E), u = -e[0] * (10000n - G) / 10000n;
   if (u <= 0n)
     throw Error(p.RECIPIENT_AMOUNT_INVALID);
-  const A = y ?? await V(r, w, a, k.Transact);
-  if (H(r, a, e, A), !i[0])
+  const A = C ?? await F(t, y, a, K.Transact);
+  if (V(t, a, e, A), !i[0])
     throw Error("Transfer Action: No Token Found");
-  const n = await t.getRandomRelay(r, !0), m = {
+  const n = await r.getRandomRelay(t, !0), m = {
     externalActionId: 0n,
-    externalAddress: n ?? await t.getEthereumAddress(),
+    externalAddress: n ?? await r.getEthereumAddressByChain(t),
     externalActionMetadata: "0x00"
-  }, s = [...await U(t, r, a, e)], R = `swapperM${e.length}x${s[0].length}x2`, f = [], c = B(e.length, t.userKeys), v = z().toString();
+  }, 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(
-      t.userKeys,
+      r.userKeys,
       s[o],
       e[o],
-      v,
+      R,
       void 0,
       !1,
       d,
@@ -62,57 +66,57 @@ const Ft = async (t, i, E, d, w, y, I, C = !1) => {
       // first token is which is sent to recipient
     );
     f.push(L);
-    const { useApprovalUtxoData: x } = W(t, r, s[o], e[o]);
+    const { useApprovalUtxoData: x } = W(r, t, s[o], e[o]);
     x && (c.useApprovalUtxoData[o] = x, c.doPreTxApproval = !0);
   }
   if (!n)
     throw Error(p.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: h, kycRequired: D, hasAccessToken: P } = await Y(
-    t,
+  const { patchAccessTokenMerkleTree: v, kycRequired: D, hasAccessToken: P } = await Y(
     r,
+    t,
     a,
     e
   ), N = await Z(
-    r,
-    await t.getEthereumAddress(),
-    t.userKeys,
+    t,
+    await r.getEthereumAddressByChain(t),
+    r.userKeys,
     D,
     P
   ), { zkCallData: l, circomData: g, dimData: T } = await S(
     "v1x1",
-    t.merkleTreeHinkalByChain[r],
-    t.merkleTreeAccessTokenByChain[r],
+    r.merkleTreeHinkalByChain[t],
+    r.merkleTreeAccessTokenByChain[t],
     s,
     f,
-    t.userKeys,
-    R,
+    r.userKeys,
+    h,
     m.externalActionId,
     m.externalAddress,
     m.externalActionMetadata,
-    t.generateProofRemotely,
+    r.generateProofRemotely,
     n,
-    r,
+    t,
     void 0,
     void 0,
     void 0,
-    h,
+    v,
     c,
     void 0,
     A,
-    t.getContractWithFetcher(r, K.HinkalHelperContract),
+    r.getContractWithFetcher(t, H.HinkalHelperContract),
     N
   );
-  if (C)
-    return await M(r, l, T, g);
+  if (I)
+    return await B(t, l, T, g);
   const _ = q(
-    I,
-    r,
+    w,
+    t,
     a,
     e,
-    await t.getEthereumAddress()
+    await r.getEthereumAddressByChain(t)
   );
-  return await F(
-    r,
+  return await M(
+    t,
     l,
     T,
     g,
@@ -123,5 +127,5 @@ const Ft = async (t, i, E, d, w, y, I, C = !1) => {
   );
 };
 export {
-  Ft as hinkalTransfer
+  Kt 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"),I=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"),B=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("../crypto-keys/keys.cjs");const J=require("../../functions/utils/time.utils.cjs"),Q=require("../../functions/utils/token-check.utils.cjs"),X=async(e,n,w,T,s,y,v,D,p=!1)=>{const t=Q.validateAndGetChainId(n),a=n.map(r=>r.erc20TokenAddress),o=await j.modifyVolatileTokenAmountChanges(t,n,w);let c;s||(c=v??await V.getFeeStructure(t,y,a,H.ExternalActionId.Transact),b.mergeWithFeeStructure(t,a,o,c));const u=n[0];if(!u)throw Error("Deposit Action: No Token Found");const d={externalActionId:0n,externalAddress:T,externalActionMetadata:"0x00"},i=[...await W.addPaddingToUtxos(e,t,a,o)],C=`swapperM${o.length.toString()}x${i[0].length}x1`,m=[],l=K.defaultHinkalLogicArgs(o.length,e.userKeys),S=J.getCurrentTimeInSeconds().toString();for(let r=0;r<a.length;r+=1){const{outputUtxos:_}=M.outputUtxoProcessing(e.userKeys,i[r],o[r],S,void 0,!1);m.push(_);const{useApprovalUtxoData:h}=G.outputApprovalDataProcessing(e,t,i[r],o[r]);h&&(l.useApprovalUtxoData[r]=h,l.doPreTxApproval=!0)}const x=await e.getRandomRelay(t,!p);if(!s&&!x)throw Error(I.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:E,kycRequired:P,hasAccessToken:k}=await $.shouldPatchAccessTokenMerkleTree(e,t,a,o),f=await Z.getSignatureDataForTransact(t,await e.getEthereumAddress(),e.userKeys,P,k),{zkCallData:A,circomData:g,dimData:q}=await R.constructZkProof("v1x1",e.merkleTreeHinkalByChain[t],e.merkleTreeAccessTokenByChain[t],i,m,e.userKeys,C,d.externalActionId,d.externalAddress,d.externalActionMetadata,e.generateProofRemotely,s?U.zeroAddress:x,t,void 0,void 0,void 0,E,l,void 0,c,e.getContractWithFetcher(t,z.ContractType.HinkalHelperContract),f,s?await e.getEthereumAddress():void 0);if(p)return await L.estimateGasRelayer(t,A,q,g);if(s){if(!u)throw Error("Withdraw Action: No Token Found");return await N.transactCallDirect(e,t,o[0],u,A,g,q)}const F=Y.constructAdminData(D,t,a,o,await e.getEthereumAddress());return await B.transactCallRelayer(t,A,q,g,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"),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;

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -1,11 +1,11 @@
-import { zeroAddress as M } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as H } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as K } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as N } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as R } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as W } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallDirect as k } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as B } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { zeroAddress as L } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as M } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as H } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as K } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+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";
@@ -31,62 +31,66 @@ 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 J } from "../../functions/utils/time.utils.mjs";
 import { validateAndGetChainId as Q } from "../../functions/utils/token-check.utils.mjs";
-const Nt = async (t, s, T, v, i, D, h, y, f = !1) => {
-  const r = Q(s), a = s.map((o) => o.erc20TokenAddress), e = await b(r, s, T);
+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);
   let n;
-  i || (n = h ?? await $(r, D, a, z.Transact), q(r, a, e, n));
+  i || (n = y ?? await $(t, v, a, z.Transact), q(t, a, e, n));
   const c = s[0];
   if (!c)
     throw Error("Deposit Action: No Token Found");
   const p = {
     externalActionId: 0n,
-    externalAddress: v,
+    externalAddress: h,
     externalActionMetadata: "0x00"
-  }, m = [...await R(t, r, a, e)], C = `swapperM${e.length.toString()}x${m[0].length}x1`, l = [], d = V(e.length, t.userKeys), E = J().toString();
+  }, 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) {
-    const { outputUtxos: L } = K(
-      t.userKeys,
+    const { outputUtxos: F } = H(
+      r.userKeys,
       m[o],
       e[o],
       E,
       void 0,
       !1
     );
-    l.push(L);
-    const { useApprovalUtxoData: w } = _(t, r, m[o], e[o]);
+    l.push(F);
+    const { useApprovalUtxoData: w } = _(r, t, m[o], e[o]);
     w && (d.useApprovalUtxoData[o] = w, d.doPreTxApproval = !0);
   }
-  const x = await t.getRandomRelay(r, !f);
+  const x = await r.getRandomRelay(t, !f);
   if (!i && !x)
-    throw Error(H.RELAYER_NOT_AVAILABLE);
+    throw Error(M.RELAYER_NOT_AVAILABLE);
   const { patchAccessTokenMerkleTree: S, kycRequired: I, hasAccessToken: P } = await Z(
-    t,
     r,
+    t,
     a,
     e
   ), U = await Y(
-    r,
-    await t.getEthereumAddress(),
-    t.userKeys,
+    t,
+    await r.getEthereumAddressByChain(t),
+    r.userKeys,
     I,
     P
-  ), { zkCallData: u, circomData: A, dimData: g } = await N(
+  ), { zkCallData: u, circomData: A, dimData: g } = await K(
     "v1x1",
-    t.merkleTreeHinkalByChain[r],
-    t.merkleTreeAccessTokenByChain[r],
+    r.merkleTreeHinkalByChain[t],
+    r.merkleTreeAccessTokenByChain[t],
     m,
     l,
-    t.userKeys,
-    C,
+    r.userKeys,
+    D,
     p.externalActionId,
     p.externalAddress,
     p.externalActionMetadata,
-    t.generateProofRemotely,
-    i ? M : x,
-    r,
+    r.generateProofRemotely,
+    i ? L : x,
+    t,
     void 0,
     void 0,
     void 0,
@@ -94,35 +98,35 @@ const Nt = async (t, s, T, v, i, D, h, y, f = !1) => {
     d,
     void 0,
     n,
-    t.getContractWithFetcher(r, G.HinkalHelperContract),
+    r.getContractWithFetcher(t, G.HinkalHelperContract),
     U,
-    i ? await t.getEthereumAddress() : void 0
+    i ? await r.getEthereumAddressByChain(t) : void 0
   );
   if (f)
-    return await W(r, u, g, A);
+    return await R(t, u, g, A);
   if (i) {
     if (!c)
       throw Error("Withdraw Action: No Token Found");
-    return await k(t, r, e[0], c, u, A, g);
+    return await W(r, t, e[0], c, u, A, g);
   }
-  const F = j(
-    y,
-    r,
+  const B = j(
+    C,
+    t,
     a,
     e,
-    await t.getEthereumAddress()
+    await r.getEthereumAddressByChain(t)
   );
-  return await B(
-    r,
+  return await k(
+    t,
     u,
     g,
     A,
     void 0,
     void 0,
     void 0,
-    F
+    B
   );
 };
 export {
-  Nt as hinkalWithdraw
+  kt as hinkalWithdraw
 };