@hinkal/common 0.3.1 → 0.3.3

package/common/src/data-structures/Hinkal/hinkalBridgePrivateToPrivate.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(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../types/external-action.types.cjs`),s=require(`../../types/token.types.cjs`),c=require(`../../functions/utils/addresses.cjs`),l=require(`../../error-handling/logger.cjs`),u=require(`../../API/API.cjs`),d=require(`../../functions/utils/erc20tokenFunctions.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../constants/addresses.constants.cjs`),m=require(`../../constants/bridging.constants.cjs`),h=require(`../../constants/tx-confirmation.constants.cjs`);require(`../../constants/index.cjs`);const g=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),_=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),v=require(`../../functions/utils/publicBalance.utils.cjs`),y=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),b=require(`../../functions/utils/fees.utils.cjs`),x=require(`../../functions/utils/tx-confirmation.utils.cjs`),S=require(`../../functions/utils/temp-wallet.utils.cjs`),C=require(`../../functions/private-wallet/emporium.helpers.cjs`),w=require(`../../functions/web3/lifiAPI.cjs`);var T=async(n,i,a,l,f,m,h)=>{let{chainId:g}=i,_=a.chainId,v=i.erc20TokenAddress,y=p.SWAP_ROUTER_ADDRESSES[o.ExternalActionId.Lifi][g];if(!y)throw Error(`LIFI not configured for chain ${g}`);let b=r.randomBigInt(6),{privateKey:x,ethAddress:T}=S.deriveTempWallet(n,g,b),{lifiDataValue:E,outSwapAmountValue:D,extraNativeTokenFee:O}=await w.getLifiPrice(i,a,l,f,T,T),k={calldata:E,expectedAmount:D,nativeFee:O},A=r.getAmountInWei(i,l),j=S.buildTempSubAccount(b,x,T),M=c.hashEthereumAddress(await n.getEthereumAddressByChain(g));await Promise.all([u.API.addTemporaryWalletNonce(g,M,Number(b),s.TemporaryWalletRecoveryDestination.Confidential),u.API.addTemporaryWalletNonce(_,M,Number(b),s.TemporaryWalletRecoveryDestination.Confidential)]);let N=t.caseInsensitiveEqual(v,e.zeroAddress),P=k.nativeFee>0n&&!N,F=N?A+k.nativeFee:A,I=[i],L=[-F];if(P){let t=await d.getErc20TokenFromAPI(g,e.zeroAddress);if(!t)throw Error(`Native token not found for bridge fee`);I.push(t),L.push(-k.nativeFee)}let R=C.createLifiBridgeOps(n,g,T,y,v,F,A,k),z=I.map((e,t)=>({token:e,amount:L[t]}));return{nonce:b,tempSubAccount:j,sourceTxHash:await n.actionPrivateWallet(g,I,L,L.map(()=>!1),R,z,j,m??v,void 0,void 0,!1,void 0,h,void 0),quote:k}},E=async(e,t,n,r,i)=>{let o=BigInt(Math.round(i*m.SLIPPAGE_SCALING_FACTOR)),s=r.expectedAmount-r.expectedAmount*o/BigInt(m.SLIPPAGE_SCALING_FACTOR),c=s>0n?s:1n,l=Date.now()+m.BRIDGE_ARRIVAL_TIMEOUT_MS;for(;Date.now()<l;){let r=await v.getPublicBalanceByTokenAddress(e,t,n);if(r!==null&&r>=c)return r;await a.waitLittle(m.BRIDGE_ARRIVAL_POLL_INTERVAL_MS)}throw Error(`Bridge did not land on destination temp wallet ${t} on chain ${e} within timeout.`)},D=async(t,r,a,s,c,l)=>{let u=r.chainId,d=r.erc20TokenAddress,p=a.ethAddress;if(!p)throw Error(`Missing temp wallet address for bridge shield`);let m=C.createTransaferEmporiumOpsBatch(t,u,[d],[s]),v=await b.calculateModifiedFeeStructure(u,r,s,await f.getFeeStructure(u,d,[d],o.ExternalActionId.Emporium,m.map(e=>g.convertEmporiumOpToCallInfo(e,p,u)),e.PAY_SEND_VARIABLE_RATE)),S=s-b.calculateTotalFee(s,v);if(S<=0n)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let w,T;if(`recipientInfo`in c)w=c.recipientInfo;else{let e=t.userKeys.getClaimableSignatureFromNonce(c.claimableNonce),n=new i.UserKeys(e);T={signature:e,keys:n,ethAddress:c.recipientEthAddress},w=_.getRecipientInfoFromUserKeys(n)}let E=await t.proxyToPrivate([r],[S],a,w,v.feeToken,v,l),D;if(T){let e=await x.waitForEthereumTransactionConfirmation(u,E,{evmTimeoutMs:h.RELAYER_TX_CONFIRMATION_TIMEOUT});if(!e)throw Error(`Could not fetch receipt for bridge shield tx ${E}`);let[n]=y.getUtxosFromReceipt(e,t,u,d,T.keys.getShieldedPrivateKey());if(!n)throw Error(`Could not find recipient UTXO in bridge shield tx`);D={chainId:u,senderAddress:await t.getEthereumAddressByChain(u),recipientAddress:T.ethAddress,claimableSignature:T.signature,utxo:n}}return{destTxHash:E,pendingEnclaveUtxo:D}},O=async(e,t,n,r,i,a=m.DEFAULT_BRIDGING_SLIPPAGE_DECIMAL,o,s)=>{let{nonce:d,tempSubAccount:f,sourceTxHash:p,quote:h}=await T(e,t,n,r,a,o,s),g=f.ethAddress;if(!g)throw Error(`Missing temp wallet address for bridge`);let{destTxHash:_,pendingEnclaveUtxo:v}=await D(e,n,f,await E(n.chainId,g,n.erc20TokenAddress,h,a),i,s),y=c.hashEthereumAddress(await e.getEthereumAddressByChain(n.chainId)),b=[t.chainId,n.chainId];return(await Promise.allSettled(b.map(e=>u.API.removeTemporaryWalletNonce(e,y,Number(d))))).forEach((e,t)=>{e.status===`rejected`&&l.Logger.error(`Failed to remove temp-wallet nonce on chain ${b[t]}`,e.reason)}),{sourceTxHash:p,destTxHash:_,pendingEnclaveUtxo:v}};exports.hinkalBridgePrivateToPrivate=O;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/token.types.cjs`),l=require(`../../API/API.cjs`),u=require(`../../error-handling/logger.cjs`),d=require(`../../functions/utils/erc20tokenFunctions.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/private-wallet/emporium.helpers.cjs`),m=require(`../../constants/addresses.constants.cjs`),h=require(`../../constants/bridging.constants.cjs`),g=require(`../../constants/tx-confirmation.constants.cjs`);require(`../../constants/index.cjs`);const _=require(`../../functions/utils/tx-confirmation.utils.cjs`),v=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),y=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),b=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),x=require(`../../functions/utils/publicBalance.utils.cjs`),S=require(`../../functions/utils/fees.utils.cjs`),C=require(`../../functions/utils/temp-wallet.utils.cjs`),w=require(`../../functions/web3/lifiAPI.cjs`);var T=async(n,i,a,u,f,h,g)=>{let{chainId:_}=i,v=a.chainId,y=i.erc20TokenAddress,b=m.SWAP_ROUTER_ADDRESSES[s.ExternalActionId.Lifi][_];if(!b)throw Error(`LIFI not configured for chain ${_}`);let x=r.randomBigInt(6),{privateKey:S,ethAddress:T}=C.deriveTempWallet(n,_,x),{lifiDataValue:E,outSwapAmountValue:D,extraNativeTokenFee:O}=await w.getLifiPrice(i,a,u,f,T,T),k={calldata:E,expectedAmount:D,nativeFee:O},A=r.getAmountInWei(i,u),j=C.buildTempSubAccount(x,S,T),M=o.hashEthereumAddress(await n.getEthereumAddressByChain(_));await Promise.all([l.API.addTemporaryWalletNonce(_,M,Number(x),c.TemporaryWalletRecoveryDestination.Confidential),l.API.addTemporaryWalletNonce(v,M,Number(x),c.TemporaryWalletRecoveryDestination.Confidential)]);let N=t.caseInsensitiveEqual(y,e.zeroAddress),P=k.nativeFee>0n&&!N,F=N?A+k.nativeFee:A,I=[i],L=[-F];if(P){let t=await d.getErc20TokenFromAPI(_,e.zeroAddress);if(!t)throw Error(`Native token not found for bridge fee`);I.push(t),L.push(-k.nativeFee)}let R=p.createLifiBridgeOps(n,_,T,b,y,F,A,k),z=I.map((e,t)=>({token:e,amount:L[t]}));return{nonce:x,tempSubAccount:j,sourceTxHash:await n.actionPrivateWallet(_,I,L,L.map(()=>!1),R,z,j,h??y,void 0,void 0,!1,void 0,g,void 0),quote:k}},E=async(e,t,n,r,i)=>{let o=BigInt(Math.round(i*h.SLIPPAGE_SCALING_FACTOR)),s=r.expectedAmount-r.expectedAmount*o/BigInt(h.SLIPPAGE_SCALING_FACTOR),c=s>0n?s:1n,l=Date.now()+h.BRIDGE_ARRIVAL_TIMEOUT_MS;for(;Date.now()<l;){let r=await x.getPublicBalanceByTokenAddress(e,t,n);if(r!==null&&r>=c)return r;await a.waitLittle(h.BRIDGE_ARRIVAL_POLL_INTERVAL_MS)}throw Error(`Bridge did not land on destination temp wallet ${t} on chain ${e} within timeout.`)},D=async(t,r,a,o,c,l)=>{let u=r.chainId,d=r.erc20TokenAddress,m=a.ethAddress;if(!m)throw Error(`Missing temp wallet address for bridge shield`);let h=p.createTransaferEmporiumOpsBatch(t,u,[d],[o]),x=await S.calculateModifiedFeeStructure(u,r,o,await f.getFeeStructure(u,d,[d],s.ExternalActionId.Emporium,h.map(e=>b.convertEmporiumOpToCallInfo(e,m,u)),e.PAY_SEND_VARIABLE_RATE)),C=o-S.calculateTotalFee(o,x);if(C<=0n)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let w,T;if(`recipientInfo`in c)w=c.recipientInfo;else{let e=t.userKeys.getClaimableSignatureFromNonce(c.claimableNonce),n=new i.UserKeys(e);T={signature:e,keys:n,ethAddress:c.recipientEthAddress},w=y.getRecipientInfoFromUserKeys(n)}let E=await t.proxyToPrivate([r],[C],a,w,x.feeToken,x,l),D;if(T){let e=await _.waitForEthereumTransactionConfirmation(u,E,{evmTimeoutMs:g.RELAYER_TX_CONFIRMATION_TIMEOUT});if(!e)throw Error(`Could not fetch receipt for bridge shield tx ${E}`);let[n]=v.getUtxosFromReceipt(e,t,u,d,T.keys.getShieldedPrivateKey());if(!n)throw Error(`Could not find recipient UTXO in bridge shield tx`);D={chainId:u,senderAddress:await t.getEthereumAddressByChain(u),recipientAddress:T.ethAddress,claimableSignature:T.signature,utxo:n}}return{destTxHash:E,pendingEnclaveUtxo:D,shieldedAmount:C}},O=async(e,t,n,r,i,a=h.DEFAULT_BRIDGING_SLIPPAGE_DECIMAL,s,c)=>{let{nonce:d,tempSubAccount:f,sourceTxHash:p,quote:m}=await T(e,t,n,r,a,s,c),g=f.ethAddress;if(!g)throw Error(`Missing temp wallet address for bridge`);let{destTxHash:_,pendingEnclaveUtxo:v,shieldedAmount:y}=await D(e,n,f,await E(n.chainId,g,n.erc20TokenAddress,m,a),i,c),b=o.hashEthereumAddress(await e.getEthereumAddressByChain(n.chainId)),x=[t.chainId,n.chainId];return(await Promise.allSettled(x.map(e=>l.API.removeTemporaryWalletNonce(e,b,Number(d))))).forEach((e,t)=>{e.status===`rejected`&&u.Logger.error(`Failed to remove temp-wallet nonce on chain ${x[t]}`,e.reason)}),{sourceTxHash:p,destTxHash:_,pendingEnclaveUtxo:v,destinationTokenAmount:y.toString()}};exports.hinkalBridgePrivateToPrivate=O;

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

@@ -4,103 +4,105 @@ import { transactionErrorCodes as r } from "../../error-handling/error-codes.con
 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 { ExternalActionId as c } from "../../types/external-action.types.mjs";
-import { TemporaryWalletRecoveryDestination as l } from "../../types/token.types.mjs";
-import { hashEthereumAddress as u } from "../../functions/utils/addresses.mjs";
-import { Logger as d } from "../../error-handling/logger.mjs";
-import { API as f } from "../../API/API.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 { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { SWAP_ROUTER_ADDRESSES as h } from "../../constants/addresses.constants.mjs";
-import { BRIDGE_ARRIVAL_POLL_INTERVAL_MS as g, BRIDGE_ARRIVAL_TIMEOUT_MS as _, DEFAULT_BRIDGING_SLIPPAGE_DECIMAL as v, SLIPPAGE_SCALING_FACTOR as y } from "../../constants/bridging.constants.mjs";
-import { RELAYER_TX_CONFIRMATION_TIMEOUT as b } from "../../constants/tx-confirmation.constants.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 { convertEmporiumOpToCallInfo as x } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { getRecipientInfoFromUserKeys as S } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-import { getPublicBalanceByTokenAddress as C } from "../../functions/utils/publicBalance.utils.mjs";
+import { waitForEthereumTransactionConfirmation as C } from "../../functions/utils/tx-confirmation.utils.mjs";
 import { getUtxosFromReceipt as w } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
-import { calculateModifiedFeeStructure as T, calculateTotalFee as E } from "../../functions/utils/fees.utils.mjs";
-import { waitForEthereumTransactionConfirmation as D } from "../../functions/utils/tx-confirmation.utils.mjs";
-import { buildTempSubAccount as O, deriveTempWallet as k } from "../../functions/utils/temp-wallet.utils.mjs";
-import { createLifiBridgeOps as A, createTransaferEmporiumOpsBatch as j } from "../../functions/private-wallet/emporium.helpers.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";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalBridgePrivateToPrivate.ts
-var N = async (e, r, o, s, d, m, g) => {
-	let { chainId: _ } = r, v = o.chainId, y = r.erc20TokenAddress, b = h[c.Lifi][_];
-	if (!b) throw Error(`LIFI not configured for chain ${_}`);
-	let x = a(6), { privateKey: S, ethAddress: C } = k(e, _, x), { lifiDataValue: w, outSwapAmountValue: T, extraNativeTokenFee: E } = await M(r, o, s, d, C, C), D = {
-		calldata: w,
-		expectedAmount: T,
-		nativeFee: E
-	}, j = i(r, s), N = O(x, S, C), P = u(await e.getEthereumAddressByChain(_));
-	await Promise.all([f.addTemporaryWalletNonce(_, P, Number(x), l.Confidential), f.addTemporaryWalletNonce(v, P, Number(x), l.Confidential)]);
-	let F = n(y, t), I = D.nativeFee > 0n && !F, L = F ? j + D.nativeFee : j, R = [r], z = [-L];
+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(_, t);
+		let e = await p(v, t);
 		if (!e) throw Error("Native token not found for bridge fee");
-		R.push(e), z.push(-D.nativeFee);
+		R.push(e), z.push(-O.nativeFee);
 	}
-	let B = A(e, _, C, b, y, L, j, D), V = R.map((e, t) => ({
+	let B = h(e, v, w, x, b, L, k, O), V = R.map((e, t) => ({
 		token: e,
 		amount: z[t]
 	}));
 	return {
-		nonce: x,
+		nonce: S,
 		tempSubAccount: N,
-		sourceTxHash: await e.actionPrivateWallet(_, R, z, z.map(() => !1), B, V, N, m ?? y, void 0, void 0, !1, void 0, g, void 0),
-		quote: D
+		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
 	};
 }, P = async (e, t, n, r, i) => {
-	let a = BigInt(Math.round(i * y)), o = r.expectedAmount - r.expectedAmount * a / BigInt(y), c = o > 0n ? o : 1n, l = Date.now() + _;
+	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 C(e, t, n);
+		let r = await D(e, t, n);
 		if (r !== null && r >= c) return r;
-		await s(g);
+		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, l) => {
+}, 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 = j(t, u, [d], [a]), h = await T(u, n, a, await m(u, d, [d], c.Emporium, p.map((e) => x(e, f, u)), e)), g = a - E(a, h);
-	if (g <= 0n) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let _, v;
-	if ("recipientInfo" in s) _ = s.recipientInfo;
+	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);
-		v = {
+		y = {
 			signature: e,
 			keys: n,
 			ethAddress: s.recipientEthAddress
-		}, _ = S(n);
+		}, v = T(n);
 	}
-	let y = await t.proxyToPrivate([n], [g], i, _, h.feeToken, h, l), C;
-	if (v) {
-		let e = await D(u, y, { evmTimeoutMs: b });
-		if (!e) throw Error(`Could not fetch receipt for bridge shield tx ${y}`);
-		let [n] = w(e, t, u, d, v.keys.getShieldedPrivateKey());
+	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");
-		C = {
+		x = {
 			chainId: u,
 			senderAddress: await t.getEthereumAddressByChain(u),
-			recipientAddress: v.ethAddress,
-			claimableSignature: v.signature,
+			recipientAddress: y.ethAddress,
+			claimableSignature: y.signature,
 			utxo: n
 		};
 	}
 	return {
-		destTxHash: y,
-		pendingEnclaveUtxo: C
+		destTxHash: b,
+		pendingEnclaveUtxo: x,
+		shieldedAmount: _
 	};
-}, I = async (e, t, n, r, i, a = v, o, s) => {
-	let { nonce: c, tempSubAccount: l, sourceTxHash: p, quote: m } = await N(e, t, n, r, a, o, s), h = l.ethAddress;
+}, 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: _ } = await F(e, n, l, await P(n.chainId, h, n.erc20TokenAddress, m, a), i, s), y = u(await e.getEthereumAddressByChain(n.chainId)), b = [t.chainId, n.chainId];
-	return (await Promise.allSettled(b.map((e) => f.removeTemporaryWalletNonce(e, y, Number(c))))).forEach((e, t) => {
-		e.status === "rejected" && d.error(`Failed to remove temp-wallet nonce on chain ${b[t]}`, e.reason);
+	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: _
+		pendingEnclaveUtxo: _,
+		destinationTokenAmount: v.toString()
 	};
 };
 //#endregion

package/common/src/data-structures/Hinkal/hinkalClaimUtxo.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(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getFeeStructure.cjs`),f=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);var m=async(m,h,g,_,v)=>{let y=l.validateAndGetChainId([h]),b=e.isTronLike(y),x=h.erc20TokenAddress,S=c.addressToHexFormat(await m.getEthereumAddressByChain(y));if(!n.caseInsensitiveEqual(x,g.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);let C=v?new i.UserKeys(v):new i.UserKeys(g.nullifyingKey,g.nullifyingKey);if(!g.nullifyingKey&&!v)throw Error(`Claimable UTXO nullifyingKey is missing`);let w=C.getShieldedPrivateKey();if(g.nullifyingKey&&g.nullifyingKey!==w)throw Error(`Claimable UTXO key mismatch`);let T=m.getRecipientInfo(),E=o.Utxo.createFrom(g,{nullifyingKey:w}),D=new o.Utxo({amount:0n,erc20TokenAddress:E.erc20TokenAddress,mintAddress:E.mintAddress,nullifyingKey:w,...E.isNewStyle?{spendingPublicKey:C.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),O=_??await d.getFeeStructure(y,x,[x],s.ExternalActionId.Transact);if(!n.caseInsensitiveEqual(O.feeToken,x))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let k=O.variableRate>0n?O.variableRate:t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(E.amount<=O.flatFee)throw Error(r.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let A=E.amount-O.flatFee,j=A*k/10000n,M=A-j;if(M<=0n)throw Error(r.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let N={feeToken:O.feeToken,flatFee:O.flatFee+j,variableRate:0n},P=[-E.amount],F=await m.getRandomRelay(y,!0);if(!F)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let I={externalActionId:0n,externalAddress:F??S,externalActionMetadata:`0x00`},L=[[E,D]],R=[],z=a.getCurrentTimeInSeconds().toString(),{outputUtxos:B}=u.outputUtxoProcessing(C,L[0],P[0],z,!0,T,M);R.push(B);let{zkCallData:V,circomData:H,dimData:U,commitmentValidationData:W}=await f.constructZkProof(m.merkleTreeHinkalByChain[y],L,R,C,I.externalActionId,I.externalAddress,I.externalActionMetadata,m.generateProofRemotely,N,F,y);return p.transactCallRelayer(y,V,U,H,W,void 0,void 0,void 0,await c.reorderZkCallData(b,V,U,H))};exports.hinkalClaimUtxo=m;
+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;

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

@@ -1,54 +1,46 @@
-import { isTronLike as e } from "../../constants/chains.constants.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE 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 { UserKeys as i } from "../crypto-keys/keys.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 { addressToHexFormat as c, reorderZkCallData as l } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
-import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { constructZkProof as p } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as m } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as e } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as t } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { UserKeys as r } from "../crypto-keys/keys.mjs";
+import { Utxo as i } from "../utxo/Utxo.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { SubmitMode as o } from "../../types/transact.types.mjs";
+import { validateAndGetChainId as s } from "../../functions/utils/token-check.utils.mjs";
+import { getFeeStructure as c } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hinkalTransact as l } from "./hinkalTransact.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalClaimUtxo.ts
-var h = async (h, g, _, v, y) => {
-	let b = u([g]), x = e(b), S = g.erc20TokenAddress, C = c(await h.getEthereumAddressByChain(b));
-	if (!n(S, _.erc20TokenAddress)) throw Error("Off-chain UTXO token mismatch");
-	let w = y ? new i(y) : new i(_.nullifyingKey, _.nullifyingKey);
-	if (!_.nullifyingKey && !y) throw Error("Claimable UTXO nullifyingKey is missing");
-	let T = w.getShieldedPrivateKey();
-	if (_.nullifyingKey && _.nullifyingKey !== T) throw Error("Claimable UTXO key mismatch");
-	let E = h.getRecipientInfo(), D = o.createFrom(_, { nullifyingKey: T }), O = new o({
-		amount: 0n,
-		erc20TokenAddress: D.erc20TokenAddress,
-		mintAddress: D.mintAddress,
-		nullifyingKey: T,
-		...D.isNewStyle ? {
-			spendingPublicKey: w.getSpendingKeyPair().pubSpendingBJJPoint,
-			isNewStyle: !0
-		} : { isNewStyle: !1 }
-	}), k = v ?? await f(b, S, [S], s.Transact);
-	if (!n(k.feeToken, S)) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
-	let A = k.variableRate > 0n ? k.variableRate : t;
-	if (D.amount <= k.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let j = D.amount - k.flatFee, M = j * A / 10000n, N = j - M;
-	if (N <= 0n) throw Error(r.RECIPIENT_AMOUNT_INVALID);
-	let P = {
-		feeToken: k.feeToken,
-		flatFee: k.flatFee + M,
+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);
+	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);
+	let C = b.amount - x.flatFee, w = C * S / 10000n, T = C - w;
+	if (T <= 0n) throw Error(n.RECIPIENT_AMOUNT_INVALID);
+	let E = {
+		feeToken: x.feeToken,
+		flatFee: x.flatFee + w,
 		variableRate: 0n
-	}, F = [-D.amount], I = await h.getRandomRelay(b, !0);
-	if (!I) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let L = {
-		externalActionId: 0n,
-		externalAddress: I ?? C,
-		externalActionMetadata: "0x00"
-	}, R = [[D, O]], z = [], B = a().toString(), { outputUtxos: V } = d(w, R[0], F[0], B, !0, E, N);
-	z.push(V);
-	let { zkCallData: H, circomData: U, dimData: W, commitmentValidationData: G } = await p(h.merkleTreeHinkalByChain[b], R, z, w, L.externalActionId, L.externalAddress, L.externalActionMetadata, h.generateProofRemotely, P, I, b);
-	return m(b, H, W, U, G, void 0, void 0, void 0, await l(x, H, W, U));
+	}, D = [-b.amount], O = await u.getRandomRelay(h, !0);
+	if (!O) throw Error(n.RELAYER_NOT_AVAILABLE);
+	return l(u, {
+		chainId: h,
+		erc20Addresses: [g],
+		amountChanges: D,
+		externalAddress: O,
+		feeStructure: E,
+		relay: O,
+		recipientAddress: [y],
+		recipientAmounts: [[T]],
+		inputUtxos: [[b]],
+		userKeys: _,
+		submit: { mode: o.Relayer }
+	});
 };
 //#endregion
-export { h as hinkalClaimUtxo };
+export { u as hinkalClaimUtxo };

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

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

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 { isValidPrivateAddress as t } from "../../functions/utils/addresses.mjs";
+import { addressToHexFormat as n } from "../../functions/utils/tron.utils.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, t, a, s = !0, c = !1) => {
+	let l = i(t);
+	return o(e, {
+		chainId: l,
+		erc20Addresses: t.map((e) => e.erc20TokenAddress),
+		amountChanges: a,
+		externalAddress: n(await e.getEthereumAddressByChain(l)),
+		submit: {
+			mode: r.Self,
+			erc20Tokens: t,
+			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((n, r) => {
+		if (!t(n)) 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 = n(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=n.caseInsensitiveEqual(D,t.zeroAddress),x=s.nativeFee>0n&&!b,S=[D],C=[-e.amount],w=[!1],E=new a.Utxo({amount:0n,erc20TokenAddress:D,nullifyingKey:c.userKeys.getShieldedPrivateKey(),timeStamp:N,...e.isNewStyle?{spendingPublicKey:c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),O=[[e,E]],P=[[E]];if(x&&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}});S.push(t.zeroAddress),C.push(-r.amount),w.push(!1),O.push([r,e]),P.push([e])}let F=v.createLifiBridgeOps(c,u,p.ethAddress,A,D,e.amount,i,s),I=await _.calculateModifiedFeeStructure(u,d,i,m),L=f.constructAdminData(T,u,S,[-e.amount],M),[{zkCallData:R,circomData:z,dimData:B,commitmentValidationData:V},H]=await Promise.all([y.constructZkProof(c.merkleTreeHinkalByChain[u],O,P,c.userKeys,o.ExternalActionId.Emporium,k,F,c.generateProofRemotely,I,j??t.zeroAddress,u,w,void 0,void 0,p.privateKey),v.getAuthorizationDataIfNeeded(u,p.privateKey)]);return{zkCallData:R,dimData:B,circomData:z,commitmentValidationData:V,authorizationData:H,recipientAddress:h,adminData:L}}));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,O=n.caseInsensitiveEqual(b,t.zeroAddress);if(s)D=s;else{let n=i[0],r=O?n.bridgeAmount+n.quote.nativeFee:n.bridgeAmount,a=v.createLifiBridgeOps(e,x,n.temporarySubAccount.ethAddress,E,b,r,n.bridgeAmount,n.quote).map(e=>g.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,x));D=await p.getFeeStructure(x,b,[b],o.ExternalActionId.Emporium,a,t.PAY_SEND_VARIABLE_RATE)}let k={feeToken:D.feeToken,flatFee:0n,variableRate:0n},A=i.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!n.caseInsensitiveEqual(b,t.zeroAddress),j=i.map(e=>O?e.bridgeAmount+e.quote.nativeFee:e.bridgeAmount),M=i.map(e=>e.recipientAddress),{userDepositedUtxos:N,statusId:P,depositTxHash:F}=await S.hinkalDepositOnChainUtxos(e,x,r,j,M,D,T,y),I=[];if(A){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),M,k,T,y);I=r}return await m.waitForDepositedUtxosInMerkleTree(e,x,[...N,...I]),{depositTxHash:F,scheduleId:await C(e,x,r,i.map((e,t)=>({...e,utxo:N[t].utxo,nativeUtxo:A?I[t]?.utxo:void 0})),D,T,P,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/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;