@hinkal/common 0.2.31 → 0.2.32

package/data-structures/Hinkal/hinkalPalTronDepositPrepare.cjs

@@ -0,0 +1 @@
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/circom-data.types.cjs`),t=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),n=require(`./prepareDepositOnChainUtxosZkProof.cjs`);let r=require(`ethers`);var i=async(i,a,o,s,c,l)=>{let{zkCallData:u,circomData:d,dimData:f,totalAmount:p,utxoAmounts:m,hinkalWrapperAddress:h,hinkalWrapperABI:g}=await n.prepareDepositOnChainUtxosZkProof(i,a,o,s,c,{hookData:{...e.defaultHookData,preHookMetadata:r.ethers.hexlify(r.ethers.toUtf8Bytes(JSON.stringify({orderId:l})))}});return{unsignedTx:await t.buildTronUnsignedTransactTransaction(i,a,p,o,u,d,f,h,g),utxoAmounts:m}};exports.hinkalPalTronDepositPrepare=i;

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

@@ -0,0 +1,9 @@
+import { IHinkal } from './IHinkal';
+import { ERC20Token } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { Types as TronWebTypes } from 'tronweb';
+export type PalTronDepositPrepareResult = {
+    unsignedTx: TronWebTypes.Transaction;
+    utxoAmounts: bigint[];
+};
+export declare const hinkalPalTronDepositPrepare: (hinkal: IHinkal, chainId: number, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalTronDepositPrepareResult>;

package/data-structures/Hinkal/hinkalPalTronDepositPrepare.mjs

@@ -0,0 +1,17 @@
+import { defaultHookData as e } from "../../types/circom-data.types.mjs";
+import { buildTronUnsignedTransactTransaction as t } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { prepareDepositOnChainUtxosZkProof as n } from "./prepareDepositOnChainUtxosZkProof.mjs";
+import { ethers as r } from "ethers";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalPalTronDepositPrepare.ts
+var i = async (i, a, o, s, c, l) => {
+	let { zkCallData: u, circomData: d, dimData: f, totalAmount: p, utxoAmounts: m, hinkalWrapperAddress: h, hinkalWrapperABI: g } = await n(i, a, o, s, c, { hookData: {
+		...e,
+		preHookMetadata: r.hexlify(r.toUtf8Bytes(JSON.stringify({ orderId: l })))
+	} });
+	return {
+		unsignedTx: await t(i, a, p, o, u, d, f, h, g),
+		utxoAmounts: m
+	};
+};
+//#endregion
+export { i as hinkalPalTronDepositPrepare };

package/data-structures/Hinkal/hinkalPrivateWallet.cjs

@@ -1 +1 @@
-const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`),r=require(`../../types/hinkal.types.cjs`),i=require(`../../types/admin.types.cjs`),a=require(`../../functions/utils/caseInsensitive.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../error-handling/error-codes.constants.cjs`),c=require(`../../functions/utils/time.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`);require(`../../error-handling/index.cjs`);const f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../AccountActions/AccountActions.cjs`),m=require(`../../functions/pre-transaction/recipientUtxoProcessing.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/utils/involves-permit2-op.cjs`),v=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),y=require(`../../functions/snarkjs/constructEmporiumProof.cjs`),b=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),x=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),S=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),C=require(`./handleAutoDepositBack.cjs`);var w=async(e,t,n,r,i,a,o)=>{let s=[...await l.addPaddingToUtxos(e,t,n,r)],f=[],p=c.getCurrentTimeInSeconds().toString();for(let o=0;o<n.length;o+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,s[o],r[o],p,void 0,!1);f.push(n);let{useApprovalUtxoData:c}=d.outputApprovalDataProcessing(e,t,s[o],r[o]);c&&(i.doPreTxApproval=!0,i.useApprovalUtxoData[o]=c,i.interactionAddress=a,i.inHinkalAddress=e.userKeys.getInHinkalAddress(a))}return o&&m.recipientUtxoProcessing(o,f,r,p),{inputUtxosArray:s,outputUtxosArray:f}},T=async(c,l,u,d,m,T,E,D,O,k,A,j=!1,M,N,P)=>{if(P&&!o.isValidPrivateAddress(P.recipientInfo))throw Error(s.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(E.length>0&&!D)throw Error(`Subaccount is required for private wallet transactions`);let F=u.map(e=>e.erc20TokenAddress),I=await c.getEthereumAddressByChain(l),L=D?p.AccountActions.getAddressFromSubAccount(l,D):void 0,{contractData:R}=n.networkRegistry[l],{emporiumAddress:z}=R;if(!z)throw Error(`No Emporium Address Provided`);let B=k??await h.getFeeStructure(l,O,F,t.ExternalActionId.Emporium,T.map(e=>v.convertEmporiumOpToCallInfo(e,L??``,l)));for(L?await S.mergeWithFeeStructureEmporium(c,l,L,T,F,d,B,E.find(e=>a.caseInsensitiveEqual(e.token.erc20TokenAddress,B.feeToken))?.amount??0n):x.mergeWithFeeStructure(l,F,d,B);m.length<F.length;)m.push(!1);let V=r.defaultHinkalLogicArgs(d.length,c.userKeys),[{inputUtxosArray:H,outputUtxosArray:U},W,{patchAccessTokenMerkleTree:G,signatureData:K}]=await Promise.all([w(c,l,F,d,V,z,P),A??await c.getRandomRelay(l,!0),g.getKycAndSignatureData(c,l,F,d,I)]);if(!W)throw Error(s.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let q=D?p.AccountActions.getPrivateKeyFromSubAccount(l,D):void 0,{zkCallData:J,circomData:Y,dimData:X,authorizationData:Z}=await y.constructEmporiumProof(c.merkleTreeHinkalByChain[l],c.merkleTreeAccessTokenByChain[l],F,F.map(()=>0),H,U,c.userKeys,d.length,H.length>0?H[0].length:0,z,T,c.generateProofRemotely,W,l,m,void 0,q,V,G,void 0,B,c.getContractWithFetcher(l,e.ContractType.HinkalHelperContract),K),Q=await b.transactCallRelayer(l,J,X,Y,_.uniswapWorkaround(T),Z,f.constructAdminData(N,l,E.map(e=>e.token.erc20TokenAddress),E.map(e=>e.amount),I,N===i.AdminTransactionType.PublicSwap?E.map(({token:e})=>e):void 0));return j&&D&&C.handleAutoDepositBack(c,l,L,D,B.feeToken,M,E,Y),Q};exports.hinkalPrivateWallet=T;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/admin.types.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`);require(`../../error-handling/index.cjs`);const l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../AccountActions/AccountActions.cjs`),d=require(`../../functions/pre-transaction/recipientUtxoProcessing.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/utils/involves-permit2-op.cjs`),h=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),g=require(`../../functions/private-wallet/emporium.helpers.cjs`),_=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),b=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),x=require(`./handleAutoDepositBack.cjs`);var S=async(e,t,n,r,i)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r)],l=[],u=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=c.outputUtxoProcessing(e.userKeys,a[t],r[t],u);l.push(n)}return i&&d.recipientUtxoProcessing(i,l,r,u),{inputUtxosArray:a,outputUtxosArray:l}},C=async(o,s,c,d,C,w,T,E,D,O,k,A=!1,j,M,N)=>{if(N&&!i.isValidPrivateAddress(N.recipientInfo))throw Error(a.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(T.length>0&&!E)throw Error(`Subaccount is required for private wallet transactions`);let P=c.map(e=>e.erc20TokenAddress),F=await o.getEthereumAddressByChain(s),I=E?u.AccountActions.getAddressFromSubAccount(s,E):void 0,{contractData:L}=t.networkRegistry[s],{emporiumAddress:R}=L;if(!R)throw Error(`No Emporium Address Provided`);let z=O??await f.getFeeStructure(s,D,P,e.ExternalActionId.Emporium,w.map(e=>h.convertEmporiumOpToCallInfo(e,I??``,s)));for(I?await b.mergeWithFeeStructureEmporium(o,s,I,w,P,d,z,T.find(e=>r.caseInsensitiveEqual(e.token.erc20TokenAddress,z.feeToken))?.amount??0n):y.mergeWithFeeStructure(s,P,d,z);C.length<P.length;)C.push(!1);let[{inputUtxosArray:B,outputUtxosArray:V},H]=await Promise.all([S(o,s,P,d,N),k??await o.getRandomRelay(s,!0)]);if(!H)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let U=E?u.AccountActions.getPrivateKeyFromSubAccount(s,E):void 0,[{zkCallData:W,circomData:G,dimData:K},q,J]=await Promise.all([_.constructZkProof(o.merkleTreeHinkalByChain[s],B,V,o.userKeys,e.ExternalActionId.Emporium,R,w,o.generateProofRemotely,z,H,s,C,void 0,void 0,U),g.getAuthorizationDataIfNeeded(s,U),p.buildCommitmentValidationData(s,o.userKeys,P,B)]),Y=await v.transactCallRelayer(s,W,K,G,J,m.uniswapWorkaround(w),q,l.constructAdminData(M,s,T.map(e=>e.token.erc20TokenAddress),T.map(e=>e.amount),F,M===n.AdminTransactionType.PublicSwap?T.map(({token:e})=>e):void 0));return A&&E&&x.handleAutoDepositBack(o,s,I,E,z.feeToken,j,T,G),Y};exports.hinkalPrivateWallet=C;

package/data-structures/Hinkal/hinkalPrivateWallet.mjs

@@ -1,57 +1,53 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { networkRegistry as n } from "../../constants/chains.constants.mjs";
-import { defaultHinkalLogicArgs as r } from "../../types/hinkal.types.mjs";
-import { AdminTransactionType as i } from "../../types/admin.types.mjs";
-import { caseInsensitiveEqual as a } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { isValidPrivateAddress as o } from "../../functions/utils/addresses.mjs";
-import { transactionErrorCodes as s } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as c } from "../../functions/utils/time.utils.mjs";
-import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { outputApprovalDataProcessing as d } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { AdminTransactionType as n } from "../../types/admin.types.mjs";
+import { caseInsensitiveEqual as r } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { addPaddingToUtxos as s } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as c } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import "../../error-handling/index.mjs";
-import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { AccountActions as p } from "../AccountActions/AccountActions.mjs";
-import { recipientUtxoProcessing as m } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
-import { getFeeStructure as h } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getKycAndSignatureData as g } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { constructAdminData as l } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as u } from "../AccountActions/AccountActions.mjs";
+import { recipientUtxoProcessing as d } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
+import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildCommitmentValidationData as p } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { uniswapWorkaround as _ } from "../../functions/utils/involves-permit2-op.mjs";
-import { convertEmporiumOpToCallInfo as v } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { constructEmporiumProof as y } from "../../functions/snarkjs/constructEmporiumProof.mjs";
-import { transactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { mergeWithFeeStructure as x } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { mergeWithFeeStructureEmporium as S } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
-import { handleAutoDepositBack as C } from "./handleAutoDepositBack.mjs";
+import { uniswapWorkaround as m } from "../../functions/utils/involves-permit2-op.mjs";
+import { convertEmporiumOpToCallInfo as h } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { getAuthorizationDataIfNeeded as g } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as y } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { mergeWithFeeStructureEmporium as b } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
+import { handleAutoDepositBack as x } from "./handleAutoDepositBack.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalPrivateWallet.ts
-var w = async (e, t, n, r, i, a, o) => {
-	let s = [...await l(e, t, n, r)], f = [], p = c().toString();
-	for (let o = 0; o < n.length; o += 1) {
-		let { outputUtxos: n } = u(e.userKeys, s[o], r[o], p, void 0, !1);
-		f.push(n);
-		let { useApprovalUtxoData: c } = d(e, t, s[o], r[o]);
-		c && (i.doPreTxApproval = !0, i.useApprovalUtxoData[o] = c, i.interactionAddress = a, i.inHinkalAddress = e.userKeys.getInHinkalAddress(a));
+var S = async (e, t, n, r, i) => {
+	let a = [...await s(e, t, n, r)], l = [], u = o().toString();
+	for (let t = 0; t < n.length; t += 1) {
+		let { outputUtxos: n } = c(e.userKeys, a[t], r[t], u);
+		l.push(n);
 	}
-	return o && m(o, f, r, p), {
-		inputUtxosArray: s,
-		outputUtxosArray: f
+	return i && d(i, l, r, u), {
+		inputUtxosArray: a,
+		outputUtxosArray: l
 	};
-}, T = async (c, l, u, d, m, T, E, D, O, k, A, j = !1, M, N, P) => {
-	if (P && !o(P.recipientInfo)) throw Error(s.RECIPIENT_FORMAT_INCORRECT);
-	if (E.length > 0 && !D) throw Error("Subaccount is required for private wallet transactions");
-	let F = u.map((e) => e.erc20TokenAddress), I = await c.getEthereumAddressByChain(l), L = D ? p.getAddressFromSubAccount(l, D) : void 0, { contractData: R } = n[l], { emporiumAddress: z } = R;
-	if (!z) throw Error("No Emporium Address Provided");
-	let B = k ?? await h(l, O, F, t.Emporium, T.map((e) => v(e, L ?? "", l)));
-	for (L ? await S(c, l, L, T, F, d, B, E.find((e) => a(e.token.erc20TokenAddress, B.feeToken))?.amount ?? 0n) : x(l, F, d, B); m.length < F.length;) m.push(!1);
-	let V = r(d.length, c.userKeys), [{ inputUtxosArray: H, outputUtxosArray: U }, W, { patchAccessTokenMerkleTree: G, signatureData: K }] = await Promise.all([
-		w(c, l, F, d, V, z, P),
-		A ?? await c.getRandomRelay(l, !0),
-		g(c, l, F, d, I)
-	]);
-	if (!W) throw Error(s.RELAYER_NOT_AVAILABLE);
-	let q = D ? p.getPrivateKeyFromSubAccount(l, D) : void 0, { zkCallData: J, circomData: Y, dimData: X, authorizationData: Z } = await y(c.merkleTreeHinkalByChain[l], c.merkleTreeAccessTokenByChain[l], F, F.map(() => 0), H, U, c.userKeys, d.length, H.length > 0 ? H[0].length : 0, z, T, c.generateProofRemotely, W, l, m, void 0, q, V, G, void 0, B, c.getContractWithFetcher(l, e.HinkalHelperContract), K), Q = await b(l, J, X, Y, _(T), Z, f(N, l, E.map((e) => e.token.erc20TokenAddress), E.map((e) => e.amount), I, N === i.PublicSwap ? E.map(({ token: e }) => e) : void 0));
-	return j && D && C(c, l, L, D, B.feeToken, M, E, Y), Q;
+}, C = async (o, s, c, d, C, w, T, E, D, O, k, A = !1, j, M, N) => {
+	if (N && !i(N.recipientInfo)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	if (T.length > 0 && !E) throw Error("Subaccount is required for private wallet transactions");
+	let P = c.map((e) => e.erc20TokenAddress), F = await o.getEthereumAddressByChain(s), I = E ? u.getAddressFromSubAccount(s, E) : void 0, { contractData: L } = t[s], { emporiumAddress: R } = L;
+	if (!R) throw Error("No Emporium Address Provided");
+	let z = O ?? await f(s, D, P, e.Emporium, w.map((e) => h(e, I ?? "", s)));
+	for (I ? await b(o, s, I, w, P, d, z, T.find((e) => r(e.token.erc20TokenAddress, z.feeToken))?.amount ?? 0n) : y(s, P, d, z); C.length < P.length;) C.push(!1);
+	let [{ inputUtxosArray: B, outputUtxosArray: V }, H] = await Promise.all([S(o, s, P, d, N), k ?? await o.getRandomRelay(s, !0)]);
+	if (!H) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let U = E ? u.getPrivateKeyFromSubAccount(s, E) : void 0, [{ zkCallData: W, circomData: G, dimData: K }, q, J] = await Promise.all([
+		_(o.merkleTreeHinkalByChain[s], B, V, o.userKeys, e.Emporium, R, w, o.generateProofRemotely, z, H, s, C, void 0, void 0, U),
+		g(s, U),
+		p(s, o.userKeys, P, B)
+	]), Y = await v(s, W, K, G, J, m(w), q, l(M, s, T.map((e) => e.token.erc20TokenAddress), T.map((e) => e.amount), F, M === n.PublicSwap ? T.map(({ token: e }) => e) : void 0));
+	return A && E && x(o, s, I, E, z.feeToken, j, T, G), Y;
 };
 //#endregion
-export { T as hinkalPrivateWallet };
+export { C as hinkalPrivateWallet };

package/data-structures/Hinkal/hinkalProoflessDeposit.cjs

@@ -1 +1 @@
-const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../externalABIs/index.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../../API/admin-calls.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/getContractAddress.cjs`),u=require(`../../functions/utils/tron.utils.cjs`),d=require(`../../error-handling/logger.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/snarkjs/common.snarkjs.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/utils/tx-confirmation.utils.cjs`),g=require(`../../functions/utils/tronSimulation.utils.cjs`),_=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),v=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`);var y=(e,t)=>{let n=[],r=0;for(let i=0;i<e.length;i+=1){let a=!1;for(let o=0;o<r;o+=1)if(f.isSameERC20Token(n[o].token,e[i])){n[o].balance+=t[i],a=!0;break}a||(n[r]={token:e[i],balance:t[i]},r+=1)}return n},b=async(t,i,a,o)=>{for(let s=0;s<o.length;s+=1)r.caseInsensitiveEqual(o[s].token.erc20TokenAddress,n.zeroAddress)||await h.waitForEthereumTransactionConfirmation(i,(await t.getContractWithSigner(i,e.ContractType.ERC20Contract,o[s].token.erc20TokenAddress).approve(a,o[s].balance)).hash)},x=async(e,t,r,a)=>{let o=Array.from(a.entries());for(let a=0;a<o.length;a+=1){let[s,c]=o[a],l=await e.contract(i.ERC20ABI,s).allowance(t,r).call({from:t});if(BigInt(String(l))<c){let{transaction:i}=await e.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:n.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:r},{type:`uint256`,value:c.toString()}],t),a=await e.trx.sign(i),o=await e.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}}}},S=e=>{let t=new Set;e.forEach(({extraRandomization:e,stealthAddress:n})=>{let r=`${e.toString()}:${n.toString()}`;if(t.has(r))throw Error(`Duplicate randomization and stealth address pair detected in stealthAddressStructures`);t.add(r)})},C=async(e,i,o,s,c)=>{let l=e.getTronWeb(),{hinkalAddress:f}=t.networkRegistry[i].contractData,p=u.evmHexToTronBase58Address(f),m=await e.getEthereumAddressByChain(i),h=o.map(e=>e.erc20TokenAddress),_=o.map(()=>0n),y=0n,b=new Map;for(let e=0;e<o.length;e+=1){let t=u.evmHexToTronBase58Address(o[e].erc20TokenAddress);if(r.caseInsensitiveEqual(o[e].erc20TokenAddress,n.zeroAddress))y+=s[e];else{let n=b.get(t)??0n;b.set(t,n+s[e])}}await x(l,m,p,b),await v.waitForTronErc20Approvals(l,m,p,Array.from(b.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t})));let S=c.map(e=>({extraRandomization:e.extraRandomization.toString(),stealthAddress:e.stealthAddress.toString(),H0:e.H0.toString(),H1:e.H1.toString()}));if(await g.simulateTronTransaction(i,p,`prooflessDeposit`,t.networkRegistry[i].contractData.hinkalABI,[h,s.map(String),_.map(String),c.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])],m,y>0n?y:void 0),y>0n){let e=BigInt(await l.trx.getBalance(m)),r=BigInt(n.TRON_DEFAULT_FEE_LIMIT_SUN);try{let{hinkalABI:e}=t.networkRegistry[i].contractData;if(!e)throw Error(`Hinkal ABI not found`);r=await u.estimateTronFeeSunWithPadding(l,i,p,m,u.createTronCallData(e,`prooflessDeposit`,[h,s.map(String),_.map(String),c.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])]),y)}catch(e){d.Logger.error(`Error estimating Tron prooflessDeposit fee`,e)}if(e<y+r)throw Error(a.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let{transaction:C}=await l.transactionBuilder.triggerSmartContract(p,`prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])`,{feeLimit:n.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:y>0n?Number(y):0},[{type:`address[]`,value:h},{type:`uint256[]`,value:s.map(String)},{type:`uint256[]`,value:_.map(String)},{type:`tuple(uint256,uint256,uint256,uint256)[]`,value:S.map(e=>[e.extraRandomization,e.stealthAddress,e.H0,e.H1])}],m),w=await l.trx.sign(C),T=await l.trx.sendRawTransaction(w);if(!T.result)throw Error(`Tron prooflessDeposit broadcast failed`);let E=typeof T==`string`?T:T?.txid??T?.transaction?.txID??T?.transaction?.txID;if(!E)throw Error(`Tron prooflessDeposit failed (missing txid)`);return E},w=async(i,a,u,d,h)=>{let g=f.validateAndGetChainId(a),x=t.isTronLike(g),w=await i.getEthereumAddressByChain(g),T=i.userKeys.getShieldedPrivateKey(),E=d??a.map(()=>p.calcStealthAddressStructure(c.Utxo.findCorrectRandomization(o.randomBigInt(31),T),T));if(E.length!==a.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);S(E);let D;if(x)D=await C(i,g,a,u,E);else{let t=i.getContractWithSigner(g,e.ContractType.HinkalContract),o=i.getProviderAdapter(g),s=y(a,u),c=a.reduce((e,t,i)=>r.caseInsensitiveEqual(t.erc20TokenAddress,n.zeroAddress)?e+u[i]:e,0n),d=s.filter(({token:e,balance:t})=>!r.caseInsensitiveEqual(e.erc20TokenAddress,n.zeroAddress)&&t>0n),f;if(d.length>0&&await o.supportsBatchCall?.(g)&&o.sendBatchCallsTransaction){let e=_.buildApproveAndProoflessDepositCalls(d.map(({token:e})=>e.erc20TokenAddress),d.map(({balance:e})=>e),l.getContractAddress(t),t,a.map(({erc20TokenAddress:e})=>e),u,a.map(()=>0n),E,c);f=await o.sendBatchCallsTransaction(g,e)}else{await b(i,g,l.getContractAddress(t),s);let e=await i.getEthereumAddressByChain(g),n=s.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await v.waitForErc20Approvals(i,g,e,l.getContractAddress(t),n),f=await t.prooflessDeposit(a.map(({erc20TokenAddress:e})=>e),u,a.map(()=>0n),E,{value:c>0n?c:void 0})}D=f.hash}return s.emitTxPublicData(m.constructAdminData(h,g,a.map(({erc20TokenAddress:e})=>e),u,w)),D};exports.hinkalProoflessDeposit=w;
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../API/admin-calls.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),u=require(`../../functions/utils/getContractAddress.cjs`),d=require(`../../functions/utils/tronSimulation.utils.cjs`),f=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),p=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),m=require(`./hinkalProoflessDeposit.utils.cjs`),h=require(`./hinkalProoflessDepositViaWrapper.cjs`);var g=async(e,r,i,s,c,l=!1)=>{let u=e.getTronWeb(),{hinkalAddress:f}=t.networkRegistry[r].contractData,h=o.evmHexToTronBase58Address(f),g=await e.getEthereumAddressByChain(r),_=i.map(e=>e.erc20TokenAddress),v=i.map(()=>0n),{totalTrxValue:y,tokensNeedingApproval:b}=o.splitTronTokensByNative(i,s),x=c.map(e=>({extraRandomization:e.extraRandomization.toString(),stealthAddress:e.stealthAddress.toString(),H0:e.H0.toString(),H1:e.H1.toString()}));if(y>0n){let{hinkalABI:e}=t.networkRegistry[r].contractData;if(!e)throw Error(`Hinkal ABI not found`);await o.assertTronSufficientBalance(u,r,h,g,o.createTronCallData(e,`prooflessDeposit`,[_,s.map(String),v.map(String),c.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])]),y)}let{transaction:S}=await u.transactionBuilder.triggerSmartContract(h,`prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])`,{feeLimit:n.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:y>0n?Number(y):0},[{type:`address[]`,value:_},{type:`uint256[]`,value:s.map(String)},{type:`uint256[]`,value:v.map(String)},{type:`tuple(uint256,uint256,uint256,uint256)[]`,value:x.map(e=>[e.extraRandomization,e.stealthAddress,e.H0,e.H1])}],g);if(l)return S;await m.approveTronTokens(u,g,h,b),await p.waitForTronErc20Approvals(u,g,h,Array.from(b.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t}))),await d.simulateTronTransaction(r,h,`prooflessDeposit`,t.networkRegistry[r].contractData.hinkalABI,[_,s.map(String),v.map(String),c.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])],g,y>0n?y:void 0);let C=await u.trx.sign(S),w=await u.trx.sendRawTransaction(C);if(!w.result)throw a.Logger.error(`Tron prooflessDeposit broadcast failed`,w),Error(`Tron prooflessDeposit broadcast failed`);let T=typeof w==`string`?w:w?.txid??w?.transaction?.txID;if(!T)throw Error(`Tron prooflessDeposit failed (missing txid)`);return T},_=async(a,o,d,h,_,v=!1)=>{let y=s.validateAndGetChainId(o),b=t.isTronLike(y),x=await a.getEthereumAddressByChain(y),S=h??o.map(()=>l.getStealthAddressStructureFromUserKeys(a.userKeys));if(S.length!==o.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);m.assertNoDuplicateStealthAddressStructures(S);let C;if(b){let e=await g(a,y,o,d,S,v);if(v)return e;C=e}else{let t=a.getContractWithSigner(y,e.ContractType.HinkalContract),i=[o.map(({erc20TokenAddress:e})=>e),d,o.map(()=>0n),S];if(v)return t.prooflessDeposit.populateTransaction(...i);let s=a.getProviderAdapter(y),c=m.aggregateAmountsForApproval(o,d),l=o.reduce((e,t,i)=>r.caseInsensitiveEqual(t.erc20TokenAddress,n.zeroAddress)?e+d[i]:e,0n),h=c.filter(({token:e,balance:t})=>!r.caseInsensitiveEqual(e.erc20TokenAddress,n.zeroAddress)&&t>0n),g;if(h.length>0&&await s.supportsBatchCall?.(y)&&s.sendBatchCallsTransaction){let e=f.buildApproveAndProoflessDepositCalls(h.map(({token:e})=>e.erc20TokenAddress),h.map(({balance:e})=>e),u.getContractAddress(t),t,...i,l);g=await s.sendBatchCallsTransaction(y,e)}else{await m.approveTokens(a,y,u.getContractAddress(t),c);let e=await a.getEthereumAddressByChain(y),n=c.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await p.waitForErc20Approvals(a,y,e,u.getContractAddress(t),n),g=await t.prooflessDeposit(...i,{value:l>0n?l:void 0})}C=g.hash}return i.emitTxPublicData(c.constructAdminData(_,y,o.map(({erc20TokenAddress:e})=>e),d,x)),C},v=async(e,n,r,i,a,o,s)=>{let c=i.map(()=>r),l=r.erc20TokenAddress;return t.isTronLike(n)?h.hinkalTronProoflessDepositViaWrapper(e,n,l,o,c,i,a,s):t.networkRegistry[n]?.contractData?.hinkalWrapperAddress?h.hinkalEvmProoflessDepositViaWrapper(e,n,l,o,c,i,a,s):await _(e,c,i,a,s,!0)};exports.hinkalProoflessDeposit=_,exports.hinkalProoflessDepositWithPublicFee=v;

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

@@ -1,5 +1,8 @@
+import { ethers } from 'ethers';
+import { Types as TronWebTypes } from 'tronweb';
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { StealthAddressStructure } from '../../types/circom-data.types';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean) => Promise<string | ethers.TransactionRequest | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
+export declare const hinkalProoflessDepositWithPublicFee: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], feeAmount: bigint, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalProoflessDeposit.mjs

@@ -2,117 +2,44 @@ import { ContractType as e } from "../../types/ethereum-network.types.mjs";
 import { isTronLike as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
 import { TRON_DEFAULT_FEE_LIMIT_SUN as r, zeroAddress as i } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as a } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { ERC20ABI as o } from "../../externalABIs/index.mjs";
-import { insufficientResourcesErrorCodes as s } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as c } from "../../functions/web3/etherFunctions.mjs";
-import { emitTxPublicData as l } from "../../API/admin-calls.mjs";
-import { Utxo as u } from "../utxo/Utxo.mjs";
-import { getContractAddress as d } from "../../functions/utils/getContractAddress.mjs";
-import { createTronCallData as f, estimateTronFeeSunWithPadding as p, evmHexToTronBase58Address as m } from "../../functions/utils/tron.utils.mjs";
-import { Logger as h } from "../../error-handling/logger.mjs";
-import { isSameERC20Token as g, validateAndGetChainId as _ } from "../../functions/utils/token-check.utils.mjs";
-import { calcStealthAddressStructure as v } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructAdminData as y } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { waitForEthereumTransactionConfirmation as b } from "../../functions/utils/tx-confirmation.utils.mjs";
-import { simulateTronTransaction as x } from "../../functions/utils/tronSimulation.utils.mjs";
-import { buildApproveAndProoflessDepositCalls as S } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
-import { waitForErc20Approvals as C, waitForTronErc20Approvals as w } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { emitTxPublicData as o } from "../../API/admin-calls.mjs";
+import { Logger as s } from "../../error-handling/logger.mjs";
+import { assertTronSufficientBalance as c, createTronCallData as l, evmHexToTronBase58Address as u, splitTronTokensByNative as d } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getStealthAddressStructureFromUserKeys as m } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+import { getContractAddress as h } from "../../functions/utils/getContractAddress.mjs";
+import { simulateTronTransaction as g } from "../../functions/utils/tronSimulation.utils.mjs";
+import { buildApproveAndProoflessDepositCalls as _ } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
+import { waitForErc20Approvals as v, waitForTronErc20Approvals as y } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { aggregateAmountsForApproval as b, approveTokens as x, approveTronTokens as S, assertNoDuplicateStealthAddressStructures as C } from "./hinkalProoflessDeposit.utils.mjs";
+import { hinkalEvmProoflessDepositViaWrapper as w, hinkalTronProoflessDepositViaWrapper as T } from "./hinkalProoflessDepositViaWrapper.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.ts
-var T = (e, t) => {
-	let n = [], r = 0;
-	for (let i = 0; i < e.length; i += 1) {
-		let a = !1;
-		for (let o = 0; o < r; o += 1) if (g(n[o].token, e[i])) {
-			n[o].balance += t[i], a = !0;
-			break;
-		}
-		a || (n[r] = {
-			token: e[i],
-			balance: t[i]
-		}, r += 1);
-	}
-	return n;
-}, E = async (t, n, r, o) => {
-	for (let s = 0; s < o.length; s += 1) a(o[s].token.erc20TokenAddress, i) || await b(n, (await t.getContractWithSigner(n, e.ERC20Contract, o[s].token.erc20TokenAddress).approve(r, o[s].balance)).hash);
-}, D = async (e, t, n, i) => {
-	let a = Array.from(i.entries());
-	for (let i = 0; i < a.length; i += 1) {
-		let [s, c] = a[i], l = await e.contract(o, s).allowance(t, n).call({ from: t });
-		if (BigInt(String(l)) < c) {
-			let { transaction: i } = await e.transactionBuilder.triggerSmartContract(s, "approve(address,uint256)", { feeLimit: r }, [{
-				type: "address",
-				value: n
-			}, {
-				type: "uint256",
-				value: c.toString()
-			}], t), a = await e.trx.sign(i), o = await e.trx.sendRawTransaction(a);
-			if (!o.result) {
-				let e = o.code ?? "UNKNOWN", t = o.message ? Buffer.from(o.message, "hex").toString() : "no message";
-				throw Error(`Tron token approval failed: ${e} - ${t}`);
-			}
-		}
-	}
-}, O = (e) => {
-	let t = /* @__PURE__ */ new Set();
-	e.forEach(({ extraRandomization: e, stealthAddress: n }) => {
-		let r = `${e.toString()}:${n.toString()}`;
-		if (t.has(r)) throw Error("Duplicate randomization and stealth address pair detected in stealthAddressStructures");
-		t.add(r);
-	});
-}, k = async (e, t, o, c, l) => {
-	let u = e.getTronWeb(), { hinkalAddress: d } = n[t].contractData, g = m(d), _ = await e.getEthereumAddressByChain(t), v = o.map((e) => e.erc20TokenAddress), y = o.map(() => 0n), b = 0n, S = /* @__PURE__ */ new Map();
-	for (let e = 0; e < o.length; e += 1) {
-		let t = m(o[e].erc20TokenAddress);
-		if (a(o[e].erc20TokenAddress, i)) b += c[e];
-		else {
-			let n = S.get(t) ?? 0n;
-			S.set(t, n + c[e]);
-		}
-	}
-	await D(u, _, g, S), await w(u, _, g, Array.from(S.entries()).map(([e, t]) => ({
-		tokenAddress: e,
-		requiredAmount: t
-	})));
-	let C = l.map((e) => ({
+var E = async (e, t, i, a, o, f = !1) => {
+	let p = e.getTronWeb(), { hinkalAddress: m } = n[t].contractData, h = u(m), _ = await e.getEthereumAddressByChain(t), v = i.map((e) => e.erc20TokenAddress), b = i.map(() => 0n), { totalTrxValue: x, tokensNeedingApproval: C } = d(i, a), w = o.map((e) => ({
 		extraRandomization: e.extraRandomization.toString(),
 		stealthAddress: e.stealthAddress.toString(),
 		H0: e.H0.toString(),
 		H1: e.H1.toString()
 	}));
-	if (await x(t, g, "prooflessDeposit", n[t].contractData.hinkalABI, [
-		v,
-		c.map(String),
-		y.map(String),
-		l.map((e) => [
-			e.extraRandomization.toString(),
-			e.stealthAddress.toString(),
-			e.H0.toString(),
-			e.H1.toString()
-		])
-	], _, b > 0n ? b : void 0), b > 0n) {
-		let e = BigInt(await u.trx.getBalance(_)), i = BigInt(r);
-		try {
-			let { hinkalABI: e } = n[t].contractData;
-			if (!e) throw Error("Hinkal ABI not found");
-			i = await p(u, t, g, _, f(e, "prooflessDeposit", [
-				v,
-				c.map(String),
-				y.map(String),
-				l.map((e) => [
-					e.extraRandomization.toString(),
-					e.stealthAddress.toString(),
-					e.H0.toString(),
-					e.H1.toString()
-				])
-			]), b);
-		} catch (e) {
-			h.error("Error estimating Tron prooflessDeposit fee", e);
-		}
-		if (e < b + i) throw Error(s.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
+	if (x > 0n) {
+		let { hinkalABI: e } = n[t].contractData;
+		if (!e) throw Error("Hinkal ABI not found");
+		await c(p, t, h, _, l(e, "prooflessDeposit", [
+			v,
+			a.map(String),
+			b.map(String),
+			o.map((e) => [
+				e.extraRandomization.toString(),
+				e.stealthAddress.toString(),
+				e.H0.toString(),
+				e.H1.toString()
+			])
+		]), x);
 	}
-	let { transaction: T } = await u.transactionBuilder.triggerSmartContract(g, "prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])", {
+	let { transaction: T } = await p.transactionBuilder.triggerSmartContract(h, "prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])", {
 		feeLimit: r,
-		callValue: b > 0n ? Number(b) : 0
+		callValue: x > 0n ? Number(x) : 0
 	}, [
 		{
 			type: "address[]",
@@ -120,48 +47,77 @@ var T = (e, t) => {
 		},
 		{
 			type: "uint256[]",
-			value: c.map(String)
+			value: a.map(String)
 		},
 		{
 			type: "uint256[]",
-			value: y.map(String)
+			value: b.map(String)
 		},
 		{
 			type: "tuple(uint256,uint256,uint256,uint256)[]",
-			value: C.map((e) => [
+			value: w.map((e) => [
 				e.extraRandomization,
 				e.stealthAddress,
 				e.H0,
 				e.H1
 			])
 		}
-	], _), E = await u.trx.sign(T), O = await u.trx.sendRawTransaction(E);
-	if (!O.result) throw Error("Tron prooflessDeposit broadcast failed");
-	let k = typeof O == "string" ? O : O?.txid ?? O?.transaction?.txID ?? O?.transaction?.txID;
-	if (!k) throw Error("Tron prooflessDeposit failed (missing txid)");
-	return k;
-}, A = async (n, r, o, s, f) => {
-	let p = _(r), m = t(p), h = await n.getEthereumAddressByChain(p), g = n.userKeys.getShieldedPrivateKey(), b = s ?? r.map(() => v(u.findCorrectRandomization(c(31), g), g));
-	if (b.length !== r.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
-	O(b);
-	let x;
-	if (m) x = await k(n, p, r, o, b);
-	else {
-		let t = n.getContractWithSigner(p, e.HinkalContract), s = n.getProviderAdapter(p), c = T(r, o), l = r.reduce((e, t, n) => a(t.erc20TokenAddress, i) ? e + o[n] : e, 0n), u = c.filter(({ token: e, balance: t }) => !a(e.erc20TokenAddress, i) && t > 0n), f;
-		if (u.length > 0 && await s.supportsBatchCall?.(p) && s.sendBatchCallsTransaction) {
-			let e = S(u.map(({ token: e }) => e.erc20TokenAddress), u.map(({ balance: e }) => e), d(t), t, r.map(({ erc20TokenAddress: e }) => e), o, r.map(() => 0n), b, l);
-			f = await s.sendBatchCallsTransaction(p, e);
+	], _);
+	if (f) return T;
+	await S(p, _, h, C), await y(p, _, h, Array.from(C.entries()).map(([e, t]) => ({
+		tokenAddress: e,
+		requiredAmount: t
+	}))), await g(t, h, "prooflessDeposit", n[t].contractData.hinkalABI, [
+		v,
+		a.map(String),
+		b.map(String),
+		o.map((e) => [
+			e.extraRandomization.toString(),
+			e.stealthAddress.toString(),
+			e.H0.toString(),
+			e.H1.toString()
+		])
+	], _, x > 0n ? x : void 0);
+	let E = await p.trx.sign(T), D = await p.trx.sendRawTransaction(E);
+	if (!D.result) throw s.error("Tron prooflessDeposit broadcast failed", D), Error("Tron prooflessDeposit broadcast failed");
+	let O = typeof D == "string" ? D : D?.txid ?? D?.transaction?.txID;
+	if (!O) throw Error("Tron prooflessDeposit failed (missing txid)");
+	return O;
+}, D = async (n, r, s, c, l, u = !1) => {
+	let d = f(r), g = t(d), y = await n.getEthereumAddressByChain(d), S = c ?? r.map(() => m(n.userKeys));
+	if (S.length !== r.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
+	C(S);
+	let w;
+	if (g) {
+		let e = await E(n, d, r, s, S, u);
+		if (u) return e;
+		w = e;
+	} else {
+		let t = n.getContractWithSigner(d, e.HinkalContract), o = [
+			r.map(({ erc20TokenAddress: e }) => e),
+			s,
+			r.map(() => 0n),
+			S
+		];
+		if (u) return t.prooflessDeposit.populateTransaction(...o);
+		let c = n.getProviderAdapter(d), l = b(r, s), f = r.reduce((e, t, n) => a(t.erc20TokenAddress, i) ? e + s[n] : e, 0n), p = l.filter(({ token: e, balance: t }) => !a(e.erc20TokenAddress, i) && t > 0n), m;
+		if (p.length > 0 && await c.supportsBatchCall?.(d) && c.sendBatchCallsTransaction) {
+			let e = _(p.map(({ token: e }) => e.erc20TokenAddress), p.map(({ balance: e }) => e), h(t), t, ...o, f);
+			m = await c.sendBatchCallsTransaction(d, e);
 		} else {
-			await E(n, p, d(t), c);
-			let e = await n.getEthereumAddressByChain(p), i = c.map(({ token: e, balance: t }) => ({
+			await x(n, d, h(t), l);
+			let e = await n.getEthereumAddressByChain(d), r = l.map(({ token: e, balance: t }) => ({
 				tokenAddress: e.erc20TokenAddress,
 				requiredAmount: t
 			}));
-			await C(n, p, e, d(t), i), f = await t.prooflessDeposit(r.map(({ erc20TokenAddress: e }) => e), o, r.map(() => 0n), b, { value: l > 0n ? l : void 0 });
+			await v(n, d, e, h(t), r), m = await t.prooflessDeposit(...o, { value: f > 0n ? f : void 0 });
 		}
-		x = f.hash;
+		w = m.hash;
 	}
-	return l(y(f, p, r.map(({ erc20TokenAddress: e }) => e), o, h)), x;
+	return o(p(l, d, r.map(({ erc20TokenAddress: e }) => e), s, y)), w;
+}, O = async (e, r, i, a, o, s, c) => {
+	let l = a.map(() => i), u = i.erc20TokenAddress;
+	return t(r) ? T(e, r, u, s, l, a, o, c) : n[r]?.contractData?.hinkalWrapperAddress ? w(e, r, u, s, l, a, o, c) : await D(e, l, a, o, c, !0);
 };
 //#endregion
-export { A as hinkalProoflessDeposit };
+export { D as hinkalProoflessDeposit, O as hinkalProoflessDepositWithPublicFee };

package/data-structures/Hinkal/hinkalProoflessDeposit.utils.cjs

@@ -0,0 +1 @@
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../externalABIs/index.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/utils/tx-confirmation.utils.cjs`);var o=(e,t)=>{let n=[],r=0;for(let a=0;a<e.length;a+=1){let o=!1;for(let s=0;s<r;s+=1)if(i.isSameERC20Token(n[s].token,e[a])){n[s].balance+=t[a],o=!0;break}o||(n[r]={token:e[a],balance:t[a]},r+=1)}return n},s=async(r,i,o,s)=>{for(let c=0;c<s.length;c+=1)n.caseInsensitiveEqual(s[c].token.erc20TokenAddress,t.zeroAddress)||await a.waitForEthereumTransactionConfirmation(i,(await r.getContractWithSigner(i,e.ContractType.ERC20Contract,s[c].token.erc20TokenAddress).approve(o,s[c].balance)).hash)},c=async(e,n,i,a)=>{let o=Array.from(a.entries());for(let a=0;a<o.length;a+=1){let[s,c]=o[a],l=await e.contract(r.ERC20ABI,s).allowance(n,i).call({from:n});if(BigInt(String(l))<c){let{transaction:r}=await e.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:i},{type:`uint256`,value:c.toString()}],n),a=await e.trx.sign(r),o=await e.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}}}},l=e=>{let t=new Set;e.forEach(({extraRandomization:e,stealthAddress:n})=>{let r=`${e.toString()}:${n.toString()}`;if(t.has(r))throw Error(`Duplicate randomization and stealth address pair detected in stealthAddressStructures`);t.add(r)})};exports.aggregateAmountsForApproval=o,exports.approveTokens=s,exports.approveTronTokens=c,exports.assertNoDuplicateStealthAddressStructures=l;

package/data-structures/Hinkal/hinkalProoflessDeposit.utils.d.ts

@@ -0,0 +1,7 @@
+import { ERC20Token, TokenBalance } from '../../types/token.types';
+import { StealthAddressStructure } from '../../types/circom-data.types';
+import { IHinkal } from './IHinkal';
+export declare const aggregateAmountsForApproval: (erc20Tokens: ERC20Token[], amounts: bigint[]) => TokenBalance[];
+export declare const approveTokens: (hinkal: IHinkal, chainId: number, spenderAddress: string, tokensWithBalances: TokenBalance[]) => Promise<void>;
+export declare const approveTronTokens: (tronWeb: any, ethereumAddress: string, spenderAddress: string, tokensNeedingApproval: Map<string, bigint>) => Promise<void>;
+export declare const assertNoDuplicateStealthAddressStructures: (stealthAddressStructures: StealthAddressStructure[]) => void;

package/data-structures/Hinkal/hinkalProoflessDeposit.utils.mjs

@@ -0,0 +1,51 @@
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { TRON_DEFAULT_FEE_LIMIT_SUN as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as r } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { ERC20ABI as i } from "../../externalABIs/index.mjs";
+import { isSameERC20Token as a } from "../../functions/utils/token-check.utils.mjs";
+import { waitForEthereumTransactionConfirmation as o } from "../../functions/utils/tx-confirmation.utils.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.utils.ts
+var s = (e, t) => {
+	let n = [], r = 0;
+	for (let i = 0; i < e.length; i += 1) {
+		let o = !1;
+		for (let s = 0; s < r; s += 1) if (a(n[s].token, e[i])) {
+			n[s].balance += t[i], o = !0;
+			break;
+		}
+		o || (n[r] = {
+			token: e[i],
+			balance: t[i]
+		}, r += 1);
+	}
+	return n;
+}, c = async (t, i, a, s) => {
+	for (let c = 0; c < s.length; c += 1) r(s[c].token.erc20TokenAddress, n) || await o(i, (await t.getContractWithSigner(i, e.ERC20Contract, s[c].token.erc20TokenAddress).approve(a, s[c].balance)).hash);
+}, l = async (e, n, r, a) => {
+	let o = Array.from(a.entries());
+	for (let a = 0; a < o.length; a += 1) {
+		let [s, c] = o[a], l = await e.contract(i, s).allowance(n, r).call({ from: n });
+		if (BigInt(String(l)) < c) {
+			let { transaction: i } = await e.transactionBuilder.triggerSmartContract(s, "approve(address,uint256)", { feeLimit: t }, [{
+				type: "address",
+				value: r
+			}, {
+				type: "uint256",
+				value: c.toString()
+			}], n), a = await e.trx.sign(i), o = await e.trx.sendRawTransaction(a);
+			if (!o.result) {
+				let e = o.code ?? "UNKNOWN", t = o.message ? Buffer.from(o.message, "hex").toString() : "no message";
+				throw Error(`Tron token approval failed: ${e} - ${t}`);
+			}
+		}
+	}
+}, u = (e) => {
+	let t = /* @__PURE__ */ new Set();
+	e.forEach(({ extraRandomization: e, stealthAddress: n }) => {
+		let r = `${e.toString()}:${n.toString()}`;
+		if (t.has(r)) throw Error("Duplicate randomization and stealth address pair detected in stealthAddressStructures");
+		t.add(r);
+	});
+};
+//#endregion
+export { s as aggregateAmountsForApproval, c as approveTokens, l as approveTronTokens, u as assertNoDuplicateStealthAddressStructures };

package/data-structures/Hinkal/hinkalProoflessDepositViaWrapper.cjs

@@ -0,0 +1 @@
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../API/admin-calls.cjs`),o=require(`../../error-handling/logger.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../../functions/utils/tronSimulation.utils.cjs`),u=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),d=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),f=require(`./hinkalProoflessDeposit.utils.cjs`);var p=(e,t,i,a)=>{let o=r.caseInsensitiveEqual(e,n.zeroAddress),s=i.reduce((e,t,i)=>r.caseInsensitiveEqual(t.erc20TokenAddress,n.zeroAddress)?e+a[i]:e,0n)+(o?t:0n),c=f.aggregateAmountsForApproval(i,a),l=c.filter(({token:e})=>!r.caseInsensitiveEqual(e.erc20TokenAddress,n.zeroAddress)).map(n=>!o&&r.caseInsensitiveEqual(n.token.erc20TokenAddress,e)?{token:n.token,balance:n.balance+t}:n).filter(({balance:e})=>e>0n);return!o&&t>0n&&(c.some(({token:t})=>r.caseInsensitiveEqual(t.erc20TokenAddress,e))||l.push({token:{erc20TokenAddress:e,chainId:i[0]?.chainId},balance:t})),{tokensForApproval:l,ethValue:s}},m=(e,t,n,r)=>{if(t.length!==n.length||n.length!==r.length)throw Error(`${e}: array length mismatch`)},h=async(e,u,h,g,_,v,y,b)=>{m(`hinkalTronProoflessDepositViaWrapper`,_,v,y),f.assertNoDuplicateStealthAddressStructures(y);let{hinkalWrapperAddress:x,hinkalWrapperABI:S}=t.networkRegistry[u]?.contractData??{};if(!x||!S)throw Error(`No HinkalWrapper configured for chainId ${u}`);let C=await e.getRandomRelay(u,!1);if(!C)throw Error(`No relay available for chainId ${u}`);let w=e.getTronWeb(),T=await e.getEthereumAddressByChain(u),E=s.evmHexToTronBase58Address(x),D=r.caseInsensitiveEqual(h,n.zeroAddress)?h:s.evmHexToTronBase58Address(h),{tokensForApproval:O,ethValue:k}=p(h,g,_,v),A=_.map(e=>e.erc20TokenAddress),j=v.map(()=>`0`),M=y.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()]);if(k>0n){let e=BigInt(await w.trx.getBalance(T)),t=BigInt(n.TRON_DEFAULT_FEE_LIMIT_SUN);try{t=await s.estimateTronFeeSunWithPadding(w,u,E,T,s.createTronCallData(S,`prooflessDeposit`,[s.evmHexToTronBase58Address(C),D,g.toString(),A,v.map(String),j,M]),k)}catch(e){o.Logger.error(`Error estimating Tron wrapper deposit fee`,e)}if(e<k+t)throw Error(i.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let{transaction:N}=await w.transactionBuilder.triggerSmartContract(E,`prooflessDeposit(address,address,uint256,address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])`,{feeLimit:n.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:k>0n?Number(k):0},[{type:`address`,value:s.evmHexToTronBase58Address(C)},{type:`address`,value:D},{type:`uint256`,value:g.toString()},{type:`address[]`,value:A},{type:`uint256[]`,value:v.map(String)},{type:`uint256[]`,value:j},{type:`tuple(uint256,uint256,uint256,uint256)[]`,value:M}],T),P=new Map(O.map(({token:e,balance:t})=>[s.evmHexToTronBase58Address(e.erc20TokenAddress),t]));await f.approveTronTokens(w,T,E,P),P.size>0&&await d.waitForTronErc20Approvals(w,T,E,Array.from(P.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t}))),await l.simulateTronTransaction(u,E,`prooflessDeposit`,S,[s.evmHexToTronBase58Address(C),D,g.toString(),A,v.map(String),j,M],T,k>0n?k:void 0);let F=await w.trx.sign(N),I=await w.trx.sendRawTransaction(F);if(!I.result)throw Error(`Tron wrapper deposit failed`);let L=typeof I==`string`?I:I?.txid??I?.transaction?.txID;if(!L)throw Error(`Tron wrapper deposit failed (missing txid)`);return a.emitTxPublicData(c.constructAdminData(b,u,A,v,T)),L},g=async(n,r,i,o,s,l,h,g)=>{m(`hinkalEvmProoflessDepositViaWrapper`,s,l,h),f.assertNoDuplicateStealthAddressStructures(h);let _=t.networkRegistry[r]?.contractData?.hinkalWrapperAddress;if(!_)throw Error(`No HinkalWrapper configured for chainId ${r}`);let v=await n.getRandomRelay(r,!1);if(!v)throw Error(`No relay available for chainId ${r}`);let y=s.map(e=>e.erc20TokenAddress),b=l.map(()=>0n),{tokensForApproval:x,ethValue:S}=p(i,o,s,l),C=await n.getEthereumAddressByChain(r),w=n.getProviderAdapter(r),T=n.getContractWithSigner(r,e.ContractType.HinkalWrapper),E;if(x.length>0&&await w.supportsBatchCall?.(r)&&w.sendBatchCallsTransaction){let e=u.buildApproveAndDepositWrapperCalls(x.map(({token:e})=>e.erc20TokenAddress),x.map(({balance:e})=>e),_,T.interface,v,i,o,y,l,b,h,S);E=await w.sendBatchCallsTransaction(r,e)}else await f.approveTokens(n,r,_,x),await d.waitForErc20Approvals(n,r,C,_,x.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}))),E=await T.prooflessDeposit(v,i,o,y,l,b,h,{value:S>0n?S:void 0});return a.emitTxPublicData(c.constructAdminData(g,r,y,l,C)),E.hash};exports.hinkalEvmProoflessDepositViaWrapper=g,exports.hinkalTronProoflessDepositViaWrapper=h;

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

@@ -0,0 +1,6 @@
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+import { StealthAddressStructure } from '../../types/circom-data.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalTronProoflessDepositViaWrapper: (hinkal: IHinkal, chainId: number, feeToken: string, feeAmount: bigint, erc20Tokens: ERC20Token[], amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalEvmProoflessDepositViaWrapper: (hinkal: IHinkal, chainId: number, feeToken: string, feeAmount: bigint, erc20Tokens: ERC20Token[], amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], action?: AdminTransactionType) => Promise<string>;