@hinkal/common 0.3.1 → 0.3.2

package/common/src/data-structures/Hinkal/hinkalDepositOnChainUtxos.d.ts

@@ -1,7 +1,7 @@
 import { IHinkal } from './IHinkal';
 import { ERC20Token, RecipientUtxo } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string, preEstimateGas?: boolean) => Promise<{
+export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string, _preEstimateGas?: boolean) => Promise<{
     userDepositedUtxos: RecipientUtxo[];
     statusId?: string;
     depositTxHash: string;

package/common/src/data-structures/Hinkal/hinkalDepositOnChainUtxos.mjs

@@ -1,54 +1,44 @@
-import { isTronLike as e } from "../../constants/chains.constants.mjs";
-import { ContractType as t } from "../../types/ethereum-network.types.mjs";
-import { DepositAndWithdrawPhase as n } from "../../types/scheduled-transactions.types.mjs";
+import { DepositAndWithdrawPhase as e } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.mjs";
-import { evmHexToTronBase58Address as r } from "../../functions/utils/tron.utils.mjs";
-import { getOnChainUtxosFromReceipt as i } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
-import { waitForEthereumTransactionConfirmation as a } from "../../functions/utils/tx-confirmation.utils.mjs";
-import { transactCallDirect as o } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallDirectTron as s } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { safeUpdateDepositAndWithdrawStatus as c, updateDepositAndWithdrawStatus as l } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { prepareDepositOnChainUtxosZkProof as u } from "./prepareDepositOnChainUtxosZkProof.mjs";
+import { getStealthAddressStructureFromUserKeys as t } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+import { getOnChainUtxosFromReceipt as n } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
+import { waitForEthereumTransactionConfirmation as r } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { getOwnRecipientEncryptionKeys as i } from "./hinkalProoflessDeposit.utils.mjs";
+import { hinkalProoflessDeposit as a } from "./hinkalProoflessDeposit.mjs";
+import { safeUpdateDepositAndWithdrawStatus as o, updateDepositAndWithdrawStatus as s } from "../../API/deposit-and-withdraw-status-calls.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositOnChainUtxos.ts
-var d = async (d, f, p, m, h, g, _, v = !0) => {
-	let y = e(f), b = p.erc20TokenAddress, { zkCallData: x, circomData: S, dimData: C, totalAmount: w, utxoAmounts: T, hinkalWrapperAddress: E, hinkalWrapperABI: D, depositOnChainUtxosExternalActionAddress: O, depositOnChainUtxosExternalActionABI: k } = await u(d, f, p, m, g), A = (await l({
-		chainId: f,
-		hashedEthereumAddress: _,
-		phase: n.BEFORE_DEPOSIT
-	})).id ?? void 0, j;
-	if (y) {
-		let e = d.getTronWeb();
-		j = await s(d, f, w, p, x, S, C, e.contract(k, r(O)), e.contract(D, r(E)), v);
-	} else {
-		let e = d.getContractWithSigner(f, t.HinkalWrapper);
-		j = (await o(d, f, w, p, x, S, C, d.getContractWithSigner(f, t.DepositOnChainUtxos), e, v)).hash;
-	}
-	if (!j) throw Error("Deposit transaction hash not found");
-	let M = await a(f, j);
-	await c({
-		id: A,
-		chainId: f,
-		hashedEthereumAddress: _,
-		phase: n.AFTER_DEPOSIT,
-		depositTxHash: j
+var c = async (c, l, u, d, f, p, m, h = !0) => {
+	let g = u.erc20TokenAddress, _ = d.map((e) => e + p.flatFee), v = _.map(() => u), y = _.map(() => t(c.userKeys)), b = (await s({
+		chainId: l,
+		hashedEthereumAddress: m,
+		phase: e.BEFORE_DEPOSIT
+	})).id ?? void 0, x = await a(c, v, _, y, i(c.userKeys, _.length), !0);
+	if (!x) throw Error("Deposit transaction hash not found");
+	let S = await r(l, x);
+	await o({
+		id: b,
+		chainId: l,
+		hashedEthereumAddress: m,
+		phase: e.AFTER_DEPOSIT,
+		depositTxHash: x
 	});
-	let N = i(M, d, f, b);
-	if (N.length === 0) throw Error("No UTXOs found in deposit transaction. Check contract address and ABI.");
-	let P = [], F = [...N];
-	return h.forEach((e, t) => {
-		let n = T[t], r = F.find((e) => e.amount === n);
+	let C = n(S, c, l, g);
+	if (C.length === 0) throw Error("No UTXOs found in deposit transaction. Check contract address and ABI.");
+	let w = [], T = [...C];
+	return f.forEach((e, t) => {
+		let n = _[t], r = T.find((e) => e.amount === n);
 		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
-		P.push({
+		w.push({
 			recipientAddress: e,
 			utxo: r
 		});
-		let i = F.indexOf(r);
-		F.splice(i, 1);
+		let i = T.indexOf(r);
+		T.splice(i, 1);
 	}), {
-		userDepositedUtxos: P,
-		statusId: A,
-		depositTxHash: j
+		userDepositedUtxos: w,
+		statusId: b,
+		depositTxHash: x
 	};
 };
 //#endregion
-export { d as hinkalDepositOnChainUtxos };
+export { c as hinkalDepositOnChainUtxos };

package/common/src/data-structures/Hinkal/hinkalPalEvmDeposit.d.ts

@@ -6,4 +6,4 @@ export type PalEvmDepositPrepareResult = {
     unsignedTx: ethers.TransactionRequest;
     utxoAmounts: bigint[];
 };
-export declare const hinkalPalEvmDepositPrepare: (hinkal: IHinkal, chainId: number, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalEvmDepositPrepareResult>;
+export declare const hinkalPalEvmDepositPrepare: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalEvmDepositPrepareResult>;

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

@@ -1,9 +1,9 @@
+import { Types as TronWebTypes } from 'tronweb';
 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>;
+export declare const hinkalPalTronDepositPrepare: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalTronDepositPrepareResult>;

package/common/src/data-structures/Hinkal/hinkalPrivateWallet.cjs

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

package/common/src/data-structures/Hinkal/hinkalPrivateWallet.mjs

@@ -2,9 +2,9 @@ import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { caseInsensitiveEqual as t } from "../../functions/utils/caseInsensitive.utils.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as i } from "../../types/external-action.types.mjs";
-import { AdminTransactionType as a } from "../../types/admin.types.mjs";
-import { isValidPrivateAddress as o } from "../../functions/utils/addresses.mjs";
+import { isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { AdminTransactionType as o } from "../../types/admin.types.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";
@@ -33,15 +33,15 @@ var x = async (e, t, n, i, a) => {
 		outputUtxosArray: l
 	};
 }, S = async (r, s, c, d, S, C, w, T, E, D, O, k = !1, A, j, M) => {
-	if (M && !o(M.recipientInfo)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
+	if (M && !i(M.recipientInfo)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
 	if (w.length > 0 && !T) throw Error("Subaccount is required for private wallet transactions");
 	let N = c.map((e) => e.erc20TokenAddress), P = await r.getEthereumAddressByChain(s), F = T ? u.getAddressFromSubAccount(s, T) : void 0, { contractData: I } = e[s], { emporiumAddress: L } = I;
 	if (!L) throw Error("No Emporium Address Provided");
-	let R = D ?? await f(s, E, N, i.Emporium, C.map((e) => m(e, F ?? "", s)));
+	let R = D ?? await f(s, E, N, a.Emporium, C.map((e) => m(e, F ?? "", s)));
 	for (F ? await y(r, s, F, C, N, d, R, w.find((e) => t(e.token.erc20TokenAddress, R.feeToken))?.amount ?? 0n) : await v(s, N, d, R); S.length < N.length;) S.push(!1);
 	let [{ inputUtxosArray: z, outputUtxosArray: B }, V] = await Promise.all([x(r, s, N, d, M), O ?? await r.getRandomRelay(s, !0)]);
 	if (!V) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let H = T ? u.getPrivateKeyFromSubAccount(s, T) : void 0, [{ zkCallData: U, circomData: W, dimData: G, commitmentValidationData: K }, q] = await Promise.all([g(r.merkleTreeHinkalByChain[s], z, B, r.userKeys, i.Emporium, L, C, r.generateProofRemotely, R, V, s, S, void 0, void 0, H), h(s, H)]), J = await _(s, U, G, W, K, p(C), q, l(j, s, w.map((e) => e.token.erc20TokenAddress), w.map((e) => e.amount), P, j === a.PublicSwap ? w.map(({ token: e }) => e) : void 0));
+	let H = T ? u.getPrivateKeyFromSubAccount(s, T) : void 0, [{ zkCallData: U, circomData: W, dimData: G, commitmentValidationData: K }, q] = await Promise.all([g(r.merkleTreeHinkalByChain[s], z, B, r.userKeys, a.Emporium, L, C, r.generateProofRemotely, R, V, s, S, void 0, void 0, H), h(s, H)]), J = await _(s, U, G, W, K, p(C), q, l(j, s, w.map((e) => e.token.erc20TokenAddress), w.map((e) => e.amount), P, j === o.PublicSwap ? w.map(({ token: e }) => e) : void 0));
 	return k && T && b(r, s, F, T, R.feeToken, A, w, W), J;
 };
 //#endregion

package/common/src/data-structures/Hinkal/hinkalProoflessDeposit.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),l=require(`../../functions/utils/getContractAddress.cjs`),u=require(`../../functions/utils/tronSimulation.utils.cjs`),d=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),f=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),p=require(`../../API/admin-calls.cjs`),m=require(`./hinkalProoflessDeposit.utils.cjs`),h=require(`./hinkalProoflessDepositViaWrapper.cjs`);var g=async(n,r,o,s,c,l=!1)=>{let d=n.getTronWeb(),{hinkalAddress:p}=e.networkRegistry[r].contractData,h=a.evmHexToTronBase58Address(p),g=await n.getEthereumAddressByChain(r),_=o.map(e=>e.erc20TokenAddress),v=o.map(()=>0n),{totalTrxValue:y,tokensNeedingApproval:b}=a.splitTronTokensByNative(o,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:t}=e.networkRegistry[r].contractData;if(!t)throw Error(`Hinkal ABI not found`);await a.assertTronSufficientBalance(d,r,h,g,a.createTronCallData(t,`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 d.transactionBuilder.triggerSmartContract(h,`prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])`,{feeLimit:t.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(d,g,h,b),await f.waitForTronErc20Approvals(d,g,h,Array.from(b.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t}))),await u.simulateTronTransaction(r,h,`prooflessDeposit`,e.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 d.trx.sign(S),w=await d.trx.sendRawTransaction(C);if(!w.result)throw i.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(i,a,u,h,_,v=!1)=>{let y=o.validateAndGetChainId(a),b=e.isTronLike(y),x=await i.getEthereumAddressByChain(y),S=h??a.map(()=>c.getStealthAddressStructureFromUserKeys(i.userKeys));if(S.length!==a.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(i,y,a,u,S,v);if(v)return e;C=e}else{let e=i.getContractWithSigner(y,r.ContractType.HinkalContract),o=[a.map(({erc20TokenAddress:e})=>e),u,a.map(()=>0n),S];if(v)return e.prooflessDeposit.populateTransaction(...o);let s=i.getProviderAdapter(y),c=m.aggregateAmountsForApproval(a,u),p=a.reduce((e,r,i)=>n.caseInsensitiveEqual(r.erc20TokenAddress,t.zeroAddress)?e+u[i]:e,0n),h=c.filter(({token:e,balance:r})=>!n.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&r>0n),g;if(h.length>0&&await s.supportsBatchCall?.(y)&&s.sendBatchCallsTransaction){let t=d.buildApproveAndProoflessDepositCalls(h.map(({token:e})=>e.erc20TokenAddress),h.map(({balance:e})=>e),l.getContractAddress(e),e,...o,p);g=await s.sendBatchCallsTransaction(y,t)}else{await m.approveTokens(i,y,l.getContractAddress(e),c);let t=await i.getEthereumAddressByChain(y),n=c.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await f.waitForErc20Approvals(i,y,t,l.getContractAddress(e),n),g=await e.prooflessDeposit(...o,{value:p>0n?p:void 0})}C=g.hash}return p.emitTxPublicData(s.constructAdminData(_,y,a.map(({erc20TokenAddress:e})=>e),u,x)),C},v=async(t,n,r,i,a,o,s)=>{let c=i.map(()=>r),l=r.erc20TokenAddress;return e.isTronLike(n)?h.hinkalTronProoflessDepositViaWrapper(t,n,l,o,c,i,a,s):e.networkRegistry[n]?.contractData?.hinkalWrapperAddress?h.hinkalEvmProoflessDepositViaWrapper(t,n,l,o,c,i,a,s):await _(t,c,i,a,s,!0)};exports.hinkalProoflessDeposit=_,exports.hinkalProoflessDepositWithPublicFee=v;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../types/ethereum-network.types.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(`../../API/admin-calls.cjs`),h=require(`./hinkalProoflessDeposit.utils.cjs`);var g=async(n,o,s,c,l,u,f,m,g,_=!1)=>{let v=n.getTronWeb(),{hinkalAddress:y,hinkalABI:b,hinkalWrapperAddress:x,hinkalWrapperABI:S}=e.networkRegistry[o].contractData,C=m.feeAmount>0n;if(C&&!x)throw Error(`Hinkal wrapper address not found`);let w=a.evmHexToTronBase58Address(C?x:y),T=C?S:b;if(!T)throw Error(C?`Hinkal wrapper ABI not found`:`Hinkal ABI not found`);let E=await n.getEthereumAddressByChain(o),D=s.map(e=>e.erc20TokenAddress),O=r.caseInsensitiveEqual(m.feeToken,t.zeroAddress),{totalTrxValue:k,tokensNeedingApproval:A}=a.splitTronTokensByNative(s,c),j=k+(O?m.feeAmount:0n);if(!O&&m.feeAmount>0n){let e=a.evmHexToTronBase58Address(m.feeToken);A.set(e,(A.get(e)??0n)+m.feeAmount)}let M=l.map(e=>[e.H0x.toString(),e.H0y.toString(),e.H1x.toString(),e.H1y.toString(),e.stealthAddress.toString()]),N=[{type:`address[]`,value:D},{type:`uint256[]`,value:c.map(String)},{type:`tuple(uint256,uint256,uint256,uint256,uint256)[]`,value:M},{type:`bytes[]`,value:u},{type:`bool`,value:f}],P=C?`prooflessDeposit(address[],uint256[],(uint256,uint256,uint256,uint256,uint256)[],bytes[],bool,(address,address,uint256),string)`:`prooflessDeposit(address[],uint256[],(uint256,uint256,uint256,uint256,uint256)[],bytes[],bool,string)`,F=C?[...N,{type:`tuple(address,address,uint256)`,value:[a.evmHexToTronBase58Address(m.feeRecipient),O?m.feeToken:a.evmHexToTronBase58Address(m.feeToken),m.feeAmount.toString()]},{type:`string`,value:g}]:[...N,{type:`string`,value:g}],I=F.map(({value:e})=>e);j>0n&&await a.assertTronSufficientBalance(v,o,w,E,a.createTronCallData(T,`prooflessDeposit`,I),j);let{transaction:L}=await v.transactionBuilder.triggerSmartContract(w,P,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:j>0n?Number(j):0},F,E);if(_)return L;await h.approveTronTokens(v,E,w,A),await p.waitForTronErc20Approvals(v,E,w,Array.from(A.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t}))),await d.simulateTronTransaction(o,w,`prooflessDeposit`,T,I,E,j>0n?j:void 0);let R=await v.trx.sign(L),z=await v.trx.sendRawTransaction(R);if(!z.result)throw i.Logger.error(`Tron prooflessDeposit broadcast failed`,z),Error(`Tron prooflessDeposit broadcast failed`);let B=typeof z==`string`?z:z?.txid??z?.transaction?.txID;if(!B)throw Error(`Tron prooflessDeposit failed (missing txid)`);return B},_=async(i,a,d,_,v,y=!1,b=n.zeroProoflessFeeStructure,x=``,S,C=!1)=>{let w=s.validateAndGetChainId(a),T=e.isTronLike(w),E=await i.getEthereumAddressByChain(w),D=_??a.map(()=>l.getStealthAddressStructureFromUserKeys(i.userKeys));if(D.length!==a.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);if(h.assertNoDuplicateStealthAddressStructures(D),_&&!v)throw Error(`recipientEncryptionKeysOverride is required whenever stealthAddressStructuresOverride is provided`);if(v&&v.length!==a.length)throw Error(`recipientEncryptionKeysOverride length must be equal to erc20 tokens length`);let O=h.buildProoflessEncryptedOutputs(a,D,v??h.getOwnRecipientEncryptionKeys(i.userKeys,a.length)),k;if(T){let e=await g(i,w,a,d,D,O,y,b,x,C);if(C)return e;k=e}else{let e=b.feeAmount>0n,n=e?i.getContractWithSigner(w,o.ContractType.HinkalWrapperContract):i.getContractWithSigner(w,o.ContractType.HinkalContract),s=e?[a.map(({erc20TokenAddress:e})=>e),d,D,O,y,b,x]:[a.map(({erc20TokenAddress:e})=>e),d,D,O,y,x],c=r.caseInsensitiveEqual(b.feeToken,t.zeroAddress),l=a.reduce((e,n,i)=>r.caseInsensitiveEqual(n.erc20TokenAddress,t.zeroAddress)?e+d[i]:e,0n)+(c?b.feeAmount:0n);if(C)return n.prooflessDeposit.populateTransaction(...s,{value:l>0n?l:void 0});let m=i.getProviderAdapter(w),g=h.aggregateAmountsForApproval(!c&&b.feeAmount>0n?[...a,{erc20TokenAddress:b.feeToken,chainId:w}]:a,!c&&b.feeAmount>0n?[...d,b.feeAmount]:d),_=g.filter(({token:e,balance:n})=>!r.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&n>0n),v;if(_.length>0&&await m.supportsBatchCall?.(w)&&m.sendBatchCallsTransaction){let t=f.buildApproveAndProoflessDepositCalls(_.map(({token:e})=>e.erc20TokenAddress),_.map(({balance:e})=>e),u.getContractAddress(n),n,a.map(({erc20TokenAddress:e})=>e),d,D,O,y,e?b:void 0,x,l);v=await m.sendBatchCallsTransaction(w,t)}else{await h.approveTokens(i,w,u.getContractAddress(n),g);let e=await i.getEthereumAddressByChain(w),t=g.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await p.waitForErc20Approvals(i,w,e,u.getContractAddress(n),t),v=await n.prooflessDeposit(...s,{value:l>0n?l:void 0})}k=v.hash}return m.emitTxPublicData(c.constructAdminData(S,w,a.map(({erc20TokenAddress:e})=>e),d,E)),k};exports.hinkalProoflessDeposit=_;

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

@@ -3,6 +3,6 @@ import { Types as TronWebTypes } from 'tronweb';
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { StealthAddressStructure } from '../../types/circom-data.types';
+import { ProoflessFeeStructure } from '../../types/hinkal.types';
 import { AdminTransactionType } from '../../types/admin.types';
-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>;
+export declare const hinkalProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], recipientEncryptionKeysOverride?: string[], createBlockedUtxos?: boolean, feeStructure?: ProoflessFeeStructure, orderId?: string, action?: AdminTransactionType, returnTxData?: boolean) => Promise<string | ethers.TransactionRequest | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;

package/common/src/data-structures/Hinkal/hinkalProoflessDeposit.mjs

@@ -1,123 +1,136 @@
 import { isTronLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
 import { TRON_DEFAULT_FEE_LIMIT_SUN as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as i } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { ContractType as a } from "../../types/ethereum-network.types.mjs";
+import { zeroProoflessFeeStructure as i } from "../../types/hinkal.types.mjs";
+import { caseInsensitiveEqual as a } from "../../functions/utils/caseInsensitive.utils.mjs";
 import { Logger as o } from "../../error-handling/logger.mjs";
 import { assertTronSufficientBalance as s, createTronCallData as c, evmHexToTronBase58Address as l, splitTronTokensByNative as u } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
-import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getStealthAddressStructureFromUserKeys as p } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-import { getContractAddress as m } from "../../functions/utils/getContractAddress.mjs";
-import { simulateTronTransaction as h } from "../../functions/utils/tronSimulation.utils.mjs";
-import { buildApproveAndProoflessDepositCalls as g } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
-import { waitForErc20Approvals as _, waitForTronErc20Approvals as v } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
-import { emitTxPublicData as y } from "../../API/admin-calls.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";
+import { ContractType as d } from "../../types/ethereum-network.types.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 { emitTxPublicData as b } from "../../API/admin-calls.mjs";
+import { aggregateAmountsForApproval as x, approveTokens as S, approveTronTokens as C, assertNoDuplicateStealthAddressStructures as w, buildProoflessEncryptedOutputs as T, getOwnRecipientEncryptionKeys as E } from "./hinkalProoflessDeposit.utils.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.ts
-var E = async (e, r, i, a, d, f = !1) => {
-	let p = e.getTronWeb(), { hinkalAddress: m } = t[r].contractData, g = l(m), _ = await e.getEthereumAddressByChain(r), y = i.map((e) => e.erc20TokenAddress), b = i.map(() => 0n), { totalTrxValue: x, tokensNeedingApproval: C } = u(i, a), w = d.map((e) => ({
-		extraRandomization: e.extraRandomization.toString(),
-		stealthAddress: e.stealthAddress.toString(),
-		H0: e.H0.toString(),
-		H1: e.H1.toString()
-	}));
-	if (x > 0n) {
-		let { hinkalABI: e } = t[r].contractData;
-		if (!e) throw Error("Hinkal ABI not found");
-		await s(p, r, g, _, c(e, "prooflessDeposit", [
-			y,
-			a.map(String),
-			b.map(String),
-			d.map((e) => [
-				e.extraRandomization.toString(),
-				e.stealthAddress.toString(),
-				e.H0.toString(),
-				e.H1.toString()
-			])
-		]), x);
+var D = async (e, i, d, f, p, m, h, _, v, b = !1) => {
+	let x = e.getTronWeb(), { hinkalAddress: S, hinkalABI: w, hinkalWrapperAddress: T, hinkalWrapperABI: E } = t[i].contractData, D = _.feeAmount > 0n;
+	if (D && !T) throw Error("Hinkal wrapper address not found");
+	let O = l(D ? T : S), k = D ? E : w;
+	if (!k) throw Error(D ? "Hinkal wrapper ABI not found" : "Hinkal ABI not found");
+	let A = await e.getEthereumAddressByChain(i), j = d.map((e) => e.erc20TokenAddress), M = a(_.feeToken, r), { totalTrxValue: N, tokensNeedingApproval: P } = u(d, f), F = N + (M ? _.feeAmount : 0n);
+	if (!M && _.feeAmount > 0n) {
+		let e = l(_.feeToken);
+		P.set(e, (P.get(e) ?? 0n) + _.feeAmount);
 	}
-	let { transaction: T } = await p.transactionBuilder.triggerSmartContract(g, "prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])", {
-		feeLimit: n,
-		callValue: x > 0n ? Number(x) : 0
-	}, [
+	let I = p.map((e) => [
+		e.H0x.toString(),
+		e.H0y.toString(),
+		e.H1x.toString(),
+		e.H1y.toString(),
+		e.stealthAddress.toString()
+	]), L = [
 		{
 			type: "address[]",
-			value: y
+			value: j
 		},
 		{
 			type: "uint256[]",
-			value: a.map(String)
+			value: f.map(String)
 		},
 		{
-			type: "uint256[]",
-			value: b.map(String)
+			type: "tuple(uint256,uint256,uint256,uint256,uint256)[]",
+			value: I
+		},
+		{
+			type: "bytes[]",
+			value: m
 		},
 		{
-			type: "tuple(uint256,uint256,uint256,uint256)[]",
-			value: w.map((e) => [
-				e.extraRandomization,
-				e.stealthAddress,
-				e.H0,
-				e.H1
-			])
+			type: "bool",
+			value: h
 		}
-	], _);
-	if (f) return T;
-	await S(p, _, g, C), await v(p, _, g, Array.from(C.entries()).map(([e, t]) => ({
+	], R = D ? "prooflessDeposit(address[],uint256[],(uint256,uint256,uint256,uint256,uint256)[],bytes[],bool,(address,address,uint256),string)" : "prooflessDeposit(address[],uint256[],(uint256,uint256,uint256,uint256,uint256)[],bytes[],bool,string)", z = D ? [
+		...L,
+		{
+			type: "tuple(address,address,uint256)",
+			value: [
+				l(_.feeRecipient),
+				M ? _.feeToken : l(_.feeToken),
+				_.feeAmount.toString()
+			]
+		},
+		{
+			type: "string",
+			value: v
+		}
+	] : [...L, {
+		type: "string",
+		value: v
+	}], B = z.map(({ value: e }) => e);
+	F > 0n && await s(x, i, O, A, c(k, "prooflessDeposit", B), F);
+	let { transaction: V } = await x.transactionBuilder.triggerSmartContract(O, R, {
+		feeLimit: n,
+		callValue: F > 0n ? Number(F) : 0
+	}, z, A);
+	if (b) return V;
+	await C(x, A, O, P), await y(x, A, O, Array.from(P.entries()).map(([e, t]) => ({
 		tokenAddress: e,
 		requiredAmount: t
-	}))), await h(r, g, "prooflessDeposit", t[r].contractData.hinkalABI, [
-		y,
-		a.map(String),
-		b.map(String),
-		d.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 o.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 (t, n, o, s, c, l = !1) => {
-	let u = d(n), h = e(u), v = await t.getEthereumAddressByChain(u), S = s ?? n.map(() => p(t.userKeys));
-	if (S.length !== n.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
-	C(S);
-	let w;
-	if (h) {
-		let e = await E(t, u, n, o, S, l);
-		if (l) return e;
-		w = e;
+	}))), await g(i, O, "prooflessDeposit", k, B, A, F > 0n ? F : void 0);
+	let H = await x.trx.sign(V), U = await x.trx.sendRawTransaction(H);
+	if (!U.result) throw o.error("Tron prooflessDeposit broadcast failed", U), Error("Tron prooflessDeposit broadcast failed");
+	let W = typeof U == "string" ? U : U?.txid ?? U?.transaction?.txID;
+	if (!W) throw Error("Tron prooflessDeposit failed (missing txid)");
+	return W;
+}, O = async (t, n, o, s, c, l = !1, u = i, g = "", y, C = !1) => {
+	let O = f(n), k = e(O), A = await t.getEthereumAddressByChain(O), j = s ?? n.map(() => m(t.userKeys));
+	if (j.length !== n.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
+	if (w(j), s && !c) throw Error("recipientEncryptionKeysOverride is required whenever stealthAddressStructuresOverride is provided");
+	if (c && c.length !== n.length) throw Error("recipientEncryptionKeysOverride length must be equal to erc20 tokens length");
+	let M = T(n, j, c ?? E(t.userKeys, n.length)), N;
+	if (k) {
+		let e = await D(t, O, n, o, j, M, l, u, g, C);
+		if (C) return e;
+		N = e;
 	} else {
-		let e = t.getContractWithSigner(u, a.HinkalContract), s = [
+		let e = u.feeAmount > 0n, i = e ? t.getContractWithSigner(O, d.HinkalWrapperContract) : t.getContractWithSigner(O, d.HinkalContract), s = e ? [
+			n.map(({ erc20TokenAddress: e }) => e),
+			o,
+			j,
+			M,
+			l,
+			u,
+			g
+		] : [
 			n.map(({ erc20TokenAddress: e }) => e),
 			o,
-			n.map(() => 0n),
-			S
-		];
-		if (l) return e.prooflessDeposit.populateTransaction(...s);
-		let c = t.getProviderAdapter(u), d = b(n, o), f = n.reduce((e, t, n) => i(t.erc20TokenAddress, r) ? e + o[n] : e, 0n), p = d.filter(({ token: e, balance: t }) => !i(e.erc20TokenAddress, r) && t > 0n), h;
-		if (p.length > 0 && await c.supportsBatchCall?.(u) && c.sendBatchCallsTransaction) {
-			let t = g(p.map(({ token: e }) => e.erc20TokenAddress), p.map(({ balance: e }) => e), m(e), e, ...s, f);
-			h = await c.sendBatchCallsTransaction(u, t);
+			j,
+			M,
+			l,
+			g
+		], c = a(u.feeToken, r), f = n.reduce((e, t, n) => a(t.erc20TokenAddress, r) ? e + o[n] : e, 0n) + (c ? u.feeAmount : 0n);
+		if (C) return i.prooflessDeposit.populateTransaction(...s, { value: f > 0n ? f : void 0 });
+		let p = t.getProviderAdapter(O), m = x(!c && u.feeAmount > 0n ? [...n, {
+			erc20TokenAddress: u.feeToken,
+			chainId: O
+		}] : n, !c && u.feeAmount > 0n ? [...o, u.feeAmount] : o), y = m.filter(({ token: e, balance: t }) => !a(e.erc20TokenAddress, r) && t > 0n), b;
+		if (y.length > 0 && await p.supportsBatchCall?.(O) && p.sendBatchCallsTransaction) {
+			let t = _(y.map(({ token: e }) => e.erc20TokenAddress), y.map(({ balance: e }) => e), h(i), i, n.map(({ erc20TokenAddress: e }) => e), o, j, M, l, e ? u : void 0, g, f);
+			b = await p.sendBatchCallsTransaction(O, t);
 		} else {
-			await x(t, u, m(e), d);
-			let n = await t.getEthereumAddressByChain(u), r = d.map(({ token: e, balance: t }) => ({
+			await S(t, O, h(i), m);
+			let e = await t.getEthereumAddressByChain(O), n = m.map(({ token: e, balance: t }) => ({
 				tokenAddress: e.erc20TokenAddress,
 				requiredAmount: t
 			}));
-			await _(t, u, n, m(e), r), h = await e.prooflessDeposit(...s, { value: f > 0n ? f : void 0 });
+			await v(t, O, e, h(i), n), b = await i.prooflessDeposit(...s, { value: f > 0n ? f : void 0 });
 		}
-		w = h.hash;
+		N = b.hash;
 	}
-	return y(f(c, u, n.map(({ erc20TokenAddress: e }) => e), o, v)), w;
-}, O = async (n, r, i, a, o, s, c) => {
-	let l = a.map(() => i), u = i.erc20TokenAddress;
-	return e(r) ? T(n, r, u, s, l, a, o, c) : t[r]?.contractData?.hinkalWrapperAddress ? w(n, r, u, s, l, a, o, c) : await D(n, l, a, o, c, !0);
+	return b(p(y, O, n.map(({ erc20TokenAddress: e }) => e), o, A)), N;
 };
 //#endregion
-export { D as hinkalProoflessDeposit, O as hinkalProoflessDepositWithPublicFee };
+export { O as hinkalProoflessDeposit };

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../types/ethereum-network.types.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)t.caseInsensitiveEqual(s[c].token.erc20TokenAddress,e.zeroAddress)||await a.waitForEthereumTransactionConfirmation(i,(await r.getContractWithSigner(i,n.ContractType.ERC20Contract,s[c].token.erc20TokenAddress).approve(o,s[c].balance)).hash)},c=async(t,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 t.contract(r.ERC20ABI,s).allowance(n,i).call({from:n});if(BigInt(String(l))<c){let{transaction:r}=await t.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:e.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:i},{type:`uint256`,value:c.toString()}],n),a=await t.trx.sign(r),o=await t.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;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../crypto-keys/keys.cjs`),r=require(`../../externalABIs/index.cjs`),i=require(`../../types/ethereum-network.types.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../crypto-keys/encryptDecryptUtxo.cjs`),s=require(`../../functions/utils/tx-confirmation.utils.cjs`);var c=(e,t,n)=>{if(t.length!==e.length||n.length!==e.length)throw Error(`erc20Tokens, stealthAddressStructures and recipientEncryptionKeys must have equal length`);return t.map((e,t)=>{let r=n[t];if(!r)throw Error(`Missing encryptionKey for proofless deposit output ${t}: required so the enclave can attribute this UTXO to its owner`);return`0x${Buffer.from(o.encryptEncryptionKeyAndStealthAddress(r,e.stealthAddress)).toString(`hex`)}`})},l=(e,t)=>{let r=n.UserKeys.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey;return Array.from({length:t},()=>r)},u=(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.isSameERC20Token(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},d=async(n,r,a,o)=>{for(let c=0;c<o.length;c+=1)t.caseInsensitiveEqual(o[c].token.erc20TokenAddress,e.zeroAddress)||await s.waitForEthereumTransactionConfirmation(r,(await n.getContractWithSigner(r,i.ContractType.ERC20Contract,o[c].token.erc20TokenAddress).approve(a,o[c].balance)).hash)},f=async(t,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 t.contract(r.ERC20ABI,s).allowance(n,i).call({from:n});if(BigInt(String(l))<c){let{transaction:r}=await t.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:e.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:i},{type:`uint256`,value:c.toString()}],n),a=await t.trx.sign(r),o=await t.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}`)}}}},p=e=>{let t=new Set;e.forEach(({H0x: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=u,exports.approveTokens=d,exports.approveTronTokens=f,exports.assertNoDuplicateStealthAddressStructures=p,exports.buildProoflessEncryptedOutputs=c,exports.getOwnRecipientEncryptionKeys=l;

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

@@ -1,6 +1,9 @@
 import { ERC20Token, TokenBalance } from '../../types/token.types';
 import { StealthAddressStructure } from '../../types/circom-data.types';
+import { UserKeys } from '../crypto-keys/keys';
 import { IHinkal } from './IHinkal';
+export declare const buildProoflessEncryptedOutputs: (erc20Tokens: ERC20Token[], stealthAddressStructures: StealthAddressStructure[], recipientEncryptionKeys: string[]) => string[];
+export declare const getOwnRecipientEncryptionKeys: (userKeys: UserKeys, count: number) => string[];
 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>;

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

@@ -1,27 +1,39 @@
 import { TRON_DEFAULT_FEE_LIMIT_SUN as e, zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { ContractType as r } from "../../types/ethereum-network.types.mjs";
+import { UserKeys as r } from "../crypto-keys/keys.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";
+import { ContractType as a } from "../../types/ethereum-network.types.mjs";
+import { isSameERC20Token as o } from "../../functions/utils/token-check.utils.mjs";
+import { encryptEncryptionKeyAndStealthAddress as s } from "../crypto-keys/encryptDecryptUtxo.mjs";
+import { waitForEthereumTransactionConfirmation as c } from "../../functions/utils/tx-confirmation.utils.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.utils.ts
-var s = (e, t) => {
+var l = (e, t, n) => {
+	if (t.length !== e.length || n.length !== e.length) throw Error("erc20Tokens, stealthAddressStructures and recipientEncryptionKeys must have equal length");
+	return t.map((e, t) => {
+		let r = n[t];
+		if (!r) throw Error(`Missing encryptionKey for proofless deposit output ${t}: required so the enclave can attribute this UTXO to its owner`);
+		return `0x${Buffer.from(s(r, e.stealthAddress)).toString("hex")}`;
+	});
+}, u = (e, t) => {
+	let n = r.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey;
+	return Array.from({ length: t }, () => n);
+}, d = (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;
+		let a = !1;
+		for (let s = 0; s < r; s += 1) if (o(n[s].token, e[i])) {
+			n[s].balance += t[i], a = !0;
 			break;
 		}
-		o || (n[r] = {
+		a || (n[r] = {
 			token: e[i],
 			balance: t[i]
 		}, r += 1);
 	}
 	return n;
-}, c = async (e, i, a, s) => {
-	for (let c = 0; c < s.length; c += 1) n(s[c].token.erc20TokenAddress, t) || await o(i, (await e.getContractWithSigner(i, r.ERC20Contract, s[c].token.erc20TokenAddress).approve(a, s[c].balance)).hash);
-}, l = async (t, n, r, a) => {
+}, f = async (e, r, i, o) => {
+	for (let s = 0; s < o.length; s += 1) n(o[s].token.erc20TokenAddress, t) || await c(r, (await e.getContractWithSigner(r, a.ERC20Contract, o[s].token.erc20TokenAddress).approve(i, o[s].balance)).hash);
+}, p = async (t, 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 t.contract(i, s).allowance(n, r).call({ from: n });
@@ -39,13 +51,13 @@ var s = (e, t) => {
 			}
 		}
 	}
-}, u = (e) => {
+}, m = (e) => {
 	let t = /* @__PURE__ */ new Set();
-	e.forEach(({ extraRandomization: e, stealthAddress: n }) => {
+	e.forEach(({ H0x: 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 };
+export { d as aggregateAmountsForApproval, f as approveTokens, p as approveTronTokens, m as assertNoDuplicateStealthAddressStructures, l as buildProoflessEncryptedOutputs, u as getOwnRecipientEncryptionKeys };

package/common/src/data-structures/Hinkal/hinkalProxyToPrivate.cjs

@@ -1 +1 @@
-const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../functions/utils/addresses.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/getFeeStructure.cjs`),s=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),c=require(`../../functions/private-wallet/emporium.helpers.cjs`);var l=async(l,u,d,f,p,m,h,g)=>{if(!h)throw Error(`hinkalProxyToPrivate: subAccount should be provided`);if(!p)throw Error(`Fee token is required in hinkalProxyToPrivate`);if(!n.isValidPrivateAddress(f))throw Error(e.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=r.validateAndGetChainId(u),v=a.AccountActions.getAddressFromSubAccount(_,h);if(!v)throw Error(`Public account address is not available`);let y=u.map(e=>e.erc20TokenAddress),b=await i.modifyVolatileTokenAmountChanges(_,u,d,v),x=c.createTransaferEmporiumOpsBatch(l,_,y,b),S=m??await o.getFeeStructure(_,p,y,t.ExternalActionId.Emporium,x.map(e=>s.convertEmporiumOpToCallInfo(e,v,_))),C=u.map((e,t)=>({token:e,amount:-1n*b[t]}));return l.actionPrivateWallet(_,[u[0]],[0n],[!1],x,C,h,p,S,void 0,void 0,void 0,g,{recipientInfo:f,amount:b[0],token:u[0]})};exports.hinkalProxyToPrivate=l;
+const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../functions/utils/addresses.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/getFeeStructure.cjs`),s=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),c=require(`../../functions/private-wallet/emporium.helpers.cjs`);var l=async(l,u,d,f,p,m,h,g)=>{if(!h)throw Error(`hinkalProxyToPrivate: subAccount should be provided`);if(!p)throw Error(`Fee token is required in hinkalProxyToPrivate`);if(!t.isValidPrivateAddress(f))throw Error(e.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=r.validateAndGetChainId(u),v=a.AccountActions.getAddressFromSubAccount(_,h);if(!v)throw Error(`Public account address is not available`);let y=u.map(e=>e.erc20TokenAddress),b=await i.modifyVolatileTokenAmountChanges(_,u,d,v),x=c.createTransaferEmporiumOpsBatch(l,_,y,b),S=m??await o.getFeeStructure(_,p,y,n.ExternalActionId.Emporium,x.map(e=>s.convertEmporiumOpToCallInfo(e,v,_))),C=u.map((e,t)=>({token:e,amount:-1n*b[t]}));return l.actionPrivateWallet(_,[u[0]],[0n],[!1],x,C,h,p,S,void 0,void 0,void 0,g,{recipientInfo:f,amount:b[0],token:u[0]})};exports.hinkalProxyToPrivate=l;

package/common/src/data-structures/Hinkal/hinkalProxyToPrivate.mjs

@@ -1,6 +1,6 @@
 import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { isValidPrivateAddress as n } from "../../functions/utils/addresses.mjs";
+import { isValidPrivateAddress as t } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as n } from "../../types/external-action.types.mjs";
 import { validateAndGetChainId as r } from "../../functions/utils/token-check.utils.mjs";
 import { modifyVolatileTokenAmountChanges as i } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
 import { AccountActions as a } from "../AccountActions/AccountActions.mjs";
@@ -11,10 +11,10 @@ import { createTransaferEmporiumOpsBatch as c } from "../../functions/private-wa
 var l = async (l, u, d, f, p, m, h, g) => {
 	if (!h) throw Error("hinkalProxyToPrivate: subAccount should be provided");
 	if (!p) throw Error("Fee token is required in hinkalProxyToPrivate");
-	if (!n(f)) throw Error(e.RECIPIENT_FORMAT_INCORRECT);
+	if (!t(f)) throw Error(e.RECIPIENT_FORMAT_INCORRECT);
 	let _ = r(u), v = a.getAddressFromSubAccount(_, h);
 	if (!v) throw Error("Public account address is not available");
-	let y = u.map((e) => e.erc20TokenAddress), b = await i(_, u, d, v), x = c(l, _, y, b), S = m ?? await o(_, p, y, t.Emporium, x.map((e) => s(e, v, _))), C = u.map((e, t) => ({
+	let y = u.map((e) => e.erc20TokenAddress), b = await i(_, u, d, v), x = c(l, _, y, b), S = m ?? await o(_, p, y, n.Emporium, x.map((e) => s(e, v, _))), C = u.map((e, t) => ({
 		token: e,
 		amount: -1n * b[t]
 	}));