@hinkal/common 0.3.13 → 0.3.14

package/common/src/data-structures/Hinkal/hinkalDepositAndBridge.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(`../../crypto/poseidon.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../../API/API.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/utils/erc20tokenFunctions.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../AccountActions/AccountActions.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),_=require(`../../functions/private-wallet/emporium.helpers.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`./hinkalTransact.cjs`),b=require(`../../constants/addresses.constants.cjs`),x=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`);require(`../../functions/utils/index.cjs`);const S=require(`./hinkalDepositOnChainUtxos.cjs`);var C=async(o,u,d,m,h,v,x,S)=>{if(m.length===0)throw Error(`No recipients to bridge`);let C=d.erc20TokenAddress,{contractData:w}=e.networkRegistry[u],{emporiumAddress:T}=w;if(!T)throw Error(`No Emporium Address`);let E=b.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][u];if(!E)throw Error(`LIFI not configured for chain ${u}`);let D=await o.getRandomRelay(u);if(!D)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let O=await o.getEthereumAddressByChain(u),k=o.generateProofRemotely,A=k?5:1,j=[];for(let i=0;i<m.length;i+=A){let d=m.slice(i,i+A),b=await Promise.all(d.map(async({utxo:d,nativeUtxo:m,bridgeAmount:b,quote:w,temporarySubAccount:A,recipientAddress:j,destinationChainId:M,destinationTokenAddress:N},P)=>{let F=h[i+P];await l.API.addTemporaryWalletNonce(u,v,A.index);let I=n.caseInsensitiveEqual(C,t.zeroAddress),L=w.nativeFee>0n&&!I,R=[C],z=[-d.amount],B=[!1],V=[[d]];L&&m&&(R.push(t.zeroAddress),z.push(-m.amount),B.push(!1),V.push([m]));let H=_.createLifiBridgeOps(o,u,A.ethAddress,E,C,d.amount,b,w),U=f.constructAdminData(x,u,R,[-d.amount],O),[W,G]=await Promise.all([(async()=>{let n=a.randomBigInt(31),i=k?await _.encodeEmporiumMetadata(u,T,A.privateKey,H,r.poseidonFunction(n),p.AccountActions.getSignerAddressFromPrivateKey(e.getOnchainChainId(u),A.privateKey),F.flatFee):void 0;return y.hinkalTransact(o,{chainId:u,erc20Addresses:R,amountChanges:z,externalAddress:T,externalActionId:s.ExternalActionId.Emporium,externalActionMetadata:i,onChainCreation:B,feeStructure:F,relay:D??t.zeroAddress,messageSeed:n,inputUtxos:V,useBlockedUtxos:!0,speculative:S&&{pendingLeaves:S,inputUtxos:V.map(e=>e.map(g.toSpeculativeUtxo))},subAccountPrivateKey:A.privateKey,emporiumOps:H,submit:{mode:c.SubmitMode.ProofOnly}})})(),_.getAuthorizationDataIfNeeded(u,A.privateKey)]),{zkCallData:K,circomData:q,dimData:J,commitmentValidationData:Y,tronProofSignature:X}=W;return{zkCallData:K,dimData:J,circomData:q,commitmentValidationData:Y,authorizationData:G,recipientAddress:j,adminData:U,tronProofSignature:X,destinationChainId:M,destinationTokenAddress:N,destinationTokenAmount:w.expectedAmount.toString()}}));j.push(...b)}return j},w=e=>e.map(e=>e.quote.nativeFee),T=async(e,n,r,i)=>{let{chainId:a,hashedEthereumAddress:o,feeStructures:s,mainTokenAmounts:c}=i,{needsNativeDeposit:l,txCompletionTime:u,ref:f,action:p,hashedDashboardAccountId:m,preEstimateGas:h}=i,g=[n],_=[c];if(l){let e=await d.getErc20TokenFromAPI(a,t.zeroAddress);if(!e)throw Error(`No native token`);g.push(e),_.push(w(r))}let y=await S.prepareDepositOnChainUtxos(e,a,g,_),{depositedUtxos:b,pendingLeaves:x}=y,[T,E=[]]=b,D=r.map((e,t)=>({...e,utxo:T[t],nativeUtxo:l?E[t]:void 0})),[O,k]=await Promise.all([S.submitDepositOnChainUtxos(e,y,h),C(e,a,n,D,s,o,p,x)]);return{depositTxHash:O,scheduleId:await v.transactCallRelayerBatch(a,k,o,u,f,m,O)}},E=async(e,r,i,a,c,l,d,f,p=!0)=>{if(i.length===0)throw Error(`No recipients to bridge`);let g=r.erc20TokenAddress,v=u.validateAndGetChainId([r]),y=await e.getEthereumAddressByChain(v),S=b.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][v];if(!S)throw Error(`LIFI router not configured`);let C=n.caseInsensitiveEqual(g,t.zeroAddress),w;if(c)w=c;else{let n=i[0],r=C?n.bridgeAmount+n.quote.nativeFee:n.bridgeAmount,a=_.createLifiBridgeOps(e,v,n.temporarySubAccount.ethAddress,S,g,r,n.bridgeAmount,n.quote).map(e=>x.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,v));w=await m.getFeeStructure(v,g,[g],s.ExternalActionId.Emporium,a,t.PAY_SEND_VARIABLE_RATE)}let E=i.reduce((e,t)=>e+t.quote.nativeFee,0n),D=i.map(e=>C?e.bridgeAmount+e.quote.nativeFee:e.bridgeAmount),O=await Promise.all(D.map(e=>h.calculateModifiedFeeStructure(v,r,e,w)));return T(e,r,i,{chainId:v,ethereumAddress:y,hashedEthereumAddress:o.hashEthereumAddress(y),feeStructures:O,mainTokenAmounts:D.map((e,t)=>e+O[t].flatFee),needsNativeDeposit:E>0n&&!C,txCompletionTime:a,ref:l,action:d,hashedDashboardAccountId:f?o.hashString(f):void 0,preEstimateGas:p})};exports.hinkalDepositAndBridge=E;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../crypto/poseidon.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../../API/API.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/utils/erc20tokenFunctions.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../AccountActions/AccountActions.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),_=require(`../../functions/private-wallet/emporium.helpers.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`./hinkalTransact.cjs`),b=require(`../../constants/addresses.constants.cjs`),x=require(`../../functions/utils/admin-dimensions.cjs`),S=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`);require(`../../functions/utils/index.cjs`);const C=require(`./hinkalDepositOnChainUtxos.cjs`);var w=async(o,u,m,h,v,S,C,w)=>{if(h.length===0)throw Error(`No recipients to bridge`);let T=m.erc20TokenAddress,{contractData:E}=e.networkRegistry[u],{emporiumAddress:D}=E;if(!D)throw Error(`No Emporium Address`);let O=b.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][u];if(!O)throw Error(`LIFI not configured for chain ${u}`);let k=await o.getRandomRelay(u);if(!k)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let A=await o.getEthereumAddressByChain(u),j=o.generateProofRemotely,M=j?5:1,N=[];for(let i=0;i<h.length;i+=M){let b=h.slice(i,i+M),E=await Promise.all(b.map(async({utxo:h,nativeUtxo:b,bridgeAmount:E,quote:M,temporarySubAccount:N,recipientAddress:P,destinationChainId:F,destinationTokenAddress:I},L)=>{let R=v[i+L];await l.API.addTemporaryWalletNonce(u,S,N.index);let z=n.caseInsensitiveEqual(T,t.zeroAddress),B=M.nativeFee>0n&&!z,V=[T],H=[-h.amount],U=[!1],W=[[h]];B&&b&&(V.push(t.zeroAddress),H.push(-b.amount),U.push(!1),W.push([b]));let G=_.createLifiBridgeOps(o,u,N.ethAddress,O,T,h.amount,E,M),K=I?await d.getErc20TokenFromAPI(F??u,I):void 0,q=x.resolveSwapPairTokens(C,[m],K),J=f.constructAdminData(C,u,V,[-h.amount],A,q),[Y,X]=await Promise.all([(async()=>{let n=a.randomBigInt(31),i=j?await _.encodeEmporiumMetadata(u,D,N.privateKey,G,r.poseidonFunction(n),p.AccountActions.getSignerAddressFromPrivateKey(e.getOnchainChainId(u),N.privateKey),R.flatFee):void 0;return y.hinkalTransact(o,{chainId:u,erc20Addresses:V,amountChanges:H,externalAddress:D,externalActionId:s.ExternalActionId.Emporium,externalActionMetadata:i,onChainCreation:U,feeStructure:R,relay:k??t.zeroAddress,messageSeed:n,inputUtxos:W,useBlockedUtxos:!0,speculative:w&&{pendingLeaves:w,inputUtxos:W.map(e=>e.map(g.toSpeculativeUtxo))},subAccountPrivateKey:N.privateKey,emporiumOps:G,submit:{mode:c.SubmitMode.ProofOnly}})})(),_.getAuthorizationDataIfNeeded(u,N.privateKey)]),{zkCallData:Z,circomData:Q,dimData:$,commitmentValidationData:ee,tronProofSignature:te}=Y;return{zkCallData:Z,dimData:$,circomData:Q,commitmentValidationData:ee,authorizationData:X,recipientAddress:P,adminData:J,tronProofSignature:te,destinationChainId:F,destinationTokenAddress:I,destinationTokenAmount:M.expectedAmount.toString()}}));N.push(...E)}return N},T=e=>e.map(e=>e.quote.nativeFee),E=async(e,n,r,i)=>{let{chainId:a,hashedEthereumAddress:o,feeStructures:s,mainTokenAmounts:c}=i,{needsNativeDeposit:l,txCompletionTime:u,ref:f,action:p,hashedDashboardAccountId:m,preEstimateGas:h}=i,g=[n],_=[c];if(l){let e=await d.getErc20TokenFromAPI(a,t.zeroAddress);if(!e)throw Error(`No native token`);g.push(e),_.push(T(r))}let y=await C.prepareDepositOnChainUtxos(e,a,g,_),{depositedUtxos:b,pendingLeaves:x}=y,[S,E=[]]=b,D=r.map((e,t)=>({...e,utxo:S[t],nativeUtxo:l?E[t]:void 0})),[O,k]=await Promise.all([C.submitDepositOnChainUtxos(e,y,h),w(e,a,n,D,s,o,p,x)]);return{depositTxHash:O,scheduleId:await v.transactCallRelayerBatch(a,k,o,u,f,m,O)}},D=async(e,r,i,a,c,l,d,f,p=!0)=>{if(i.length===0)throw Error(`No recipients to bridge`);let g=r.erc20TokenAddress,v=u.validateAndGetChainId([r]),y=await e.getEthereumAddressByChain(v),x=b.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][v];if(!x)throw Error(`LIFI router not configured`);let C=n.caseInsensitiveEqual(g,t.zeroAddress),w;if(c)w=c;else{let n=i[0],r=C?n.bridgeAmount+n.quote.nativeFee:n.bridgeAmount,a=_.createLifiBridgeOps(e,v,n.temporarySubAccount.ethAddress,x,g,r,n.bridgeAmount,n.quote).map(e=>S.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,v));w=await m.getFeeStructure(v,g,[g],s.ExternalActionId.Emporium,a,t.PAY_SEND_VARIABLE_RATE)}let T=i.reduce((e,t)=>e+t.quote.nativeFee,0n),D=i.map(e=>C?e.bridgeAmount+e.quote.nativeFee:e.bridgeAmount),O=await Promise.all(D.map(e=>h.calculateModifiedFeeStructure(v,r,e,w)));return E(e,r,i,{chainId:v,ethereumAddress:y,hashedEthereumAddress:o.hashEthereumAddress(y),feeStructures:O,mainTokenAmounts:D.map((e,t)=>e+O[t].flatFee),needsNativeDeposit:T>0n&&!C,txCompletionTime:a,ref:l,action:d,hashedDashboardAccountId:f?o.hashString(f):void 0,preEstimateGas:p})};exports.hinkalDepositAndBridge=D;

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

@@ -19,100 +19,101 @@ import { createLifiBridgeOps as b, encodeEmporiumMetadata as x, getAuthorization
 import { transactCallRelayerBatch as C } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { hinkalTransact as w } from "./hinkalTransact.mjs";
 import { SWAP_ROUTER_ADDRESSES as T } from "../../constants/addresses.constants.mjs";
-import { convertEmporiumOpToCallInfo as E } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { resolveSwapPairTokens as E } from "../../functions/utils/admin-dimensions.mjs";
+import { convertEmporiumOpToCallInfo as D } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 import "../../functions/utils/index.mjs";
-import { prepareDepositOnChainUtxos as D, submitDepositOnChainUtxos as O } from "./hinkalDepositOnChainUtxos.mjs";
+import { prepareDepositOnChainUtxos as O, submitDepositOnChainUtxos as k } from "./hinkalDepositOnChainUtxos.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
-var k = async (n, c, l, p, m, _, v, C) => {
+var A = async (n, c, l, p, _, v, C, D) => {
 	if (p.length === 0) throw Error("No recipients to bridge");
-	let E = l.erc20TokenAddress, { contractData: D } = t[c], { emporiumAddress: O } = D;
-	if (!O) throw Error("No Emporium Address");
-	let k = T[u.Lifi][c];
-	if (!k) throw Error(`LIFI not configured for chain ${c}`);
-	let A = await n.getRandomRelay(c);
-	if (!A) throw Error(o.RELAYER_NOT_AVAILABLE);
-	let j = await n.getEthereumAddressByChain(c), M = n.generateProofRemotely, N = M ? 5 : 1, P = [];
-	for (let t = 0; t < p.length; t += N) {
-		let o = p.slice(t, t + N), l = await Promise.all(o.map(async ({ utxo: o, nativeUtxo: l, bridgeAmount: p, quote: T, temporarySubAccount: D, recipientAddress: N, destinationChainId: P, destinationTokenAddress: F }, I) => {
-			let L = m[t + I];
-			await f.addTemporaryWalletNonce(c, _, D.index);
-			let R = i(E, r), z = T.nativeFee > 0n && !R, B = [E], V = [-o.amount], H = [!1], U = [[o]];
-			z && l && (B.push(r), V.push(-l.amount), H.push(!1), U.push([l]));
-			let W = b(n, c, D.ethAddress, k, E, o.amount, p, T), G = h(v, c, B, [-o.amount], j), [K, q] = await Promise.all([(async () => {
-				let t = s(31), i = M ? await x(c, O, D.privateKey, W, a(t), g.getSignerAddressFromPrivateKey(e(c), D.privateKey), L.flatFee) : void 0;
+	let O = l.erc20TokenAddress, { contractData: k } = t[c], { emporiumAddress: A } = k;
+	if (!A) throw Error("No Emporium Address");
+	let j = T[u.Lifi][c];
+	if (!j) throw Error(`LIFI not configured for chain ${c}`);
+	let M = await n.getRandomRelay(c);
+	if (!M) throw Error(o.RELAYER_NOT_AVAILABLE);
+	let N = await n.getEthereumAddressByChain(c), P = n.generateProofRemotely, F = P ? 5 : 1, I = [];
+	for (let t = 0; t < p.length; t += F) {
+		let o = p.slice(t, t + F), T = await Promise.all(o.map(async ({ utxo: o, nativeUtxo: p, bridgeAmount: T, quote: k, temporarySubAccount: F, recipientAddress: I, destinationChainId: L, destinationTokenAddress: R }, z) => {
+			let B = _[t + z];
+			await f.addTemporaryWalletNonce(c, v, F.index);
+			let V = i(O, r), H = k.nativeFee > 0n && !V, U = [O], W = [-o.amount], G = [!1], K = [[o]];
+			H && p && (U.push(r), W.push(-p.amount), G.push(!1), K.push([p]));
+			let q = b(n, c, F.ethAddress, j, O, o.amount, T, k), J = R ? await m(L ?? c, R) : void 0, Y = E(C, [l], J), X = h(C, c, U, [-o.amount], N, Y), [Z, Q] = await Promise.all([(async () => {
+				let t = s(31), i = P ? await x(c, A, F.privateKey, q, a(t), g.getSignerAddressFromPrivateKey(e(c), F.privateKey), B.flatFee) : void 0;
 				return w(n, {
 					chainId: c,
-					erc20Addresses: B,
-					amountChanges: V,
-					externalAddress: O,
+					erc20Addresses: U,
+					amountChanges: W,
+					externalAddress: A,
 					externalActionId: u.Emporium,
 					externalActionMetadata: i,
-					onChainCreation: H,
-					feeStructure: L,
-					relay: A ?? r,
+					onChainCreation: G,
+					feeStructure: B,
+					relay: M ?? r,
 					messageSeed: t,
-					inputUtxos: U,
+					inputUtxos: K,
 					useBlockedUtxos: !0,
-					speculative: C && {
-						pendingLeaves: C,
-						inputUtxos: U.map((e) => e.map(y))
+					speculative: D && {
+						pendingLeaves: D,
+						inputUtxos: K.map((e) => e.map(y))
 					},
-					subAccountPrivateKey: D.privateKey,
-					emporiumOps: W,
+					subAccountPrivateKey: F.privateKey,
+					emporiumOps: q,
 					submit: { mode: d.ProofOnly }
 				});
-			})(), S(c, D.privateKey)]), { zkCallData: J, circomData: Y, dimData: X, commitmentValidationData: Z, tronProofSignature: Q } = K;
+			})(), S(c, F.privateKey)]), { zkCallData: $, circomData: ee, dimData: te, commitmentValidationData: ne, tronProofSignature: re } = Z;
 			return {
-				zkCallData: J,
-				dimData: X,
-				circomData: Y,
-				commitmentValidationData: Z,
-				authorizationData: q,
-				recipientAddress: N,
-				adminData: G,
-				tronProofSignature: Q,
-				destinationChainId: P,
-				destinationTokenAddress: F,
-				destinationTokenAmount: T.expectedAmount.toString()
+				zkCallData: $,
+				dimData: te,
+				circomData: ee,
+				commitmentValidationData: ne,
+				authorizationData: Q,
+				recipientAddress: I,
+				adminData: X,
+				tronProofSignature: re,
+				destinationChainId: L,
+				destinationTokenAddress: R,
+				destinationTokenAmount: k.expectedAmount.toString()
 			};
 		}));
-		P.push(...l);
+		I.push(...T);
 	}
-	return P;
-}, A = (e) => e.map((e) => e.quote.nativeFee), j = async (e, t, n, i) => {
+	return I;
+}, j = (e) => e.map((e) => e.quote.nativeFee), M = async (e, t, n, i) => {
 	let { chainId: a, hashedEthereumAddress: o, feeStructures: s, mainTokenAmounts: c } = i, { needsNativeDeposit: l, txCompletionTime: u, ref: d, action: f, hashedDashboardAccountId: p, preEstimateGas: h } = i, g = [t], _ = [c];
 	if (l) {
 		let e = await m(a, r);
 		if (!e) throw Error("No native token");
-		g.push(e), _.push(A(n));
+		g.push(e), _.push(j(n));
 	}
-	let v = await D(e, a, g, _), { depositedUtxos: y, pendingLeaves: b } = v, [x, S = []] = y, w = n.map((e, t) => ({
+	let v = await O(e, a, g, _), { depositedUtxos: y, pendingLeaves: b } = v, [x, S = []] = y, w = n.map((e, t) => ({
 		...e,
 		utxo: x[t],
 		nativeUtxo: l ? S[t] : void 0
-	})), [T, E] = await Promise.all([O(e, v, h), k(e, a, t, w, s, o, f, b)]);
+	})), [T, E] = await Promise.all([k(e, v, h), A(e, a, t, w, s, o, f, b)]);
 	return {
 		depositTxHash: T,
 		scheduleId: await C(a, E, o, u, d, p, T)
 	};
-}, M = async (e, t, a, o, s, d, f, m, h = !0) => {
+}, N = async (e, t, a, o, s, d, f, m, h = !0) => {
 	if (a.length === 0) throw Error("No recipients to bridge");
 	let g = t.erc20TokenAddress, y = p([t]), x = await e.getEthereumAddressByChain(y), S = T[u.Lifi][y];
 	if (!S) throw Error("LIFI router not configured");
 	let C = i(g, r), w;
 	if (s) w = s;
 	else {
-		let t = a[0], r = C ? t.bridgeAmount + t.quote.nativeFee : t.bridgeAmount, i = b(e, y, t.temporarySubAccount.ethAddress, S, g, r, t.bridgeAmount, t.quote).map((e) => E(e, t.temporarySubAccount.ethAddress, y));
+		let t = a[0], r = C ? t.bridgeAmount + t.quote.nativeFee : t.bridgeAmount, i = b(e, y, t.temporarySubAccount.ethAddress, S, g, r, t.bridgeAmount, t.quote).map((e) => D(e, t.temporarySubAccount.ethAddress, y));
 		w = await _(y, g, [g], u.Emporium, i, n);
 	}
-	let D = a.reduce((e, t) => e + t.quote.nativeFee, 0n), O = a.map((e) => C ? e.bridgeAmount + e.quote.nativeFee : e.bridgeAmount), k = await Promise.all(O.map((e) => v(y, t, e, w)));
-	return j(e, t, a, {
+	let E = a.reduce((e, t) => e + t.quote.nativeFee, 0n), O = a.map((e) => C ? e.bridgeAmount + e.quote.nativeFee : e.bridgeAmount), k = await Promise.all(O.map((e) => v(y, t, e, w)));
+	return M(e, t, a, {
 		chainId: y,
 		ethereumAddress: x,
 		hashedEthereumAddress: c(x),
 		feeStructures: k,
 		mainTokenAmounts: O.map((e, t) => e + k[t].flatFee),
-		needsNativeDeposit: D > 0n && !C,
+		needsNativeDeposit: E > 0n && !C,
 		txCompletionTime: o,
 		ref: d,
 		action: f,
@@ -121,4 +122,4 @@ var k = async (n, c, l, p, m, _, v, C) => {
 	});
 };
 //#endregion
-export { M as hinkalDepositAndBridge };
+export { N as hinkalDepositAndBridge };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../utxo/Utxo.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../crypto-keys/encryptDecryptUtxo.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),m=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`./hinkalTransact.cjs`);require(`../../functions/index.cjs`);const _=require(`./hinkalDepositOnChainUtxos.cjs`);let v=require(`ethers`);var y=async(e,o,s,l,u,f,m,h)=>{if(l.length===0)throw Error(`userDepositedUtxos must not be empty`);let _=s.erc20TokenAddress,[v,y]=await Promise.all([e.getRandomRelay(o),e.getEthereumAddressByChain(o)]);if(!v)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let b=e.generateProofRemotely?5:1,x=[],S=a.addressToHexFormat(y);for(let r=0;r<l.length;r+=b){let s=l.slice(r,r+b),y=await Promise.all(s.map(async({recipientAddress:s,utxo:l},y)=>{let b=r+y,x=a.addressToHexFormat(s),C=n.caseInsensitiveEqual(l.erc20TokenAddress,_)?l:i.Utxo.createFrom(l,{erc20TokenAddress:_}),w=d.constructAdminData(f,o,[_],[-l.amount],S),{zkCallData:T,circomData:E,dimData:D,commitmentValidationData:O,tronProofSignature:k}=await g.hinkalTransact(e,{chainId:o,erc20Addresses:[_],amountChanges:[-l.amount],externalAddress:x,feeStructure:u,relay:v??t.zeroAddress,inputUtxos:[[C]],useBlockedUtxos:!0,speculative:h&&{pendingLeaves:h,inputUtxos:[[p.toSpeculativeUtxo(C)]]},submit:{mode:c.SubmitMode.ProofOnly},skipLock:!0});return{zkCallData:T,dimData:D,circomData:E,commitmentValidationData:O,adminData:w,recipientAddress:s,tronProofSignature:k,destinationChainId:m?.chainId,destinationTokenAddress:m?.tokenAddress,destinationTokenAmount:m?.tokenAmounts?.[b]}}));x.push(...y)}return x},b=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),g=await _.prepareDepositOnChainUtxos(e,a,[t],[m]),{depositedUtxos:v,pendingLeaves:b}=g,x=v[0].map((e,t)=>({recipientAddress:r[t],utxo:e})),[S,C]=await Promise.all([_.submitDepositOnChainUtxos(e,g,p),y(e,a,t,x,s,c,l,b)]);return{depositTxHash:S,scheduleId:await h.transactCallRelayerBatch(a,C,o,u,d,f,S)}},x=async(e,t,n,r,i)=>{let{chainId:o,ethereumAddress:s,hashedEthereumAddress:u,feeStructure:d,action:f,destination:p}=i,{txCompletionTime:_,ref:b,hashedDashboardAccountId:x,preEstimateGas:S}=i,C=n.map(e=>e+d.flatFee),w=C.reduce((e,t)=>e+t,0n),T=await g.hinkalTransact(e,{chainId:o,erc20Addresses:[t.erc20TokenAddress],amountChanges:[w],externalAddress:s,selfOutputAmounts:C,createBlockedUtxos:!0,forceEmptyUtxos:!0,submit:{mode:c.SubmitMode.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)=>({recipientAddress:r[n],utxo:l.decryptUtxo(v.ethers.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()=>{a.swapTronBCoordinate(T.zkCallData);let n=await m.transactCallDirectTron(e,o,w,t,T.zkCallData,T.circomData,T.dimData,void 0,void 0,S,T.tronProofSignature);if(!n)throw Error(`Deposit transaction hash not found`);return n})(),y(e,o,t,D,d,f,p,O)]);return{depositTxHash:k,scheduleId:await h.transactCallRelayerBatch(o,A,u,_,b,x,k)}},S=async(t,n,r,i,c,l,d,p,m,h=!0,g)=>{let _=u.validateAndGetChainId([n]),v=n.erc20TokenAddress,y=a.addressToHexFormat(await t.getEthereumAddressByChain(_)),S={chainId:_,ethereumAddress:y,hashedEthereumAddress:o.hashEthereumAddress(y),feeStructure:l??await f.getFeeStructure(_,v,[v],s.ExternalActionId.Transact,[],25n),txCompletionTime:c,ref:d,action:p,hashedDashboardAccountId:m?o.hashString(m):void 0,preEstimateGas:h,destination:g};if(!e.isTronLike(_))return b(t,n,r,i,S);if(r.length>4)throw Error(`Tron supports at most 4 recipients per deposit - no circuit emits more outputs`);return x(t,n,r,i,S)};exports.hinkalDepositAndWithdraw=S;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../utxo/Utxo.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../crypto-keys/encryptDecryptUtxo.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/utils/erc20tokenFunctions.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),g=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`./hinkalTransact.cjs`),y=require(`../../functions/utils/admin-dimensions.cjs`);require(`../../functions/index.cjs`);const b=require(`./hinkalDepositOnChainUtxos.cjs`);let x=require(`ethers`);var S=async(e,o,s,l,u,p,m,g)=>{if(l.length===0)throw Error(`userDepositedUtxos must not be empty`);let _=s.erc20TokenAddress,[b,x]=await Promise.all([e.getRandomRelay(o),e.getEthereumAddressByChain(o)]);if(!b)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let S=e.generateProofRemotely?5:1,C=[],w=a.addressToHexFormat(x);for(let r=0;r<l.length;r+=S){let x=l.slice(r,r+S),T=await Promise.all(x.map(async({recipientAddress:l,utxo:x},S)=>{let C=r+S,T=a.addressToHexFormat(l),E=n.caseInsensitiveEqual(x.erc20TokenAddress,_)?x:i.Utxo.createFrom(x,{erc20TokenAddress:_}),D=m?.tokenAddress?await d.getErc20TokenFromAPI(m.chainId??o,m.tokenAddress):void 0,O=y.resolveSwapPairTokens(p,[s],D),k=f.constructAdminData(p,o,[_],[-x.amount],w,O),{zkCallData:A,circomData:j,dimData:M,commitmentValidationData:N,tronProofSignature:P}=await v.hinkalTransact(e,{chainId:o,erc20Addresses:[_],amountChanges:[-x.amount],externalAddress:T,feeStructure:u,relay:b??t.zeroAddress,inputUtxos:[[E]],useBlockedUtxos:!0,speculative:g&&{pendingLeaves:g,inputUtxos:[[h.toSpeculativeUtxo(E)]]},submit:{mode:c.SubmitMode.ProofOnly},skipLock:!0});return{zkCallData:A,dimData:M,circomData:j,commitmentValidationData:N,adminData:k,recipientAddress:l,tronProofSignature:P,destinationChainId:m?.chainId,destinationTokenAddress:m?.tokenAddress,destinationTokenAmount:m?.tokenAmounts?.[C]}}));C.push(...T)}return C},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,h=m.calculateGrossUtxoAmounts(n,s),g=await b.prepareDepositOnChainUtxos(e,a,[t],[h]),{depositedUtxos:v,pendingLeaves:y}=g,x=v[0].map((e,t)=>({recipientAddress:r[t],utxo:e})),[C,w]=await Promise.all([b.submitDepositOnChainUtxos(e,g,p),S(e,a,t,x,s,c,l,y)]);return{depositTxHash:C,scheduleId:await _.transactCallRelayerBatch(a,w,o,u,d,f,C)}},w=async(e,t,n,r,i)=>{let{chainId:o,ethereumAddress:s,hashedEthereumAddress:u,feeStructure:d,action:f,destination:p}=i,{txCompletionTime:h,ref:y,hashedDashboardAccountId:b,preEstimateGas:C}=i,w=m.calculateGrossUtxoAmounts(n,d),T=w.reduce((e,t)=>e+t,0n),E=await v.hinkalTransact(e,{chainId:o,erc20Addresses:[t.erc20TokenAddress],amountChanges:[T],externalAddress:s,selfOutputAmounts:w,createBlockedUtxos:!0,forceEmptyUtxos:!0,submit:{mode:c.SubmitMode.ProofOnly}}),D=E.circomData.encryptedOutputs?.[0];if(!D||D.length!==w.length)throw Error(`Deposit proof is missing encryptedOutputs for the deposited UTXOs`);let O=D.map((t,n)=>({recipientAddress:r[n],utxo:l.decryptUtxo(x.ethers.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()=>{a.swapTronBCoordinate(E.zkCallData);let n=await g.transactCallDirectTron(e,o,T,t,E.zkCallData,E.circomData,E.dimData,void 0,void 0,C,E.tronProofSignature);if(!n)throw Error(`Deposit transaction hash not found`);return n})(),S(e,o,t,O,d,f,p,k)]);return{depositTxHash:A,scheduleId:await _.transactCallRelayerBatch(o,j,u,h,y,b,A)}},T=async(t,n,r,i,c,l,d,f,m,h=!0,g)=>{let _=u.validateAndGetChainId([n]),v=n.erc20TokenAddress,y=a.addressToHexFormat(await t.getEthereumAddressByChain(_)),b={chainId:_,ethereumAddress:y,hashedEthereumAddress:o.hashEthereumAddress(y),feeStructure:l??await p.getFeeStructure(_,v,[v],s.ExternalActionId.Transact,[],25n),txCompletionTime:c,ref:d,action:f,hashedDashboardAccountId:m?o.hashString(m):void 0,preEstimateGas:h,destination:g};if(!e.isTronLike(_))return C(t,n,r,i,b);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,b)};exports.hinkalDepositAndWithdraw=T;

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

@@ -9,105 +9,108 @@ import { ExternalActionId as l } from "../../types/external-action.types.mjs";
 import { SubmitMode as u } from "../../types/transact.types.mjs";
 import { decryptUtxo as d } from "../crypto-keys/encryptDecryptUtxo.mjs";
 import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.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 { 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: f, 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: d(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, f, 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, d, p, h, g = !0, _) => {
+}, 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: 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.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(`../crypto-keys/encryptDecryptUtxo.cjs`),a=require(`../../functions/utils/token-check.utils.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(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;
+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

@@ -3,8 +3,8 @@ import { caseInsensitiveEqual as t } from "../../functions/utils/caseInsensitive
 import { UserKeys as n } from "../crypto-keys/keys.mjs";
 import { ContractType as r } from "../../types/ethereum-network.types.mjs";
 import { encryptEncryptionKeyAndStealthAddress as i } from "../crypto-keys/encryptDecryptUtxo.mjs";
-import { isSameERC20Token as a } from "../../functions/utils/token-check.utils.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) => {

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(`../../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)};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

@@ -19,7 +19,7 @@ var l = async (l, u, d, f, p, m, h, g, _, v = !1, y, b, x, S) => {
 		token: e,
 		amount: d[t]
 	})), 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);
+	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/hinkalReceiveVaultAccount.cjs

@@ -1 +1 @@
-const e=require(`../../functions/utils/erc20tokenFunctions.cjs`),t=require(`../../functions/utils/receive-vault-account.utils.cjs`),n=require(`../../functions/utils/receive-vault-scan.utils.cjs`);var r=async r=>{let{records:i,blocks:a}=await t.getReceiveVaultAccountSnapshot(r.userKeys);return{entries:(await Promise.all(i.map(async t=>{let n=await e.getErc20TokenFromAPI(t.chainId,t.token);return n?{record:t,token:n,expiresAt:new Date(Number(t.expiry)*1e3)}:void 0}))).filter(e=>!!e).sort((e,t)=>t.expiresAt.getTime()-e.expiresAt.getTime()),blockedFunds:await n.getReceiveVaultBlockedFunds(i,a)}};exports.hinkalGetReceiveVaultAccount=r;
+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.mjs

@@ -1,20 +1,12 @@
-import { getErc20TokenFromAPI as e } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { getReceiveVaultAccountSnapshot as t } from "../../functions/utils/receive-vault-account.utils.mjs";
-import { getReceiveVaultBlockedFunds as n } from "../../functions/utils/receive-vault-scan.utils.mjs";
+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 r = async (r) => {
-	let { records: i, blocks: a } = await t(r.userKeys);
+var n = async (n) => {
+	let { records: r, blocks: i } = await e(n.userKeys);
 	return {
-		entries: (await Promise.all(i.map(async (t) => {
-			let n = await e(t.chainId, t.token);
-			return n ? {
-				record: t,
-				token: n,
-				expiresAt: /* @__PURE__ */ new Date(Number(t.expiry) * 1e3)
-			} : void 0;
-		}))).filter((e) => !!e).sort((e, t) => t.expiresAt.getTime() - e.expiresAt.getTime()),
-		blockedFunds: await n(i, a)
+		entries: [...r].sort((e, t) => t.index - e.index),
+		blockedFunds: await t(r, i)
 	};
 };
 //#endregion
-export { r as hinkalGetReceiveVaultAccount };
+export { n as hinkalGetReceiveVaultAccount };