@hinkal/common 0.2.17 → 0.2.19

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -7,124 +7,121 @@ import { getFeeStructure as V } from "../../functions/pre-transaction/getFeeStru
 import { mergeWithFeeStructure as H } 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 O } from "../../types/external-action.types.mjs";
+import { ExternalActionId as k } from "../../types/external-action.types.mjs";
 import { defaultHinkalLogicArgs as B } from "../../types/hinkal.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import { outputUtxoProcessing as W } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { outputUtxoProcessing as O } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import "../../constants/server.constants.mjs";
-import "../../constants/chains.constants.mjs";
-import "../../constants/vite.constants.mjs";
+import "../../API/getServerURL.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 $ } 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 { 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 "@coral-xyz/anchor";
 import "@solana/web3.js";
+import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
 import "../crypto-keys/keys.mjs";
-import "circomlibjs-hinkal-fork";
-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))
+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);
+  if (!b(d))
     throw Error(p.RECIPIENT_FORMAT_INCORRECT);
-  const e = i.map((r) => r.erc20TokenAddress), o = await z(
-    t.getCurrentChainId(),
-    i,
-    E
-  ), u = -o[0] * (10000n - $) / 10000n;
+  const a = i.map((o) => o.erc20TokenAddress), e = await $(r, i, E), u = -e[0] * (10000n - G) / 10000n;
   if (u <= 0n)
     throw Error(p.RECIPIENT_AMOUNT_INVALID);
-  const A = I ?? await V(t.getCurrentChainId(), C, e, O.Transact);
-  H(t.getCurrentChainId(), e, o, A);
-  const a = t.getCurrentChainId();
-  if (!i[0])
+  const A = y ?? await V(r, w, a, k.Transact);
+  if (H(r, a, e, A), !i[0])
     throw Error("Transfer Action: No Token Found");
-  const n = await t.getRandomRelay(), m = {
+  const n = await t.getRandomRelay(r, !0), m = {
     externalActionId: 0n,
     externalAddress: n ?? await t.getEthereumAddress(),
     externalActionMetadata: "0x00"
-  }, s = [...await U(t, e, o)], v = `swapperM${o.length}x${s[0].length}x2`, f = [], c = B(o.length, t.userKeys), y = Y().toString();
-  for (let r = 0; r < e.length; r += 1) {
-    const { outputUtxos: L } = W(
+  }, 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();
+  for (let o = 0; o < a.length; o += 1) {
+    const { outputUtxos: L } = O(
       t.userKeys,
-      s[r],
-      o[r],
-      y,
+      s[o],
+      e[o],
+      v,
       void 0,
       !1,
       d,
-      r === 0 ? u : 0n
+      o === 0 ? u : 0n
       // first token is which is sent to recipient
     );
     f.push(L);
-    const { useApprovalUtxoData: x } = q(t, s[r], o[r]);
-    x && (c.useApprovalUtxoData[r] = x, c.doPreTxApproval = !0);
+    const { useApprovalUtxoData: x } = W(t, r, s[o], e[o]);
+    x && (c.useApprovalUtxoData[o] = x, c.doPreTxApproval = !0);
   }
   if (!n)
     throw Error(p.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: D, kycRequired: P, hasAccessToken: N } = await Z(
+  const { patchAccessTokenMerkleTree: h, kycRequired: D, hasAccessToken: P } = await Y(
     t,
-    e,
-    o
-  ), _ = await b(
+    r,
     a,
+    e
+  ), N = await Z(
+    r,
     await t.getEthereumAddress(),
     t.userKeys,
-    P,
-    N
-  ), { zkCallData: g, circomData: T, dimData: l } = await S(
+    D,
+    P
+  ), { zkCallData: l, circomData: g, dimData: T } = await S(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
+    t.merkleTreeHinkalByChain[r],
+    t.merkleTreeAccessTokenByChain[r],
     s,
     f,
     t.userKeys,
-    v,
+    R,
     m.externalActionId,
     m.externalAddress,
     m.externalActionMetadata,
     t.generateProofRemotely,
     n,
-    a,
-    void 0,
+    r,
     void 0,
     void 0,
     void 0,
-    D,
+    h,
     c,
     void 0,
     A,
-    t.getContractWithFetcher(K.HinkalHelperContract),
-    _
+    t.getContractWithFetcher(r, K.HinkalHelperContract),
+    N
   );
-  if (R)
-    return await M(t, g, l, T);
-  const h = G(
-    w,
+  if (C)
+    return await M(r, l, T, g);
+  const _ = q(
+    I,
+    r,
     a,
     e,
-    o,
     await t.getEthereumAddress()
   );
   return await F(
-    a,
-    g,
+    r,
     l,
     T,
+    g,
     void 0,
     void 0,
     void 0,
-    h
+    _
   );
 };
 export {
-  St as hinkalTransfer
+  Ft 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"),_=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/transactions.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("@solana/spl-token");require("../crypto-keys/keys.cjs");require("circomlibjs-hinkal-fork");const Y=require("../../functions/utils/time.utils.cjs"),J=async(e,n,C,T,a,w,v,y,q=!1)=>{const o=n.map(t=>t.erc20TokenAddress),r=await $.modifyVolatileTokenAmountChanges(e.getCurrentChainId(),n,C);let c;a||(c=v??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)],D=`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,D,u.externalActionId,u.externalAddress,u.externalActionMetadata,e.generateProofRemotely,a?U.zeroAddress:m,e.getCurrentChainId(),void 0,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(y,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;
+"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;

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -1,130 +1,128 @@
-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 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 { 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 { 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 "../../types/circom-data.types.mjs";
-import { ContractType as Y } from "../../types/ethereum-network.types.mjs";
+import { ContractType as G } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import { getSignatureDataForTransact as Z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as b } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as Y } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as Z } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import "../../constants/server.constants.mjs";
-import "../../constants/chains.constants.mjs";
-import "../../constants/vite.constants.mjs";
+import "../../API/getServerURL.mjs";
 import "../http/HttpClient.mjs";
 import "axios";
+import "../../constants/vite.constants.mjs";
 import "ethers";
 import "../../constants/token-data/index.mjs";
-import { modifyVolatileTokenAmountChanges as j } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as G } from "../../functions/pre-transaction/constructAdminData.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 "@coral-xyz/anchor";
 import "@solana/web3.js";
+import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
 import "../crypto-keys/keys.mjs";
-import "circomlibjs-hinkal-fork";
 import { getCurrentTimeInSeconds as J } from "../../functions/utils/time.utils.mjs";
-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
-  );
+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);
   let n;
-  a || (n = v ?? await q(t.getCurrentChainId(), T, e, V.Transact), B(t.getCurrentChainId(), e, o, n));
-  const m = s[0];
-  if (!m)
+  i || (n = h ?? await $(r, D, a, z.Transact), q(r, a, e, n));
+  const c = s[0];
+  if (!c)
     throw Error("Deposit Action: No Token Found");
-  const c = {
+  const p = {
     externalActionId: 0n,
-    externalAddress: l,
+    externalAddress: v,
     externalActionMetadata: "0x00"
-  }, 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(
+  }, 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();
+  for (let o = 0; o < a.length; o += 1) {
+    const { outputUtxos: L } = K(
       t.userKeys,
-      i[r],
-      o[r],
-      I,
+      m[o],
+      e[o],
+      E,
       void 0,
       !1
     );
-    f.push(F);
-    const { useApprovalUtxoData: C } = $(t, i[r], o[r]);
-    C && (d.useApprovalUtxoData[r] = C, d.doPreTxApproval = !0);
+    l.push(L);
+    const { useApprovalUtxoData: w } = _(t, r, m[o], e[o]);
+    w && (d.useApprovalUtxoData[o] = w, d.doPreTxApproval = !0);
   }
-  const x = await t.getRandomRelay(!A);
-  if (!a && !x)
-    throw Error(M.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: y, kycRequired: S, hasAccessToken: h } = await b(
+  const x = await t.getRandomRelay(r, !f);
+  if (!i && !x)
+    throw Error(H.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: S, kycRequired: I, hasAccessToken: P } = await Z(
     t,
-    e,
-    o
-  ), P = await Z(
-    t.getCurrentChainId(),
+    r,
+    a,
+    e
+  ), U = await Y(
+    r,
     await t.getEthereumAddress(),
     t.userKeys,
-    S,
-    h
-  ), { zkCallData: p, circomData: u, dimData: g } = await K(
+    I,
+    P
+  ), { zkCallData: u, circomData: A, dimData: g } = await N(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    i,
-    f,
+    t.merkleTreeHinkalByChain[r],
+    t.merkleTreeAccessTokenByChain[r],
+    m,
+    l,
     t.userKeys,
-    E,
-    c.externalActionId,
-    c.externalAddress,
-    c.externalActionMetadata,
+    C,
+    p.externalActionId,
+    p.externalAddress,
+    p.externalActionMetadata,
     t.generateProofRemotely,
-    a ? L : x,
-    t.getCurrentChainId(),
-    void 0,
+    i ? M : x,
+    r,
     void 0,
     void 0,
     void 0,
-    y,
+    S,
     d,
     void 0,
     n,
-    t.getContractWithFetcher(Y.HinkalHelperContract),
-    P,
-    a ? await t.getEthereumAddress() : void 0
+    t.getContractWithFetcher(r, G.HinkalHelperContract),
+    U,
+    i ? await t.getEthereumAddress() : void 0
   );
-  if (A)
-    return await R(t, p, g, u);
-  if (a) {
-    if (!m)
+  if (f)
+    return await W(r, u, g, A);
+  if (i) {
+    if (!c)
       throw Error("Withdraw Action: No Token Found");
-    return await W(t, o[0], m, p, u, g);
+    return await k(t, r, e[0], c, u, A, g);
   }
-  const U = G(
-    D,
-    t.getCurrentChainId(),
+  const F = j(
+    y,
+    r,
+    a,
     e,
-    o,
     await t.getEthereumAddress()
   );
-  return await z(
-    t.getCurrentChainId(),
-    p,
-    g,
+  return await B(
+    r,
     u,
+    g,
+    A,
     void 0,
     void 0,
     void 0,
-    U
+    F
   );
 };
 export {
-  Lt as hinkalWithdraw
+  Nt as hinkalWithdraw
 };

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

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

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.d.ts

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
-import { AdminTransactionType, ERC20Token } from '../../types';
+import { ERC20Token } from '../../types';
 import { RelayerTransaction } from '../../types/relayer.types';
-export declare const hinkalWithdrawStuckUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAddress: string, action?: AdminTransactionType) => Promise<RelayerTransaction[]>;
+export declare const hinkalWithdrawStuckUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAddress: string) => Promise<RelayerTransaction[]>;