@hinkal/common 0.3.1 → 0.3.2

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

@@ -4,10 +4,10 @@ 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 { hashEthereumAddress as c } from "../../functions/utils/addresses.mjs";
+import { Logger as l } from "../../error-handling/logger.mjs";
+import { ExternalActionId as u } from "../../types/external-action.types.mjs";
+import { TemporaryWalletRecoveryDestination as d } from "../../types/token.types.mjs";
 import { API as f } from "../../API/API.mjs";
 import { getErc20TokenFromAPI as p } from "../../functions/utils/erc20tokenFunctions.mjs";
 import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
@@ -25,15 +25,15 @@ import { buildTempSubAccount as O, deriveTempWallet as k } from "../../functions
 import { createLifiBridgeOps as A, createTransaferEmporiumOpsBatch as j } from "../../functions/private-wallet/emporium.helpers.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][_];
+var N = async (e, r, o, s, l, m, g) => {
+	let { chainId: _ } = r, v = o.chainId, y = r.erc20TokenAddress, b = h[u.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 = {
+	let x = a(6), { privateKey: S, ethAddress: C } = k(e, _, x), { lifiDataValue: w, outSwapAmountValue: T, extraNativeTokenFee: E } = await M(r, o, s, l, 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)]);
+	}, j = i(r, s), N = O(x, S, C), P = c(await e.getEthereumAddressByChain(_));
+	await Promise.all([f.addTemporaryWalletNonce(_, P, Number(x), d.Confidential), f.addTemporaryWalletNonce(v, P, Number(x), d.Confidential)]);
 	let F = n(y, t), I = D.nativeFee > 0n && !F, L = F ? j + D.nativeFee : j, R = [r], z = [-L];
 	if (I) {
 		let e = await p(_, t);
@@ -58,10 +58,10 @@ var N = async (e, r, o, s, d, m, g) => {
 		await s(g);
 	}
 	throw Error(`Bridge did not land on destination temp wallet ${t} on chain ${e} within timeout.`);
-}, F = async (t, n, i, a, s, l) => {
-	let u = n.chainId, d = n.erc20TokenAddress, f = i.ethAddress;
+}, F = async (t, n, i, a, s, c) => {
+	let l = 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);
+	let p = j(t, l, [d], [a]), h = await T(l, n, a, await m(l, d, [d], u.Emporium, p.map((e) => x(e, f, l)), e)), g = a - E(a, h);
 	if (g <= 0n) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
 	let _, v;
 	if ("recipientInfo" in s) _ = s.recipientInfo;
@@ -73,15 +73,15 @@ var N = async (e, r, o, s, d, m, g) => {
 			ethAddress: s.recipientEthAddress
 		}, _ = S(n);
 	}
-	let y = await t.proxyToPrivate([n], [g], i, _, h.feeToken, h, l), C;
+	let y = await t.proxyToPrivate([n], [g], i, _, h.feeToken, h, c), C;
 	if (v) {
-		let e = await D(u, y, { evmTimeoutMs: b });
+		let e = await D(l, 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 [n] = w(e, t, l, d, v.keys.getShieldedPrivateKey());
 		if (!n) throw Error("Could not find recipient UTXO in bridge shield tx");
 		C = {
-			chainId: u,
-			senderAddress: await t.getEthereumAddressByChain(u),
+			chainId: l,
+			senderAddress: await t.getEthereumAddressByChain(l),
 			recipientAddress: v.ethAddress,
 			claimableSignature: v.signature,
 			utxo: n
@@ -92,11 +92,11 @@ var N = async (e, r, o, s, d, m, g) => {
 		pendingEnclaveUtxo: C
 	};
 }, 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;
+	let { nonce: u, tempSubAccount: d, sourceTxHash: p, quote: m } = await N(e, t, n, r, a, o, s), h = d.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: _ } = await F(e, n, d, await P(n.chainId, h, n.erc20TokenAddress, m, a), i, s), y = c(await e.getEthereumAddressByChain(n.chainId)), b = [t.chainId, n.chainId];
+	return (await Promise.allSettled(b.map((e) => f.removeTemporaryWalletNonce(e, y, Number(u))))).forEach((e, t) => {
+		e.status === "rejected" && l.error(`Failed to remove temp-wallet nonce on chain ${b[t]}`, e.reason);
 	}), {
 		sourceTxHash: p,
 		destTxHash: g,

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/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(`../../functions/utils/tron.utils.cjs`),c=require(`../../types/external-action.types.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=s.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,spendingPublicKey:C.getSpendingKeyPair().pubSpendingBJJPoint}),O=_??await d.getFeeStructure(y,x,[x],c.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 s.reorderZkCallData(b,V,U,H))};exports.hinkalClaimUtxo=m;

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

@@ -5,8 +5,8 @@ import { transactionErrorCodes as r } from "../../error-handling/error-codes.con
 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 { addressToHexFormat as s, reorderZkCallData as c } from "../../functions/utils/tron.utils.mjs";
+import { ExternalActionId as l } from "../../types/external-action.types.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";
@@ -14,7 +14,7 @@ import { constructZkProof as p } from "../../functions/snarkjs/constructGeneralZ
 import { transactCallRelayer as m } from "../../functions/web3/functionCalls/transactCallRelayer.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));
+	let b = u([g]), x = e(b), S = g.erc20TokenAddress, C = s(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");
@@ -25,11 +25,8 @@ var h = async (h, g, _, v, y) => {
 		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);
+		spendingPublicKey: w.getSpendingKeyPair().pubSpendingBJJPoint
+	}), k = v ?? await f(b, S, [S], l.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);
@@ -48,7 +45,7 @@ var h = async (h, g, _, v, y) => {
 	}, 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));
+	return m(b, H, W, U, G, void 0, void 0, void 0, await c(x, H, W, U));
 };
 //#endregion
 export { h 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(`../../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}),new a.Utxo({amount:0n,erc20TokenAddress:e,nullifyingKey:i.userKeys.getShieldedPrivateKey(),spendingPublicKey:i.userKeys.getSpendingKeyPair().pubSpendingBJJPoint})]),O=S.map((e,t)=>[new a.Utxo({amount:l[t],erc20TokenAddress:e,H0:[BigInt(w),BigInt(T)],stealthAddress:C,encryptionKey:E})]),{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;

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

@@ -91,27 +91,24 @@ var D = async (e, t) => ({
 	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(",");
+	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
+		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
 	}), new s({
 		amount: 0n,
 		erc20TokenAddress: e,
 		nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
 	})]), w = h.map((e, t) => [new s({
 		amount: o[t],
 		erc20TokenAddress: e,
 		H0: [BigInt(_), BigInt(y)],
 		stealthAddress: g,
-		encryptionKey: b,
-		isNewStyle: !0
+		encryptionKey: b
 	})]), { 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);

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

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

@@ -4,10 +4,10 @@ import { caseInsensitiveEqual as r } from "../../functions/utils/caseInsensitive
 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 { hashEthereumAddress as s, hashString as c } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as l } from "../../types/external-action.types.mjs";
+import { DepositAndWithdrawPhase as u } from "../../types/scheduled-transactions.types.mjs";
 import "../../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";
@@ -16,7 +16,7 @@ import { getFeeStructure as h } from "../../functions/pre-transaction/getFeeStru
 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 { calculateGrossAmountWithFee as y } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/utils/index.mjs";
 import { createLifiBridgeOps as b, getAuthorizationDataIfNeeded as x } from "../../functions/private-wallet/emporium.helpers.mjs";
 import { constructZkProof as S } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
@@ -25,95 +25,93 @@ import { safeUpdateDepositAndWithdrawStatus as w } from "../../API/deposit-and-w
 import { hinkalDepositOnChainUtxos as T } from "./hinkalDepositOnChainUtxos.mjs";
 import "../../functions/index.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) => {
+var E = async (t, s, c, f, p, h, g, v, y, T, E) => {
 	if (f.length === 0) throw Error("No recipients to bridge");
-	let 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 _ = r(O, n), v = c.nativeFee > 0n && !_, C = [O], w = [-e.amount], T = [!1], D = new o({
+	let D = c.erc20TokenAddress, { contractData: O } = e[s], { emporiumAddress: k } = O;
+	if (!k) throw Error("No Emporium Address");
+	let A = _[l.Lifi][s];
+	if (!A) throw Error(`LIFI not configured for chain ${s}`);
+	let j = await t.getRandomRelay(s);
+	if (!j) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let M = await t.getEthereumAddressByChain(s), N = a().toString(), P = t.generateProofRemotely ? 5 : 1, F = [];
+	for (let e = 0; e < f.length; e += P) {
+		let i = f.slice(e, e + P), a = await Promise.all(i.map(async ({ utxo: e, nativeUtxo: i, bridgeAmount: a, quote: c, temporarySubAccount: u, recipientAddress: f }) => {
+			await d.addTemporaryWalletNonce(s, h, u.index);
+			let g = r(D, n), _ = c.nativeFee > 0n && !g, v = [D], y = [-e.amount], C = [!1], w = new o({
 				amount: 0n,
-				erc20TokenAddress: O,
+				erc20TokenAddress: D,
 				nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-				timeStamp: P,
-				...e.isNewStyle ? {
-					spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-					isNewStyle: !0
-				} : { isNewStyle: !1 }
-			}), k = [[e, D]], F = [[D]];
-			if (v && i) {
+				timeStamp: N,
+				spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+			}), E = [[e, w]], O = [[w]];
+			if (_ && i) {
 				let e = new o({
 					amount: 0n,
 					erc20TokenAddress: n,
 					nullifyingKey: t.userKeys.getShieldedPrivateKey(),
-					timeStamp: P,
-					...i.isNewStyle ? {
-						spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-						isNewStyle: !0
-					} : { isNewStyle: !1 }
+					timeStamp: N,
+					spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
 				});
-				C.push(n), w.push(-i.amount), T.push(!1), k.push([i, e]), F.push([e]);
+				v.push(n), y.push(-i.amount), C.push(!1), E.push([i, e]), O.push([e]);
 			}
-			let I = b(t, l, f.ethAddress, j, O, e.amount, a, c), L = await y(l, u, a, p), R = m(E, l, C, [-e.amount], N), [{ zkCallData: z, circomData: B, dimData: V, commitmentValidationData: H }, U] = await Promise.all([S(t.merkleTreeHinkalByChain[l], k, F, t.userKeys, s.Emporium, A, I, t.generateProofRemotely, L, M ?? n, l, T, void 0, void 0, f.privateKey), x(l, f.privateKey)]);
+			let P = b(t, s, u.ethAddress, A, D, e.amount, a, c), F = m(T, s, v, [-e.amount], M), [{ zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z }, B] = await Promise.all([S(t.merkleTreeHinkalByChain[s], E, O, t.userKeys, l.Emporium, k, P, t.generateProofRemotely, p, j ?? n, s, C, void 0, void 0, u.privateKey), x(s, u.privateKey)]);
 			return {
-				zkCallData: z,
-				dimData: V,
-				circomData: B,
-				commitmentValidationData: H,
-				authorizationData: U,
-				recipientAddress: g,
-				adminData: R
+				zkCallData: I,
+				dimData: R,
+				circomData: L,
+				commitmentValidationData: z,
+				authorizationData: B,
+				recipientAddress: f,
+				adminData: F
 			};
 		}));
-		I.push(...a);
+		F.push(...a);
 	}
 	await w({
 		id: g,
-		chainId: l,
+		chainId: s,
 		hashedEthereumAddress: h,
-		phase: c.BEFORE_SCHEDULE_WITHDRAW
+		phase: u.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let L = await C(l, I, h, v, T, D);
+	let I = await C(s, F, h, v, y, E);
 	return await w({
 		id: g,
-		chainId: l,
+		chainId: s,
 		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, A = r(S, n);
-	if (c) k = c;
+		phase: u.AFTER_SCHEDULE_WITHDRAW,
+		scheduleId: I
+	}), I;
+}, D = async (e, i, a, o, u, d, m, x, S = !0) => {
+	let C = i.erc20TokenAddress, w = f([i]), D = x ? c(x) : void 0, O = s(await e.getEthereumAddressByChain(w)), k = _[l.Lifi][w];
+	if (!k) throw Error("LIFI router not configured");
+	let A, j = r(C, n);
+	if (u) A = u;
 	else {
-		let n = a[0], r = A ? n.bridgeAmount + n.quote.nativeFee : n.bridgeAmount, i = b(e, C, n.temporarySubAccount.ethAddress, O, S, r, n.bridgeAmount, n.quote).map((e) => v(e, n.temporarySubAccount.ethAddress, C));
-		k = await h(C, S, [S], s.Emporium, i, t);
+		let n = a[0], r = j ? n.bridgeAmount + n.quote.nativeFee : n.bridgeAmount, i = b(e, w, n.temporarySubAccount.ethAddress, k, C, r, n.bridgeAmount, n.quote).map((e) => v(e, n.temporarySubAccount.ethAddress, w));
+		A = await h(w, C, [C], l.Emporium, i, t);
 	}
-	let j = {
-		feeToken: k.feeToken,
+	let M = {
+		feeToken: A.feeToken,
 		flatFee: 0n,
 		variableRate: 0n
-	}, M = a.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !r(S, n), N = a.map((e) => A ? e.bridgeAmount + e.quote.nativeFee : e.bridgeAmount), P = a.map((e) => e.recipientAddress), { userDepositedUtxos: F, statusId: I, depositTxHash: L } = await T(e, C, i, N, P, k, D, x), R = [];
-	if (M) {
-		let t = await p(C, n);
+	}, N = a.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !r(C, n), P = a.map((e) => y(j ? e.bridgeAmount + e.quote.nativeFee : e.bridgeAmount, A)), F = a.map((e) => e.recipientAddress), { userDepositedUtxos: I, statusId: L, depositTxHash: R } = await T(e, w, i, P, F, M, O, S), z = [];
+	if (N) {
+		let t = await p(w, n);
 		if (!t) throw Error("No native token");
-		let { userDepositedUtxos: r } = await T(e, C, t, a.map((e) => e.quote.nativeFee), P, j, D, x);
-		R = r;
+		let { userDepositedUtxos: r } = await T(e, w, t, a.map((e) => y(e.quote.nativeFee, {
+			feeToken: A.feeToken,
+			flatFee: 0n,
+			variableRate: A.variableRate
+		})), F, M, O, S);
+		z = r;
 	}
-	return await g(e, C, [...F, ...R]), {
-		depositTxHash: L,
-		scheduleId: await E(e, C, i, a.map((e, t) => ({
+	return await g(e, w, [...I, ...z]), {
+		depositTxHash: R,
+		scheduleId: await E(e, w, i, a.map((e, t) => ({
 			...e,
-			utxo: F[t].utxo,
-			nativeUtxo: M ? R[t]?.utxo : void 0
-		})), k, D, I, o, d, m, w)
+			utxo: I[t].utxo,
+			nativeUtxo: N ? z[t]?.utxo : void 0
+		})), A, O, L, o, d, m, D)
 	};
 };
 //#endregion

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;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../types/external-action.types.cjs`),l=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../API/deposit-and-withdraw-status-calls.cjs`),_=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var v=async(o,c,u,f,p,_,v,y,b,x,S)=>{let C=e.isTronLike(c);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let w=u.erc20TokenAddress,[T,E]=await Promise.all([o.getRandomRelay(c),o.getEthereumAddressByChain(c)]);if(!T)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let D=i.getCurrentTimeInSeconds().toString(),O=o.generateProofRemotely&&!C?5:1,k=[],A=s.addressToHexFormat(E);for(let e=0;e<f.length;e+=O){let r=f.slice(e,e+O),i=await Promise.all(r.map(async({recipientAddress:e,utxo:r})=>{let i=s.addressToHexFormat(e),l=new a.Utxo({amount:0n,erc20TokenAddress:w,nullifyingKey:o.userKeys.getShieldedPrivateKey(),timeStamp:D,spendingPublicKey:o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint}),u=[[n.caseInsensitiveEqual(r.erc20TokenAddress,w)?r:a.Utxo.createFrom(r,{erc20TokenAddress:w}),l]],f=[[l]],h={externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},g=d.constructAdminData(x,c,[w],[-r.amount],A),{zkCallData:_,circomData:v,dimData:y,commitmentValidationData:b}=await m.constructZkProof(o.merkleTreeHinkalByChain[c],u,f,o.userKeys,h.externalActionId,h.externalAddress,h.externalActionMetadata,o.generateProofRemotely,p,T??t.zeroAddress,c);return{zkCallData:_,dimData:y,circomData:v,commitmentValidationData:b,adminData:g,recipientAddress:e,tronProofSignature:await s.reorderZkCallData(C,_,y,v)}}));k.push(...i)}await g.safeUpdateDepositAndWithdrawStatus({id:v,chainId:c,hashedEthereumAddress:_,phase:l.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let j=await h.transactCallRelayerBatch(c,k,_,y,b,S);return await g.safeUpdateDepositAndWithdrawStatus({id:v,chainId:c,hashedEthereumAddress:_,phase:l.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:j}),j},y=async(e,t,n,r,i,a,l,d,m,h=!0)=>{let g=u.validateAndGetChainId([t]),y=m?o.hashString(m):void 0,b=t.erc20TokenAddress,x=o.hashEthereumAddress(s.addressToHexFormat(await e.getEthereumAddressByChain(g))),S=a??await f.getFeeStructure(g,b,[b],c.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await _.hinkalDepositOnChainUtxos(e,g,t,n,r,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(e,g,C),{depositTxHash:T,scheduleId:await v(e,g,t,C,S,x,w,i,l,d,y)}};exports.hinkalDepositAndWithdraw=y;

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

@@ -1,6 +1,6 @@
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType, DepositAndSendExtendedResult, ERC20Token, RecipientUtxo } from '../../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, statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string) => 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>;

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

@@ -4,76 +4,72 @@ import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
 import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
 import { Utxo as a } from "../utxo/Utxo.mjs";
-import { ExternalActionId as o } from "../../types/external-action.types.mjs";
-import { DepositAndWithdrawPhase as s } from "../../types/scheduled-transactions.types.mjs";
+import { hashEthereumAddress as o, hashString as s } from "../../functions/utils/addresses.mjs";
+import { addressToHexFormat as c, reorderZkCallData as l } from "../../functions/utils/tron.utils.mjs";
+import { ExternalActionId as u } from "../../types/external-action.types.mjs";
+import { DepositAndWithdrawPhase as d } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.mjs";
-import { hashEthereumAddress as c, hashString as l } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as u, reorderZkCallData as d } from "../../functions/utils/tron.utils.mjs";
 import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
 import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { waitForDepositedUtxosInMerkleTree as h } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { calculateModifiedFeeStructure as g } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayerBatch as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as y } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { hinkalDepositOnChainUtxos as b } from "./hinkalDepositOnChainUtxos.mjs";
+import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayerBatch as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as v } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as y } from "./hinkalDepositOnChainUtxos.mjs";
 import "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.ts
-var x = async (o, c, l, f, m, h, b, x, S, C, w, T) => {
-	let E = e(c);
+var b = async (o, s, u, f, m, h, y, b, x, S, C) => {
+	let w = e(s);
 	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let D = l.erc20TokenAddress, [O, k] = await Promise.all([o.getRandomRelay(c), o.getEthereumAddressByChain(c)]);
-	if (!O) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let A = i().toString(), j = o.generateProofRemotely && !E ? 5 : 1, M = [], N = u(k);
-	for (let e = 0; e < f.length; e += j) {
-		let r = f.slice(e, e + j), i = await Promise.all(r.map(async ({ recipientAddress: r, utxo: i }, s) => {
-			let f = e + s, v = u(r), y = new a({
+	let T = u.erc20TokenAddress, [E, D] = await Promise.all([o.getRandomRelay(s), o.getEthereumAddressByChain(s)]);
+	if (!E) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let O = i().toString(), k = o.generateProofRemotely && !w ? 5 : 1, A = [], j = c(D);
+	for (let e = 0; e < f.length; e += k) {
+		let r = f.slice(e, e + k), i = await Promise.all(r.map(async ({ recipientAddress: e, utxo: r }) => {
+			let i = c(e), u = new a({
 				amount: 0n,
-				erc20TokenAddress: D,
+				erc20TokenAddress: T,
 				nullifyingKey: o.userKeys.getShieldedPrivateKey(),
-				timeStamp: A,
-				...i.isNewStyle ? {
-					spendingPublicKey: o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-					isNewStyle: !0
-				} : { isNewStyle: !1 }
-			}), b = [[n(i.erc20TokenAddress, D) ? i : a.createFrom(i, { erc20TokenAddress: D }), y]], x = [[y]], S = {
+				timeStamp: O,
+				spendingPublicKey: o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+			}), d = [[n(r.erc20TokenAddress, T) ? r : a.createFrom(r, { erc20TokenAddress: T }), u]], f = [[u]], h = {
 				externalActionId: 0n,
-				externalAddress: v,
+				externalAddress: i,
 				externalActionMetadata: "0x00"
-			}, C = p(w, c, [D], [-i.amount], N), T = await g(c, l, m[f], h), { zkCallData: k, circomData: j, dimData: M, commitmentValidationData: P } = await _(o.merkleTreeHinkalByChain[c], b, x, o.userKeys, S.externalActionId, S.externalAddress, S.externalActionMetadata, o.generateProofRemotely, T, O ?? t, c);
+			}, _ = p(S, s, [T], [-r.amount], j), { zkCallData: v, circomData: y, dimData: b, commitmentValidationData: x } = await g(o.merkleTreeHinkalByChain[s], d, f, o.userKeys, h.externalActionId, h.externalAddress, h.externalActionMetadata, o.generateProofRemotely, m, E ?? t, s);
 			return {
-				zkCallData: k,
-				dimData: M,
-				circomData: j,
-				commitmentValidationData: P,
-				adminData: C,
-				recipientAddress: r,
-				tronProofSignature: await d(E, k, M, j)
+				zkCallData: v,
+				dimData: b,
+				circomData: y,
+				commitmentValidationData: x,
+				adminData: _,
+				recipientAddress: e,
+				tronProofSignature: await l(w, v, b, y)
 			};
 		}));
-		M.push(...i);
+		A.push(...i);
 	}
-	await y({
-		id: x,
-		chainId: c,
-		hashedEthereumAddress: b,
-		phase: s.BEFORE_SCHEDULE_WITHDRAW
+	await v({
+		id: y,
+		chainId: s,
+		hashedEthereumAddress: h,
+		phase: d.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let P = await v(c, M, b, S, C, T);
-	return await y({
-		id: x,
-		chainId: c,
-		hashedEthereumAddress: b,
-		phase: s.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: P
-	}), P;
-}, S = async (e, t, n, r, i, a, s, d, p, g = !0) => {
-	let _ = f([t]), v = p ? l(p) : void 0, y = t.erc20TokenAddress, S = c(u(await e.getEthereumAddressByChain(_))), C = a ?? await m(_, y, [y], o.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await b(e, _, t, n, r, C, S, g);
+	let M = await _(s, A, h, b, x, C);
+	return await v({
+		id: y,
+		chainId: s,
+		hashedEthereumAddress: h,
+		phase: d.AFTER_SCHEDULE_WITHDRAW,
+		scheduleId: M
+	}), M;
+}, x = async (e, t, n, r, i, a, l, d, p, g = !0) => {
+	let _ = f([t]), v = p ? s(p) : void 0, x = t.erc20TokenAddress, S = o(c(await e.getEthereumAddressByChain(_))), C = a ?? await m(_, x, [x], u.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await y(e, _, t, n, r, C, S, g);
 	return await h(e, _, w), {
 		depositTxHash: E,
-		scheduleId: await x(e, _, t, w, n, C, S, T, i, s, d, v)
+		scheduleId: await b(e, _, t, w, C, S, T, i, l, d, v)
 	};
 };
 //#endregion
-export { S as hinkalDepositAndWithdraw };
+export { x as hinkalDepositAndWithdraw };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../functions/utils/tron.utils.cjs`),i=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),a=require(`../../functions/utils/tx-confirmation.utils.cjs`),o=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),s=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),c=require(`../../API/deposit-and-withdraw-status-calls.cjs`),l=require(`./prepareDepositOnChainUtxosZkProof.cjs`);var u=async(u,d,f,p,m,h,g,_=!0)=>{let v=e.isTronLike(d),y=f.erc20TokenAddress,{zkCallData:b,circomData:x,dimData:S,totalAmount:C,utxoAmounts:w,hinkalWrapperAddress:T,hinkalWrapperABI:E,depositOnChainUtxosExternalActionAddress:D,depositOnChainUtxosExternalActionABI:O}=await l.prepareDepositOnChainUtxosZkProof(u,d,f,p,h),k=(await c.updateDepositAndWithdrawStatus({chainId:d,hashedEthereumAddress:g,phase:n.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,A;if(v){let e=u.getTronWeb();A=await s.transactCallDirectTron(u,d,C,f,b,x,S,e.contract(O,r.evmHexToTronBase58Address(D)),e.contract(E,r.evmHexToTronBase58Address(T)),_)}else{let e=u.getContractWithSigner(d,t.ContractType.HinkalWrapper);A=(await o.transactCallDirect(u,d,C,f,b,x,S,u.getContractWithSigner(d,t.ContractType.DepositOnChainUtxos),e,_)).hash}if(!A)throw Error(`Deposit transaction hash not found`);let j=await a.waitForEthereumTransactionConfirmation(d,A);await c.safeUpdateDepositAndWithdrawStatus({id:k,chainId:d,hashedEthereumAddress:g,phase:n.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:A});let M=i.getOnChainUtxosFromReceipt(j,u,d,y);if(M.length===0)throw Error(`No UTXOs found in deposit transaction. Check contract address and ABI.`);let N=[],P=[...M];return m.forEach((e,t)=>{let n=w[t],r=P.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);N.push({recipientAddress:e,utxo:r});let i=P.indexOf(r);P.splice(i,1)}),{userDepositedUtxos:N,statusId:k,depositTxHash:A}};exports.hinkalDepositOnChainUtxos=u;
+const e=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const t=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),n=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),r=require(`../../functions/utils/tx-confirmation.utils.cjs`),i=require(`./hinkalProoflessDeposit.utils.cjs`),a=require(`./hinkalProoflessDeposit.cjs`),o=require(`../../API/deposit-and-withdraw-status-calls.cjs`);var s=async(s,c,l,u,d,f,p,m=!0)=>{let h=l.erc20TokenAddress,g=u.map(e=>e+f.flatFee),_=g.map(()=>l),v=g.map(()=>t.getStealthAddressStructureFromUserKeys(s.userKeys)),y=(await o.updateDepositAndWithdrawStatus({chainId:c,hashedEthereumAddress:p,phase:e.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,b=await a.hinkalProoflessDeposit(s,_,g,v,i.getOwnRecipientEncryptionKeys(s.userKeys,g.length),!0);if(!b)throw Error(`Deposit transaction hash not found`);let x=await r.waitForEthereumTransactionConfirmation(c,b);await o.safeUpdateDepositAndWithdrawStatus({id:y,chainId:c,hashedEthereumAddress:p,phase:e.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:b});let S=n.getOnChainUtxosFromReceipt(x,s,c,h);if(S.length===0)throw Error(`No UTXOs found in deposit transaction. Check contract address and ABI.`);let C=[],w=[...S];return d.forEach((e,t)=>{let n=g[t],r=w.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);C.push({recipientAddress:e,utxo:r});let i=w.indexOf(r);w.splice(i,1)}),{userDepositedUtxos:C,statusId:y,depositTxHash:b}};exports.hinkalDepositOnChainUtxos=s;