@hinkal/common 0.2.26 → 0.2.28

package/data-structures/Hinkal/hinkalTransfer.mjs

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

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

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

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -1,129 +1,127 @@
-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 H } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as I } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as L } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as B } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as K } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { transactCallDirect as M } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as N } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as W } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as R } from "../../types/hinkal.types.mjs";
+import { outputApprovalDataProcessing as z } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { getFeeStructure as V } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as Z } 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 _ } from "../../types/ethereum-network.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 { getKycAndSignatureData as $ } from "../../functions/pre-transaction/getKycAndSignatureData.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/tokens.constants.mjs";
+import { isTronLike as b } from "../../constants/chains.constants.mjs";
+import { modifyVolatileTokenAmountChanges as G } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as Y } 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 "tweetnacl";
+import "bs58";
 import "buffer";
-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 c = {
-    externalActionId: 0n,
-    externalAddress: l,
-    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(
-      t.userKeys,
-      i[r],
-      o[r],
-      I,
+import "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as j } from "../../functions/utils/time.utils.mjs";
+import "libsodium-wrappers";
+import "lodash";
+import { validateAndGetChainId as q } from "../../functions/utils/token-check.utils.mjs";
+import { addressToHexFormat as h, reorderZkCallData as J } from "../../functions/utils/tron.utils.mjs";
+import { calculateTotalFee as Q } from "../../functions/utils/fees.utils.mjs";
+const X = async (o, e, c, i) => {
+  const r = [...await K(o, e, c, i)], d = [], m = R(i.length, o.userKeys), u = j().toString();
+  for (let t = 0; t < c.length; t += 1) {
+    const { outputUtxos: l } = L(
+      o.userKeys,
+      r[t],
+      i[t],
+      u,
       void 0,
       !1
     );
-    f.push(F);
-    const { useApprovalUtxoData: C } = $(t, i[r], o[r]);
-    C && (d.useApprovalUtxoData[r] = C, d.doPreTxApproval = !0);
+    d.push(l);
+    const { useApprovalUtxoData: n } = z(o, e, r[t], i[t]);
+    n && (m.useApprovalUtxoData[t] = n, m.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(
-    t,
-    e,
-    o
-  ), P = await Z(
-    t.getCurrentChainId(),
-    await t.getEthereumAddress(),
-    t.userKeys,
-    S,
-    h
-  ), { zkCallData: p, circomData: u, dimData: g } = await K(
+  return { inputUtxosArray: r, outputUtxosArray: d, hinkalLogicArgs: m };
+}, Vt = async (o, e, c, i, r, d, m, u) => {
+  const t = q(e), l = b(t), n = h(await o.getEthereumAddressByChain(t)), s = e.map((p) => p.erc20TokenAddress), a = await G(t, e, c);
+  let A;
+  if (!r) {
+    const p = m ?? await V(t, d, s, W.Transact), k = Q(-a[0], p);
+    A = {
+      feeToken: p.feeToken,
+      flatFee: k,
+      variableRate: 0n
+    }, Z(t, s, a, A);
+  }
+  const f = e[0];
+  if (!f)
+    throw Error("Deposit Action: No Token Found");
+  const x = {
+    externalActionId: 0n,
+    externalAddress: h(i),
+    externalActionMetadata: "0x00"
+  }, [v, { patchAccessTokenMerkleTree: C, signatureData: D }, { inputUtxosArray: y, outputUtxosArray: F, hinkalLogicArgs: S }] = await Promise.all([
+    o.getRandomRelay(t, !0),
+    $(o, t, s, a, n),
+    X(o, t, s, a)
+  ]);
+  if (!r && !v)
+    throw Error(I.RELAYER_NOT_AVAILABLE);
+  const U = `swapperM${a.length.toString()}x${y[0].length}x1`, { zkCallData: g, circomData: T, dimData: w } = await B(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    i,
-    f,
-    t.userKeys,
-    E,
-    c.externalActionId,
-    c.externalAddress,
-    c.externalActionMetadata,
-    t.generateProofRemotely,
-    a ? L : x,
-    t.getCurrentChainId(),
+    o.merkleTreeHinkalByChain[t],
+    o.merkleTreeAccessTokenByChain[t],
+    y,
+    F,
+    o.userKeys,
+    U,
+    x.externalActionId,
+    x.externalAddress,
+    x.externalActionMetadata,
+    o.generateProofRemotely,
+    r ? H : v,
+    t,
     void 0,
     void 0,
     void 0,
-    y,
-    d,
+    C,
+    S,
     void 0,
-    n,
-    t.getContractWithFetcher(Y.HinkalHelperContract),
-    P,
-    a ? await t.getEthereumAddress() : void 0
-  );
-  if (A)
-    return await R(t, p, g, u);
-  if (a) {
-    if (!m)
+    A,
+    o.getContractWithFetcher(t, _.HinkalHelperContract),
+    D,
+    r ? n : void 0
+  ), E = await J(l, g, w, T);
+  if (r) {
+    if (!f)
       throw Error("Withdraw Action: No Token Found");
-    return await W(t, o[0], m, p, u, g);
+    return await M(o, t, a[0], f, g, T, w);
   }
-  const U = G(
-    D,
-    t.getCurrentChainId(),
-    e,
-    o,
-    await t.getEthereumAddress()
-  );
-  return await z(
-    t.getCurrentChainId(),
-    p,
+  const P = Y(u, t, s, a, n);
+  return await N(
+    t,
     g,
-    u,
-    void 0,
+    w,
+    T,
     void 0,
     void 0,
-    U
+    P,
+    E
   );
 };
 export {
-  Lt as hinkalWithdraw
+  Vt as hinkalWithdraw
 };

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../error-handling/error-codes.constants.cjs"),P=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),D=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),E=require("../../types/external-action.types.cjs"),M=require("../../types/hinkal.types.cjs"),R=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),_=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),b=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),L=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");const N=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const H=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const O=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/utils/encodeTokenWithId.cjs"),z=async(e,a,i,d)=>{const r=[a.erc20TokenAddress],l=a.erc20TokenAddress,c=await _.getFeeStructure(e.getCurrentChainId(),l,r,E.ExternalActionId.Transact),u=i-c.flatFee;if(u<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${c.flatFee}`);const t=[-u];W.mergeWithFeeStructure(e.getCurrentChainId(),r,t,c);const o={externalActionId:0n,externalAddress:d,externalActionMetadata:"0x00"},s=[...await Z.addPaddingToUtxos(e,r,t,void 0,void 0,!1,!0)],T=`swapperM${t.length.toString()}x${s[0].length}x1`,A=M.defaultHinkalLogicArgs(t.length,e.userKeys),m=H.getCurrentTimeInSeconds().toString(),q=[];for(let n=0;n<r.length;n+=1){const{outputUtxos:k}=P.outputUtxoProcessing(e.userKeys,s[n],t[n],m,void 0,!1);q.push(k);const{useApprovalUtxoData:x}=R.outputApprovalDataProcessing(e,s[n],t[n]);x&&(A.useApprovalUtxoData[n]=x,A.doPreTxApproval=!0)}const p=await e.getRandomRelay(!0);if(!p)throw Error(U.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:f,kycRequired:y,hasAccessToken:C}=await L.shouldPatchAccessTokenMerkleTree(e,r,t),w=await K.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,y,C),{zkCallData:I,circomData:h,dimData:v}=await D.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,q,e.userKeys,T,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,p,e.getCurrentChainId(),void 0,void 0,void 0,f,A,void 0,c,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),w,void 0,!1),S=$.constructAdminData(b.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),r,t,await e.getEthereumAddress());return{tx:await F.transactCallRelayer(e.getCurrentChainId(),I,v,h,void 0,void 0,void 0,S),amountToRecipient:u}},G=async(e,a,i)=>{const d=[],r=e.getCurrentChainId(),l=j.encodeTokenWithId(r,{erc20TokenAddress:a.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary();const u=((await O.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0}))?.get(l)??[]).filter(o=>o.amount>0n).slice(0,6).sort((o,s)=>Number(s.amount-o.amount)),g=N.countTotalAmountInUtxos(u);if(!g)break;const{tx:t}=await z(e,a,g,i);d.push(t)}return d};exports.hinkalWithdrawStuckUtxos=G;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../error-handling/error-codes.constants.cjs"),_=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),Z=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),B=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),h=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs"),I=require("../../types/hinkal.types.cjs"),Y=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),D=require("../../functions/pre-transaction/getFeeStructure.cjs"),j=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const G=require("../../types/ethereum-network.types.cjs"),V=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const X=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 J=require("../../functions/utils/amounts.utils.cjs"),Q=require("../../functions/web3/etherFunctions.cjs");require("../../constants/token-data/index.cjs");const ee=require("../../constants/protocol.constants.cjs");require("../../constants/tokens.constants.cjs");const R=require("../../constants/chains.constants.cjs"),te=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");const re=require("ethers");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");const oe=require("../../functions/snarkjs/common.snarkjs.cjs");require("lodash");const se=require("../../functions/pre-transaction/getKycAndSignatureData.cjs"),M=require("../../functions/utils/time.utils.cjs"),ne=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),O=require("../../functions/web3/events/getShieldedBalance.cjs"),ae=require("../../functions/utils/encodeTokenWithId.cjs"),ce=require("../../functions/utils/token-check.utils.cjs"),ie=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ue=require("../../functions/utils/tx-confirmation.utils.cjs"),E=require("../../functions/utils/tron.utils.cjs"),le=require("../../constants/tx-confirmation.constants.cjs"),de=async(t,e,a,s)=>{const r=[...await O.addPaddingToUtxos(t,e,a,s,void 0,void 0,!1,!0)],c=[],o=I.defaultHinkalLogicArgs(s.length,t.userKeys),d=M.getCurrentTimeInSeconds().toString();for(let n=0;n<a.length;n+=1){const{outputUtxos:i}=_.outputUtxoProcessing(t.userKeys,r[n],s[n],d,void 0,!1);c.push(i);const{useApprovalUtxoData:u}=Y.outputApprovalDataProcessing(t,e,r[n],s[n]);u&&(o.useApprovalUtxoData[n]=u,o.doPreTxApproval=!0)}return{inputUtxosArray:r,outputUtxosArray:c,hinkalLogicArgs:o}},me=async(t,e,a,s)=>{const r=[...await O.addPaddingToUtxos(t,e,a,s,6,void 0,!1,!0)][0],c=M.getCurrentTimeInSeconds().toString(),{outputUtxos:o}=_.outputUtxoProcessing(t.userKeys,r,s[0],c,void 0,!1);return{inputUtxos:r,outputUtxos:o}},Ae=async(t,e,a,s,r)=>{const c=R.isTronLike(e),o=[a.erc20TokenAddress],d=a.erc20TokenAddress,[n,i,u]=await Promise.all([D.getFeeStructure(e,d,o,h.ExternalActionId.Transact),t.getRandomRelay(e,!0),t.getEthereumAddressByChain(e)]),A=E.addressToHexFormat(u);if(!i)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const w=E.addressToHexFormat(r),l=s-n.flatFee;if(l<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${n.flatFee}`);const m=[-l];j.mergeWithFeeStructure(e,o,m,n);const g={externalActionId:0n,externalAddress:w,externalActionMetadata:"0x00"},[{patchAccessTokenMerkleTree:y,signatureData:T},{inputUtxosArray:x,outputUtxosArray:S,hinkalLogicArgs:v}]=await Promise.all([se.getKycAndSignatureData(t,e,o,m,A),de(t,e,o,m)]),q=`swapperM${m.length.toString()}x${x[0].length}x1`,{zkCallData:p,circomData:k,dimData:f}=await Z.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],x,S,t.userKeys,q,g.externalActionId,g.externalAddress,g.externalActionMetadata,t.generateProofRemotely,i,e,void 0,void 0,void 0,y,v,void 0,n,t.getContractWithFetcher(e,G.ContractType.HinkalHelperContract),T),C=await E.reorderZkCallData(c,p,f,k),U=te.constructAdminData(V.AdminTransactionType.WithdrawOnChainUtxos,e,o,m,A);return{tx:await B.transactCallRelayer(e,p,f,k,void 0,void 0,U,C),amountToRecipient:l}},pe=async(t,e,a,s,r,c)=>{const o=[a.erc20TokenAddress],{originalDeployer:d,hinkalIdl:n}=R.networkRegistry[e].contractData;if(!d||!n)throw new Error("missing data");const{userKeys:i,merkleTreeAccessTokenByChain:u,merkleTreeHinkalByChain:A}=t,w=a.erc20TokenAddress,[l,m,g]=await Promise.all([D.getFeeStructure(e,w,o,h.ExternalActionId.Transact,void 0,void 0,{mintTo:o[0],recipient:r,nullifierCount:c}),t.getRandomRelay(e,!0),t.getEthereumAddressByChain(e)]);if(!m)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const y=s-l.flatFee;if(y<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${l.flatFee}`);const T=[-y];T[0]-=l.flatFee;const[{patchAccessTokenMerkleTree:x,kycRequired:S,hasAccessToken:v},{inputUtxos:q,outputUtxos:p}]=await Promise.all([X.shouldPatchAccessTokenMerkleTree(t,e,o,T),me(t,e,o,T)]),k=z.Utxo.findCorrectRandomization(Q.randomBigInt(31),t.userKeys.getShieldedPrivateKey()),f={tokenNumber:o.length,nullifierAmount:q.length,outputAmount:p.length},C=t.getSolanaProgram(n),U=oe.calcEncryptedOutputs([p])[0][0],P=Array.from(re.ethers.getBytes(U)),{proofAArr:K,proofBArr:L,proofCArr:N,publicInputsArr:b}=await ie.constructSolanaZkProof(t.generateProofRemotely,d,A[e],u[e],i,C,[o[0]],[q],[p],k,l.flatFee,l.variableRate,r,m,f,[P],e,x),W=o[0]===ee.solanaNativeAddress,H={recipient:r,mint:W?void 0:o[0]},$={proofAArr:K,proofBArr:L,proofCArr:N,publicInputsArr:b,encryptedOutputs:[P],relayerFee:l.flatFee.toString(),dimensions:f};return{tx:await B.solanaTransactCallRelayer({chainId:e,relayAddress:m,functionName:"transact",args:$,accounts:H,solanaAccessTokenData:!v&&S?{ethereumAddress:g,accessKey:i.getAccessKey()}:void 0}),amountToRecipient:y}},ge=async(t,e,a,s,r,c)=>R.isSolanaLike(e)?pe(t,e,a,s,r,c):Ae(t,e,a,s,r),ye=async(t,e,a)=>{const s=[],r=ce.validateAndGetChainId([e]),c=ae.encodeTokenWithId(r,{erc20TokenAddress:e.erc20TokenAddress,tokenId:0});for(;;){await t.resetMerkleTreesIfNecessary([r]);const d=((await ne.getInputUtxoAndBalancePerToken({hinkal:t,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:r}))?.get(c)??[]).filter(u=>u.amount>0n).sort((u,A)=>Number(A.amount-u.amount)).slice(0,6),n=J.countTotalAmountInUtxos(d);if(!n)break;const{tx:i}=await ge(t,r,e,n,a,d.length);await ue.waitForTransactionConfirmation(r,i,{solanaCommitment:"finalized",evmTimeoutMs:le.RELAYER_TX_CONFIRMATION_TIMEOUT}),s.push(i)}return s};exports.hinkalWithdrawStuckUtxos=ye;

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

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