@gurge/sdk 0.3.150 → 0.3.151

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

@@ -3,4 +3,5 @@ import { Types as TronWebTypes } from 'tronweb';
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType, ERC20Token } from '../../types';
 export declare const hinkalDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], preEstimateGas?: boolean, returnTxData?: boolean) => Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
+export declare const hinkalDepositForOthers: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountsByRecipient: bigint[][], recipientInfos: string[], preEstimateGas?: boolean, returnTxData?: boolean, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
 export declare const hinkalDepositForOther: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientInfo: string, preEstimateGas?: boolean, returnTxData?: boolean, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;

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

@@ -1,121 +1,52 @@
-import { isTronLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
-import { TRON_DEFAULT_FEE_LIMIT_SUN as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
-import { zeroFeeStructure as i } from "../../types/hinkal.types.mjs";
-import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { Utxo as s } from "../utxo/Utxo.mjs";
-import { isValidPrivateAddress as c } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as l, approveTronTokens as u, assertTronSufficientBalance as d, circomDataToArray as f, createTronCallData as p, evmHexToTronBase58Address as m, parseZkCalldata as h, reorderZkCallData as g, splitTronTokensByNative as _ } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as v } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as y } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as b } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructAdminData as x } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { simulateTronTransaction as S } from "../../functions/utils/tronSimulation.utils.mjs";
-import { constructZkProof as C } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { waitForTronErc20Approvals as w } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
-import { transactCallDirect as T } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { emitTxPublicData as E } from "../../API/admin-calls.mjs";
+import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
+import { addressToHexFormat as t } from "../../functions/utils/tron.utils.mjs";
+import { isValidPrivateAddress as n } from "../../functions/utils/addresses.mjs";
+import { SubmitMode as r } from "../../types/transact.types.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as a } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { hinkalTransact as o } from "./hinkalTransact.mjs";
+import { emitTxPublicData as s } from "../../API/admin-calls.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDeposit.ts
-var D = async (e, t) => ({
-	externalActionData: {
-		externalActionId: 0n,
-		externalAddress: l(await e.getEthereumAddressByChain(t)),
-		externalActionMetadata: "0x00"
-	},
-	contractTransaction: void 0,
-	contractToApprove: void 0
-}), O = async (e, t, n, r) => {
-	let i = [...await y(e, t, n, r)], a = [], s = o().toString();
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = b(e.userKeys, i[t], r[t], s);
-		a.push(n);
-	}
-	return {
-		inputUtxosArray: i,
-		outputUtxosArray: a
-	};
-}, k = async (e, r, i, a, o, s, c, l = !0, v = !1) => {
-	let y = e.getTronWeb(), { hinkalAddress: b, hinkalABI: x } = t[r].contractData;
-	if (!x) throw Error("Hinkal ABI not found");
-	let C = m(b), T = await e.getEthereumAddressByChain(r), { totalTrxValue: E, tokensNeedingApproval: D } = _(i, a), { a: O, b: k, c: A } = h(o), j = await g(!0, o, c, s, !1);
-	if (!j) throw Error("Tron proof signature not found");
-	let M = [
-		j.v,
-		j.r,
-		j.s
-	], N = [
-		c.tokenNumber,
-		c.nullifierAmount,
-		c.outputAmount
-	], P = f(s), F = E > 0n ? Number(E) : 0;
-	if (v) {
-		let e = p(x, "transact", [
-			M,
-			O,
-			k,
-			A,
-			N,
-			P
-		]), { transaction: t } = await y.transactionBuilder.triggerSmartContract(C, "", {
-			feeLimit: n,
-			callValue: F,
-			input: e
-		}, [], T);
-		return t;
-	}
-	await u(y, T, C, D), D.size > 0 && await w(y, T, C, Array.from(D.entries()).map(([e, t]) => ({
-		tokenAddress: e,
-		requiredAmount: t
-	}))), l && (await S(r, C, "transact", x, [
-		M,
-		O,
-		k,
-		A,
-		N,
-		P
-	], T, E > 0n ? E : void 0), await d(y, r, C, T, p(x, "transact", [
-		M,
-		O,
-		k,
-		A,
-		N,
-		P
-	]), E));
-	let I = await y.contract(x, C).transact(M, O, k, A, N, P).send({
-		feeLimit: n,
-		callValue: F
-	}), L = typeof I == "string" ? I : I?.txid ?? I?.transaction?.txID;
-	if (!L) throw Error("Tron deposit failed (missing txid)");
-	return L;
-}, A = async (t, n, a, o = !0, s = !1) => {
-	let c = v(n), l = e(c), u = n.map((e) => e.erc20TokenAddress), [{ externalActionData: d, contractTransaction: f, contractToApprove: p }, { inputUtxosArray: m, outputUtxosArray: h }] = await Promise.all([D(t, c), O(t, c, u, a)]), { zkCallData: g, circomData: _, dimData: y } = await C(t.merkleTreeHinkalByChain[c], m, h, t.userKeys, d.externalActionId, d.externalAddress, d.externalActionMetadata, t.generateProofRemotely, i, r, c);
-	return l ? await k(t, c, n, a, g, _, y, o, s) : await T(t, c, a, n, g, _, y, p, f, o, s);
-}, j = async (t, n, o, l, u = !0, d = !1, f) => {
-	let p = v(n), m = e(p), h = n.map((e) => e.erc20TokenAddress), [g, _, y, , b] = l.split(",");
-	if (!c(l)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
-	let S = h.map((e) => [new s({
-		amount: 0n,
-		erc20TokenAddress: e,
-		nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
-	}), new s({
-		amount: 0n,
-		erc20TokenAddress: e,
-		nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
-	})]), w = h.map((e, t) => [new s({
-		amount: o[t],
-		erc20TokenAddress: e,
-		H0: [BigInt(_), BigInt(y)],
-		stealthAddress: g,
-		encryptionKey: b,
-		isNewStyle: !0
-	})]), { externalActionData: O, contractTransaction: A, contractToApprove: j } = await D(t, p), { zkCallData: M, circomData: N, dimData: P } = await C(t.merkleTreeHinkalByChain[p], S, w, t.userKeys, O.externalActionId, O.externalAddress, O.externalActionMetadata, t.generateProofRemotely, i, r, p);
-	if (m) return await k(t, p, n, o, M, N, P, u, d);
-	let F = await T(t, p, o, n, M, N, P, j, A, u, d);
-	return E(x(f, p, h, o, await t.getEthereumAddress())), F;
-};
+var c = async (e, n, a, s = !0, c = !1) => {
+	let l = i(n);
+	return o(e, {
+		chainId: l,
+		erc20Addresses: n.map((e) => e.erc20TokenAddress),
+		amountChanges: a,
+		externalAddress: t(await e.getEthereumAddressByChain(l)),
+		submit: {
+			mode: r.Self,
+			erc20Tokens: n,
+			approvalAmounts: a,
+			preEstimateGas: s,
+			returnTxData: c
+		}
+	});
+}, l = async (c, l, u, d, f = !0, p = !1, m) => {
+	if (d.length === 0) throw Error("recipientInfos must not be empty");
+	if (u.length !== d.length) throw Error("amountsByRecipient must have one entry per recipientInfo");
+	let h = i(l), g = l.map((e) => e.erc20TokenAddress);
+	d.forEach((t, r) => {
+		if (!n(t)) throw Error(e.RECIPIENT_FORMAT_INCORRECT);
+		if (u[r].length !== g.length) throw Error("Each amountsByRecipient entry must have one amount per erc20Token");
+	});
+	let _ = g.map((e, t) => u.reduce((e, n) => e + n[t], 0n)), v = t(await c.getEthereumAddressByChain(h)), y = await o(c, {
+		chainId: h,
+		erc20Addresses: g,
+		amountChanges: _.map(() => 0n),
+		externalAddress: v,
+		recipientAddress: d,
+		recipientAmounts: u,
+		forceEmptyUtxos: !0,
+		submit: {
+			mode: r.Self,
+			erc20Tokens: l,
+			approvalAmounts: _,
+			preEstimateGas: f,
+			returnTxData: p
+		}
+	});
+	return s(a(m, h, g, _, await c.getEthereumAddress())), y;
+}, u = async (e, t, n, r, i = !0, a = !1, o) => l(e, t, [n], [r], i, a, o);
 //#endregion
-export { A as hinkalDeposit, j as hinkalDepositForOther };
+export { c as hinkalDeposit, u as hinkalDepositForOther };

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(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../types/external-action.types.cjs`),s=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/addresses.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(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),h=require(`../../constants/addresses.constants.cjs`),g=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),_=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`);const v=require(`../../functions/private-wallet/emporium.helpers.cjs`),y=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),b=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),x=require(`../../API/deposit-and-withdraw-status-calls.cjs`),S=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var C=async(c,u,d,p,m,g,S,C,w,T,E)=>{if(p.length===0)throw Error(`No recipients to bridge`);let D=d.erc20TokenAddress,{contractData:O}=e.networkRegistry[u],{emporiumAddress:k}=O;if(!k)throw Error(`No Emporium Address`);let A=h.SWAP_ROUTER_ADDRESSES[o.ExternalActionId.Lifi][u];if(!A)throw Error(`LIFI not configured for chain ${u}`);let j=await c.getRandomRelay(u);if(!j)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=await c.getEthereumAddressByChain(u),N=i.getCurrentTimeInSeconds().toString(),P=c.generateProofRemotely?5:1,F=[];for(let e=0;e<p.length;e+=P){let r=p.slice(e,e+P),i=await Promise.all(r.map(async({utxo:e,nativeUtxo:r,bridgeAmount:i,quote:s,temporarySubAccount:p,recipientAddress:h})=>{await l.API.addTemporaryWalletNonce(u,g,p.index);let b=s.nativeFee>0n&&!n.caseInsensitiveEqual(D,t.zeroAddress),x=[D],S=[-e.amount],C=[!1],w=new a.Utxo({amount:0n,erc20TokenAddress:D,nullifyingKey:c.userKeys.getShieldedPrivateKey(),timeStamp:N,...e.isNewStyle?{spendingPublicKey:c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),E=[[e,w]],O=[[w]];if(b&&r){let e=new a.Utxo({amount:0n,erc20TokenAddress:t.zeroAddress,nullifyingKey:c.userKeys.getShieldedPrivateKey(),timeStamp:N,...r.isNewStyle?{spendingPublicKey:c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}});x.push(t.zeroAddress),S.push(-r.amount),C.push(!1),E.push([r,e]),O.push([e])}let P=v.createLifiBridgeOps(c,u,p.ethAddress,A,D,e.amount,i,s),F=await _.calculateModifiedFeeStructure(u,d,i,m),I=f.constructAdminData(T,u,x,[-e.amount],M),[{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B},V]=await Promise.all([y.constructZkProof(c.merkleTreeHinkalByChain[u],E,O,c.userKeys,o.ExternalActionId.Emporium,k,P,c.generateProofRemotely,F,j??t.zeroAddress,u,C,void 0,void 0,p.privateKey),v.getAuthorizationDataIfNeeded(u,p.privateKey)]);return{zkCallData:L,dimData:z,circomData:R,commitmentValidationData:B,authorizationData:V,recipientAddress:h,adminData:I}}));F.push(...i)}await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:u,hashedEthereumAddress:g,phase:s.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let I=await b.transactCallRelayerBatch(u,F,g,C,w,E);return await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:u,hashedEthereumAddress:g,phase:s.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:I}),I},w=async(e,r,i,a,s,l,f,_,y=!0)=>{let b=r.erc20TokenAddress,x=u.validateAndGetChainId([r]),w=_?c.hashString(_):void 0,T=c.hashEthereumAddress(await e.getEthereumAddressByChain(x)),E=h.SWAP_ROUTER_ADDRESSES[o.ExternalActionId.Lifi][x];if(!E)throw Error(`LIFI router not configured`);let D;if(s)D=s;else{let n=i[0],r=v.createLifiBridgeOps(e,x,n.temporarySubAccount.ethAddress,E,b,n.bridgeAmount,n.bridgeAmount,n.quote).map(e=>g.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,x));D=await p.getFeeStructure(x,b,[b],o.ExternalActionId.Emporium,r,t.PAY_SEND_VARIABLE_RATE)}let O={feeToken:D.feeToken,flatFee:0n,variableRate:0n},k=i.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!n.caseInsensitiveEqual(b,t.zeroAddress),A=i.map(e=>e.bridgeAmount),j=i.map(e=>e.recipientAddress),{userDepositedUtxos:M,statusId:N,depositTxHash:P}=await S.hinkalDepositOnChainUtxos(e,x,r,A,j,D,T,y),F=[];if(k){let n=await d.getErc20TokenFromAPI(x,t.zeroAddress);if(!n)throw Error(`No native token`);let{userDepositedUtxos:r}=await S.hinkalDepositOnChainUtxos(e,x,n,i.map(e=>e.quote.nativeFee),j,O,T,y);F=r}return await m.waitForDepositedUtxosInMerkleTree(e,x,[...M,...F]),{depositTxHash:P,scheduleId:await C(e,x,r,i.map((e,t)=>({...e,utxo:M[t].utxo,nativeUtxo:k?F[t]?.utxo:void 0})),D,T,N,a,l,f,w)}};exports.hinkalDepositAndBridge=w;
+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.d.ts

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
-import { AdminTransactionType, BridgeRecipient, DepositAndSendExtendedResult, ERC20Token } from '../../types';
+import { AdminTransactionType, DepositAndSendExtendedResult, ERC20Token, PublicBridgeRecipient } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<DepositAndSendExtendedResult>;
+export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: PublicBridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<DepositAndSendExtendedResult>;

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

@@ -1,120 +1,124 @@
-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 { ExternalActionId as s } from "../../types/external-action.types.mjs";
-import { DepositAndWithdrawPhase as c } from "../../types/scheduled-transactions.types.mjs";
-import "../../types/index.mjs";
-import { hashEthereumAddress as l, hashString as u } from "../../functions/utils/addresses.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 { calculateModifiedFeeStructure as y } from "../../functions/utils/fees.utils.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 { 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 { createLifiBridgeOps as b, getAuthorizationDataIfNeeded as x } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructZkProof as S } from "../../functions/snarkjs/constructGeneralZkProof.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 "../../functions/index.mjs";
+import { prepareDepositOnChainUtxos as D, submitDepositOnChainUtxos as O } from "./hinkalDepositOnChainUtxos.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
-var E = async (t, l, u, f, p, h, g, v, T, E, D) => {
-	if (f.length === 0) throw Error("No recipients to bridge");
-	let O = u.erc20TokenAddress, { contractData: k } = e[l], { emporiumAddress: A } = k;
-	if (!A) throw Error("No Emporium Address");
-	let j = _[s.Lifi][l];
-	if (!j) throw Error(`LIFI not configured for chain ${l}`);
-	let M = await t.getRandomRelay(l);
-	if (!M) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let N = await t.getEthereumAddressByChain(l), P = a().toString(), F = t.generateProofRemotely ? 5 : 1, I = [];
-	for (let e = 0; e < f.length; e += F) {
-		let i = f.slice(e, e + F), a = await Promise.all(i.map(async ({ utxo: e, nativeUtxo: i, bridgeAmount: a, quote: c, temporarySubAccount: f, recipientAddress: g }) => {
-			await d.addTemporaryWalletNonce(l, h, f.index);
-			let _ = c.nativeFee > 0n && !r(O, n), v = [O], C = [-e.amount], w = [!1], T = new o({
-				amount: 0n,
-				erc20TokenAddress: O,
-				nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-				timeStamp: P,
-				...e.isNewStyle ? {
-					spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-					isNewStyle: !0
-				} : { isNewStyle: !1 }
-			}), D = [[e, T]], k = [[T]];
-			if (_ && i) {
-				let e = new o({
-					amount: 0n,
-					erc20TokenAddress: n,
-					nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-					timeStamp: P,
-					...i.isNewStyle ? {
-						spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-						isNewStyle: !0
-					} : { isNewStyle: !1 }
+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: B,
+					amountChanges: V,
+					externalAddress: O,
+					externalActionId: u.Emporium,
+					externalActionMetadata: i,
+					onChainCreation: H,
+					feeStructure: L,
+					relay: A ?? r,
+					messageSeed: t,
+					inputUtxos: U,
+					useBlockedUtxos: !0,
+					speculative: T && {
+						pendingLeaves: T,
+						inputUtxos: U.map((e) => e.map(v))
+					},
+					subAccountPrivateKey: D.privateKey,
+					emporiumOps: W,
+					submit: { mode: d.ProofOnly }
 				});
-				v.push(n), C.push(-i.amount), w.push(!1), D.push([i, e]), k.push([e]);
-			}
-			let F = b(t, l, f.ethAddress, j, O, e.amount, a, c), I = await y(l, u, a, p), L = m(E, l, v, [-e.amount], N), [{ zkCallData: R, circomData: z, dimData: B, commitmentValidationData: V }, H] = await Promise.all([S(t.merkleTreeHinkalByChain[l], D, k, t.userKeys, s.Emporium, A, F, t.generateProofRemotely, I, M ?? n, l, w, void 0, void 0, f.privateKey), x(l, f.privateKey)]);
+			})(), x(c, D.privateKey)]), { zkCallData: J, circomData: Y, dimData: X, commitmentValidationData: Z, tronProofSignature: Q } = K;
 			return {
-				zkCallData: R,
-				dimData: B,
-				circomData: z,
-				commitmentValidationData: V,
-				authorizationData: H,
-				recipientAddress: g,
-				adminData: L
+				zkCallData: J,
+				dimData: X,
+				circomData: Y,
+				commitmentValidationData: Z,
+				authorizationData: q,
+				recipientAddress: N,
+				adminData: G,
+				tronProofSignature: Q,
+				destinationChainId: P,
+				destinationTokenAddress: F,
+				destinationTokenAmount: w.expectedAmount.toString()
 			};
 		}));
-		I.push(...a);
+		P.push(...l);
 	}
-	await w({
-		id: g,
-		chainId: l,
-		hashedEthereumAddress: h,
-		phase: c.BEFORE_SCHEDULE_WITHDRAW
-	});
-	let L = await C(l, I, h, v, T, D);
-	return await w({
-		id: g,
-		chainId: l,
-		hashedEthereumAddress: h,
-		phase: c.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: L
-	}), L;
-}, D = async (e, i, a, o, c, d, m, y, x = !0) => {
-	let S = i.erc20TokenAddress, C = f([i]), w = y ? u(y) : void 0, D = l(await e.getEthereumAddressByChain(C)), O = _[s.Lifi][C];
-	if (!O) throw Error("LIFI router not configured");
-	let k;
-	if (c) k = c;
-	else {
-		let n = a[0], r = b(e, C, n.temporarySubAccount.ethAddress, O, S, n.bridgeAmount, n.bridgeAmount, n.quote).map((e) => v(e, n.temporarySubAccount.ethAddress, C));
-		k = await h(C, S, [S], s.Emporium, r, t);
-	}
-	let A = {
-		feeToken: k.feeToken,
-		flatFee: 0n,
-		variableRate: 0n
-	}, j = a.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !r(S, n), M = a.map((e) => e.bridgeAmount), N = a.map((e) => e.recipientAddress), { userDepositedUtxos: P, statusId: F, depositTxHash: I } = await T(e, C, i, M, N, k, D, x), L = [];
-	if (j) {
-		let t = await p(C, n);
-		if (!t) throw Error("No native token");
-		let { userDepositedUtxos: r } = await T(e, C, t, a.map((e) => e.quote.nativeFee), N, A, D, x);
-		L = r;
+	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 g(e, C, [...P, ...L]), {
-		depositTxHash: I,
-		scheduleId: await E(e, C, i, a.map((e, t) => ({
-			...e,
-			utxo: P[t].utxo,
-			nativeUtxo: j ? L[t]?.utxo : void 0
-		})), k, D, F, o, d, m, w)
+	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 { D as hinkalDepositAndBridge };
+export { M 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(`../../types/external-action.types.cjs`),s=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/addresses.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../API/deposit-and-withdraw-status-calls.cjs`),v=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var y=async(o,c,u,f,p,v,y,b,x,S,C,w)=>{let T=e.isTronLike(c);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let E=u.erc20TokenAddress,[D,O]=await Promise.all([o.getRandomRelay(c),o.getEthereumAddressByChain(c)]);if(!D)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=i.getCurrentTimeInSeconds().toString(),A=o.generateProofRemotely&&!T?5:1,j=[],M=l.addressToHexFormat(O);for(let e=0;e<f.length;e+=A){let r=f.slice(e,e+A),i=await Promise.all(r.map(async({recipientAddress:r,utxo:i},s)=>{let f=e+s,g=l.addressToHexFormat(r),_=new a.Utxo({amount:0n,erc20TokenAddress:E,nullifyingKey:o.userKeys.getShieldedPrivateKey(),timeStamp:k,...i.isNewStyle?{spendingPublicKey:o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),y=[[n.caseInsensitiveEqual(i.erc20TokenAddress,E)?i:a.Utxo.createFrom(i,{erc20TokenAddress:E}),_]],b=[[_]],x={externalActionId:0n,externalAddress:g,externalActionMetadata:`0x00`},S=d.constructAdminData(C,c,[E],[-i.amount],M),w=await m.calculateModifiedFeeStructure(c,u,p[f],v),{zkCallData:O,circomData:A,dimData:j,commitmentValidationData:N}=await h.constructZkProof(o.merkleTreeHinkalByChain[c],y,b,o.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,o.generateProofRemotely,w,D??t.zeroAddress,c);return{zkCallData:O,dimData:j,circomData:A,commitmentValidationData:N,adminData:S,recipientAddress:r,tronProofSignature:await l.reorderZkCallData(T,O,j,A)}}));j.push(...i)}await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:c,hashedEthereumAddress:y,phase:s.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let N=await g.transactCallRelayerBatch(c,j,y,x,S,w);return await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:c,hashedEthereumAddress:y,phase:s.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:N}),N},b=async(e,t,n,r,i,a,s,d,m,h=!0)=>{let g=u.validateAndGetChainId([t]),_=m?c.hashString(m):void 0,b=t.erc20TokenAddress,x=c.hashEthereumAddress(l.addressToHexFormat(await e.getEthereumAddressByChain(g))),S=a??await f.getFeeStructure(g,b,[b],o.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await v.hinkalDepositOnChainUtxos(e,g,t,n,r,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(e,g,C),{depositTxHash:T,scheduleId:await y(e,g,t,C,n,S,x,w,i,s,d,_)}};exports.hinkalDepositAndWithdraw=b;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../utxo/Utxo.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../../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,o,s,l,u,f,m,h)=>{if(l.length===0)throw Error(`userDepositedUtxos must not be empty`);let _=s.erc20TokenAddress,[v,y]=await Promise.all([e.getRandomRelay(o),e.getEthereumAddressByChain(o)]);if(!v)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let b=e.generateProofRemotely?5:1,x=[],S=a.addressToHexFormat(y);for(let r=0;r<l.length;r+=b){let s=l.slice(r,r+b),y=await Promise.all(s.map(async({recipientAddress:s,utxo:l},y)=>{let b=r+y,x=a.addressToHexFormat(s),C=n.caseInsensitiveEqual(l.erc20TokenAddress,_)?l:i.Utxo.createFrom(l,{erc20TokenAddress:_}),w=d.constructAdminData(f,o,[_],[-l.amount],S),{zkCallData:T,circomData:E,dimData:D,commitmentValidationData:O,tronProofSignature:k}=await g.hinkalTransact(e,{chainId:o,erc20Addresses:[_],amountChanges:[-l.amount],externalAddress:x,feeStructure:u,relay:v??t.zeroAddress,inputUtxos:[[C]],useBlockedUtxos:!0,speculative:h&&{pendingLeaves:h,inputUtxos:[[p.toSpeculativeUtxo(C)]]},submit:{mode:c.SubmitMode.ProofOnly},skipLock:!0});return{zkCallData:T,dimData:D,circomData:E,commitmentValidationData:O,adminData:w,recipientAddress:s,tronProofSignature:k,destinationChainId:m?.chainId,destinationTokenAddress:m?.tokenAddress,destinationTokenAmount:m?.tokenAmounts?.[b]}}));x.push(...y)}return x},b=async(e,t,n,r,i)=>{let{chainId:a,hashedEthereumAddress:o,feeStructure:s,action:c,destination:l}=i,{txCompletionTime:u,ref:d,hashedDashboardAccountId:f,preEstimateGas:p}=i,m=n.map(e=>e+s.flatFee),g=await _.prepareDepositOnChainUtxos(e,a,[t],[m]),{depositedUtxos:v,pendingLeaves:b}=g,x=v[0].map((e,t)=>({recipientAddress:r[t],utxo:e})),[S,C]=await Promise.all([_.submitDepositOnChainUtxos(e,g,p),y(e,a,t,x,s,c,l,b)]);return{depositTxHash:S,scheduleId:await h.transactCallRelayerBatch(a,C,o,u,d,f,S)}},x=async(e,t,n,r,i)=>{let{chainId:o,ethereumAddress:s,hashedEthereumAddress: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:o,erc20Addresses:[t.erc20TokenAddress],amountChanges:[w],externalAddress:s,selfOutputAmounts:C,createBlockedUtxos:!0,forceEmptyUtxos:!0,submit:{mode:c.SubmitMode.ProofOnly}}),E=T.circomData.encryptedOutputs?.[0];if(!E||E.length!==C.length)throw Error(`Deposit proof is missing encryptedOutputs for the deposited UTXOs`);let D=E.map((t,n)=>({recipientAddress:r[n],utxo: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()=>{a.swapTronBCoordinate(T.zkCallData);let n=await m.transactCallDirectTron(e,o,w,t,T.zkCallData,T.circomData,T.dimData,void 0,void 0,S,T.tronProofSignature);if(!n)throw Error(`Deposit transaction hash not found`);return n})(),y(e,o,t,D,d,f,p,O)]);return{depositTxHash:k,scheduleId:await h.transactCallRelayerBatch(o,A,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=a.addressToHexFormat(await t.getEthereumAddressByChain(_)),S={chainId:_,ethereumAddress:y,hashedEthereumAddress:o.hashEthereumAddress(y),feeStructure:u??await f.getFeeStructure(_,v,[v],s.ExternalActionId.Transact,[],25n),txCompletionTime:c,ref:d,action:p,hashedDashboardAccountId:m?o.hashString(m):void 0,preEstimateGas:h,destination:g};if(!e.isTronLike(_))return b(t,n,r,i,S);if(r.length>4)throw Error(`Tron supports at most 4 recipients per deposit - no circuit emits more outputs`);return x(t,n,r,i,S)};exports.hinkalDepositAndWithdraw=S;

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[], recipientAmounts: bigint[], 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, 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>;