@hinkal/common 0.3.1 → 0.3.3

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

@@ -33,9 +33,13 @@ var c = async (c, l, u, d, f, p, m, h, g, _) => {
 			depositAddress: r.depositAddress,
 			quote: r
 		};
-	})), S = m ?? await a(v, l, x[0].depositAddress), C = x.map((e) => e.amount), w = x.map((e) => e.depositAddress), T;
-	return e(v) ? {depositTxHash: T} = await s(c, l, C, w, p, S, h, g, _, x.map((e) => e.destinationRecipient)) : {depositTxHash: T} = await o(c, l, C, w, p, S, h, g, _), {
-		depositTxHash: T,
+	})), S = m ?? await a(v, l, x[0].depositAddress), C = x.map((e) => e.amount), w = x.map((e) => e.depositAddress), T = {
+		chainId: f.destinationChainId === v ? void 0 : f.destinationChainId,
+		tokenAddress: f.destinationTokenAddress,
+		tokenAmounts: x.map((e) => e.quote.amountOut)
+	}, E;
+	return e(v) ? {depositTxHash: E} = await s(c, l, C, w, p, S, h, g, _, x.map((e) => e.destinationRecipient), T) : {depositTxHash: E} = await o(c, l, C, w, p, S, h, g, _, void 0, T), {
+		depositTxHash: E,
 		legs: x
 	};
 };

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(`../../crypto/poseidon.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../types/external-action.types.cjs`),s=require(`../../types/admin.types.cjs`),c=require(`../../types/transact.types.cjs`);require(`../../error-handling/index.cjs`);const l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../AccountActions/AccountActions.cjs`),d=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const f=require(`../../functions/private-wallet/emporium.helpers.cjs`),p=require(`./hinkalTransact.cjs`),m=require(`../../functions/utils/involves-permit2-op.cjs`),h=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),_=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),v=require(`./handleAutoDepositBack.cjs`);var y=async(y,b,x,S,C,w,T,E,D,O,k,A=!1,j,M,N)=>{if(N&&!a.isValidPrivateAddress(N.recipientInfo))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(T.length>0&&!E)throw Error(`Subaccount is required for private wallet transactions`);let P=x.map(e=>e.erc20TokenAddress),F=await y.getEthereumAddressByChain(b),I=E?u.AccountActions.getAddressFromSubAccount(b,E):void 0,{contractData:L}=e.networkRegistry[b],{emporiumAddress:R}=L;if(!R)throw Error(`No Emporium Address Provided`);let z=O??await d.getFeeStructure(b,D,P,o.ExternalActionId.Emporium,w.map(e=>h.convertEmporiumOpToCallInfo(e,I??``,b)));for(I?await _.mergeWithFeeStructureEmporium(y,b,I,w,P,S,z,T.find(e=>t.caseInsensitiveEqual(e.token.erc20TokenAddress,z.feeToken))?.amount??0n):await g.mergeWithFeeStructure(b,P,S,z);C.length<P.length;)C.push(!1);let B=k??await y.getRandomRelay(b,!0);if(!B)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let V=E?u.AccountActions.getPrivateKeyFromSubAccount(b,E):void 0,H=e.getOnchainChainId(b),U=V?u.AccountActions.getSignerAddressFromPrivateKey(H,V):void 0,W=i.randomBigInt(31),G=y.generateProofRemotely?await f.encodeEmporiumMetadata(b,R,V,w,n.poseidonFunction(W),U):void 0,K=await f.getAuthorizationDataIfNeeded(b,V),q=m.uniswapWorkaround(w),J=l.constructAdminData(M,b,T.map(e=>e.token.erc20TokenAddress),T.map(e=>e.amount),F,M===s.AdminTransactionType.PublicSwap?T.map(({token:e})=>e):void 0),Y,X=await p.hinkalTransact(y,{chainId:b,erc20Addresses:P,amountChanges:S,externalAddress:R,externalActionId:o.ExternalActionId.Emporium,externalActionMetadata:G,onChainCreation:C,feeStructure:z,relay:B,messageSeed:W,recipientAddress:N?[N.recipientInfo]:void 0,recipientAmounts:N?[P.map(e=>t.caseInsensitiveEqual(e,N.token.erc20TokenAddress)?N.amount:0n)]:void 0,subAccountPrivateKey:V,emporiumOps:w,onTxSubmitLocally:e=>{Y=e},submit:{mode:c.SubmitMode.Relayer,adminData:J,authorizationData:K,withUniswapWorkAround:q}});return A&&E&&v.handleAutoDepositBack(y,b,I,E,z.feeToken,j,T,Y),X};exports.hinkalPrivateWallet=y;

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

@@ -1,48 +1,60 @@
-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 { getOnchainChainId as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { poseidonFunction as r } from "../../crypto/poseidon.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
 import { isValidPrivateAddress as o } from "../../functions/utils/addresses.mjs";
-import { addPaddingToUtxos as s } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as c } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { ExternalActionId as s } from "../../types/external-action.types.mjs";
+import { AdminTransactionType as c } from "../../types/admin.types.mjs";
+import { SubmitMode as l } from "../../types/transact.types.mjs";
 import "../../error-handling/index.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 { constructAdminData as u } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as d } from "../AccountActions/AccountActions.mjs";
 import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { uniswapWorkaround as p } from "../../functions/utils/involves-permit2-op.mjs";
-import { convertEmporiumOpToCallInfo as m } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { getAuthorizationDataIfNeeded as h } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { encodeEmporiumMetadata as p, getAuthorizationDataIfNeeded as m } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalTransact as h } from "./hinkalTransact.mjs";
+import { uniswapWorkaround as g } from "../../functions/utils/involves-permit2-op.mjs";
+import { convertEmporiumOpToCallInfo as _ } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 import { mergeWithFeeStructure as v } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import { mergeWithFeeStructureEmporium as y } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
 import { handleAutoDepositBack as b } from "./handleAutoDepositBack.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalPrivateWallet.ts
-var x = async (e, t, n, i, a) => {
-	let o = [...await s(e, t, n, i)], l = [], u = r().toString();
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = c(e.userKeys, o[t], i[t], u);
-		l.push(n);
-	}
-	return a && d(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(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)));
-	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));
-	return k && T && b(r, s, F, T, R.feeToken, A, w, W), J;
+var x = async (x, S, C, w, T, E, D, O, k, A, j, M = !1, N, P, F) => {
+	if (F && !o(F.recipientInfo)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
+	if (D.length > 0 && !O) throw Error("Subaccount is required for private wallet transactions");
+	let I = C.map((e) => e.erc20TokenAddress), L = await x.getEthereumAddressByChain(S), R = O ? d.getAddressFromSubAccount(S, O) : void 0, { contractData: z } = t[S], { emporiumAddress: B } = z;
+	if (!B) throw Error("No Emporium Address Provided");
+	let V = A ?? await f(S, k, I, s.Emporium, E.map((e) => _(e, R ?? "", S)));
+	for (R ? await y(x, S, R, E, I, w, V, D.find((e) => n(e.token.erc20TokenAddress, V.feeToken))?.amount ?? 0n) : await v(S, I, w, V); T.length < I.length;) T.push(!1);
+	let H = j ?? await x.getRandomRelay(S, !0);
+	if (!H) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let U = O ? d.getPrivateKeyFromSubAccount(S, O) : void 0, W = e(S), G = U ? d.getSignerAddressFromPrivateKey(W, U) : void 0, K = a(31), q = x.generateProofRemotely ? await p(S, B, U, E, r(K), G) : void 0, J = await m(S, U), Y = g(E), X = u(P, S, D.map((e) => e.token.erc20TokenAddress), D.map((e) => e.amount), L, P === c.PublicSwap ? D.map(({ token: e }) => e) : void 0), Z, Q = await h(x, {
+		chainId: S,
+		erc20Addresses: I,
+		amountChanges: w,
+		externalAddress: B,
+		externalActionId: s.Emporium,
+		externalActionMetadata: q,
+		onChainCreation: T,
+		feeStructure: V,
+		relay: H,
+		messageSeed: K,
+		recipientAddress: F ? [F.recipientInfo] : void 0,
+		recipientAmounts: F ? [I.map((e) => n(e, F.token.erc20TokenAddress) ? F.amount : 0n)] : void 0,
+		subAccountPrivateKey: U,
+		emporiumOps: E,
+		onTxSubmitLocally: (e) => {
+			Z = e;
+		},
+		submit: {
+			mode: l.Relayer,
+			adminData: X,
+			authorizationData: J,
+			withUniswapWorkAround: Y
+		}
+	});
+	return M && O && b(x, S, R, O, V.feeToken, N, D, Z), Q;
 };
 //#endregion
-export { S as hinkalPrivateWallet };
+export { x as hinkalPrivateWallet };

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(`../../types/ethereum-network.types.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),l=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),u=require(`../../API/admin-calls.cjs`),d=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),f=require(`./hinkalProoflessDeposit.utils.cjs`);var p=async(p,m,h,g,_,v=!1,y=n.zeroProoflessFeeStructure,b=``,x,S=!1)=>{let C=a.validateAndGetChainId(m);if(e.isTronLike(C))throw Error(`Proofless deposit is not supported on Tron`);let w=await p.getEthereumAddressByChain(C),T=g??m.map(()=>d.getStealthAddressStructureFromUserKeys(p.userKeys));if(T.length!==m.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);if(f.assertNoDuplicateStealthAddressStructures(T),g&&!_)throw Error(`recipientEncryptionKeysOverride is required whenever stealthAddressStructuresOverride is provided`);if(_&&_.length!==m.length)throw Error(`recipientEncryptionKeysOverride length must be equal to erc20 tokens length`);let E=f.buildProoflessEncryptedOutputs(T,_??f.getOwnRecipientEncryptionKeys(p.userKeys,m.length)),D=y.feeAmount>0n,O=D?p.getContractWithSigner(C,i.ContractType.HinkalWrapperContract):p.getContractWithSigner(C,i.ContractType.HinkalContract),k=D?[m.map(({erc20TokenAddress:e})=>e),h,T,E,v,y,b]:[m.map(({erc20TokenAddress:e})=>e),h,T,E,v,b],A=r.caseInsensitiveEqual(y.feeToken,t.zeroAddress),j=m.reduce((e,n,i)=>r.caseInsensitiveEqual(n.erc20TokenAddress,t.zeroAddress)?e+h[i]:e,0n)+(A?y.feeAmount:0n);if(S)return O.prooflessDeposit.populateTransaction(...k,{value:j>0n?j:void 0});let M=p.getProviderAdapter(C),N=f.aggregateAmountsForApproval(!A&&y.feeAmount>0n?[...m,{erc20TokenAddress:y.feeToken,chainId:C}]:m,!A&&y.feeAmount>0n?[...h,y.feeAmount]:h),P=N.filter(({token:e,balance:n})=>!r.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&n>0n),F;if(P.length>0&&await M.supportsBatchCall?.(C)&&M.sendBatchCallsTransaction){let e=c.buildApproveAndProoflessDepositCalls(P.map(({token:e})=>e.erc20TokenAddress),P.map(({balance:e})=>e),s.getContractAddress(O),O,m.map(({erc20TokenAddress:e})=>e),h,T,E,v,D?y:void 0,b,j);F=await M.sendBatchCallsTransaction(C,e)}else{await f.approveTokens(p,C,s.getContractAddress(O),N);let e=await p.getEthereumAddressByChain(C),t=N.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await l.waitForErc20Approvals(p,C,e,s.getContractAddress(O),t),F=await O.prooflessDeposit(...k,{value:j>0n?j:void 0})}let I=F.hash;return u.emitTxPublicData(o.constructAdminData(x,C,m.map(({erc20TokenAddress:e})=>e),h,w)),I};exports.hinkalProoflessDeposit=p;

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

@@ -1,8 +1,7 @@
 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 { 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>;

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

@@ -1,123 +1,58 @@
-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 { 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 { isTronLike as e } from "../../constants/chains.constants.mjs";
+import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
+import { zeroProoflessFeeStructure as n } from "../../types/hinkal.types.mjs";
+import { caseInsensitiveEqual as r } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { ContractType as i } from "../../types/ethereum-network.types.mjs";
+import { validateAndGetChainId as a } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getContractAddress as s } from "../../functions/utils/getContractAddress.mjs";
+import { buildApproveAndProoflessDepositCalls as c } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
+import { waitForErc20Approvals as l } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { emitTxPublicData as u } from "../../API/admin-calls.mjs";
+import { getStealthAddressStructureFromUserKeys as d } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+import { aggregateAmountsForApproval as f, approveTokens as p, assertNoDuplicateStealthAddressStructures as m, buildProoflessEncryptedOutputs as h, getOwnRecipientEncryptionKeys as g } 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);
-	}
-	let { transaction: T } = await p.transactionBuilder.triggerSmartContract(g, "prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])", {
-		feeLimit: n,
-		callValue: x > 0n ? Number(x) : 0
-	}, [
-		{
-			type: "address[]",
-			value: y
-		},
-		{
-			type: "uint256[]",
-			value: a.map(String)
-		},
-		{
-			type: "uint256[]",
-			value: b.map(String)
-		},
-		{
-			type: "tuple(uint256,uint256,uint256,uint256)[]",
-			value: w.map((e) => [
-				e.extraRandomization,
-				e.stealthAddress,
-				e.H0,
-				e.H1
-			])
-		}
-	], _);
-	if (f) return T;
-	await S(p, _, g, C), await v(p, _, g, Array.from(C.entries()).map(([e, t]) => ({
-		tokenAddress: e,
-		requiredAmount: t
-	}))), await h(r, g, "prooflessDeposit", t[r].contractData.hinkalABI, [
+var _ = async (_, v, y, b, x, S = !1, C = n, w = "", T, E = !1) => {
+	let D = a(v);
+	if (e(D)) throw Error("Proofless deposit is not supported on Tron");
+	let O = await _.getEthereumAddressByChain(D), k = b ?? v.map(() => d(_.userKeys));
+	if (k.length !== v.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
+	if (m(k), b && !x) throw Error("recipientEncryptionKeysOverride is required whenever stealthAddressStructuresOverride is provided");
+	if (x && x.length !== v.length) throw Error("recipientEncryptionKeysOverride length must be equal to erc20 tokens length");
+	let A = h(k, x ?? g(_.userKeys, v.length)), j = C.feeAmount > 0n, M = j ? _.getContractWithSigner(D, i.HinkalWrapperContract) : _.getContractWithSigner(D, i.HinkalContract), N = j ? [
+		v.map(({ erc20TokenAddress: e }) => e),
+		y,
+		k,
+		A,
+		S,
+		C,
+		w
+	] : [
+		v.map(({ erc20TokenAddress: e }) => e),
 		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;
+		k,
+		A,
+		S,
+		w
+	], P = r(C.feeToken, t), F = v.reduce((e, n, i) => r(n.erc20TokenAddress, t) ? e + y[i] : e, 0n) + (P ? C.feeAmount : 0n);
+	if (E) return M.prooflessDeposit.populateTransaction(...N, { value: F > 0n ? F : void 0 });
+	let I = _.getProviderAdapter(D), L = f(!P && C.feeAmount > 0n ? [...v, {
+		erc20TokenAddress: C.feeToken,
+		chainId: D
+	}] : v, !P && C.feeAmount > 0n ? [...y, C.feeAmount] : y), R = L.filter(({ token: e, balance: n }) => !r(e.erc20TokenAddress, t) && n > 0n), z;
+	if (R.length > 0 && await I.supportsBatchCall?.(D) && I.sendBatchCallsTransaction) {
+		let e = c(R.map(({ token: e }) => e.erc20TokenAddress), R.map(({ balance: e }) => e), s(M), M, v.map(({ erc20TokenAddress: e }) => e), y, k, A, S, j ? C : void 0, w, F);
+		z = await I.sendBatchCallsTransaction(D, e);
 	} else {
-		let e = t.getContractWithSigner(u, a.HinkalContract), s = [
-			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);
-		} else {
-			await x(t, u, m(e), d);
-			let n = await t.getEthereumAddressByChain(u), r = d.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 });
-		}
-		w = h.hash;
+		await p(_, D, s(M), L);
+		let e = await _.getEthereumAddressByChain(D), t = L.map(({ token: e, balance: t }) => ({
+			tokenAddress: e.erc20TokenAddress,
+			requiredAmount: t
+		}));
+		await l(_, D, e, s(M), t), z = await M.prooflessDeposit(...N, { value: F > 0n ? F : void 0 });
 	}
-	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);
+	let B = z.hash;
+	return u(o(T, D, v.map(({ erc20TokenAddress: e }) => e), y, O)), B;
 };
 //#endregion
-export { D as hinkalProoflessDeposit, O as hinkalProoflessDepositWithPublicFee };
+export { _ 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(`../../types/ethereum-network.types.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../crypto-keys/encryptDecryptUtxo.cjs`);require(`../../externalABIs/index.cjs`);const o=require(`../../functions/utils/tx-confirmation.utils.cjs`);var s=(e,t)=>{if(e.length!==t.length)throw Error(`stealthAddressStructures and recipientEncryptionKeys must have equal length`);return e.map((e,n)=>{let r=t[n];if(!r)throw Error(`Missing encryptionKey for proofless deposit output ${n}: required so the enclave can attribute this UTXO to its owner`);return`0x${Buffer.from(a.encryptEncryptionKeyAndStealthAddress(r,e.stealthAddress)).toString(`hex`)}`})},c=(e,t)=>{let r=n.UserKeys.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey;return Array.from({length:t},()=>r)},l=(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},u=async(n,i,a,s)=>{for(let c=0;c<s.length;c+=1)t.caseInsensitiveEqual(s[c].token.erc20TokenAddress,e.zeroAddress)||await o.waitForEthereumTransactionConfirmation(i,(await n.getContractWithSigner(i,r.ContractType.ERC20Contract,s[c].token.erc20TokenAddress).approve(a,s[c].balance)).hash)},d=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=l,exports.approveTokens=u,exports.assertNoDuplicateStealthAddressStructures=d,exports.buildProoflessEncryptedOutputs=s,exports.getOwnRecipientEncryptionKeys=c;

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: (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,51 +1,45 @@
-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 { zeroAddress as e } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as t } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { UserKeys as n } from "../crypto-keys/keys.mjs";
 import { ContractType as r } from "../../types/ethereum-network.types.mjs";
-import { ERC20ABI as i } from "../../externalABIs/index.mjs";
-import { isSameERC20Token as a } from "../../functions/utils/token-check.utils.mjs";
+import { isSameERC20Token as i } from "../../functions/utils/token-check.utils.mjs";
+import { encryptEncryptionKeyAndStealthAddress as a } from "../crypto-keys/encryptDecryptUtxo.mjs";
+import "../../externalABIs/index.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) => {
+	if (e.length !== t.length) throw Error("stealthAddressStructures and recipientEncryptionKeys must have equal length");
+	return e.map((e, n) => {
+		let r = t[n];
+		if (!r) throw Error(`Missing encryptionKey for proofless deposit output ${n}: required so the enclave can attribute this UTXO to its owner`);
+		return `0x${Buffer.from(a(r, e.stealthAddress)).toString("hex")}`;
+	});
+}, c = (e, t) => {
+	let r = n.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey;
+	return Array.from({ length: t }, () => r);
+}, l = (e, t) => {
 	let n = [], r = 0;
-	for (let i = 0; i < e.length; i += 1) {
+	for (let a = 0; a < e.length; a += 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;
+		for (let s = 0; s < r; s += 1) if (i(n[s].token, e[a])) {
+			n[s].balance += t[a], o = !0;
 			break;
 		}
 		o || (n[r] = {
-			token: e[i],
-			balance: t[i]
+			token: e[a],
+			balance: t[a]
 		}, 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) => {
-	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 });
-		if (BigInt(String(l)) < c) {
-			let { transaction: i } = await t.transactionBuilder.triggerSmartContract(s, "approve(address,uint256)", { feeLimit: e }, [{
-				type: "address",
-				value: r
-			}, {
-				type: "uint256",
-				value: c.toString()
-			}], n), a = await t.trx.sign(i), 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}`);
-			}
-		}
-	}
-}, u = (e) => {
+}, u = async (n, i, a, s) => {
+	for (let c = 0; c < s.length; c += 1) t(s[c].token.erc20TokenAddress, e) || await o(i, (await n.getContractWithSigner(i, r.ERC20Contract, s[c].token.erc20TokenAddress).approve(a, s[c].balance)).hash);
+}, d = (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 { l as aggregateAmountsForApproval, u as approveTokens, d as assertNoDuplicateStealthAddressStructures, s as buildProoflessEncryptedOutputs, c 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/private-wallet/emporium.helpers.cjs`),c=require(`../../functions/utils/convertEmporiumOpToCallInfo.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=s.createTransaferEmporiumOpsBatch(l,_,y,b),S=m??await o.getFeeStructure(_,p,y,n.ExternalActionId.Emporium,x.map(e=>c.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,20 +1,20 @@
 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";
 import { getFeeStructure as o } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { convertEmporiumOpToCallInfo as s } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { createTransaferEmporiumOpsBatch as c } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { createTransaferEmporiumOpsBatch as s } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { convertEmporiumOpToCallInfo as c } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProxyToPrivate.ts
 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 = s(l, _, y, b), S = m ?? await o(_, p, y, n.Emporium, x.map((e) => c(e, v, _))), C = u.map((e, t) => ({
 		token: e,
 		amount: -1n * b[t]
 	}));

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/getFeeStructure.cjs`),d=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),f=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let p=require(`ethers`);var m=async(m,h,g,_,v)=>{let y=c.validateAndGetChainId([h]),b=h.erc20TokenAddress;if(g.getTokenAddress(y)!==b)throw Error(`Off-chain UTXO token mismatch`);let x=v?new i.UserKeys(v):new i.UserKeys(g.nullifyingKey,g.nullifyingKey);if(!g.nullifyingKey&&!v)throw Error(`Claimable UTXO nullifyingKey is missing`);let S=x.getShieldedPrivateKey();if(g.nullifyingKey&&g.nullifyingKey!==S)throw Error(`Claimable UTXO key mismatch`);let{originalDeployer:C}=e.networkRegistry[y].contractData;if(!C)throw Error(`missing data`);let w=o.Utxo.createFrom(g,{nullifyingKey:S}),T=_??await u.getFeeStructure(y,b,[b],s.ExternalActionId.Transact,void 0,void 0,{mintTo:b,nullifierCount:1});if(T.feeToken!==b)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let E=T.variableRate>0n?T.variableRate:t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(w.amount<=T.flatFee)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let D=w.amount-T.flatFee,O=D*E/10000n,k=D-O;if(k<=0n)throw Error(n.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let A=T.flatFee+O,[j,M,N,,P]=m.getRecipientInfo().split(`,`);if(!M||!N||!j||!P)throw Error(`Invalid recipient info`);let F=a.getCurrentTimeInSeconds().toString(),I=new o.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),...w.isNewStyle?{spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),L=new o.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),timeStamp:F,spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}),R=new o.Utxo({amount:k,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,timeStamp:F,H0:[BigInt(M),BigInt(N)],stealthAddress:j,encryptionKey:P,isNewStyle:!0}),z=[w,I],B=[L,R],V=await m.getRandomRelay(y,!0);if(!V)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let H=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),x.getShieldedPrivateKey()),U={tokenNumber:1,nullifierAmount:z.length,outputAmount:B.length},W=l.calcEncryptedOutputs([B])[0].map(e=>Array.from(p.ethers.getBytes(e))),{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,commitmentValidationData:Y}=await d.constructSolanaZkProof(m.generateProofRemotely,m.merkleTreeHinkalByChain[y],x,[b],[z],[B],H,A,0n,t.solanaNativeAddress,V,U,W,y),X={recipient:V,mint:b===`11111111111111111111111111111111`?void 0:b};return f.solanaTransactCallRelayer({chainId:y,relayAddress:V,functionName:`transfer`,args:{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:W,relayerFee:A.toString(),dimensions:U},accounts:X,commitmentValidationData:Y})};exports.hinkalSolanaClaimUtxo=m;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/constructTxEnclave.cjs`),u=require(`../../functions/pre-transaction/getFeeStructure.cjs`),d=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),f=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);var p=async(e,n,r,i,a,o,s,c,u,d,f)=>{let{jobId:p,signedMessageHash:m}=await l.prepareSolanaTxEnclaveCall(e,{chainId:n,mintAddresses:[r],amountChanges:i,relayAddress:a,recipient:t.solanaNativeAddress,signer:a,functionName:`transfer`,accounts:o,relayerFee:u,variableRate:0n,hinkalInstructions:[],remainingAccounts:[],recipientAddress:s,recipientAmounts:[c],inputCommitments:[f]},d),{R8:h,S:g}=d.signEddsa(BigInt(m));return l.finalizeSolanaTxEnclaveCallRelay(p,{R8:h,S:g},n)},m=async(l,m,h,g,_)=>{let v=c.validateAndGetChainId([m]),y=m.erc20TokenAddress;if(h.getTokenAddress(v)!==y)throw Error(`Off-chain UTXO token mismatch`);let b=_?new i.UserKeys(_):new i.UserKeys(h.nullifyingKey,h.nullifyingKey);if(!h.nullifyingKey&&!_)throw Error(`Claimable UTXO nullifyingKey is missing`);let x=b.getShieldedPrivateKey();if(h.nullifyingKey&&h.nullifyingKey!==x)throw Error(`Claimable UTXO key mismatch`);let{originalDeployer:S}=e.networkRegistry[v].contractData;if(!S)throw Error(`missing data`);let C=o.Utxo.createFrom(h,{nullifyingKey:x}),w=g??await u.getFeeStructure(v,y,[y],s.ExternalActionId.Transact,void 0,void 0,{mintTo:y,nullifierCount:1,rootInsertCount:2});if(w.feeToken!==y)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let T=w.variableRate>0n?w.variableRate:t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(C.amount<=w.flatFee)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let E=C.amount-w.flatFee,D=E*T/10000n,O=E-D;if(O<=0n)throw Error(n.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let k=w.flatFee+D,A=l.getRecipientInfo(),[j,M,N,,,P]=A.split(`,`);if(!M||!N||!j||!P)throw Error(`Invalid recipient info`);let F=a.getCurrentTimeInSeconds().toString(),I=new o.Utxo({amount:0n,erc20TokenAddress:C.erc20TokenAddress,mintAddress:C.mintAddress,nullifyingKey:b.getShieldedPrivateKey(),spendingPublicKey:b.getSpendingKeyPair().pubSpendingBJJPoint}),L=new o.Utxo({amount:0n,erc20TokenAddress:C.erc20TokenAddress,mintAddress:C.mintAddress,nullifyingKey:b.getShieldedPrivateKey(),timeStamp:F,spendingPublicKey:b.getSpendingKeyPair().pubSpendingBJJPoint}),R=new o.Utxo({amount:O,erc20TokenAddress:C.erc20TokenAddress,mintAddress:C.mintAddress,timeStamp:F,H0:[BigInt(M),BigInt(N)],stealthAddress:j,encryptionKey:P}),z=[C,I],B=[L,R],V=await l.getRandomRelay(v,!0);if(!V)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let H={recipient:V,mint:y===`11111111111111111111111111111111`?void 0:y};if(l.generateProofRemotely)return p(l,v,y,[-(O+k)],V,H,A,O,k,b,C.getCommitment());let U=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),b.getShieldedPrivateKey()),W={tokenNumber:1,nullifierAmount:z.length,outputAmount:B.length},{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,commitmentValidationData:Y,rootHashHinkalIndex:X,encryptedOutputs:Z}=await f.constructSolanaZkProof(l.merkleTreeHinkalByChain[v],b,[y],[z],[B],U,k,0n,t.solanaNativeAddress,V,W,void 0,v);return d.solanaTransactCallRelayer({chainId:v,relayAddress:V,functionName:`transfer`,args:{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:Z,relayerFee:k.toString(),dimensions:W,rootHashIndex:X.toString()},accounts:H,commitmentValidationData:Y})};exports.hinkalSolanaClaimUtxo=m;