@hinkal/common 0.3.2 → 0.3.4

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

@@ -1,118 +1,128 @@
-import { networkRegistry as e } from "../../constants/chains.constants.mjs";
-import { PAY_SEND_VARIABLE_RATE as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as r } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.mjs";
-import { Utxo as o } from "../utxo/Utxo.mjs";
-import { hashEthereumAddress as s, hashString as c } from "../../functions/utils/addresses.mjs";
-import { ExternalActionId as l } from "../../types/external-action.types.mjs";
-import { DepositAndWithdrawPhase as u } from "../../types/scheduled-transactions.types.mjs";
+import { getOnchainChainId as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { PAY_SEND_VARIABLE_RATE as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as i } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { poseidonFunction as a } from "../../crypto/poseidon.mjs";
+import { transactionErrorCodes as o } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as s } from "../../functions/web3/etherFunctions.mjs";
+import { hashEthereumAddress as c, hashString as l } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as u } from "../../types/external-action.types.mjs";
+import { DepositAndWithdrawPhase as d } from "../../types/scheduled-transactions.types.mjs";
+import { SubmitMode as f } from "../../types/transact.types.mjs";
 import "../../types/index.mjs";
-import { API as d } from "../../API/API.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 { waitForDepositedUtxosInMerkleTree as g } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { SWAP_ROUTER_ADDRESSES as _ } from "../../constants/addresses.constants.mjs";
-import { convertEmporiumOpToCallInfo as v } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { calculateGrossAmountWithFee as y } from "../../functions/utils/fees.utils.mjs";
-import "../../functions/utils/index.mjs";
-import { createLifiBridgeOps as b, getAuthorizationDataIfNeeded as x } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructZkProof as S } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { API as p } from "../../API/API.mjs";
+import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
+import { getErc20TokenFromAPI as h } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as _ } from "../AccountActions/AccountActions.mjs";
+import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { waitForDepositedUtxosInMerkleTree as y } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import { createLifiBridgeOps as b, encodeEmporiumMetadata as x, getAuthorizationDataIfNeeded as S } from "../../functions/private-wallet/emporium.helpers.mjs";
 import { transactCallRelayerBatch as C } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as w } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { hinkalDepositOnChainUtxos as T } from "./hinkalDepositOnChainUtxos.mjs";
+import { hinkalTransact as w } from "./hinkalTransact.mjs";
+import { SWAP_ROUTER_ADDRESSES as T } from "../../constants/addresses.constants.mjs";
+import { safeUpdateDepositAndWithdrawStatus as E } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as D } from "./hinkalDepositOnChainUtxos.mjs";
+import { convertEmporiumOpToCallInfo as O } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { calculateGrossAmountWithFee as k } from "../../functions/utils/fees.utils.mjs";
+import "../../functions/utils/index.mjs";
 import "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
-var E = async (t, s, c, f, p, h, g, v, y, T, E) => {
-	if (f.length === 0) throw Error("No recipients to bridge");
-	let D = c.erc20TokenAddress, { contractData: O } = e[s], { emporiumAddress: k } = O;
-	if (!k) throw Error("No Emporium Address");
-	let A = _[l.Lifi][s];
-	if (!A) throw Error(`LIFI not configured for chain ${s}`);
-	let j = await t.getRandomRelay(s);
-	if (!j) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let M = await t.getEthereumAddressByChain(s), N = a().toString(), P = t.generateProofRemotely ? 5 : 1, F = [];
-	for (let e = 0; e < f.length; e += P) {
-		let i = f.slice(e, e + P), a = await Promise.all(i.map(async ({ utxo: e, nativeUtxo: i, bridgeAmount: a, quote: c, temporarySubAccount: u, recipientAddress: f }) => {
-			await d.addTemporaryWalletNonce(s, h, u.index);
-			let g = r(D, n), _ = c.nativeFee > 0n && !g, v = [D], y = [-e.amount], C = [!1], w = new o({
-				amount: 0n,
-				erc20TokenAddress: D,
-				nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-				timeStamp: N,
-				spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
-			}), E = [[e, w]], O = [[w]];
-			if (_ && i) {
-				let e = new o({
-					amount: 0n,
-					erc20TokenAddress: n,
-					nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-					timeStamp: N,
-					spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+var A = async (n, c, l, m, h, v, y, D, O, k, A) => {
+	if (m.length === 0) throw Error("No recipients to bridge");
+	let j = l.erc20TokenAddress, { contractData: M } = t[c], { emporiumAddress: N } = M;
+	if (!N) throw Error("No Emporium Address");
+	let P = T[u.Lifi][c];
+	if (!P) throw Error(`LIFI not configured for chain ${c}`);
+	let F = await n.getRandomRelay(c);
+	if (!F) throw Error(o.RELAYER_NOT_AVAILABLE);
+	let I = await n.getEthereumAddressByChain(c), L = n.generateProofRemotely, R = L ? 5 : 1, z = [];
+	for (let t = 0; t < m.length; t += R) {
+		let o = m.slice(t, t + R), l = await Promise.all(o.map(async ({ utxo: t, nativeUtxo: o, bridgeAmount: l, quote: d, temporarySubAccount: m, recipientAddress: y, destinationChainId: C, destinationTokenAddress: T }) => {
+			await p.addTemporaryWalletNonce(c, v, m.index);
+			let E = i(j, r), D = d.nativeFee > 0n && !E, O = [j], A = [-t.amount], M = [!1], R = [[t]];
+			D && o && (O.push(r), A.push(-o.amount), M.push(!1), R.push([o]));
+			let z = b(n, c, m.ethAddress, P, j, t.amount, l, d), B = g(k, c, O, [-t.amount], I), [V, H] = await Promise.all([(async () => {
+				let t = s(31), i = L ? await x(c, N, m.privateKey, z, a(t), _.getSignerAddressFromPrivateKey(e(c), m.privateKey)) : void 0;
+				return w(n, {
+					chainId: c,
+					erc20Addresses: O,
+					amountChanges: A,
+					externalAddress: N,
+					externalActionId: u.Emporium,
+					externalActionMetadata: i,
+					onChainCreation: M,
+					feeStructure: h,
+					relay: F ?? r,
+					messageSeed: t,
+					inputUtxos: R,
+					useBlockedUtxos: !0,
+					subAccountPrivateKey: m.privateKey,
+					emporiumOps: z,
+					submit: { mode: f.ProofOnly }
 				});
-				v.push(n), y.push(-i.amount), C.push(!1), E.push([i, e]), O.push([e]);
-			}
-			let P = b(t, s, u.ethAddress, A, D, e.amount, a, c), F = m(T, s, v, [-e.amount], M), [{ zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z }, B] = await Promise.all([S(t.merkleTreeHinkalByChain[s], E, O, t.userKeys, l.Emporium, k, P, t.generateProofRemotely, p, j ?? n, s, C, void 0, void 0, u.privateKey), x(s, u.privateKey)]);
+			})(), S(c, m.privateKey)]), { zkCallData: U, circomData: W, dimData: G, commitmentValidationData: K, tronProofSignature: q } = V;
 			return {
-				zkCallData: I,
-				dimData: R,
-				circomData: L,
-				commitmentValidationData: z,
-				authorizationData: B,
-				recipientAddress: f,
-				adminData: F
+				zkCallData: U,
+				dimData: G,
+				circomData: W,
+				commitmentValidationData: K,
+				authorizationData: H,
+				recipientAddress: y,
+				adminData: B,
+				tronProofSignature: q,
+				destinationChainId: C,
+				destinationTokenAddress: T,
+				destinationTokenAmount: d.expectedAmount.toString()
 			};
 		}));
-		F.push(...a);
+		z.push(...l);
 	}
-	await w({
-		id: g,
-		chainId: s,
-		hashedEthereumAddress: h,
-		phase: u.BEFORE_SCHEDULE_WITHDRAW
+	await E({
+		id: y,
+		chainId: c,
+		hashedEthereumAddress: v,
+		phase: d.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let I = await C(s, F, h, v, y, E);
-	return await w({
-		id: g,
-		chainId: s,
-		hashedEthereumAddress: h,
-		phase: u.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: I
-	}), I;
-}, D = async (e, i, a, o, u, d, m, x, S = !0) => {
-	let C = i.erc20TokenAddress, w = f([i]), D = x ? c(x) : void 0, O = s(await e.getEthereumAddressByChain(w)), k = _[l.Lifi][w];
-	if (!k) throw Error("LIFI router not configured");
-	let A, j = r(C, n);
-	if (u) A = u;
+	let B = await C(c, z, v, D, O, A);
+	return await E({
+		id: y,
+		chainId: c,
+		hashedEthereumAddress: v,
+		phase: d.AFTER_SCHEDULE_WITHDRAW,
+		scheduleId: B
+	}), B;
+}, j = async (e, t, a, o, s, d, f, p, g = !0) => {
+	let _ = t.erc20TokenAddress, x = m([t]), S = p ? l(p) : void 0, C = c(await e.getEthereumAddressByChain(x)), w = T[u.Lifi][x];
+	if (!w) throw Error("LIFI router not configured");
+	let E, j = i(_, r);
+	if (s) E = s;
 	else {
-		let n = a[0], r = j ? n.bridgeAmount + n.quote.nativeFee : n.bridgeAmount, i = b(e, w, n.temporarySubAccount.ethAddress, k, C, r, n.bridgeAmount, n.quote).map((e) => v(e, n.temporarySubAccount.ethAddress, w));
-		A = await h(w, C, [C], l.Emporium, i, t);
+		let t = a[0], r = j ? t.bridgeAmount + t.quote.nativeFee : t.bridgeAmount, i = b(e, x, t.temporarySubAccount.ethAddress, w, _, r, t.bridgeAmount, t.quote).map((e) => O(e, t.temporarySubAccount.ethAddress, x));
+		E = await v(x, _, [_], u.Emporium, i, n);
 	}
 	let M = {
-		feeToken: A.feeToken,
+		feeToken: E.feeToken,
 		flatFee: 0n,
 		variableRate: 0n
-	}, N = a.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !r(C, n), P = a.map((e) => y(j ? e.bridgeAmount + e.quote.nativeFee : e.bridgeAmount, A)), F = a.map((e) => e.recipientAddress), { userDepositedUtxos: I, statusId: L, depositTxHash: R } = await T(e, w, i, P, F, M, O, S), z = [];
+	}, N = a.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !i(_, r), P = a.map((e) => k(j ? e.bridgeAmount + e.quote.nativeFee : e.bridgeAmount, E)), F = a.map((e) => e.recipientAddress), { userDepositedUtxos: I, statusId: L, depositTxHash: R } = await D(e, x, t, P, F, M, C, g), z = [];
 	if (N) {
-		let t = await p(w, n);
+		let t = await h(x, r);
 		if (!t) throw Error("No native token");
-		let { userDepositedUtxos: r } = await T(e, w, t, a.map((e) => y(e.quote.nativeFee, {
-			feeToken: A.feeToken,
+		let { userDepositedUtxos: n } = await D(e, x, t, a.map((e) => k(e.quote.nativeFee, {
+			feeToken: E.feeToken,
 			flatFee: 0n,
-			variableRate: A.variableRate
-		})), F, M, O, S);
-		z = r;
+			variableRate: E.variableRate
+		})), F, M, C, g);
+		z = n;
 	}
-	return await g(e, w, [...I, ...z]), {
+	return await y(e, x, [...I, ...z]), {
 		depositTxHash: R,
-		scheduleId: await E(e, w, i, a.map((e, t) => ({
+		scheduleId: await A(e, x, t, a.map((e, t) => ({
 			...e,
 			utxo: I[t].utxo,
 			nativeUtxo: N ? z[t]?.utxo : void 0
-		})), A, O, L, o, d, m, D)
+		})), E, C, L, o, d, f, S)
 	};
 };
 //#endregion
-export { D as hinkalDepositAndBridge };
+export { j as hinkalDepositAndBridge };

package/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.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(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../types/external-action.types.cjs`),l=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const 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/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../API/deposit-and-withdraw-status-calls.cjs`),_=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var v=async(o,c,u,f,p,_,v,y,b,x,S)=>{let C=e.isTronLike(c);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let w=u.erc20TokenAddress,[T,E]=await Promise.all([o.getRandomRelay(c),o.getEthereumAddressByChain(c)]);if(!T)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let D=i.getCurrentTimeInSeconds().toString(),O=o.generateProofRemotely&&!C?5:1,k=[],A=s.addressToHexFormat(E);for(let e=0;e<f.length;e+=O){let r=f.slice(e,e+O),i=await Promise.all(r.map(async({recipientAddress:e,utxo:r})=>{let i=s.addressToHexFormat(e),l=new a.Utxo({amount:0n,erc20TokenAddress:w,nullifyingKey:o.userKeys.getShieldedPrivateKey(),timeStamp:D,spendingPublicKey:o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint}),u=[[n.caseInsensitiveEqual(r.erc20TokenAddress,w)?r:a.Utxo.createFrom(r,{erc20TokenAddress:w}),l]],f=[[l]],h={externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},g=d.constructAdminData(x,c,[w],[-r.amount],A),{zkCallData:_,circomData:v,dimData:y,commitmentValidationData:b}=await m.constructZkProof(o.merkleTreeHinkalByChain[c],u,f,o.userKeys,h.externalActionId,h.externalAddress,h.externalActionMetadata,o.generateProofRemotely,p,T??t.zeroAddress,c);return{zkCallData:_,dimData:y,circomData:v,commitmentValidationData:b,adminData:g,recipientAddress:e,tronProofSignature:await s.reorderZkCallData(C,_,y,v)}}));k.push(...i)}await g.safeUpdateDepositAndWithdrawStatus({id:v,chainId:c,hashedEthereumAddress:_,phase:l.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let j=await h.transactCallRelayerBatch(c,k,_,y,b,S);return await g.safeUpdateDepositAndWithdrawStatus({id:v,chainId:c,hashedEthereumAddress:_,phase:l.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:j}),j},y=async(e,t,n,r,i,a,l,d,m,h=!0)=>{let g=u.validateAndGetChainId([t]),y=m?o.hashString(m):void 0,b=t.erc20TokenAddress,x=o.hashEthereumAddress(s.addressToHexFormat(await e.getEthereumAddressByChain(g))),S=a??await f.getFeeStructure(g,b,[b],c.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await _.hinkalDepositOnChainUtxos(e,g,t,n,r,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(e,g,C),{depositTxHash:T,scheduleId:await v(e,g,t,C,S,x,w,i,l,d,y)}};exports.hinkalDepositAndWithdraw=y;
+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/addresses.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/scheduled-transactions.types.cjs`),l=require(`../../types/transact.types.cjs`);require(`../../types/index.cjs`);const u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../crypto-keys/encryptDecryptUtxo.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/snarkjs/constructTxEnclave.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`./hinkalTransact.cjs`),b=require(`../../functions/utils/tx-confirmation.utils.cjs`),x=require(`../../API/deposit-and-withdraw-status-calls.cjs`),S=require(`./hinkalDepositOnChainUtxos.cjs`),C=require(`./hinkalTronDepositToSelf.cjs`);require(`../../functions/index.cjs`);let w=require(`ethers`);var T=async(e,t,n,r,i,a,s,l=!0)=>{let u=n.erc20TokenAddress,p=r.map(e=>e+a.flatFee),h=p.reduce((e,t)=>e+t,0n),g=(await x.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:s,phase:c.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,{jobId:v,signedMessageHash:y}=await m.prepareTxEnclaveCall(e,{chainId:t,erc20Addresses:[u],amountChanges:[h],externalAddress:o.addressToHexFormat(await e.getEthereumAddressByChain(t)),selfOutputAmounts:p,createBlockedUtxos:!0}),{R8:S,S:C}=e.userKeys.signEddsa(BigInt(y)),{zkCallData:T,circomData:E,dimData:D,tronProofSignature:O}=await m.finalizeTxEnclaveCall(v,{R8:S,S:C}),k=f.deserializeCircomData(E),A=await _.transactCallDirectTron(e,t,h,n,T,k,D,void 0,void 0,l,O);await b.waitForEthereumTransactionConfirmation(t,A),await x.safeUpdateDepositAndWithdrawStatus({id:g,chainId:t,hashedEthereumAddress:s,phase:c.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:A});let j=k.encryptedOutputs?.[0];if(!j||j.length!==p.length)throw Error(`Enclave response missing encryptedOutputs for deposited UTXOs`);return{userDepositedUtxos:j.map((t,n)=>({recipientAddress:i[n],utxo:d.decryptUtxo(w.ethers.getBytes(t),e.userKeys)})),statusId:g,depositTxHash:A}},E=async(e,a,s,u,d,f,m,h,g,_,b,S)=>{if(u.length===0)throw Error(`userDepositedUtxos must not be empty`);let C=s.erc20TokenAddress,[w,T]=await Promise.all([e.getRandomRelay(a),e.getEthereumAddressByChain(a)]);if(!w)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let E=e.generateProofRemotely?5:1,D=[],O=o.addressToHexFormat(T);for(let r=0;r<u.length;r+=E){let s=u.slice(r,r+E),c=await Promise.all(s.map(async({recipientAddress:s,utxo:c},u)=>{let f=r+u,m=o.addressToHexFormat(s),h=n.caseInsensitiveEqual(c.erc20TokenAddress,C)?c:i.Utxo.createFrom(c,{erc20TokenAddress:C}),g=p.constructAdminData(_,a,[C],[-c.amount],O),{zkCallData:v,circomData:b,dimData:x,commitmentValidationData:T,tronProofSignature:E}=await y.hinkalTransact(e,{chainId:a,erc20Addresses:[C],amountChanges:[-c.amount],externalAddress:m,feeStructure:d,relay:w??t.zeroAddress,inputUtxos:[[h]],useBlockedUtxos:!0,submit:{mode:l.SubmitMode.ProofOnly},skipLock:!0});return{zkCallData:v,dimData:x,circomData:b,commitmentValidationData:T,adminData:g,recipientAddress:s,tronProofSignature:E,destinationChainId:S?.chainId,destinationTokenAddress:S?.tokenAddress,destinationTokenAmount:S?.tokenAmounts?.[f]}}));D.push(...c)}await x.safeUpdateDepositAndWithdrawStatus({id:m,chainId:a,hashedEthereumAddress:f,phase:c.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let k=await v.transactCallRelayerBatch(a,D,f,h,g,b);return await x.safeUpdateDepositAndWithdrawStatus({id:m,chainId:a,hashedEthereumAddress:f,phase:c.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:k}),k},D=async(t,n,r,i,c,l,d,f,p,m=!0,_)=>{let v=u.validateAndGetChainId([n]),y=p?a.hashString(p):void 0,b=n.erc20TokenAddress,x=a.hashEthereumAddress(o.addressToHexFormat(await t.getEthereumAddressByChain(v))),w=l??await h.getFeeStructure(v,b,[b],s.ExternalActionId.Transact,[],10n),D=e.isTronLike(v),O=S.hinkalDepositOnChainUtxos;D&&(O=t.generateProofRemotely?T:C.hinkalTronDepositToSelf);let{userDepositedUtxos:k,statusId:A,depositTxHash:j}=await O(t,v,n,r,i,w,x,m);return await g.waitForDepositedUtxosInMerkleTree(t,v,k),{depositTxHash:j,scheduleId:await E(t,v,n,k,w,x,A,c,d,f,y,_)}};exports.hinkalDepositAndWithdraw=D;

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

@@ -1,6 +1,7 @@
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType, DepositAndSendExtendedResult, ERC20Token, RecipientUtxo } from '../../types';
+import { DestinationMetadata } from '../../types/bridging-tx.types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalWithdrawBatch: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string) => Promise<string>;
+export declare const hinkalWithdrawBatch: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string, destination?: DestinationMetadata) => Promise<string>;
 export declare const hinkalDepositAndWithdraw: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
-ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<DepositAndSendExtendedResult>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean, destination?: DestinationMetadata) => Promise<DepositAndSendExtendedResult>;

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

@@ -2,74 +2,119 @@ import { isTronLike as e } from "../../constants/chains.constants.mjs";
 import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive.utils.mjs";
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { Utxo as a } from "../utxo/Utxo.mjs";
-import { hashEthereumAddress as o, hashString as s } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as c, reorderZkCallData as l } from "../../functions/utils/tron.utils.mjs";
-import { ExternalActionId as u } from "../../types/external-action.types.mjs";
-import { DepositAndWithdrawPhase as d } from "../../types/scheduled-transactions.types.mjs";
+import { Utxo as i } from "../utxo/Utxo.mjs";
+import { hashEthereumAddress as a, hashString as o } from "../../functions/utils/addresses.mjs";
+import { addressToHexFormat as s } from "../../functions/utils/tron.utils.mjs";
+import { ExternalActionId as c } from "../../types/external-action.types.mjs";
+import { DepositAndWithdrawPhase as l } from "../../types/scheduled-transactions.types.mjs";
+import { SubmitMode as u } from "../../types/transact.types.mjs";
 import "../../types/index.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 { waitForDepositedUtxosInMerkleTree as h } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayerBatch as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as v } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { hinkalDepositOnChainUtxos as y } from "./hinkalDepositOnChainUtxos.mjs";
+import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
+import { decryptUtxo as f } from "../crypto-keys/encryptDecryptUtxo.mjs";
+import { deserializeCircomData as p } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { finalizeTxEnclaveCall as h, prepareTxEnclaveCall as g } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { waitForDepositedUtxosInMerkleTree as v } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import { transactCallDirectTron as y } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { transactCallRelayerBatch as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { hinkalTransact as x } from "./hinkalTransact.mjs";
+import { waitForEthereumTransactionConfirmation as S } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { safeUpdateDepositAndWithdrawStatus as C, updateDepositAndWithdrawStatus as w } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as T } from "./hinkalDepositOnChainUtxos.mjs";
+import { hinkalTronDepositToSelf as E } from "./hinkalTronDepositToSelf.mjs";
 import "../../functions/index.mjs";
+import { ethers as D } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.ts
-var b = async (o, s, u, f, m, h, y, b, x, S, C) => {
-	let w = e(s);
-	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let T = u.erc20TokenAddress, [E, D] = await Promise.all([o.getRandomRelay(s), o.getEthereumAddressByChain(s)]);
-	if (!E) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let O = i().toString(), k = o.generateProofRemotely && !w ? 5 : 1, A = [], j = c(D);
-	for (let e = 0; e < f.length; e += k) {
-		let r = f.slice(e, e + k), i = await Promise.all(r.map(async ({ recipientAddress: e, utxo: r }) => {
-			let i = c(e), u = new a({
-				amount: 0n,
-				erc20TokenAddress: T,
-				nullifyingKey: o.userKeys.getShieldedPrivateKey(),
-				timeStamp: O,
-				spendingPublicKey: o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
-			}), d = [[n(r.erc20TokenAddress, T) ? r : a.createFrom(r, { erc20TokenAddress: T }), u]], f = [[u]], h = {
-				externalActionId: 0n,
-				externalAddress: i,
-				externalActionMetadata: "0x00"
-			}, _ = p(S, s, [T], [-r.amount], j), { zkCallData: v, circomData: y, dimData: b, commitmentValidationData: x } = await g(o.merkleTreeHinkalByChain[s], d, f, o.userKeys, h.externalActionId, h.externalAddress, h.externalActionMetadata, o.generateProofRemotely, m, E ?? t, s);
+var O = async (e, t, n, r, i, a, o, c = !0) => {
+	let u = n.erc20TokenAddress, d = r.map((e) => e + a.flatFee), m = d.reduce((e, t) => e + t, 0n), _ = (await w({
+		chainId: t,
+		hashedEthereumAddress: o,
+		phase: l.BEFORE_DEPOSIT
+	})).id ?? void 0, { jobId: v, signedMessageHash: b } = await g(e, {
+		chainId: t,
+		erc20Addresses: [u],
+		amountChanges: [m],
+		externalAddress: s(await e.getEthereumAddressByChain(t)),
+		selfOutputAmounts: d,
+		createBlockedUtxos: !0
+	}), { R8: x, S: T } = e.userKeys.signEddsa(BigInt(b)), { zkCallData: E, circomData: O, dimData: k, tronProofSignature: A } = await h(v, {
+		R8: x,
+		S: T
+	}), j = p(O), M = await y(e, t, m, n, E, j, k, void 0, void 0, c, A);
+	await S(t, M), await C({
+		id: _,
+		chainId: t,
+		hashedEthereumAddress: o,
+		phase: l.AFTER_DEPOSIT,
+		depositTxHash: M
+	});
+	let N = j.encryptedOutputs?.[0];
+	if (!N || N.length !== d.length) throw Error("Enclave response missing encryptedOutputs for deposited UTXOs");
+	return {
+		userDepositedUtxos: N.map((t, n) => ({
+			recipientAddress: i[n],
+			utxo: f(D.getBytes(t), e.userKeys)
+		})),
+		statusId: _,
+		depositTxHash: M
+	};
+}, k = async (e, a, o, c, d, f, p, h, g, _, v, y) => {
+	if (c.length === 0) throw Error("userDepositedUtxos must not be empty");
+	let S = o.erc20TokenAddress, [w, T] = await Promise.all([e.getRandomRelay(a), e.getEthereumAddressByChain(a)]);
+	if (!w) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let E = e.generateProofRemotely ? 5 : 1, D = [], O = s(T);
+	for (let r = 0; r < c.length; r += E) {
+		let o = c.slice(r, r + E), l = await Promise.all(o.map(async ({ recipientAddress: o, utxo: c }, l) => {
+			let f = r + l, p = s(o), h = n(c.erc20TokenAddress, S) ? c : i.createFrom(c, { erc20TokenAddress: S }), g = m(_, a, [S], [-c.amount], O), { zkCallData: v, circomData: b, dimData: C, commitmentValidationData: T, tronProofSignature: E } = await x(e, {
+				chainId: a,
+				erc20Addresses: [S],
+				amountChanges: [-c.amount],
+				externalAddress: p,
+				feeStructure: d,
+				relay: w ?? t,
+				inputUtxos: [[h]],
+				useBlockedUtxos: !0,
+				submit: { mode: u.ProofOnly },
+				skipLock: !0
+			});
 			return {
 				zkCallData: v,
-				dimData: b,
-				circomData: y,
-				commitmentValidationData: x,
-				adminData: _,
-				recipientAddress: e,
-				tronProofSignature: await l(w, v, b, y)
+				dimData: C,
+				circomData: b,
+				commitmentValidationData: T,
+				adminData: g,
+				recipientAddress: o,
+				tronProofSignature: E,
+				destinationChainId: y?.chainId,
+				destinationTokenAddress: y?.tokenAddress,
+				destinationTokenAmount: y?.tokenAmounts?.[f]
 			};
 		}));
-		A.push(...i);
+		D.push(...l);
 	}
-	await v({
-		id: y,
-		chainId: s,
-		hashedEthereumAddress: h,
-		phase: d.BEFORE_SCHEDULE_WITHDRAW
+	await C({
+		id: p,
+		chainId: a,
+		hashedEthereumAddress: f,
+		phase: l.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let M = await _(s, A, h, b, x, C);
-	return await v({
-		id: y,
-		chainId: s,
-		hashedEthereumAddress: h,
-		phase: d.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: M
-	}), M;
-}, x = async (e, t, n, r, i, a, l, d, p, g = !0) => {
-	let _ = f([t]), v = p ? s(p) : void 0, x = t.erc20TokenAddress, S = o(c(await e.getEthereumAddressByChain(_))), C = a ?? await m(_, x, [x], u.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await y(e, _, t, n, r, C, S, g);
-	return await h(e, _, w), {
-		depositTxHash: E,
-		scheduleId: await b(e, _, t, w, C, S, T, i, l, d, v)
+	let k = await b(a, D, f, h, g, v);
+	return await C({
+		id: p,
+		chainId: a,
+		hashedEthereumAddress: f,
+		phase: l.AFTER_SCHEDULE_WITHDRAW,
+		scheduleId: k
+	}), k;
+}, A = async (t, n, r, i, l, u, f, p, m, h = !0, g) => {
+	let y = d([n]), b = m ? o(m) : void 0, x = n.erc20TokenAddress, S = a(s(await t.getEthereumAddressByChain(y))), C = u ?? await _(y, x, [x], c.Transact, [], 10n), w = e(y), D = T;
+	w && (D = t.generateProofRemotely ? O : E);
+	let { userDepositedUtxos: A, statusId: j, depositTxHash: M } = await D(t, y, n, r, i, C, S, h);
+	return await v(t, y, A), {
+		depositTxHash: M,
+		scheduleId: await k(t, y, n, A, C, S, j, l, f, p, b, g)
 	};
 };
 //#endregion
-export { x as hinkalDepositAndWithdraw };
+export { A as hinkalDepositAndWithdraw };

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

@@ -1 +1 @@
-const e=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const t=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),n=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),r=require(`../../functions/utils/tx-confirmation.utils.cjs`),i=require(`./hinkalProoflessDeposit.utils.cjs`),a=require(`./hinkalProoflessDeposit.cjs`),o=require(`../../API/deposit-and-withdraw-status-calls.cjs`);var s=async(s,c,l,u,d,f,p,m=!0)=>{let h=l.erc20TokenAddress,g=u.map(e=>e+f.flatFee),_=g.map(()=>l),v=g.map(()=>t.getStealthAddressStructureFromUserKeys(s.userKeys)),y=(await o.updateDepositAndWithdrawStatus({chainId:c,hashedEthereumAddress:p,phase:e.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,b=await a.hinkalProoflessDeposit(s,_,g,v,i.getOwnRecipientEncryptionKeys(s.userKeys,g.length),!0);if(!b)throw Error(`Deposit transaction hash not found`);let x=await r.waitForEthereumTransactionConfirmation(c,b);await o.safeUpdateDepositAndWithdrawStatus({id:y,chainId:c,hashedEthereumAddress:p,phase:e.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:b});let S=n.getOnChainUtxosFromReceipt(x,s,c,h);if(S.length===0)throw Error(`No UTXOs found in deposit transaction. Check contract address and ABI.`);let C=[],w=[...S];return d.forEach((e,t)=>{let n=g[t],r=w.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);C.push({recipientAddress:e,utxo:r});let i=w.indexOf(r);w.splice(i,1)}),{userDepositedUtxos:C,statusId:y,depositTxHash:b}};exports.hinkalDepositOnChainUtxos=s;
+const e=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const t=require(`../../functions/utils/tx-confirmation.utils.cjs`),n=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),r=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),i=require(`./hinkalProoflessDeposit.utils.cjs`),a=require(`./hinkalProoflessDeposit.cjs`),o=require(`../../API/deposit-and-withdraw-status-calls.cjs`);var s=async(s,c,l,u,d,f,p,m=!0)=>{let h=l.erc20TokenAddress,g=u.map(e=>e+f.flatFee),_=g.map(()=>l),v=g.map(()=>r.getStealthAddressStructureFromUserKeys(s.userKeys)),y=(await o.updateDepositAndWithdrawStatus({chainId:c,hashedEthereumAddress:p,phase:e.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,b=await a.hinkalProoflessDeposit(s,_,g,v,i.getOwnRecipientEncryptionKeys(s.userKeys,g.length),!0);if(!b)throw Error(`Deposit transaction hash not found`);let x=await t.waitForEthereumTransactionConfirmation(c,b);await o.safeUpdateDepositAndWithdrawStatus({id:y,chainId:c,hashedEthereumAddress:p,phase:e.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:b});let S=n.getOnChainUtxosFromReceipt(x,s,c,h);if(S.length===0)throw Error(`No UTXOs found in deposit transaction. Check contract address and ABI.`);let C=[],w=[...S];return d.forEach((e,t)=>{let n=g[t],r=w.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);C.push({recipientAddress:e,utxo:r});let i=w.indexOf(r);w.splice(i,1)}),{userDepositedUtxos:C,statusId:y,depositTxHash:b}};exports.hinkalDepositOnChainUtxos=s;

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

@@ -1,20 +1,20 @@
 import { DepositAndWithdrawPhase as e } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.mjs";
-import { getStealthAddressStructureFromUserKeys as t } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+import { waitForEthereumTransactionConfirmation as t } from "../../functions/utils/tx-confirmation.utils.mjs";
 import { getOnChainUtxosFromReceipt as n } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
-import { waitForEthereumTransactionConfirmation as r } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { getStealthAddressStructureFromUserKeys as r } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
 import { getOwnRecipientEncryptionKeys as i } from "./hinkalProoflessDeposit.utils.mjs";
 import { hinkalProoflessDeposit as a } from "./hinkalProoflessDeposit.mjs";
 import { safeUpdateDepositAndWithdrawStatus as o, updateDepositAndWithdrawStatus as s } from "../../API/deposit-and-withdraw-status-calls.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositOnChainUtxos.ts
 var c = async (c, l, u, d, f, p, m, h = !0) => {
-	let g = u.erc20TokenAddress, _ = d.map((e) => e + p.flatFee), v = _.map(() => u), y = _.map(() => t(c.userKeys)), b = (await s({
+	let g = u.erc20TokenAddress, _ = d.map((e) => e + p.flatFee), v = _.map(() => u), y = _.map(() => r(c.userKeys)), b = (await s({
 		chainId: l,
 		hashedEthereumAddress: m,
 		phase: e.BEFORE_DEPOSIT
 	})).id ?? void 0, x = await a(c, v, _, y, i(c.userKeys, _.length), !0);
 	if (!x) throw Error("Deposit transaction hash not found");
-	let S = await r(l, x);
+	let S = await t(l, x);
 	await o({
 		id: b,
 		chainId: l,

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/time.utils.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../constants/bridging.constants.cjs`),i=require(`../../API/callNearIntentsAPI.cjs`),a=require(`../../functions/utils/nearIntents.utils.cjs`),o=require(`./hinkalDepositAndWithdraw.cjs`),s=require(`./hinkalSolanaDepositAndWithdraw.cjs`);var c=async(c,l,u,d,f,p,m,h,g,_)=>{if(u.length!==d.length)throw Error(`recipientAmounts and recipientAddresses length mismatch`);if(u.length===0)throw Error(`No recipients to bridge`);let v=n.validateAndGetChainId([l]),y=t.secondsToMs(p),b=new Date(y+r.NEAR_BRIDGE_QUOTE_DEADLINE_BUFFER_MS).toISOString(),x=await Promise.all(d.map(async(e,t)=>{let n=u[t],{quote:r}=await i.getNearIntentsQuote({dry:!1,swapType:`EXACT_INPUT`,slippageTolerance:f.slippageBps??100,originAsset:f.originAsset,depositType:`ORIGIN_CHAIN`,destinationAsset:f.destinationAsset,amount:n.toString(),recipient:e,recipientType:`DESTINATION_CHAIN`,refundTo:c.userKeys.getNearIntentsAccountId(),refundType:`INTENTS`,deadline:b});if(!r.depositAddress)throw Error(`NEAR Intents quote returned no deposit address for recipient ${e}`);if(r.deadline&&new Date(r.deadline).getTime()<y)throw Error(`Bridge quote expires before the scheduled execution time. Choose a sooner time.`);return{destinationRecipient:e,amount:n,depositAddress:r.depositAddress,quote:r}})),S=m??await a.buildNearBridgeFeeStructure(v,l,x[0].depositAddress),C=x.map(e=>e.amount),w=x.map(e=>e.depositAddress),T;return e.isSolanaLike(v)?{depositTxHash:T}=await s.hinkalSolanaDepositAndWithdraw(c,l,C,w,p,S,h,g,_,x.map(e=>e.destinationRecipient)):{depositTxHash:T}=await o.hinkalDepositAndWithdraw(c,l,C,w,p,S,h,g,_),{depositTxHash:T,legs:x}};exports.hinkalNearDepositAndBridge=c;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/time.utils.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../constants/bridging.constants.cjs`),i=require(`../../API/callNearIntentsAPI.cjs`),a=require(`../../functions/utils/nearIntents.utils.cjs`),o=require(`./hinkalDepositAndWithdraw.cjs`),s=require(`./hinkalSolanaDepositAndWithdraw.cjs`);var c=async(c,l,u,d,f,p,m,h,g,_)=>{if(u.length!==d.length)throw Error(`recipientAmounts and recipientAddresses length mismatch`);if(u.length===0)throw Error(`No recipients to bridge`);let v=n.validateAndGetChainId([l]),y=t.secondsToMs(p),b=new Date(y+r.NEAR_BRIDGE_QUOTE_DEADLINE_BUFFER_MS).toISOString(),x=await Promise.all(d.map(async(e,t)=>{let n=u[t],{quote:r}=await i.getNearIntentsQuote({dry:!1,swapType:`EXACT_INPUT`,slippageTolerance:f.slippageBps??100,originAsset:f.originAsset,depositType:`ORIGIN_CHAIN`,destinationAsset:f.destinationAsset,amount:n.toString(),recipient:e,recipientType:`DESTINATION_CHAIN`,refundTo:c.userKeys.getNearIntentsAccountId(),refundType:`INTENTS`,deadline:b});if(!r.depositAddress)throw Error(`NEAR Intents quote returned no deposit address for recipient ${e}`);if(r.deadline&&new Date(r.deadline).getTime()<y)throw Error(`Bridge quote expires before the scheduled execution time. Choose a sooner time.`);return{destinationRecipient:e,amount:n,depositAddress:r.depositAddress,quote:r}})),S=m??await a.buildNearBridgeFeeStructure(v,l,x[0].depositAddress),C=x.map(e=>e.amount),w=x.map(e=>e.depositAddress),T={chainId:f.destinationChainId===v?void 0:f.destinationChainId,tokenAddress:f.destinationTokenAddress,tokenAmounts:x.map(e=>e.quote.amountOut)},E;return e.isSolanaLike(v)?{depositTxHash:E}=await s.hinkalSolanaDepositAndWithdraw(c,l,C,w,p,S,h,g,_,x.map(e=>e.destinationRecipient),T):{depositTxHash:E}=await o.hinkalDepositAndWithdraw(c,l,C,w,p,S,h,g,_,void 0,T),{depositTxHash:E,legs:x}};exports.hinkalNearDepositAndBridge=c;

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

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

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

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