@hinkal/common 0.3.12 → 0.3.14

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

@@ -7,107 +7,110 @@ import { addressToHexFormat as a, swapTronBCoordinate as o } from "../../functio
 import { hashEthereumAddress as s, hashString as c } from "../../functions/utils/addresses.mjs";
 import { ExternalActionId as l } from "../../types/external-action.types.mjs";
 import { SubmitMode as u } from "../../types/transact.types.mjs";
-import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
-import { decryptUtxo as f } from "../crypto-keys/encryptDecryptUtxo.mjs";
-import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { toSpeculativeUtxo as h } from "../../functions/pre-transaction/speculativeUtxo.mjs";
-import { transactCallDirectTron as g } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { transactCallRelayerBatch as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { hinkalTransact as v } from "./hinkalTransact.mjs";
+import { decryptUtxo as d } from "../crypto-keys/encryptDecryptUtxo.mjs";
+import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
+import { getErc20TokenFromAPI as p } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as h } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { calculateGrossUtxoAmounts as g } from "../../functions/utils/fees.utils.mjs";
+import { toSpeculativeUtxo as _ } from "../../functions/pre-transaction/speculativeUtxo.mjs";
+import { transactCallDirectTron as v } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { transactCallRelayerBatch as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { hinkalTransact as b } from "./hinkalTransact.mjs";
+import { resolveSwapPairTokens as x } from "../../functions/utils/admin-dimensions.mjs";
 import "../../functions/index.mjs";
-import { prepareDepositOnChainUtxos as y, submitDepositOnChainUtxos as b } from "./hinkalDepositOnChainUtxos.mjs";
-import { ethers as x } from "ethers";
+import { prepareDepositOnChainUtxos as S, submitDepositOnChainUtxos as C } from "./hinkalDepositOnChainUtxos.mjs";
+import { ethers as w } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.ts
-var S = async (e, o, s, c, l, d, f, m) => {
+var T = async (e, o, s, c, l, d, f, h) => {
 	if (c.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let g = s.erc20TokenAddress, [_, y] = await Promise.all([e.getRandomRelay(o), e.getEthereumAddressByChain(o)]);
-	if (!_) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let b = e.generateProofRemotely ? 5 : 1, x = [], S = a(y);
-	for (let r = 0; r < c.length; r += b) {
-		let s = c.slice(r, r + b), y = await Promise.all(s.map(async ({ recipientAddress: s, utxo: c }, y) => {
-			let b = r + y, x = a(s), C = n(c.erc20TokenAddress, g) ? c : i.createFrom(c, { erc20TokenAddress: g }), w = p(d, o, [g], [-c.amount], S), { zkCallData: T, circomData: E, dimData: D, commitmentValidationData: O, tronProofSignature: k } = await v(e, {
+	let g = s.erc20TokenAddress, [v, y] = await Promise.all([e.getRandomRelay(o), e.getEthereumAddressByChain(o)]);
+	if (!v) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let S = e.generateProofRemotely ? 5 : 1, C = [], w = a(y);
+	for (let r = 0; r < c.length; r += S) {
+		let y = c.slice(r, r + S), T = await Promise.all(y.map(async ({ recipientAddress: c, utxo: y }, S) => {
+			let C = r + S, T = a(c), E = n(y.erc20TokenAddress, g) ? y : i.createFrom(y, { erc20TokenAddress: g }), D = f?.tokenAddress ? await p(f.chainId ?? o, f.tokenAddress) : void 0, O = x(d, [s], D), k = m(d, o, [g], [-y.amount], w, O), { zkCallData: A, circomData: j, dimData: M, commitmentValidationData: N, tronProofSignature: P } = await b(e, {
 				chainId: o,
 				erc20Addresses: [g],
-				amountChanges: [-c.amount],
-				externalAddress: x,
+				amountChanges: [-y.amount],
+				externalAddress: T,
 				feeStructure: l,
-				relay: _ ?? t,
-				inputUtxos: [[C]],
+				relay: v ?? t,
+				inputUtxos: [[E]],
 				useBlockedUtxos: !0,
-				speculative: m && {
-					pendingLeaves: m,
-					inputUtxos: [[h(C)]]
+				speculative: h && {
+					pendingLeaves: h,
+					inputUtxos: [[_(E)]]
 				},
 				submit: { mode: u.ProofOnly },
 				skipLock: !0
 			});
 			return {
-				zkCallData: T,
-				dimData: D,
-				circomData: E,
-				commitmentValidationData: O,
-				adminData: w,
-				recipientAddress: s,
-				tronProofSignature: k,
+				zkCallData: A,
+				dimData: M,
+				circomData: j,
+				commitmentValidationData: N,
+				adminData: k,
+				recipientAddress: c,
+				tronProofSignature: P,
 				destinationChainId: f?.chainId,
 				destinationTokenAddress: f?.tokenAddress,
-				destinationTokenAmount: f?.tokenAmounts?.[b]
+				destinationTokenAmount: f?.tokenAmounts?.[C]
 			};
 		}));
-		x.push(...y);
+		C.push(...T);
 	}
-	return x;
-}, C = async (e, t, n, r, i) => {
-	let { chainId: a, hashedEthereumAddress: o, feeStructure: s, action: c, destination: l } = i, { txCompletionTime: u, ref: d, hashedDashboardAccountId: f, preEstimateGas: p } = i, m = n.map((e) => e + s.flatFee), h = await y(e, a, [t], [m]), { depositedUtxos: g, pendingLeaves: v } = h, x = g[0].map((e, t) => ({
+	return C;
+}, E = async (e, t, n, r, i) => {
+	let { chainId: a, hashedEthereumAddress: o, feeStructure: s, action: c, destination: l } = i, { txCompletionTime: u, ref: d, hashedDashboardAccountId: f, preEstimateGas: p } = i, m = g(n, s), h = await S(e, a, [t], [m]), { depositedUtxos: _, pendingLeaves: v } = h, b = _[0].map((e, t) => ({
 		recipientAddress: r[t],
 		utxo: e
-	})), [C, w] = await Promise.all([b(e, h, p), S(e, a, t, x, s, c, l, v)]);
+	})), [x, w] = await Promise.all([C(e, h, p), T(e, a, t, b, s, c, l, v)]);
 	return {
-		depositTxHash: C,
-		scheduleId: await _(a, w, o, u, d, f, C)
+		depositTxHash: x,
+		scheduleId: await y(a, w, o, u, d, f, x)
 	};
-}, w = async (e, t, n, r, i) => {
-	let { chainId: a, ethereumAddress: s, hashedEthereumAddress: c, feeStructure: l, action: d, destination: p } = i, { txCompletionTime: m, ref: h, hashedDashboardAccountId: y, preEstimateGas: b } = i, C = n.map((e) => e + l.flatFee), w = C.reduce((e, t) => e + t, 0n), T = await v(e, {
+}, D = async (e, t, n, r, i) => {
+	let { chainId: a, ethereumAddress: s, hashedEthereumAddress: c, feeStructure: l, action: f, destination: p } = i, { txCompletionTime: m, ref: h, hashedDashboardAccountId: _, preEstimateGas: x } = i, S = g(n, l), C = S.reduce((e, t) => e + t, 0n), E = await b(e, {
 		chainId: a,
 		erc20Addresses: [t.erc20TokenAddress],
-		amountChanges: [w],
+		amountChanges: [C],
 		externalAddress: s,
-		selfOutputAmounts: C,
+		selfOutputAmounts: S,
 		createBlockedUtxos: !0,
 		forceEmptyUtxos: !0,
 		submit: { mode: u.ProofOnly }
-	}), E = T.circomData.encryptedOutputs?.[0];
-	if (!E || E.length !== C.length) throw Error("Deposit proof is missing encryptedOutputs for the deposited UTXOs");
-	let D = E.map((t, n) => ({
+	}), D = E.circomData.encryptedOutputs?.[0];
+	if (!D || D.length !== S.length) throw Error("Deposit proof is missing encryptedOutputs for the deposited UTXOs");
+	let O = D.map((t, n) => ({
 		recipientAddress: r[n],
-		utxo: f(x.getBytes(t), e.userKeys)
-	})), O = T.circomData.outCommitments.flat().map((e) => BigInt(e)).filter((e) => e !== 0n).map((e) => e.toString()), [k, A] = await Promise.all([(async () => {
-		o(T.zkCallData);
-		let n = await g(e, a, w, t, T.zkCallData, T.circomData, T.dimData, void 0, void 0, b, T.tronProofSignature);
+		utxo: d(w.getBytes(t), e.userKeys)
+	})), k = E.circomData.outCommitments.flat().map((e) => BigInt(e)).filter((e) => e !== 0n).map((e) => e.toString()), [A, j] = await Promise.all([(async () => {
+		o(E.zkCallData);
+		let n = await v(e, a, C, t, E.zkCallData, E.circomData, E.dimData, void 0, void 0, x, E.tronProofSignature);
 		if (!n) throw Error("Deposit transaction hash not found");
 		return n;
-	})(), S(e, a, t, D, l, d, p, O)]);
+	})(), T(e, a, t, O, l, f, p, k)]);
 	return {
-		depositTxHash: k,
-		scheduleId: await _(a, A, c, m, h, y, k)
+		depositTxHash: A,
+		scheduleId: await y(a, j, c, m, h, _, A)
 	};
-}, T = async (t, n, r, i, o, u, f, p, h, g = !0, _) => {
-	let v = d([n]), y = n.erc20TokenAddress, b = a(await t.getEthereumAddressByChain(v)), x = {
+}, O = async (t, n, r, i, o, u, d, p, m, g = !0, _) => {
+	let v = f([n]), y = n.erc20TokenAddress, b = a(await t.getEthereumAddressByChain(v)), x = {
 		chainId: v,
 		ethereumAddress: b,
 		hashedEthereumAddress: s(b),
-		feeStructure: u ?? await m(v, y, [y], l.Transact, [], 25n),
+		feeStructure: u ?? await h(v, y, [y], l.Transact, [], 25n),
 		txCompletionTime: o,
-		ref: f,
+		ref: d,
 		action: p,
-		hashedDashboardAccountId: h ? c(h) : void 0,
+		hashedDashboardAccountId: m ? c(m) : void 0,
 		preEstimateGas: g,
 		destination: _
 	};
-	if (!e(v)) return C(t, n, r, i, x);
+	if (!e(v)) return E(t, n, r, i, x);
 	if (r.length > 4) throw Error("Tron supports at most 4 recipients per deposit - no circuit emits more outputs");
-	return w(t, n, r, i, x);
+	return D(t, n, r, i, x);
 };
 //#endregion
-export { T as hinkalDepositAndWithdraw };
+export { O as hinkalDepositAndWithdraw };

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

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

@@ -3,4 +3,4 @@ import { FeeStructure } from '../../types/hinkal.types';
 import { ERC20Token, PrivateRecipientInfo, TokenChanges } from '../../types/token.types';
 import { SubAccount } from '../../types/proxy.types';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalPrivateWallet: (hinkal: IHinkal, chainId: number, erc20Tokens: ERC20Token[], deltaChanges: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount?: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, privateRecipientInfo?: PrivateRecipientInfo) => Promise<string>;
+export declare const hinkalPrivateWallet: (hinkal: IHinkal, chainId: number, erc20Tokens: ERC20Token[], deltaChanges: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount?: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, privateRecipientInfo?: PrivateRecipientInfo, bridgedToken?: ERC20Token) => Promise<string>;

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

@@ -5,56 +5,56 @@ import { transactionErrorCodes as i } from "../../error-handling/error-codes.con
 import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
 import { isValidPrivateAddress as o } from "../../functions/utils/addresses.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 { SubmitMode as c } from "../../types/transact.types.mjs";
 import "../../error-handling/index.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 { constructAdminData as l } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as u } from "../AccountActions/AccountActions.mjs";
+import { getFeeStructure as d } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { encodeEmporiumMetadata as p, getAuthorizationDataIfNeeded as m } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { hinkalTransact as h } from "./hinkalTransact.mjs";
+import { encodeEmporiumMetadata as f, getAuthorizationDataIfNeeded as p } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalTransact as m } from "./hinkalTransact.mjs";
+import { resolveSwapPairTokens as h } from "../../functions/utils/admin-dimensions.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 (x, S, C, w, T, E, D, O, k, A, j, M = !1, N, P, F) => {
+var x = async (x, S, C, w, T, E, D, O, k, A, j, M = !1, N, P, F, I) => {
 	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.getEthereumAddress(), 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, V.flatFee) : 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, {
+	let L = C.map((e) => e.erc20TokenAddress), R = await x.getEthereumAddress(), z = O ? u.getAddressFromSubAccount(S, O) : void 0, { contractData: B } = t[S], { emporiumAddress: V } = B;
+	if (!V) throw Error("No Emporium Address Provided");
+	let H = A ?? await d(S, k, L, s.Emporium, E.map((e) => _(e, z ?? "", S)));
+	for (z ? await y(x, S, z, E, L, w, H, D.find((e) => n(e.token.erc20TokenAddress, H.feeToken))?.amount ?? 0n) : await v(S, L, w, H); T.length < L.length;) T.push(!1);
+	let U = j ?? await x.getRandomRelay(S, !0);
+	if (!U) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let W = O ? u.getPrivateKeyFromSubAccount(S, O) : void 0, G = e(S), K = W ? u.getSignerAddressFromPrivateKey(G, W) : void 0, q = a(31), J = x.generateProofRemotely ? await f(S, V, W, E, r(q), K, H.flatFee) : void 0, Y = await p(S, W), X = g(E), Z = h(P, D.map(({ token: e }) => e), I), Q = l(P, S, D.map((e) => e.token.erc20TokenAddress), D.map((e) => e.amount), R, Z), $, ee = await m(x, {
 		chainId: S,
-		erc20Addresses: I,
+		erc20Addresses: L,
 		amountChanges: w,
-		externalAddress: B,
+		externalAddress: V,
 		externalActionId: s.Emporium,
-		externalActionMetadata: q,
+		externalActionMetadata: J,
 		onChainCreation: T,
-		feeStructure: V,
-		relay: H,
-		messageSeed: K,
+		feeStructure: H,
+		relay: U,
+		messageSeed: q,
 		recipientAddress: F ? [F.recipientInfo] : void 0,
-		recipientAmounts: F ? [I.map((e) => n(e, F.token.erc20TokenAddress) ? F.amount : 0n)] : void 0,
-		subAccountPrivateKey: U,
+		recipientAmounts: F ? [L.map((e) => n(e, F.token.erc20TokenAddress) ? F.amount : 0n)] : void 0,
+		subAccountPrivateKey: W,
 		emporiumOps: E,
 		onTxSubmitLocally: (e) => {
-			Z = e;
+			$ = e;
 		},
 		submit: {
-			mode: l.Relayer,
-			adminData: X,
-			authorizationData: J,
-			withUniswapWorkAround: Y
+			mode: c.Relayer,
+			adminData: Q,
+			authorizationData: Y,
+			withUniswapWorkAround: X
 		}
 	});
-	return M && O && b(x, S, R, O, V.feeToken, N, D, Z), Q;
+	return M && O && b(x, S, z, O, H.feeToken, N, D, $), ee;
 };
 //#endregion
 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(`../../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;
+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,C=!1)=>{let w=a.validateAndGetChainId(m);if(e.isTronLike(w))throw Error(`Proofless deposit is not supported on Tron`);let T=await p.getEthereumAddressByChain(w),E=g??m.map(()=>d.getStealthAddressStructureFromUserKeys(p.userKeys));if(E.length!==m.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);if(S||f.assertNoDuplicateStealthAddressStructures(E),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 D=f.buildProoflessEncryptedOutputs(E,_??f.getOwnRecipientEncryptionKeys(p.userKeys,m.length)),O=y.feeAmount>0n,k=O?p.getContractWithSigner(w,i.ContractType.HinkalWrapperContract):p.getContractWithSigner(w,i.ContractType.HinkalContract),A=O?[m.map(({erc20TokenAddress:e})=>e),h,E,D,v,y,b]:[m.map(({erc20TokenAddress:e})=>e),h,E,D,v,b],j=r.caseInsensitiveEqual(y.feeToken,t.zeroAddress),M=m.reduce((e,n,i)=>r.caseInsensitiveEqual(n.erc20TokenAddress,t.zeroAddress)?e+h[i]:e,0n)+(j?y.feeAmount:0n);if(C)return k.prooflessDeposit.populateTransaction(...A,{value:M>0n?M:void 0});let N=p.getProviderAdapter(w),P=f.aggregateAmountsForApproval(!j&&y.feeAmount>0n?[...m,{erc20TokenAddress:y.feeToken,chainId:w}]:m,!j&&y.feeAmount>0n?[...h,y.feeAmount]:h),F=P.filter(({token:e,balance:n})=>!r.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&n>0n),I;if(F.length>0&&await N.supportsBatchCall?.(w)&&N.sendBatchCallsTransaction){let e=c.buildApproveAndProoflessDepositCalls(F.map(({token:e})=>e.erc20TokenAddress),F.map(({balance:e})=>e),s.getContractAddress(k),k,m.map(({erc20TokenAddress:e})=>e),h,E,D,v,O?y:void 0,b,M);I=await N.sendBatchCallsTransaction(w,e)}else{await f.approveTokens(p,w,s.getContractAddress(k),P);let e=await p.getEthereumAddressByChain(w),t=P.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await l.waitForErc20Approvals(p,w,e,s.getContractAddress(k),t),I=await k.prooflessDeposit(...A,{value:M>0n?M:void 0})}let L=I.hash;return u.emitTxPublicData(o.constructAdminData(x,w,m.map(({erc20TokenAddress:e})=>e),h,T)),L};exports.hinkalProoflessDeposit=p;

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

@@ -4,4 +4,4 @@ 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[], recipientEncryptionKeysOverride?: string[], createBlockedUtxos?: boolean, feeStructure?: ProoflessFeeStructure, orderId?: string, action?: AdminTransactionType, returnTxData?: boolean) => Promise<string | ethers.TransactionRequest>;
+export declare const hinkalProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], recipientEncryptionKeysOverride?: string[], createBlockedUtxos?: boolean, feeStructure?: ProoflessFeeStructure, orderId?: string, action?: AdminTransactionType, skipDuplicateCheck?: boolean, returnTxData?: boolean) => Promise<string | ethers.TransactionRequest>;

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

@@ -12,47 +12,47 @@ 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 _ = 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");
+var _ = async (_, v, y, b, x, S = !1, C = n, w = "", T, E = !1, D = !1) => {
+	let O = a(v);
+	if (e(O)) throw Error("Proofless deposit is not supported on Tron");
+	let k = await _.getEthereumAddressByChain(O), A = b ?? v.map(() => d(_.userKeys));
+	if (A.length !== v.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
+	if (E || m(A), 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 ? [
+	let j = h(A, x ?? g(_.userKeys, v.length)), M = C.feeAmount > 0n, N = M ? _.getContractWithSigner(O, i.HinkalWrapperContract) : _.getContractWithSigner(O, i.HinkalContract), P = M ? [
 		v.map(({ erc20TokenAddress: e }) => e),
 		y,
-		k,
 		A,
+		j,
 		S,
 		C,
 		w
 	] : [
 		v.map(({ erc20TokenAddress: e }) => e),
 		y,
-		k,
 		A,
+		j,
 		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, {
+	], F = r(C.feeToken, t), I = v.reduce((e, n, i) => r(n.erc20TokenAddress, t) ? e + y[i] : e, 0n) + (F ? C.feeAmount : 0n);
+	if (D) return N.prooflessDeposit.populateTransaction(...P, { value: I > 0n ? I : void 0 });
+	let L = _.getProviderAdapter(O), R = f(!F && 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);
+		chainId: O
+	}] : v, !F && C.feeAmount > 0n ? [...y, C.feeAmount] : y), z = R.filter(({ token: e, balance: n }) => !r(e.erc20TokenAddress, t) && n > 0n), B;
+	if (z.length > 0 && await L.supportsBatchCall?.(O) && L.sendBatchCallsTransaction) {
+		let e = c(z.map(({ token: e }) => e.erc20TokenAddress), z.map(({ balance: e }) => e), s(N), N, v.map(({ erc20TokenAddress: e }) => e), y, A, j, S, M ? C : void 0, w, I);
+		B = await L.sendBatchCallsTransaction(O, e);
 	} else {
-		await p(_, D, s(M), L);
-		let e = await _.getEthereumAddressByChain(D), t = L.map(({ token: e, balance: t }) => ({
+		await p(_, O, s(N), R);
+		let e = await _.getEthereumAddressByChain(O), t = R.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 });
+		await l(_, O, e, s(N), t), B = await N.prooflessDeposit(...P, { value: I > 0n ? I : void 0 });
 	}
-	let B = z.hash;
-	return u(o(T, D, v.map(({ erc20TokenAddress: e }) => e), y, O)), B;
+	let V = B.hash;
+	return u(o(T, O, v.map(({ erc20TokenAddress: e }) => e), y, k)), V;
 };
 //#endregion
 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(`../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;
+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(`../crypto-keys/encryptDecryptUtxo.cjs`);require(`../../externalABIs/index.cjs`);const a=require(`../../functions/utils/token-check.utils.cjs`),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(i.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 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},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.mjs

@@ -2,9 +2,9 @@ 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 { isSameERC20Token as i } from "../../functions/utils/token-check.utils.mjs";
-import { encryptEncryptionKeyAndStealthAddress as a } from "../crypto-keys/encryptDecryptUtxo.mjs";
+import { encryptEncryptionKeyAndStealthAddress as i } from "../crypto-keys/encryptDecryptUtxo.mjs";
 import "../../externalABIs/index.mjs";
+import { isSameERC20Token as a } from "../../functions/utils/token-check.utils.mjs";
 import { waitForEthereumTransactionConfirmation as o } from "../../functions/utils/tx-confirmation.utils.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.utils.ts
 var s = (e, t) => {
@@ -12,22 +12,22 @@ var s = (e, t) => {
 	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")}`;
+		return `0x${Buffer.from(i(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 a = 0; a < e.length; a += 1) {
+	for (let i = 0; i < e.length; i += 1) {
 		let o = !1;
-		for (let s = 0; s < r; s += 1) if (i(n[s].token, e[a])) {
-			n[s].balance += t[a], o = !0;
+		for (let s = 0; s < r; s += 1) if (a(n[s].token, e[i])) {
+			n[s].balance += t[i], o = !0;
 			break;
 		}
 		o || (n[r] = {
-			token: e[a],
-			balance: t[a]
+			token: e[i],
+			balance: t[i]
 		}, r += 1);
 	}
 	return n;

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

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../AccountActions/AccountActions.cjs`),i=require(`../../functions/pre-transaction/getFeeStructure.cjs`),a=require(`../../constants/addresses.constants.cjs`),o=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),s=require(`../../functions/utils/fees.utils.cjs`),c=require(`../../functions/private-wallet/emporium.swap.helpers.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!1,y,b,x,S)=>{if(!g)throw Error(`Fee token is required in hinkalProxySwap`);let C=n.validateAndGetChainId(u),w=r.AccountActions.getAddressFromSubAccount(C,h);if(!w)throw Error(`Public account address is not available`);let T=u.map(e=>e.erc20TokenAddress),E=await l.getRandomRelay(C,!0);if(!E)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let D=await c.createSwapToEmporiumOps(l,C,f,a.SWAP_ROUTER_ADDRESSES[f][C],p,T[0],d[0],d[1],T[1],m,w,E,!0),O=_??await i.getFeeStructure(C,g,T,t.ExternalActionId.Emporium,D.map(e=>o.convertEmporiumOpToCallInfo(e,w,C)),35n),k=u.map((e,t)=>({token:e,amount:d[t]})),A=x&&S!==void 0?await s.calculateModifiedFeeStructure(C,x,S,O):O;return l.actionPrivateWallet(C,[],[],[],D,k,h,g,A,E,v,y,b,void 0)};exports.hinkalProxySwap=l;
+require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../AccountActions/AccountActions.cjs`),i=require(`../../functions/pre-transaction/getFeeStructure.cjs`),a=require(`../../functions/utils/fees.utils.cjs`),o=require(`../../constants/addresses.constants.cjs`),s=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),c=require(`../../functions/private-wallet/emporium.swap.helpers.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!1,y,b,x,S)=>{if(!g)throw Error(`Fee token is required in hinkalProxySwap`);let C=n.validateAndGetChainId(u),w=r.AccountActions.getAddressFromSubAccount(C,h);if(!w)throw Error(`Public account address is not available`);let T=u.map(e=>e.erc20TokenAddress),E=await l.getRandomRelay(C,!0);if(!E)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let D=await c.createSwapToEmporiumOps(l,C,f,o.SWAP_ROUTER_ADDRESSES[f][C],p,T[0],d[0],d[1],T[1],m,w,E,!0),O=_??await i.getFeeStructure(C,g,T,t.ExternalActionId.Emporium,D.map(e=>s.convertEmporiumOpToCallInfo(e,w,C)),35n),k=u.map((e,t)=>({token:e,amount:d[t]})),A=x&&S!==void 0?await a.calculateModifiedFeeStructure(C,x,S,O):O;return l.actionPrivateWallet(C,[],[],[],D,k,h,g,A,E,v,y,b,void 0,x)};exports.hinkalProxySwap=l;

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

@@ -4,9 +4,9 @@ import { ExternalActionId as t } from "../../types/external-action.types.mjs";
 import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
 import { AccountActions as r } from "../AccountActions/AccountActions.mjs";
 import { getFeeStructure as i } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { SWAP_ROUTER_ADDRESSES as a } from "../../constants/addresses.constants.mjs";
-import { convertEmporiumOpToCallInfo as o } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { calculateModifiedFeeStructure as s } from "../../functions/utils/fees.utils.mjs";
+import { calculateModifiedFeeStructure as a } from "../../functions/utils/fees.utils.mjs";
+import { SWAP_ROUTER_ADDRESSES as o } from "../../constants/addresses.constants.mjs";
+import { convertEmporiumOpToCallInfo as s } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 import { createSwapToEmporiumOps as c } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProxySwap.ts
 var l = async (l, u, d, f, p, m, h, g, _, v = !1, y, b, x, S) => {
@@ -15,11 +15,11 @@ var l = async (l, u, d, f, p, m, h, g, _, v = !1, y, b, x, S) => {
 	if (!w) throw Error("Public account address is not available");
 	let T = u.map((e) => e.erc20TokenAddress), E = await l.getRandomRelay(C, !0);
 	if (!E) throw Error(e.RELAYER_NOT_AVAILABLE);
-	let D = await c(l, C, f, a[f][C], p, T[0], d[0], d[1], T[1], m, w, E, !0), O = _ ?? await i(C, g, T, t.Emporium, D.map((e) => o(e, w, C)), 35n), k = u.map((e, t) => ({
+	let D = await c(l, C, f, o[f][C], p, T[0], d[0], d[1], T[1], m, w, E, !0), O = _ ?? await i(C, g, T, t.Emporium, D.map((e) => s(e, w, C)), 35n), k = u.map((e, t) => ({
 		token: e,
 		amount: d[t]
-	})), A = x && S !== void 0 ? await s(C, x, S, O) : O;
-	return l.actionPrivateWallet(C, [], [], [], D, k, h, g, A, E, v, y, b, void 0);
+	})), A = x && S !== void 0 ? await a(C, x, S, O) : O;
+	return l.actionPrivateWallet(C, [], [], [], D, k, h, g, A, E, v, y, b, void 0, x);
 };
 //#endregion
 export { l as hinkalProxySwap };

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

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

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

@@ -6,9 +6,9 @@ import { validateAndGetChainId as r } from "../../functions/utils/token-check.ut
 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 { createTransaferEmporiumOpsBatch as s } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { convertEmporiumOpToCallInfo as c } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { calculateModifiedFeeStructureForTokens as l } from "../../functions/utils/fees.utils.mjs";
+import { calculateModifiedFeeStructureForTokens as s } from "../../functions/utils/fees.utils.mjs";
+import { createTransaferEmporiumOpsBatch as c } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { convertEmporiumOpToCallInfo as l } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProxyToPrivate.ts
 var u = async (u, d, f, p, m, h, g, _) => {
 	if (!g) throw Error("hinkalProxyToPrivate: subAccount should be provided");
@@ -16,7 +16,7 @@ var u = async (u, d, f, p, m, h, g, _) => {
 	if (!t(p)) throw Error(e.RECIPIENT_FORMAT_INCORRECT);
 	let v = r(d), y = a.getAddressFromSubAccount(v, g);
 	if (!y) throw Error("Public account address is not available");
-	let b = d.map((e) => e.erc20TokenAddress), x = await i(v, d, f, y), S = s(u, v, b, x), C = await l(v, d, x, h ?? await o(v, m, b, n.Emporium, S.map((e) => c(e, y, v)), 25n)), w = d.map((e, t) => ({
+	let b = d.map((e) => e.erc20TokenAddress), x = await i(v, d, f, y), S = c(u, v, b, x), C = await s(v, d, x, h ?? await o(v, m, b, n.Emporium, S.map((e) => l(e, y, v)), 25n)), w = d.map((e, t) => ({
 		token: e,
 		amount: -1n * x[t]
 	}));

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

@@ -0,0 +1 @@
+const e=require(`../../functions/utils/receive-vault-account.utils.cjs`),t=require(`../../functions/utils/receive-vault-scan.utils.cjs`);var n=async n=>{let{records:r,blocks:i}=await e.getReceiveVaultAccountSnapshot(n.userKeys);return{entries:[...r].sort((e,t)=>t.index-e.index),blockedFunds:await t.getReceiveVaultBlockedFunds(r,i)}};exports.hinkalGetReceiveVaultAccount=n;

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

@@ -0,0 +1,3 @@
+import { ReceiveVaultAccount } from '../../types/receive-vault.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalGetReceiveVaultAccount: (hinkal: IHinkal) => Promise<ReceiveVaultAccount>;

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

@@ -0,0 +1,12 @@
+import { getReceiveVaultAccountSnapshot as e } from "../../functions/utils/receive-vault-account.utils.mjs";
+import { getReceiveVaultBlockedFunds as t } from "../../functions/utils/receive-vault-scan.utils.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalReceiveVaultAccount.ts
+var n = async (n) => {
+	let { records: r, blocks: i } = await e(n.userKeys);
+	return {
+		entries: [...r].sort((e, t) => t.index - e.index),
+		blockedFunds: await t(r, i)
+	};
+};
+//#endregion
+export { n as hinkalGetReceiveVaultAccount };

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

@@ -0,0 +1 @@
+const e=require(`../../functions/utils/receive-vault.utils.cjs`),t=require(`../../API/receiveVaultCalls.cjs`),n=require(`../../functions/utils/receive-vault-account.utils.cjs`),r=require(`./hinkalReceiveVaultSettle.cjs`);var i=async(n,i,a,o)=>{let s=e.getReceiveVaultParams(n,o),c=r.buildReceiveVaultEncryptedOutput(s,i);return t.registerReceiveVault(o,s,i,a,c,await Promise.all(e.receiveVaultChainsForNetwork(o.network).map(async t=>({chainId:t,signature:await e.signReceiveVaultOutput(n,o,c,t)}))))},a=async(t,r,a,o)=>{let s=await e.buildReceiveVaultRecord(t,{index:await n.getReceiveVaultNextIndex(t,r),network:r,version:(await e.getReceiveVaultCurrentVersion(r)).toString()});return await i(t,a,o,s),s},o=(e,t)=>e.filter(e=>e.network===t).sort((e,t)=>t.index-e.index)[0],s=async(t,r,i=!1)=>{if(e.receiveVaultChainsForNetwork(r).length===0)throw Error(`receive vault: no factory for network ${r}`);let{userKeys:s}=t,c=e.getReceiveVaultEncryptionKey(s),l=e.getReceiveVaultAccountKey(s);if(!i){let{records:e}=await n.getReceiveVaultAccountSnapshot(s),t=o(e,r);if(t)return t}return a(s,r,c,l)};exports.hinkalReceiveVaultCreate=s;

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

@@ -0,0 +1,3 @@
+import { ReceiveVaultNetwork, ReceiveVaultRecord } from '../../types/receive-vault.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalReceiveVaultCreate: (hinkal: IHinkal, network: ReceiveVaultNetwork, forceFresh?: boolean) => Promise<ReceiveVaultRecord>;

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

@@ -0,0 +1,29 @@
+import { buildReceiveVaultRecord as e, getReceiveVaultAccountKey as t, getReceiveVaultCurrentVersion as n, getReceiveVaultEncryptionKey as r, getReceiveVaultParams as i, receiveVaultChainsForNetwork as a, signReceiveVaultOutput as o } from "../../functions/utils/receive-vault.utils.mjs";
+import { registerReceiveVault as s } from "../../API/receiveVaultCalls.mjs";
+import { getReceiveVaultAccountSnapshot as c, getReceiveVaultNextIndex as l } from "../../functions/utils/receive-vault-account.utils.mjs";
+import { buildReceiveVaultEncryptedOutput as u } from "./hinkalReceiveVaultSettle.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalReceiveVaultCreate.ts
+var d = async (e, t, n, r) => {
+	let c = i(e, r), l = u(c, t);
+	return s(r, c, t, n, l, await Promise.all(a(r.network).map(async (t) => ({
+		chainId: t,
+		signature: await o(e, r, l, t)
+	}))));
+}, f = async (t, r, i, a) => {
+	let o = await e(t, {
+		index: await l(t, r),
+		network: r,
+		version: (await n(r)).toString()
+	});
+	return await d(t, i, a, o), o;
+}, p = (e, t) => e.filter((e) => e.network === t).sort((e, t) => t.index - e.index)[0], m = async (e, n, i = !1) => {
+	if (a(n).length === 0) throw Error(`receive vault: no factory for network ${n}`);
+	let { userKeys: o } = e, s = r(o), l = t(o);
+	if (!i) {
+		let { records: e } = await c(o), t = p(e, n);
+		if (t) return t;
+	}
+	return f(o, n, s, l);
+};
+//#endregion
+export { m as hinkalReceiveVaultCreate };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/tron.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../functions/utils/receive-vault.utils.cjs`),a=require(`../../functions/utils/string.utils.cjs`),o=require(`../../error-handling/get-error.message.cjs`),s=require(`./hinkalSolanaReceiveVault.cjs`);let c=require(`ethers`);var l={NothingToSettle:`These funds have already been moved out of the receive address.`,RecoveryExpired:`The recovery request expired before it was confirmed. Please try again.`,BadRecoverySignature:`This wallet cannot recover these funds. Reconnect the account that generated the address.`,RecoveryAlreadyUsed:`This recovery was already submitted. Please try again.`},u=e=>{let t=e?.revert?.name;if(t&&l[t])return l[t];let n=JSON.stringify(e??``),r=Object.keys(l).find(e=>n.includes(c.ethers.id(`${e}()`).slice(2,10)));if(r)return l[r];let i=e?.message;return i&&c.ethers.isHexString(`0x${i}`)?a.hexToUtf8(i):e?.shortMessage??o.getErrorMessage(e)},d=async(a,o,c,l,d,f=!1)=>{let p=i.getReceiveVaultFactoryAddress(l);if(!p)throw Error(`receive vault: no factory on chain ${l}`);if(o.network!==i.receiveVaultNetworkOf(l))throw Error(`receive vault: network mismatch`);let m=BigInt(Math.floor(Date.now()/1e3)+900),h=await i.signReceiveVaultRecovery(a.userKeys,o,c,l,d,m);if(e.isSolanaLike(l)){let e=await a.getEthereumAddressByChain(l);return s.hinkalSolanaReceiveVaultRecover(a,l,i.getReceiveVaultParams(a.userKeys,o),c,d,m,h,e,f)}let g=[i.receiveVaultParamsToTuple(i.getReceiveVaultParams(a.userKeys,o)),n.addressToHexFormat(c),n.addressToHexFormat(d),m,h];if(e.isTronLike(l)){let{receiveVaultFactoryABI:r}=e.networkRegistry[l].contractData;if(!r)throw Error(`receive vault: no factory ABI on chain ${l}`);let i=a.getTronWeb(),o=n.evmHexToTronBase58Address(p);if(f){let{transaction:e}=await i.transactionBuilder.triggerSmartContract(o,``,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:0,input:n.createTronCallData(r,`recover`,g)},[],await a.getEthereumAddressByChain(l));return e}let s=i.contract(r,o);try{return await s.recover(...g).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN})}catch(e){throw Error(u(e))}}let _=a.getContractWithSigner(l,r.ContractType.ReceiveVaultFactoryContract);try{return f?_.recover.populateTransaction(...g):(await _.recover(...g)).hash}catch(e){throw Error(u(e))}};exports.hinkalReceiveVaultRecover=d;