@hinkal/common 0.3.6 → 0.3.7

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

@@ -1,109 +1,100 @@
-import { PAY_SEND_VARIABLE_RATE as e, 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 { getAmountInWei as i, randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
-import { UserKeys as o } from "../crypto-keys/keys.mjs";
-import { waitLittle as s } from "../../functions/utils/time.utils.mjs";
+import { isNearIntentsBridgeSource as e, isSolanaLike 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 { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInWei as o, randomBigInt as s } from "../../functions/web3/etherFunctions.mjs";
 import { hashEthereumAddress as c } from "../../functions/utils/addresses.mjs";
 import { ExternalActionId as l } from "../../types/external-action.types.mjs";
 import { TemporaryWalletRecoveryDestination as u } from "../../types/token.types.mjs";
 import { API as d } from "../../API/API.mjs";
-import { Logger as f } from "../../error-handling/logger.mjs";
-import { getErc20TokenFromAPI as p } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getErc20TokenFromAPI as f } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { AccountActions as p } from "../AccountActions/AccountActions.mjs";
 import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { createLifiBridgeOps as h, createTransaferEmporiumOpsBatch as g } from "../../functions/private-wallet/emporium.helpers.mjs";
 import { SWAP_ROUTER_ADDRESSES as _ } from "../../constants/addresses.constants.mjs";
-import { BRIDGE_ARRIVAL_POLL_INTERVAL_MS as v, BRIDGE_ARRIVAL_TIMEOUT_MS as y, DEFAULT_BRIDGING_SLIPPAGE_DECIMAL as b, SLIPPAGE_SCALING_FACTOR as x } from "../../constants/bridging.constants.mjs";
-import { RELAYER_TX_CONFIRMATION_TIMEOUT as S } from "../../constants/tx-confirmation.constants.mjs";
-import "../../constants/index.mjs";
-import { waitForEthereumTransactionConfirmation as C } from "../../functions/utils/tx-confirmation.utils.mjs";
-import { getUtxosFromReceipt as w } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
-import { getRecipientInfoFromUserKeys as T } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-import { convertEmporiumOpToCallInfo as E } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { getPublicBalanceByTokenAddress as D } from "../../functions/utils/publicBalance.utils.mjs";
-import { calculateModifiedFeeStructure as O, calculateTotalFee as k } from "../../functions/utils/fees.utils.mjs";
-import { buildTempSubAccount as A, deriveTempWallet as j } from "../../functions/utils/temp-wallet.utils.mjs";
-import { getLifiPrice as M } from "../../functions/web3/lifiAPI.mjs";
+import { DEFAULT_BRIDGING_SLIPPAGE_DECIMAL as v, NEAR_BRIDGE_QUOTE_DEADLINE_BUFFER_MS as y } from "../../constants/bridging.constants.mjs";
+import { convertEmporiumOpToCallInfo as b } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { calculateModifiedFeeStructure as x, calculateTotalFee as S } from "../../functions/utils/fees.utils.mjs";
+import { storeClaimableKeyInEnclave as C } from "../../functions/utils/enclave-utxo-storage.mjs";
+import { waitForBridgeArrival as w } from "../../functions/utils/bridge-arrival.utils.mjs";
+import { buildTempSubAccountForChain as T, deriveBridgeTempWallets as E } from "../../functions/utils/temp-wallet.utils.mjs";
+import { getNearIntentsQuote as D } from "../../API/callNearIntentsAPI.mjs";
+import { resolveNearAssetId as O } from "../../functions/utils/nearIntents.utils.mjs";
+import { getLifiPrice as k } from "../../functions/web3/lifiAPI.mjs";
+import { hinkalSolanaShieldBridged as A, resolveBridgeRecipient as j } from "../../functions/utils/bridge-claimable-utxo.utils.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalBridgePrivateToPrivate.ts
-var N = async (e, r, o, s, f, m, g) => {
-	let { chainId: v } = r, y = o.chainId, b = r.erc20TokenAddress, x = _[l.Lifi][v];
-	if (!x) throw Error(`LIFI not configured for chain ${v}`);
-	let S = a(6), { privateKey: C, ethAddress: w } = j(e, v, S), { lifiDataValue: T, outSwapAmountValue: E, extraNativeTokenFee: D } = await M(r, o, s, f, w, w), O = {
-		calldata: T,
-		expectedAmount: E,
-		nativeFee: D
-	}, k = i(r, s), N = A(S, C, w), P = c(await e.getEthereumAddressByChain(v));
-	await Promise.all([d.addTemporaryWalletNonce(v, P, Number(S), u.Confidential), d.addTemporaryWalletNonce(y, P, Number(S), u.Confidential)]);
-	let F = n(b, t), I = O.nativeFee > 0n && !F, L = F ? k + O.nativeFee : k, R = [r], z = [-L];
-	if (I) {
-		let e = await p(v, t);
+var M = async (e, t, n, a, m, g, v, y) => {
+	let { chainId: b } = t, x = n.chainId, S = t.erc20TokenAddress, C = _[l.Lifi][b];
+	if (!C) throw Error(`LIFI not configured for chain ${b}`);
+	let w = s(6), { sourceSubAccount: T, destinationSubAccount: D } = E(e, b, x, w), O = p.getAddressFromSubAccount(b, T), A = p.getAddressFromSubAccount(x, D);
+	if (!O || !A) throw Error("Missing temp wallet address for LIFI bridge");
+	let { lifiDataValue: j, outSwapAmountValue: M, extraNativeTokenFee: N } = await k(t, n, a, m, O, A), P = {
+		calldata: j,
+		expectedAmount: M,
+		nativeFee: N
+	}, F = o(t, a), I = Array.from(new Set([b, x])), L = c(await e.getEthereumAddress());
+	await Promise.all(I.map((e) => d.addTemporaryWalletNonce(e, L, Number(w), u.Confidential)));
+	let R = i(S, r), z = P.nativeFee > 0n && !R, B = R ? F + P.nativeFee : F, V = [t], H = [-B];
+	if (z) {
+		let e = await f(b, r);
 		if (!e) throw Error("Native token not found for bridge fee");
-		R.push(e), z.push(-O.nativeFee);
+		V.push(e), H.push(-P.nativeFee);
 	}
-	let B = h(e, v, w, x, b, L, k, O), V = R.map((e, t) => ({
+	let U = h(e, b, O, C, S, B, F, P), W = V.map((e, t) => ({
 		token: e,
-		amount: z[t]
+		amount: H[t]
 	}));
 	return {
-		nonce: S,
-		tempSubAccount: N,
-		sourceTxHash: await e.actionPrivateWallet(v, R, z, z.map(() => !1), B, V, N, m ?? b, void 0, void 0, !1, void 0, g, void 0),
-		quote: O
+		tempSubAccount: D,
+		sourceTxHash: await e.actionPrivateWallet(b, V, H, H.map(() => !1), U, W, T, g ?? S, v, void 0, !1, void 0, y, void 0),
+		expectedAmount: P.expectedAmount
 	};
-}, P = async (e, t, n, r, i) => {
-	let a = BigInt(Math.round(i * x)), o = r.expectedAmount - r.expectedAmount * a / BigInt(x), c = o > 0n ? o : 1n, l = Date.now() + y;
-	for (; Date.now() < l;) {
-		let r = await D(e, t, n);
-		if (r !== null && r >= c) return r;
-		await s(v);
-	}
-	throw Error(`Bridge did not land on destination temp wallet ${t} on chain ${e} within timeout.`);
-}, F = async (t, n, i, a, s, c) => {
-	let u = n.chainId, d = n.erc20TokenAddress, f = i.ethAddress;
-	if (!f) throw Error("Missing temp wallet address for bridge shield");
-	let p = g(t, u, [d], [a]), h = await O(u, n, a, await m(u, d, [d], l.Emporium, p.map((e) => E(e, f, u)), e)), _ = a - k(a, h);
-	if (_ <= 0n) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let v, y;
-	if ("recipientInfo" in s) v = s.recipientInfo;
-	else {
-		let e = t.userKeys.getClaimableSignatureFromNonce(s.claimableNonce), n = new o(e);
-		y = {
-			signature: e,
-			keys: n,
-			ethAddress: s.recipientEthAddress
-		}, v = T(n);
-	}
-	let b = await t.proxyToPrivate([n], [_], i, v, h.feeToken, h, c), x;
-	if (y) {
-		let e = await C(u, b, { evmTimeoutMs: S });
-		if (!e) throw Error(`Could not fetch receipt for bridge shield tx ${b}`);
-		let [n] = w(e, t, u, d, y.keys.getShieldedPrivateKey());
-		if (!n) throw Error("Could not find recipient UTXO in bridge shield tx");
-		x = {
-			chainId: u,
-			senderAddress: await t.getEthereumAddressByChain(u),
-			recipientAddress: y.ethAddress,
-			claimableSignature: y.signature,
-			utxo: n
-		};
-	}
+}, N = async (e, t, n, r, i, a, l, f) => {
+	let m = n.chainId, h = s(6), g = T(e, m, h), _ = p.getAddressFromSubAccount(m, g);
+	if (!_) throw Error("Missing temp wallet address for NEAR bridge");
+	let v = c(await e.getEthereumAddress());
+	await d.addTemporaryWalletNonce(m, v, Number(h), u.Confidential);
+	let [b, x] = await Promise.all([O(t.chainId, t.erc20TokenAddress), O(m, n.erc20TokenAddress)]), S = o(t, r), C = new Date(Date.now() + y).toISOString(), { quote: w } = await D({
+		dry: !1,
+		swapType: "EXACT_INPUT",
+		slippageTolerance: Math.round(i * 1e4) || 100,
+		originAsset: b,
+		depositType: "ORIGIN_CHAIN",
+		destinationAsset: x,
+		amount: S.toString(),
+		recipient: _,
+		recipientType: "DESTINATION_CHAIN",
+		refundTo: e.userKeys.getNearIntentsAccountId(),
+		refundType: "INTENTS",
+		deadline: C
+	});
+	if (!w.depositAddress) throw Error("NEAR Intents quote returned no deposit address");
+	let E = await e.withdraw([t], [-S], w.depositAddress, !1, a ?? t.erc20TokenAddress, l, void 0, f);
 	return {
-		destTxHash: b,
-		pendingEnclaveUtxo: x,
-		shieldedAmount: _
+		tempSubAccount: g,
+		sourceTxHash: typeof E == "string" ? E : E.hash,
+		expectedAmount: BigInt(w.amountOut)
 	};
-}, I = async (e, t, n, r, i, a = b, o, s) => {
-	let { nonce: l, tempSubAccount: u, sourceTxHash: p, quote: m } = await N(e, t, n, r, a, o, s), h = u.ethAddress;
-	if (!h) throw Error("Missing temp wallet address for bridge");
-	let { destTxHash: g, pendingEnclaveUtxo: _, shieldedAmount: v } = await F(e, n, u, await P(n.chainId, h, n.erc20TokenAddress, m, a), i, s), y = c(await e.getEthereumAddressByChain(n.chainId)), x = [t.chainId, n.chainId];
-	return (await Promise.allSettled(x.map((e) => d.removeTemporaryWalletNonce(e, y, Number(l))))).forEach((e, t) => {
-		e.status === "rejected" && f.error(`Failed to remove temp-wallet nonce on chain ${x[t]}`, e.reason);
-	}), {
-		sourceTxHash: p,
-		destTxHash: g,
-		pendingEnclaveUtxo: _,
-		destinationTokenAmount: v.toString()
+}, P = async (e, r, i, o, s) => {
+	let c = r.chainId, u = r.erc20TokenAddress, d = p.getAddressFromSubAccount(c, i);
+	if (!d) throw Error("Missing temp wallet address for bridge shield");
+	let { recipientInfo: f, claimable: h } = j(e, s);
+	if (h && await C(await e.getEthereumAddressByChain(c), h.ethAddress, h.keys.getShieldedPrivateKey(), c, h.signature), t(c)) return A(e, r, i, o, f);
+	let _ = g(e, c, [u], [o]), v = await x(c, r, o, await m(c, u, [u], l.Emporium, _.map((e) => b(e, d, c)), n)), y = o - S(o, v);
+	if (y <= 0n) throw Error(a.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	return {
+		destTxHash: await e.proxyToPrivate([r], [y], i, f, v.feeToken, v),
+		shieldedAmount: y
+	};
+}, F = async (t, n, r, i, a, o = v, s, c, l) => {
+	let { tempSubAccount: u, sourceTxHash: d, expectedAmount: f } = e(n.chainId) ? await N(t, n, r, i, o, s, c, l) : await M(t, n, r, i, o, s, c, l), m = p.getAddressFromSubAccount(r.chainId, u);
+	if (!m) throw Error("Missing temp wallet address for bridge");
+	let { destTxHash: h, shieldedAmount: g } = await P(t, r, u, await w(r.chainId, m, r.erc20TokenAddress, f, o), a);
+	return {
+		sourceTxHash: d,
+		destTxHash: h,
+		destinationTokenAmount: g.toString()
 	};
 };
 //#endregion
-export { I as hinkalBridgePrivateToPrivate };
+export { F as hinkalBridgePrivateToPrivate };

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../utxo/Utxo.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../types/transact.types.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/pre-transaction/getFeeStructure.cjs`),l=require(`./hinkalTransact.cjs`);var u=async(u,d,f,p,m)=>{let h=s.validateAndGetChainId([d]),g=d.erc20TokenAddress;if(!t.caseInsensitiveEqual(g,f.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);let _=m?new r.UserKeys(m):new r.UserKeys(f.nullifyingKey,f.nullifyingKey);if(!f.nullifyingKey&&!m)throw Error(`Claimable UTXO nullifyingKey is missing`);let v=_.getShieldedPrivateKey();if(f.nullifyingKey&&f.nullifyingKey!==v)throw Error(`Claimable UTXO key mismatch`);let y=u.getRecipientInfo(),b=i.Utxo.createFrom(f,{nullifyingKey:v}),x=p??await c.getFeeStructure(h,g,[g],a.ExternalActionId.Transact);if(!t.caseInsensitiveEqual(x.feeToken,g))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let S=x.variableRate>0n?x.variableRate:e.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(b.amount<=x.flatFee)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let C=b.amount-x.flatFee,w=C*S/10000n,T=C-w;if(T<=0n)throw Error(n.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let E={feeToken:x.feeToken,flatFee:x.flatFee+w,variableRate:0n},D=[-b.amount],O=await u.getRandomRelay(h,!0);if(!O)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);return l.hinkalTransact(u,{chainId:h,erc20Addresses:[g],amountChanges:D,externalAddress:O,feeStructure:E,relay:O,recipientAddress:[y],recipientAmounts:[[T]],inputUtxos:[[b]],userKeys:_,submit:{mode:o.SubmitMode.Relayer}})};exports.hinkalClaimUtxo=u;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../utxo/Utxo.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../types/transact.types.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/pre-transaction/getFeeStructure.cjs`),l=require(`./hinkalTransact.cjs`);var u=async(u,d,f,p,m)=>{let h=s.validateAndGetChainId([d]),g=d.erc20TokenAddress;if(!t.caseInsensitiveEqual(g,f.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);let _=new r.UserKeys(p),v=_.getShieldedPrivateKey();if(f.nullifyingKey&&BigInt(f.nullifyingKey)!==BigInt(v))throw Error(`Claimable UTXO key mismatch`);let y=u.getRecipientInfo(),b=i.Utxo.createFrom(f,{nullifyingKey:v}),x=m??await c.getFeeStructure(h,g,[g],a.ExternalActionId.Transact);if(!t.caseInsensitiveEqual(x.feeToken,g))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let S=x.variableRate>0n?x.variableRate:e.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(b.amount<=x.flatFee)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let C=b.amount-x.flatFee,w=C*S/10000n,T=C-w;if(T<=0n)throw Error(n.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let E={feeToken:x.feeToken,flatFee:x.flatFee+w,variableRate:0n},D=[-b.amount],O=await u.getRandomRelay(h,!0);if(!O)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);return l.hinkalTransact(u,{chainId:h,erc20Addresses:[g],amountChanges:D,externalAddress:O,feeStructure:E,relay:O,recipientAddress:[y],recipientAmounts:[[T]],inputUtxos:[[b]],userKeys:_,submit:{mode:o.SubmitMode.Relayer}})};exports.hinkalClaimUtxo=u;

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

@@ -2,4 +2,4 @@ import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
 import { Utxo } from '../utxo/Utxo';
-export declare const hinkalClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, claimableSignature?: string) => Promise<string>;
+export declare const hinkalClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, claimableSignature: string, feeStructureOverride?: FeeStructure) => Promise<string>;

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

@@ -12,11 +12,9 @@ import { hinkalTransact as l } from "./hinkalTransact.mjs";
 var u = async (u, d, f, p, m) => {
 	let h = s([d]), g = d.erc20TokenAddress;
 	if (!t(g, f.erc20TokenAddress)) throw Error("Off-chain UTXO token mismatch");
-	let _ = m ? new r(m) : new r(f.nullifyingKey, f.nullifyingKey);
-	if (!f.nullifyingKey && !m) throw Error("Claimable UTXO nullifyingKey is missing");
-	let v = _.getShieldedPrivateKey();
-	if (f.nullifyingKey && f.nullifyingKey !== v) throw Error("Claimable UTXO key mismatch");
-	let y = u.getRecipientInfo(), b = i.createFrom(f, { nullifyingKey: v }), x = p ?? await c(h, g, [g], a.Transact);
+	let _ = new r(p), v = _.getShieldedPrivateKey();
+	if (f.nullifyingKey && BigInt(f.nullifyingKey) !== BigInt(v)) throw Error("Claimable UTXO key mismatch");
+	let y = u.getRecipientInfo(), b = i.createFrom(f, { nullifyingKey: v }), x = m ?? await c(h, g, [g], a.Transact);
 	if (!t(x.feeToken, g)) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
 	let S = x.variableRate > 0n ? x.variableRate : e;
 	if (b.amount <= x.flatFee) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);

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/scheduled-transactions.types.cjs`),l=require(`../../types/transact.types.cjs`);require(`../../types/index.cjs`);const u=require(`../../API/API.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/utils/erc20tokenFunctions.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../AccountActions/AccountActions.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.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(`../../API/deposit-and-withdraw-status-calls.cjs`),S=require(`./hinkalDepositOnChainUtxos.cjs`),C=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),w=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`),require(`../../functions/index.cjs`);var T=async(o,d,f,h,g,S,C,w,T,E,D)=>{if(h.length===0)throw Error(`No recipients to bridge`);let O=f.erc20TokenAddress,{contractData:k}=e.networkRegistry[d],{emporiumAddress:A}=k;if(!A)throw Error(`No Emporium Address`);let j=b.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][d];if(!j)throw Error(`LIFI not configured for chain ${d}`);let M=await o.getRandomRelay(d);if(!M)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let N=await o.getEthereumAddressByChain(d),P=o.generateProofRemotely,F=P?5:1,I=[];for(let i=0;i<h.length;i+=F){let c=h.slice(i,i+F),f=await Promise.all(c.map(async({utxo:i,nativeUtxo:c,bridgeAmount:f,quote:h,temporarySubAccount:v,recipientAddress:b,destinationChainId:x,destinationTokenAddress:C})=>{await u.API.addTemporaryWalletNonce(d,S,v.index);let w=n.caseInsensitiveEqual(O,t.zeroAddress),T=h.nativeFee>0n&&!w,D=[O],k=[-i.amount],F=[!1],I=[[i]];T&&c&&(D.push(t.zeroAddress),k.push(-c.amount),F.push(!1),I.push([c]));let L=_.createLifiBridgeOps(o,d,v.ethAddress,j,O,i.amount,f,h),R=p.constructAdminData(E,d,D,[-i.amount],N),[z,B]=await Promise.all([(async()=>{let n=a.randomBigInt(31),i=P?await _.encodeEmporiumMetadata(d,A,v.privateKey,L,r.poseidonFunction(n),m.AccountActions.getSignerAddressFromPrivateKey(e.getOnchainChainId(d),v.privateKey)):void 0;return y.hinkalTransact(o,{chainId:d,erc20Addresses:D,amountChanges:k,externalAddress:A,externalActionId:s.ExternalActionId.Emporium,externalActionMetadata:i,onChainCreation:F,feeStructure:g,relay:M??t.zeroAddress,messageSeed:n,inputUtxos:I,useBlockedUtxos:!0,subAccountPrivateKey:v.privateKey,emporiumOps:L,submit:{mode:l.SubmitMode.ProofOnly}})})(),_.getAuthorizationDataIfNeeded(d,v.privateKey)]),{zkCallData:V,circomData:H,dimData:U,commitmentValidationData:W,tronProofSignature:G}=z;return{zkCallData:V,dimData:U,circomData:H,commitmentValidationData:W,authorizationData:B,recipientAddress:b,adminData:R,tronProofSignature:G,destinationChainId:x,destinationTokenAddress:C,destinationTokenAmount:h.expectedAmount.toString()}}));I.push(...f)}await x.safeUpdateDepositAndWithdrawStatus({id:C,chainId:d,hashedEthereumAddress:S,phase:c.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let L=await v.transactCallRelayerBatch(d,I,S,w,T,D);return await x.safeUpdateDepositAndWithdrawStatus({id:C,chainId:d,hashedEthereumAddress:S,phase:c.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:L}),L},E=async(e,r,i,a,c,l,u,p,m=!0)=>{let v=r.erc20TokenAddress,y=d.validateAndGetChainId([r]),x=p?o.hashString(p):void 0,E=o.hashEthereumAddress(await e.getEthereumAddressByChain(y)),D=b.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][y];if(!D)throw Error(`LIFI router not configured`);let O,k=n.caseInsensitiveEqual(v,t.zeroAddress);if(c)O=c;else{let n=i[0],r=k?n.bridgeAmount+n.quote.nativeFee:n.bridgeAmount,a=_.createLifiBridgeOps(e,y,n.temporarySubAccount.ethAddress,D,v,r,n.bridgeAmount,n.quote).map(e=>C.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,y));O=await h.getFeeStructure(y,v,[v],s.ExternalActionId.Emporium,a,t.PAY_SEND_VARIABLE_RATE)}let A={feeToken:O.feeToken,flatFee:0n,variableRate:0n},j=i.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!n.caseInsensitiveEqual(v,t.zeroAddress),M=i.map(e=>w.calculateGrossAmountWithFee(k?e.bridgeAmount+e.quote.nativeFee:e.bridgeAmount,O)),N=i.map(e=>e.recipientAddress),{userDepositedUtxos:P,statusId:F,depositTxHash:I}=await S.hinkalDepositOnChainUtxos(e,y,r,M,N,A,E,m),L=[];if(j){let n=await f.getErc20TokenFromAPI(y,t.zeroAddress);if(!n)throw Error(`No native token`);let{userDepositedUtxos:r}=await S.hinkalDepositOnChainUtxos(e,y,n,i.map(e=>w.calculateGrossAmountWithFee(e.quote.nativeFee,{feeToken:O.feeToken,flatFee:0n,variableRate:O.variableRate})),N,A,E,m);L=r}return await g.waitForDepositedUtxosInMerkleTree(e,y,[...P,...L]),{depositTxHash:I,scheduleId:await T(e,y,r,i.map((e,t)=>({...e,utxo:P[t].utxo,nativeUtxo:j?L[t]?.utxo:void 0})),O,E,F,a,l,u,x)}};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/pre-transaction/speculativeUtxo.cjs`),g=require(`../../functions/private-wallet/emporium.helpers.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`./hinkalTransact.cjs`),y=require(`../../constants/addresses.constants.cjs`),b=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),x=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`);const S=require(`./hinkalDepositOnChainUtxos.cjs`);var C=async(o,u,d,m,_,b,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=y.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),y=await Promise.all(d.map(async({utxo:d,nativeUtxo:m,bridgeAmount:y,quote:w,temporarySubAccount:A,recipientAddress:j,destinationChainId:M,destinationTokenAddress:N},P)=>{let F=_[i+P];await l.API.addTemporaryWalletNonce(u,b,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=g.createLifiBridgeOps(o,u,A.ethAddress,E,C,d.amount,y,w),U=f.constructAdminData(x,u,R,[-d.amount],O),[W,G]=await Promise.all([(async()=>{let n=a.randomBigInt(31),i=k?await g.encodeEmporiumMetadata(u,T,A.privateKey,H,r.poseidonFunction(n),p.AccountActions.getSignerAddressFromPrivateKey(e.getOnchainChainId(u),A.privateKey),F.flatFee):void 0;return v.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(h.toSpeculativeUtxo))},subAccountPrivateKey:A.privateKey,emporiumOps:H,submit:{mode:c.SubmitMode.ProofOnly}})})(),g.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(...y)}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],v=[c];if(l){let e=await d.getErc20TokenFromAPI(a,t.zeroAddress);if(!e)throw Error(`No native token`);g.push(e),v.push(w(r))}let y=await S.prepareDepositOnChainUtxos(e,a,g,v),{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 _.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 h=r.erc20TokenAddress,_=u.validateAndGetChainId([r]),v=await e.getEthereumAddressByChain(_),S=y.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][_];if(!S)throw Error(`LIFI router not configured`);let C=n.caseInsensitiveEqual(h,t.zeroAddress),w;if(c)w=c;else{let n=i[0],r=C?n.bridgeAmount+n.quote.nativeFee:n.bridgeAmount,a=g.createLifiBridgeOps(e,_,n.temporarySubAccount.ethAddress,S,h,r,n.bridgeAmount,n.quote).map(e=>b.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,_));w=await m.getFeeStructure(_,h,[h],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=>x.calculateModifiedFeeStructure(_,r,e,w)));return T(e,r,i,{chainId:_,ethereumAddress:v,hashedEthereumAddress:o.hashEthereumAddress(v),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;

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

@@ -6,123 +6,119 @@ import { transactionErrorCodes as o } from "../../error-handling/error-codes.con
 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 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 { 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 { SubmitMode as d } from "../../types/transact.types.mjs";
+import { API as f } from "../../API/API.mjs";
+import { validateAndGetChainId as p } from "../../functions/utils/token-check.utils.mjs";
+import { getErc20TokenFromAPI as m } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as g } from "../AccountActions/AccountActions.mjs";
+import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { toSpeculativeUtxo as v } from "../../functions/pre-transaction/speculativeUtxo.mjs";
+import { createLifiBridgeOps as y, encodeEmporiumMetadata as b, getAuthorizationDataIfNeeded as x } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { transactCallRelayerBatch as S } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { hinkalTransact as C } from "./hinkalTransact.mjs";
+import { SWAP_ROUTER_ADDRESSES as w } from "../../constants/addresses.constants.mjs";
+import { convertEmporiumOpToCallInfo as T } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { calculateModifiedFeeStructure as E } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/utils/index.mjs";
-import "../../functions/index.mjs";
+import { prepareDepositOnChainUtxos as D, submitDepositOnChainUtxos as O } from "./hinkalDepositOnChainUtxos.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
-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, {
+var k = async (n, c, l, p, m, _, S, T) => {
+	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 = w[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: w, 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 = w.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 = y(n, c, D.ethAddress, k, E, o.amount, p, w), G = h(S, c, B, [-o.amount], j), [K, q] = await Promise.all([(async () => {
+				let t = s(31), i = M ? await b(c, O, D.privateKey, W, a(t), g.getSignerAddressFromPrivateKey(e(c), D.privateKey), L.flatFee) : void 0;
+				return C(n, {
 					chainId: c,
-					erc20Addresses: O,
-					amountChanges: A,
-					externalAddress: N,
+					erc20Addresses: B,
+					amountChanges: V,
+					externalAddress: O,
 					externalActionId: u.Emporium,
 					externalActionMetadata: i,
-					onChainCreation: M,
-					feeStructure: h,
-					relay: F ?? r,
+					onChainCreation: H,
+					feeStructure: L,
+					relay: A ?? r,
 					messageSeed: t,
-					inputUtxos: R,
+					inputUtxos: U,
 					useBlockedUtxos: !0,
-					subAccountPrivateKey: m.privateKey,
-					emporiumOps: z,
-					submit: { mode: f.ProofOnly }
+					speculative: T && {
+						pendingLeaves: T,
+						inputUtxos: U.map((e) => e.map(v))
+					},
+					subAccountPrivateKey: D.privateKey,
+					emporiumOps: W,
+					submit: { mode: d.ProofOnly }
 				});
-			})(), S(c, m.privateKey)]), { zkCallData: U, circomData: W, dimData: G, commitmentValidationData: K, tronProofSignature: q } = V;
+			})(), x(c, D.privateKey)]), { zkCallData: J, circomData: Y, dimData: X, commitmentValidationData: Z, tronProofSignature: Q } = K;
 			return {
-				zkCallData: U,
-				dimData: G,
-				circomData: W,
-				commitmentValidationData: K,
-				authorizationData: H,
-				recipientAddress: y,
-				adminData: B,
-				tronProofSignature: q,
-				destinationChainId: C,
-				destinationTokenAddress: T,
-				destinationTokenAmount: d.expectedAmount.toString()
+				zkCallData: J,
+				dimData: X,
+				circomData: Y,
+				commitmentValidationData: Z,
+				authorizationData: q,
+				recipientAddress: N,
+				adminData: G,
+				tronProofSignature: Q,
+				destinationChainId: P,
+				destinationTokenAddress: F,
+				destinationTokenAmount: w.expectedAmount.toString()
 			};
 		}));
-		z.push(...l);
+		P.push(...l);
 	}
-	await E({
-		id: y,
-		chainId: c,
-		hashedEthereumAddress: v,
-		phase: d.BEFORE_SCHEDULE_WITHDRAW
-	});
-	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 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: E.feeToken,
-		flatFee: 0n,
-		variableRate: 0n
-	}, 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 h(x, r);
-		if (!t) throw Error("No native token");
-		let { userDepositedUtxos: n } = await D(e, x, t, a.map((e) => k(e.quote.nativeFee, {
-			feeToken: E.feeToken,
-			flatFee: 0n,
-			variableRate: E.variableRate
-		})), F, M, C, g);
-		z = n;
+	return P;
+}, A = (e) => e.map((e) => e.quote.nativeFee), j = 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));
 	}
-	return await y(e, x, [...I, ...z]), {
-		depositTxHash: R,
-		scheduleId: await A(e, x, t, a.map((e, t) => ({
-			...e,
-			utxo: I[t].utxo,
-			nativeUtxo: N ? z[t]?.utxo : void 0
-		})), E, C, L, o, d, f, S)
+	let v = await D(e, a, g, _), { depositedUtxos: y, pendingLeaves: b } = v, [x, C = []] = y, w = n.map((e, t) => ({
+		...e,
+		utxo: x[t],
+		nativeUtxo: l ? C[t] : void 0
+	})), [T, E] = await Promise.all([O(e, v, h), k(e, a, t, w, s, o, f, b)]);
+	return {
+		depositTxHash: T,
+		scheduleId: await S(a, E, o, u, d, p, T)
 	};
+}, M = 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, v = p([t]), b = await e.getEthereumAddressByChain(v), x = w[u.Lifi][v];
+	if (!x) throw Error("LIFI router not configured");
+	let S = i(g, r), C;
+	if (s) C = s;
+	else {
+		let t = a[0], r = S ? t.bridgeAmount + t.quote.nativeFee : t.bridgeAmount, i = y(e, v, t.temporarySubAccount.ethAddress, x, g, r, t.bridgeAmount, t.quote).map((e) => T(e, t.temporarySubAccount.ethAddress, v));
+		C = await _(v, g, [g], u.Emporium, i, n);
+	}
+	let D = a.reduce((e, t) => e + t.quote.nativeFee, 0n), O = a.map((e) => S ? e.bridgeAmount + e.quote.nativeFee : e.bridgeAmount), k = await Promise.all(O.map((e) => E(v, t, e, C)));
+	return j(e, t, a, {
+		chainId: v,
+		ethereumAddress: b,
+		hashedEthereumAddress: c(b),
+		feeStructures: k,
+		mainTokenAmounts: O.map((e, t) => e + k[t].flatFee),
+		needsNativeDeposit: D > 0n && !S,
+		txCompletionTime: o,
+		ref: d,
+		action: f,
+		hashedDashboardAccountId: m ? l(m) : void 0,
+		preEstimateGas: h
+	});
 };
 //#endregion
-export { j as hinkalDepositAndBridge };
+export { M 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/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;
+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/transact.types.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../crypto-keys/encryptDecryptUtxo.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,a,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(a),e.getEthereumAddressByChain(a)]);if(!v)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let b=e.generateProofRemotely?5:1,x=[],S=o.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=o.addressToHexFormat(s),C=n.caseInsensitiveEqual(l.erc20TokenAddress,_)?l:i.Utxo.createFrom(l,{erc20TokenAddress:_}),w=d.constructAdminData(f,a,[_],[-l.amount],S),{zkCallData:T,circomData:E,dimData:D,commitmentValidationData:O,tronProofSignature:k}=await g.hinkalTransact(e,{chainId:a,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:a,ethereumAddress:s,hashedEthereumAddress:l,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:a,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:u.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()=>{o.swapTronBCoordinate(T.zkCallData);let n=await m.transactCallDirectTron(e,a,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,a,t,D,d,f,p,O)]);return{depositTxHash:k,scheduleId:await h.transactCallRelayerBatch(a,A,l,_,b,x,k)}},S=async(t,n,r,i,c,u,d,p,m,h=!0,g)=>{let _=l.validateAndGetChainId([n]),v=n.erc20TokenAddress,y=o.addressToHexFormat(await t.getEthereumAddressByChain(_)),S={chainId:_,ethereumAddress:y,hashedEthereumAddress:a.hashEthereumAddress(y),feeStructure:u??await f.getFeeStructure(_,v,[v],s.ExternalActionId.Transact,[],10n),txCompletionTime:c,ref:d,action:p,hashedDashboardAccountId:m?a.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;

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

@@ -2,6 +2,6 @@ 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, destination?: DestinationMetadata) => Promise<string>;
+export declare const hinkalWithdrawBatch: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, 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, destination?: DestinationMetadata) => Promise<DepositAndSendExtendedResult>;