@hinkal/common 0.2.28 → 0.2.30

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,129 +1,63 @@
-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 { 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 { mergeWithFeeStructure as N } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import "../../types/circom-data.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 V } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import "../../constants/server.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 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 "tweetnacl";
-import "bs58";
-import "buffer";
-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,
-      o === 0 ? u : 0n
-      // first token is which is sent to recipient
-    );
-    t.push(e);
-    const { useApprovalUtxoData: n } = b(r, a, m[o], i[o]);
-    n && (s.useApprovalUtxoData[o] = n, s.doPreTxApproval = !0);
-  }
-  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,
-    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",
-    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,
-    h,
-    void 0,
-    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,
-    y,
-    T,
-    void 0,
-    void 0,
-    S,
-    F
-  );
-};
-export {
-  bt as hinkalTransfer
+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 libs/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"),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;
+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

@@ -2,4 +2,6 @@ import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
 import { AdminTransactionType, ERC20Token } from '../../types';
 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>;
+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,127 +1,68 @@
-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 _ } from "../../types/ethereum-network.types.mjs";
-import "../../types/activities.types.mjs";
-import { getKycAndSignatureData as $ } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
-import "../../constants/server.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 "../../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 "tweetnacl";
-import "bs58";
-import "buffer";
-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
-    );
-    d.push(l);
-    const { useApprovalUtxoData: n } = z(o, e, r[t], i[t]);
-    n && (m.useApprovalUtxoData[t] = n, m.doPreTxApproval = !0);
-  }
-  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",
-    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,
-    C,
-    S,
-    void 0,
-    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 M(o, t, a[0], f, g, T, w);
-  }
-  const P = Y(u, t, s, a, n);
-  return await N(
-    t,
-    g,
-    w,
-    T,
-    void 0,
-    void 0,
-    P,
-    E
-  );
-};
-export {
-  Vt 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 libs/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 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;
+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,allowRemoteDecryption:!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;