@hinkal/common 0.2.14 → 0.2.16

package/data-structures/Hinkal/hinkalSwap.mjs

@@ -1,85 +1,130 @@
-import { transactionErrorCodes as S } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as U } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as L } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as M } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as h } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as F } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getFeeStructure as H } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as K } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { ExternalActionId as N } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as W } from "../../types/hinkal.types.mjs";
-import { outputApprovalDataProcessing as _ } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { ContractType as $ } from "../../types/ethereum-network.types.mjs";
-import { shouldPatchAccessTokenMerkleTree as q } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { getExternalSwapAddress as B } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
-const st = async (t, o, r, n, x, d, C, y = !1, T = !1) => {
-  const c = C ?? await H(t.getCurrentChainId(), d, o, N.Transact);
-  K(t.getCurrentChainId(), o, r, c);
-  const w = B(t, n), s = {
-    externalActionId: n,
-    externalAddress: w,
-    externalActionMetadata: x
-  }, a = [...await M(t, o, r)], A = `swapperM${r.length.toString()}x${a[0].length}x1`, v = [!1, !0, !1].slice(0, r.length), p = [], i = W(r.length, t.userKeys);
-  for (let e = 0; e < o.length; e += 1) {
-    const { outputUtxos: P } = U(
+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 N } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as W } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { getFeeStructure as B } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as V } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { ExternalActionId as $ } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as q } from "../../types/hinkal.types.mjs";
+import { outputApprovalDataProcessing as z } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { ContractType as O } from "../../types/ethereum-network.types.mjs";
+import { shouldPatchAccessTokenMerkleTree as Y } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as Z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { getExternalSwapAddress as b } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
+import { getCurrentTimeInSeconds as j } from "../../functions/utils/time.utils.mjs";
+import { HINKAL_SWAP_VARIABLE_RATE as G } from "../../constants/protocol.constants.mjs";
+import "../../types/circom-data.types.mjs";
+import "../../types/transactions.types.mjs";
+import "../../types/activities.types.mjs";
+import "../../constants/server.constants.mjs";
+import "../../constants/chains.constants.mjs";
+import "../../constants/vite.constants.mjs";
+import "../http/HttpClient.mjs";
+import "axios";
+import "ethers";
+import "../../constants/token-data/index.mjs";
+import "../../API/getServerURL.mjs";
+import "circomlibjs-hinkal-fork";
+import "libsodium-wrappers";
+import "process";
+import "buffer";
+import "../../constants/save-depths.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../../functions/utils/mutexes.utils.mjs";
+import "@coral-xyz/anchor";
+import "@solana/web3.js";
+import "../crypto-keys/keys.mjs";
+import { constructAdminData as J } from "../../functions/pre-transaction/constructAdminData.mjs";
+import "@solana/spl-token";
+const Wt = async (t, m, e, p, l, T, y, v, c = !1, w = !1) => {
+  const o = m.map((r) => r.erc20TokenAddress), n = await t.getEthereumAddress(), d = y ?? await B(
+    t.getCurrentChainId(),
+    T,
+    o,
+    $.Transact,
+    void 0,
+    G
+  );
+  V(t.getCurrentChainId(), o, e, d);
+  const R = b(t, p), i = {
+    externalActionId: p,
+    externalAddress: R,
+    externalActionMetadata: l
+  }, a = [...await F(t, o, e)], D = `swapperM${e.length.toString()}x${a[0].length}x1`, E = [!1, !0, !1].slice(0, e.length), u = [], s = q(e.length, t.userKeys), I = j().toString();
+  for (let r = 0; r < o.length; r += 1) {
+    const { outputUtxos: H } = M(
       t.userKeys,
-      a[e],
-      r[e],
-      void 0,
+      a[r],
+      e[r],
+      I,
       void 0,
       !1
     );
-    p.push(P);
-    const { useApprovalUtxoData: l } = _(t, a[e], r[e]);
-    l && (i.useApprovalUtxoData[e] = l, i.doPreTxApproval = !0);
+    u.push(H);
+    const { useApprovalUtxoData: x } = z(t, a[r], e[r]);
+    x && (s.useApprovalUtxoData[r] = x, s.doPreTxApproval = !0);
   }
-  const m = await t.getRandomRelay();
-  if (!m)
-    throw Error(S.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: E, kycRequired: R, hasAccessToken: D } = await q(
+  const g = await t.getRandomRelay(!c);
+  if (!g)
+    throw Error(K.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: S, kycRequired: P, hasAccessToken: L } = await Y(
     t,
     o,
-    r
-  ), I = await z(
+    e
+  ), U = await Z(
     t.getCurrentChainId(),
-    await t.getEthereumAddress(),
+    n,
     t.userKeys,
-    R,
-    D
-  ), { zkCallData: u, circomData: g, dimData: f } = await L(
+    P,
+    L
+  ), { zkCallData: f, circomData: A, dimData: C } = await _(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     a,
-    p,
+    u,
     t.userKeys,
-    A,
-    s.externalActionId,
-    s.externalAddress,
-    s.externalActionMetadata,
+    D,
+    i.externalActionId,
+    i.externalAddress,
+    i.externalActionMetadata,
     t.generateProofRemotely,
-    m,
+    g,
     t.getCurrentChainId(),
-    v,
+    E,
     void 0,
     void 0,
     void 0,
-    E,
-    i,
+    S,
+    s,
     void 0,
-    c,
-    t.getContractWithFetcher($.HinkalHelperContract),
-    I
+    d,
+    t.getContractWithFetcher(O.HinkalHelperContract),
+    U
   );
-  return y ? await h(t, u, f, g) : await F(
+  if (c)
+    return await N(t, f, C, A);
+  const h = J(
+    v,
+    t.getCurrentChainId(),
+    o,
+    e,
+    n,
+    m
+  );
+  return await W(
     t.getCurrentChainId(),
-    u,
     f,
-    g,
-    T
+    C,
+    A,
+    w,
+    void 0,
+    void 0,
+    h
   );
 };
 export {
-  st as hinkalSwap
+  Wt as hinkalSwap
 };

package/data-structures/Hinkal/hinkalTransfer.cjs

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

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

@@ -1 +1,4 @@
-export declare const hinkalTransfer: () => Promise<void>;
+import { FeeStructure } from '../../types/hinkal.types';
+import { AdminTransactionType, ERC20Token } from '../../types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesBase: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import("../../types").RelayerTransaction>;

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,5 +1,130 @@
-const n = async () => {
+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 "../../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 { 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 "../../constants/server.constants.mjs";
+import "../../constants/chains.constants.mjs";
+import "../../constants/vite.constants.mjs";
+import "../http/HttpClient.mjs";
+import "axios";
+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 "@coral-xyz/anchor";
+import "@solana/web3.js";
+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))
+    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;
+  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])
+    throw Error("Transfer Action: No Token Found");
+  const n = await t.getRandomRelay(), 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(
+      t.userKeys,
+      s[r],
+      o[r],
+      y,
+      void 0,
+      !1,
+      d,
+      r === 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);
+  }
+  if (!n)
+    throw Error(p.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: D, kycRequired: P, hasAccessToken: N } = await Z(
+    t,
+    e,
+    o
+  ), _ = await b(
+    a,
+    await t.getEthereumAddress(),
+    t.userKeys,
+    P,
+    N
+  ), { zkCallData: g, circomData: T, dimData: l } = await S(
+    "v1x1",
+    t.merkleTreeHinkal,
+    t.merkleTreeAccessToken,
+    s,
+    f,
+    t.userKeys,
+    v,
+    m.externalActionId,
+    m.externalAddress,
+    m.externalActionMetadata,
+    t.generateProofRemotely,
+    n,
+    a,
+    void 0,
+    void 0,
+    void 0,
+    void 0,
+    D,
+    c,
+    void 0,
+    A,
+    t.getContractWithFetcher(K.HinkalHelperContract),
+    _
+  );
+  if (R)
+    return await M(t, g, l, T);
+  const h = G(
+    w,
+    a,
+    e,
+    o,
+    await t.getEthereumAddress()
+  );
+  return await F(
+    a,
+    g,
+    l,
+    T,
+    void 0,
+    void 0,
+    void 0,
+    h
+  );
 };
 export {
-  n as hinkalTransfer
+  St as hinkalTransfer
 };

package/data-structures/Hinkal/hinkalWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../constants/protocol.constants.cjs"),m=require("../../error-handling/error-codes.constants.cjs"),F=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),I=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),U=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),R=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),_=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),k=require("../../types/external-action.types.cjs"),W=require("../../types/hinkal.types.cjs"),L=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),N=require("../../functions/pre-transaction/getFeeStructure.cjs"),H=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");require("../../types/curve.types.cjs");require("../../types/activities.types.cjs");const G=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),b=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),z=async(e,p,r,C,a,T,w,y=!1)=>{const o=p.map(t=>t.erc20TokenAddress);let c;a||(c=w??await N.getFeeStructure(e.getCurrentChainId(),T,o,k.ExternalActionId.Transact),H.mergeWithFeeStructure(e.getCurrentChainId(),o,r,c));const n=p[0];if(!n)throw Error("Deposit Action: No Token Found");const i={externalActionId:0n,externalAddress:C,externalActionMetadata:"0x00"},s=[...await U.addPaddingToUtxos(e,o,r)],h=`swapperM${r.length.toString()}x${s[0].length}x1`,x=[],u=W.defaultHinkalLogicArgs(r.length,e.userKeys);for(let t=0;t<o.length;t+=1){const{outputUtxos:S}=F.outputUtxoProcessing(e.userKeys,s[t],r[t],void 0,void 0,!1);x.push(S);const{useApprovalUtxoData:q}=L.outputApprovalDataProcessing(e,s[t],r[t]);q&&(u.useApprovalUtxoData[t]=q,u.doPreTxApproval=!0)}const A=await e.getRandomRelay();if(!a&&!A)throw Error(m.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:v,kycRequired:D,hasAccessToken:P}=await b.shouldPatchAccessTokenMerkleTree(e,o,r),E=await G.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,D,P),{zkCallData:d,circomData:g,dimData:l}=await I.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,x,e.userKeys,h,i.externalActionId,i.externalAddress,i.externalActionMetadata,e.generateProofRemotely,a?f.zeroAddress:A,e.getCurrentChainId(),void 0,void 0,void 0,void 0,v,u,void 0,c,e.getContractWithFetcher(K.ContractType.HinkalHelperContract),E);if(y)return await M.estimateGasRelayer(e,d,l,g);if(a){if(!n)throw Error("Withdraw Action: No Token Found");return await R.transactCallDirect(e,r[0],n,d,g,l)}return await _.transactCallRelayer(e.getCurrentChainId(),d,l,g)};exports.hinkalWithdraw=z;
+"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;

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

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
-import { ERC20Token } from '../../types';
-export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmounts: bigint[], recipientAddress: string, isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<any>;
+import { AdminTransactionType, ERC20Token } from '../../types';
+export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientAddress: string, isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<any>;

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -1,95 +1,130 @@
-import { zeroAddress as U } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as h } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as F } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as L } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as M } from "../../functions/web3/events/getShieldedBalance.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 S } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as H } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as K } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as N } from "../../types/hinkal.types.mjs";
-import { outputApprovalDataProcessing as W } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { getFeeStructure as z } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as _ } from "../../functions/pre-transaction/merge-with-fee-structure.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 "../../types/circom-data.types.mjs";
-import { ContractType as $ } from "../../types/ethereum-network.types.mjs";
+import { ContractType as Y } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import "../../types/curve.types.mjs";
 import "../../types/activities.types.mjs";
-import { getSignatureDataForTransact as q } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as B } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-const pt = async (t, g, e, C, a, w, T, l = !1) => {
-  const o = g.map((r) => r.erc20TokenAddress);
-  let i;
-  a || (i = T ?? await z(t.getCurrentChainId(), w, o, K.Transact), _(t.getCurrentChainId(), o, e, i));
-  const c = g[0];
-  if (!c)
+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 "../../constants/chains.constants.mjs";
+import "../../constants/vite.constants.mjs";
+import "../http/HttpClient.mjs";
+import "axios";
+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 "@coral-xyz/anchor";
+import "@solana/web3.js";
+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
+  );
+  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)
     throw Error("Deposit Action: No Token Found");
-  const n = {
+  const c = {
     externalActionId: 0n,
-    externalAddress: C,
+    externalAddress: l,
     externalActionMetadata: "0x00"
-  }, s = [...await M(t, o, e)], v = `swapperM${e.length.toString()}x${s[0].length}x1`, x = [], m = N(e.length, t.userKeys);
-  for (let r = 0; r < o.length; r += 1) {
-    const { outputUtxos: P } = F(
+  }, 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(
       t.userKeys,
-      s[r],
-      e[r],
-      void 0,
+      i[r],
+      o[r],
+      I,
       void 0,
       !1
     );
-    x.push(P);
-    const { useApprovalUtxoData: A } = W(t, s[r], e[r]);
-    A && (m.useApprovalUtxoData[r] = A, m.doPreTxApproval = !0);
+    f.push(F);
+    const { useApprovalUtxoData: C } = $(t, i[r], o[r]);
+    C && (d.useApprovalUtxoData[r] = C, d.doPreTxApproval = !0);
   }
-  const f = await t.getRandomRelay();
-  if (!a && !f)
-    throw Error(h.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: y, kycRequired: D, hasAccessToken: E } = await B(
+  const x = await t.getRandomRelay(!A);
+  if (!a && !x)
+    throw Error(M.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: y, kycRequired: S, hasAccessToken: h } = await b(
     t,
-    o,
-    e
-  ), I = await q(
+    e,
+    o
+  ), P = await Z(
     t.getCurrentChainId(),
     await t.getEthereumAddress(),
     t.userKeys,
-    D,
-    E
-  ), { zkCallData: p, circomData: d, dimData: u } = await L(
+    S,
+    h
+  ), { zkCallData: p, circomData: u, dimData: g } = await K(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    s,
-    x,
+    i,
+    f,
     t.userKeys,
-    v,
-    n.externalActionId,
-    n.externalAddress,
-    n.externalActionMetadata,
+    E,
+    c.externalActionId,
+    c.externalAddress,
+    c.externalActionMetadata,
     t.generateProofRemotely,
-    a ? U : f,
+    a ? L : x,
     t.getCurrentChainId(),
     void 0,
     void 0,
     void 0,
     void 0,
     y,
-    m,
+    d,
     void 0,
-    i,
-    t.getContractWithFetcher($.HinkalHelperContract),
-    I
+    n,
+    t.getContractWithFetcher(Y.HinkalHelperContract),
+    P,
+    a ? await t.getEthereumAddress() : void 0
   );
-  if (l)
-    return await R(t, p, u, d);
+  if (A)
+    return await R(t, p, g, u);
   if (a) {
-    if (!c)
+    if (!m)
       throw Error("Withdraw Action: No Token Found");
-    return await S(t, e[0], c, p, d, u);
+    return await W(t, o[0], m, p, u, g);
   }
-  return await H(t.getCurrentChainId(), p, u, d);
+  const U = G(
+    D,
+    t.getCurrentChainId(),
+    e,
+    o,
+    await t.getEthereumAddress()
+  );
+  return await z(
+    t.getCurrentChainId(),
+    p,
+    g,
+    u,
+    void 0,
+    void 0,
+    void 0,
+    U
+  );
 };
 export {
-  pt as hinkalWithdraw
+  Lt as hinkalWithdraw
 };

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -0,0 +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;

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

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