@hinkal/common 0.2.27 → 0.2.29

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,129 +1,63 @@
-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/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 "circomlibjs-hinkal-fork";
-import "@solana/spl-token";
-import "../crypto-keys/keys.mjs";
-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,
-      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,
-    y,
-    m.externalActionId,
-    m.externalAddress,
-    m.externalActionMetadata,
-    t.generateProofRemotely,
-    n,
-    a,
-    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 {
-  St as hinkalTransfer
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import { isTronLike as n } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as r } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as i } from "../../types/hinkal.types.mjs";
+import "../../types/index.mjs";
+import { isValidPrivateAddress as a } from "../../functions/utils/addresses.mjs";
+import { transactionErrorCodes as o } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
+import { addressToHexFormat as c, reorderZkCallData as l } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as d } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as f } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calculateTotalFee as p } from "../../functions/utils/fees.utils.mjs";
+import { outputApprovalDataProcessing as m } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { modifyVolatileTokenAmountChanges as h } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getKycAndSignatureData as v } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructZkProof as y } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as x } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalTransfer.ts
+var S = async (e, t, n, r, a, o) => {
+	let c = [...await d(e, t, n, r)], l = [], u = i(r.length, e.userKeys), p = s().toString();
+	for (let i = 0; i < n.length; i += 1) {
+		let { outputUtxos: n } = f(e.userKeys, c[i], r[i], p, void 0, !1, a, i === 0 ? o : 0n);
+		l.push(n);
+		let { useApprovalUtxoData: s } = m(e, t, c[i], r[i]);
+		s && (u.useApprovalUtxoData[i] = s, u.doPreTxApproval = !0);
+	}
+	return {
+		inputUtxosArray: c,
+		outputUtxosArray: l,
+		hinkalLogicArgs: u
+	};
+}, C = async (i, s, d, f, m, C, w) => {
+	let T = u(s), E = n(T);
+	if (!a(f)) throw Error(o.RECIPIENT_FORMAT_INCORRECT);
+	let D = c(await i.getEthereumAddressByChain(T)), O = s.map((e) => e.erc20TokenAddress), k = await h(T, s, d), A = C ?? await _(T, m, O, t.Transact, [], 5n);
+	A.variableRate ||= r;
+	let j = p(-k[0], A), M = -k[0], N = {
+		feeToken: A.feeToken,
+		flatFee: j,
+		variableRate: 0n
+	};
+	if (x(T, O, k, N), !s[0]) throw Error("Transfer Action: No Token Found");
+	let [P, { patchAccessTokenMerkleTree: F, signatureData: I }, { inputUtxosArray: L, outputUtxosArray: R, hinkalLogicArgs: z }] = await Promise.all([
+		i.getRandomRelay(T, !0),
+		v(i, T, O, k, D),
+		S(i, T, O, k, f, M)
+	]);
+	if (!P) throw Error(o.RELAYER_NOT_AVAILABLE);
+	let B = {
+		externalActionId: 0n,
+		externalAddress: P,
+		externalActionMetadata: "0x00"
+	}, V = `swapperM${k.length}x${L[0].length}x2`, { zkCallData: H, circomData: U, dimData: W } = await y(i.merkleTreeHinkalByChain[T], i.merkleTreeAccessTokenByChain[T], L, R, i.userKeys, V, B.externalActionId, B.externalAddress, B.externalActionMetadata, i.generateProofRemotely, P, T, void 0, void 0, void 0, F, z, void 0, N, i.getContractWithFetcher(T, e.HinkalHelperContract), I), G = await l(E, H, W, U);
+	return await b(T, H, W, U, void 0, void 0, g(w, T, O, k, D), G);
 };
+//#endregion
+export { C 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;
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`),r=require(`../../constants/protocol.constants.cjs`),i=require(`../../types/hinkal.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`),p=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),y=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),b=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var x=async(e,t,n,r)=>{let a=[...await l.addPaddingToUtxos(e,t,n,r)],s=[],c=i.defaultHinkalLogicArgs(r.length,e.userKeys),d=o.getCurrentTimeInSeconds().toString();for(let i=0;i<n.length;i+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,a[i],r[i],d,void 0,!1);s.push(n);let{useApprovalUtxoData:o}=f.outputApprovalDataProcessing(e,t,a[i],r[i]);o&&(c.useApprovalUtxoData[i]=o,c.doPreTxApproval=!0)}return{inputUtxosArray:a,outputUtxosArray:s,hinkalLogicArgs:c}},S=async(i,o,l,u,f,S,C,w)=>{let T=c.validateAndGetChainId(o),E=n.isTronLike(T),D=s.addressToHexFormat(await i.getEthereumAddressByChain(T)),O=o.map(e=>e.erc20TokenAddress),k=await p.modifyVolatileTokenAmountChanges(T,o,l),A;if(!f){let e=C??await h.getFeeStructure(T,S,O,t.ExternalActionId.Transact),n=d.calculateTotalFee(-k[0],e);A={feeToken:e.feeToken,flatFee:n,variableRate:0n},b.mergeWithFeeStructure(T,O,k,A)}let j=o[0];if(!j)throw Error(`Deposit Action: No Token Found`);let M={externalActionId:0n,externalAddress:s.addressToHexFormat(u),externalActionMetadata:`0x00`},[N,{patchAccessTokenMerkleTree:P,signatureData:F},{inputUtxosArray:I,outputUtxosArray:L,hinkalLogicArgs:R}]=await Promise.all([i.getRandomRelay(T,!0),g.getKycAndSignatureData(i,T,O,k,D),x(i,T,O,k)]);if(!f&&!N)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z=`swapperM${k.length.toString()}x${I[0].length}x1`,{zkCallData:B,circomData:V,dimData:H}=await _.constructZkProof(i.merkleTreeHinkalByChain[T],i.merkleTreeAccessTokenByChain[T],I,L,i.userKeys,z,M.externalActionId,M.externalAddress,M.externalActionMetadata,i.generateProofRemotely,f?r.zeroAddress:N,T,void 0,void 0,void 0,P,R,void 0,A,i.getContractWithFetcher(T,e.ContractType.HinkalHelperContract),F,f?D:void 0),U=await s.reorderZkCallData(E,B,H,V);if(f){if(!j)throw Error(`Withdraw Action: No Token Found`);return await v.transactCallDirect(i,T,k[0],j,B,V,H)}return await y.transactCallRelayer(T,B,H,V,void 0,void 0,m.constructAdminData(w,T,O,k,D),U)};exports.hinkalWithdraw=S;

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

@@ -1,4 +1,7 @@
 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[], // should differentiate now: amountChanges is about off-chain utxos
+recipientAddress: string, // for Tron this address may be passed as base58
+isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -1,129 +1,68 @@
-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 "../../types/circom-data.types.mjs";
-import { ContractType as Y } 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 "../../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 "circomlibjs-hinkal-fork";
-import "@solana/spl-token";
-import "../crypto-keys/keys.mjs";
-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,
-      void 0,
-      !1
-    );
-    f.push(F);
-    const { useApprovalUtxoData: C } = $(t, i[r], o[r]);
-    C && (d.useApprovalUtxoData[r] = C, 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(
-    t,
-    e,
-    o
-  ), P = await Z(
-    t.getCurrentChainId(),
-    await t.getEthereumAddress(),
-    t.userKeys,
-    S,
-    h
-  ), { zkCallData: p, circomData: u, dimData: g } = await K(
-    "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    i,
-    f,
-    t.userKeys,
-    E,
-    c.externalActionId,
-    c.externalAddress,
-    c.externalActionMetadata,
-    t.generateProofRemotely,
-    a ? L : x,
-    t.getCurrentChainId(),
-    void 0,
-    void 0,
-    void 0,
-    y,
-    d,
-    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)
-      throw Error("Withdraw Action: No Token Found");
-    return await W(t, o[0], m, p, u, g);
-  }
-  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 {
-  Lt as hinkalWithdraw
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import { isTronLike as n } from "../../constants/chains.constants.mjs";
+import { zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as i } from "../../types/hinkal.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { addressToHexFormat as s, reorderZkCallData as c } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calculateTotalFee as f } from "../../functions/utils/fees.utils.mjs";
+import { outputApprovalDataProcessing as p } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { modifyVolatileTokenAmountChanges as m } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getKycAndSignatureData as _ } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructZkProof as v } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallDirect as y } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as x } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
+var S = async (e, t, n, r) => {
+	let a = [...await u(e, t, n, r)], s = [], c = i(r.length, e.userKeys), l = o().toString();
+	for (let i = 0; i < n.length; i += 1) {
+		let { outputUtxos: n } = d(e.userKeys, a[i], r[i], l, void 0, !1);
+		s.push(n);
+		let { useApprovalUtxoData: o } = p(e, t, a[i], r[i]);
+		o && (c.useApprovalUtxoData[i] = o, c.doPreTxApproval = !0);
+	}
+	return {
+		inputUtxosArray: a,
+		outputUtxosArray: s,
+		hinkalLogicArgs: c
+	};
+}, C = async (i, o, u, d, p, C, w, T) => {
+	let E = l(o), D = n(E), O = s(await i.getEthereumAddressByChain(E)), k = o.map((e) => e.erc20TokenAddress), A = await m(E, o, u), j;
+	if (!p) {
+		let e = w ?? await g(E, C, k, t.Transact), n = f(-A[0], e);
+		j = {
+			feeToken: e.feeToken,
+			flatFee: n,
+			variableRate: 0n
+		}, x(E, k, A, j);
+	}
+	let M = o[0];
+	if (!M) throw Error("Deposit Action: No Token Found");
+	let N = {
+		externalActionId: 0n,
+		externalAddress: s(d),
+		externalActionMetadata: "0x00"
+	}, [P, { patchAccessTokenMerkleTree: F, signatureData: I }, { inputUtxosArray: L, outputUtxosArray: R, hinkalLogicArgs: z }] = await Promise.all([
+		i.getRandomRelay(E, !0),
+		_(i, E, k, A, O),
+		S(i, E, k, A)
+	]);
+	if (!p && !P) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let B = `swapperM${A.length.toString()}x${L[0].length}x1`, { zkCallData: V, circomData: H, dimData: U } = await v(i.merkleTreeHinkalByChain[E], i.merkleTreeAccessTokenByChain[E], L, R, i.userKeys, B, N.externalActionId, N.externalAddress, N.externalActionMetadata, i.generateProofRemotely, p ? r : P, E, void 0, void 0, void 0, F, z, void 0, j, i.getContractWithFetcher(E, e.HinkalHelperContract), I, p ? O : void 0), W = await c(D, V, U, H);
+	if (p) {
+		if (!M) throw Error("Withdraw Action: No Token Found");
+		return await y(i, E, A[0], M, V, H, U);
+	}
+	return await b(E, V, U, H, void 0, void 0, h(T, E, k, A, O), W);
 };
+//#endregion
+export { C 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;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const r=require(`../../types/hinkal.types.cjs`),i=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../../functions/utils/amounts.utils.cjs`),c=require(`../../constants/tx-confirmation.constants.cjs`),l=require(`../../functions/utils/time.utils.cjs`),u=require(`../utxo/Utxo.cjs`),d=require(`../../functions/utils/encodeTokenWithId.cjs`),f=require(`../../functions/utils/tron.utils.cjs`),p=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),m=require(`../../functions/utils/token-check.utils.cjs`),h=require(`../../functions/web3/events/getShieldedBalance.cjs`),g=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),_=require(`../../functions/snarkjs/common.snarkjs.cjs`),v=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`),y=require(`../../functions/pre-transaction/constructAdminData.cjs`),b=require(`../../functions/pre-transaction/getFeeStructure.cjs`),x=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`),S=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const C=require(`../../functions/utils/tx-confirmation.utils.cjs`),w=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),T=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),E=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),D=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);let O=require(`ethers`);var k=async(e,t,n,i)=>{let a=[...await h.addPaddingToUtxos(e,t,n,i,void 0,void 0,!1,!0)],o=[],s=r.defaultHinkalLogicArgs(i.length,e.userKeys),c=l.getCurrentTimeInSeconds().toString();for(let r=0;r<n.length;r+=1){let{outputUtxos:n}=g.outputUtxoProcessing(e.userKeys,a[r],i[r],c,void 0,!1);o.push(n);let{useApprovalUtxoData:l}=v.outputApprovalDataProcessing(e,t,a[r],i[r]);l&&(s.useApprovalUtxoData[r]=l,s.doPreTxApproval=!0)}return{inputUtxosArray:a,outputUtxosArray:o,hinkalLogicArgs:s}},A=async(e,t,n,r)=>{let i=[...await h.addPaddingToUtxos(e,t,n,r,6,void 0,!1,!0)][0],a=l.getCurrentTimeInSeconds().toString(),{outputUtxos:o}=g.outputUtxoProcessing(e.userKeys,i,r[0],a,void 0,!1);return{inputUtxos:i,outputUtxos:o}},j=async(r,o,s,c,l)=>{let u=n.isTronLike(o),d=[s.erc20TokenAddress],p=s.erc20TokenAddress,[m,h,g]=await Promise.all([b.getFeeStructure(o,p,d,t.ExternalActionId.Transact),r.getRandomRelay(o,!0),r.getEthereumAddressByChain(o)]),_=f.addressToHexFormat(g);if(!h)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let v=f.addressToHexFormat(l),x=c-m.flatFee;if(x<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${c}, Fee: ${m.flatFee}`);let C=[-x];D.mergeWithFeeStructure(o,d,C,m);let T={externalActionId:0n,externalAddress:v,externalActionMetadata:`0x00`},[{patchAccessTokenMerkleTree:O,signatureData:A},{inputUtxosArray:j,outputUtxosArray:M,hinkalLogicArgs:N}]=await Promise.all([S.getKycAndSignatureData(r,o,d,C,_),k(r,o,d,C)]),P=`swapperM${C.length.toString()}x${j[0].length}x1`,{zkCallData:F,circomData:I,dimData:L}=await w.constructZkProof(r.merkleTreeHinkalByChain[o],r.merkleTreeAccessTokenByChain[o],j,M,r.userKeys,P,T.externalActionId,T.externalAddress,T.externalActionMetadata,r.generateProofRemotely,h,o,void 0,void 0,void 0,O,N,void 0,m,r.getContractWithFetcher(o,e.ContractType.HinkalHelperContract),A),R=await f.reorderZkCallData(u,F,L,I);return{tx:await E.transactCallRelayer(o,F,L,I,void 0,void 0,y.constructAdminData(i.AdminTransactionType.WithdrawOnChainUtxos,o,d,C,_),R),amountToRecipient:x}},M=async(e,r,i,s,c,l)=>{let d=[i.erc20TokenAddress],{originalDeployer:f,hinkalIdl:p}=n.networkRegistry[r].contractData;if(!f||!p)throw Error(`missing data`);let{userKeys:m,merkleTreeAccessTokenByChain:h,merkleTreeHinkalByChain:g}=e,v=i.erc20TokenAddress,[y,S,C]=await Promise.all([b.getFeeStructure(r,v,d,t.ExternalActionId.Transact,void 0,void 0,{mintTo:d[0],recipient:c,nullifierCount:l}),e.getRandomRelay(r,!0),e.getEthereumAddressByChain(r)]);if(!S)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let w=s-y.flatFee;if(w<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${y.flatFee}`);let D=[-w];D[0]-=y.flatFee;let[{patchAccessTokenMerkleTree:k,kycRequired:j,hasAccessToken:M},{inputUtxos:N,outputUtxos:P}]=await Promise.all([x.shouldPatchAccessTokenMerkleTree(e,r,d,D),A(e,r,d,D)]),F=u.Utxo.findCorrectRandomization(o.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),I={tokenNumber:d.length,nullifierAmount:N.length,outputAmount:P.length},L=e.getSolanaProgram(p),R=_.calcEncryptedOutputs([P])[0][0],z=Array.from(O.ethers.getBytes(R)),{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U}=await T.constructSolanaZkProof(e.generateProofRemotely,f,g[r],h[r],m,L,[d[0]],[N],[P],F,y.flatFee,y.variableRate,c,S,I,[z],r,k),W={recipient:c,mint:d[0]===`11111111111111111111111111111111`?void 0:d[0]};return{tx:await E.solanaTransactCallRelayer({chainId:r,relayAddress:S,functionName:`transact`,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:[z],relayerFee:y.flatFee.toString(),dimensions:I},accounts:W,solanaAccessTokenData:!M&&j?{ethereumAddress:C,accessKey:m.getAccessKey()}:void 0}),amountToRecipient:w}},N=async(e,t,r,i,a,o)=>n.isSolanaLike(t)?M(e,t,r,i,a,o):j(e,t,r,i,a),P=async(e,t,n)=>{let r=[],i=m.validateAndGetChainId([t]),a=d.encodeTokenWithId(i,{erc20TokenAddress:t.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary([i]);let o=((await p.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:i}))?.get(a)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount)).slice(0,6),l=s.countTotalAmountInUtxos(o);if(!l)break;let{tx:u}=await N(e,i,t,l,n,o.length);await C.waitForTransactionConfirmation(i,u,{solanaCommitment:`finalized`,evmTimeoutMs:c.RELAYER_TX_CONFIRMATION_TIMEOUT}),r.push(u)}return r};exports.hinkalWithdrawStuckUtxos=P;

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[]>;