@hinkal/common 0.3.8 → 0.3.10

package/common/src/functions/utils/tron.utils.mjs

@@ -58,38 +58,25 @@ var s = 2000n, c = (e) => {
 		c: i,
 		publicSignals: a
 	};
-}, S = (e, t) => {
-	let n = a.AbiCoder.defaultAbiCoder().encode([
-		"uint16",
-		"uint16",
-		"uint16",
-		"uint256"
-	], [
-		e.tokenNumber,
-		e.nullifierAmount,
-		e.outputAmount,
-		t
-	]);
-	return BigInt(a.keccak256(n));
-}, C = async (e, t, n, o, s, c, l, u = !1) => {
-	let d = S(s, c), f = e.map(String), p = n.map(String), m = o.map(String), h = {
+}, S = async (e, t, n, o, s, c, l, u = !1) => {
+	let d = e.map(String), f = n.map(String), p = o.map(String), m = {
 		chainId: l,
-		a: f,
+		a: d,
 		b: [t[0].map(String), t[1].map(String)],
-		c: p,
-		inputs: m,
-		verifier_id: String(d),
+		c: f,
+		inputs: p,
+		externalActionId: String(c),
 		tokenNumber: s.tokenNumber,
 		nullifierAmount: s.nullifierAmount,
 		outputAmount: s.outputAmount,
 		skipLock: u
-	}, g = await i.post(`${r}/sign-proof`, h), { v: _, r: v, s: y } = a.Signature.from(g.signature.trim());
+	}, h = await i.post(`${r}/sign-proof`, m), { v: g, r: _, s: v } = a.Signature.from(h.signature.trim());
 	return {
-		v: _,
-		r: v,
-		s: y
+		v: g,
+		r: _,
+		s: v
 	};
-}, w = (e) => {
+}, C = (e) => {
 	if (e.newRootHash === void 0) throw Error("circomData.newRootHash is required for Tron transactions");
 	if (e.insertedLeafIndex === void 0) throw Error("circomData.insertedLeafIndex is required for Tron transactions");
 	return [
@@ -128,17 +115,17 @@ var s = 2000n, c = (e) => {
 		e.insertedLeafIndex,
 		e.createBlockedUtxos ?? !1
 	];
-}, T = (e) => {
+}, w = (e) => {
 	e[1] = [[e[1][0][1], e[1][0][0]], [e[1][1][1], e[1][1][0]]];
-}, E = async (e, t, n, r, i, a = !0, o = !1) => {
+}, T = async (e, t, n, r, i, a = !0, o = !1) => {
 	if (e) {
-		let { a: e, b: s, c, publicSignals: l } = x(t), u = await C(e, s, c, l, n, BigInt(r.externalActionData.externalActionId), i, o), d = {
+		let { a: e, b: s, c, publicSignals: l } = x(t), u = await S(e, s, c, l, n, BigInt(r.externalActionData.externalActionId), i, o), d = {
 			v: u.v,
 			r: u.r,
 			s: u.s
 		};
-		return a && T(t), d;
+		return a && w(t), d;
 	}
 };
 //#endregion
-export { f as addressToHexFormat, w as circomDataToArray, h as createTronCallData, l as createTronWeb, b as estimateTronFeeSunWithPadding, u as evmHexToTronBase58Address, y as fetchTronAccountResources, v as fetchTronChainParameters, C as generateProofSignatureRemotely, g as getAvailableResource, _ as getChainParameterValue, p as getTronWalletRpcUrl, S as getVerifierId, c as normalizeTronPrivateKey, x as parseZkCalldata, E as reorderZkCallData, T as swapTronBCoordinate, d as toTronBase58IfHex };
+export { f as addressToHexFormat, C as circomDataToArray, h as createTronCallData, l as createTronWeb, b as estimateTronFeeSunWithPadding, u as evmHexToTronBase58Address, y as fetchTronAccountResources, v as fetchTronChainParameters, S as generateProofSignatureRemotely, g as getAvailableResource, _ as getChainParameterValue, p as getTronWalletRpcUrl, c as normalizeTronPrivateKey, x as parseZkCalldata, T as reorderZkCallData, w as swapTronBCoordinate, d as toTronBase58IfHex };

package/common/src/functions/utils/tx-confirmation.utils.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`./create-provider.cjs`),i=require(`../../constants/tx-confirmation.constants.cjs`);require(`../../constants/index.cjs`);var a=`confirmed`,o=async(e,n,a={})=>{let{evmConfirmations:o=1,evmTimeoutMs:s=i.TX_CONFIRMATION_TIMEOUT_EXTENDED}=a,c=n.startsWith(`0x`)?n:`0x${n}`,l=await r.createJsonRpcProvider(e).waitForTransaction(c,o,s);if(!l||l.status!==1)throw Error(t.transactionErrorCodes.TRANSACTION_NOT_CONFIRMED);return l},s=async(t,n,i={})=>{let{solanaCommitment:o=a}=i,{rpcUrl:s}=e.networkRegistry[t];if(!s)throw Error(`RPC URL not found for the specified chain ID`);let c=await r.createCustomSolanaConnection(s,o).confirmTransaction(n,o);if(c.value.err)throw Error(`Transaction failed`);return c},c=async(t,r,i={})=>{try{if(e.isSolanaLike(t)){await s(t,r,i);return}await o(t,r.startsWith(`0x`)?r:`0x${r}`,i)}catch(e){throw n.Logger.error(`waitForTransactionConfirmation failed`,{chainId:t,txHash:r,error:e}),e}};exports.waitForEthereumTransactionConfirmation=o,exports.waitForSolanaTransactionConfirmation=s,exports.waitForTransactionConfirmation=c;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`./create-provider.cjs`),i=require(`../../constants/tx-confirmation.constants.cjs`);require(`../../constants/index.cjs`);var a=`confirmed`,o=async(e,n,a={})=>{let{evmConfirmations:o=1,evmTimeoutMs:s=i.TX_CONFIRMATION_TIMEOUT_EXTENDED}=a,c=n.startsWith(`0x`)?n:`0x${n}`,l=await r.createJsonRpcProvider(e).waitForTransaction(c,o,s);if(!l||l.status!==1)throw Error(t.transactionErrorCodes.TRANSACTION_NOT_CONFIRMED);return l},s=async(t,n,o={})=>{let{solanaCommitment:s=a,solanaTimeoutMs:c=i.SOLANA_TX_CONFIRMATION_TIMEOUT}=o,{rpcUrl:l}=e.networkRegistry[t];if(!l)throw Error(`RPC URL not found for the specified chain ID`);let u=await r.createCustomSolanaConnection(l,{commitment:s,confirmTransactionInitialTimeout:c}).confirmTransaction(n,s);if(u.value.err)throw Error(`Transaction failed`);return u},c=async(t,r,i={})=>{try{if(e.isSolanaLike(t)){await s(t,r,i);return}await o(t,r.startsWith(`0x`)?r:`0x${r}`,i)}catch(e){throw n.Logger.error(`waitForTransactionConfirmation failed`,{chainId:t,txHash:r,error:e}),e}};exports.waitForEthereumTransactionConfirmation=o,exports.waitForSolanaTransactionConfirmation=s,exports.waitForTransactionConfirmation=c;

package/common/src/functions/utils/tx-confirmation.utils.d.ts

@@ -3,6 +3,7 @@ type TxConfirmationOptions = {
     evmConfirmations?: number;
     evmTimeoutMs?: number;
     solanaCommitment?: Commitment;
+    solanaTimeoutMs?: number;
 };
 export declare const waitForEthereumTransactionConfirmation: (chainId: number, txHash: string, opts?: TxConfirmationOptions) => Promise<import('ethers').TransactionReceipt>;
 export declare const waitForSolanaTransactionConfirmation: (chainId: number, txHash: string, opts?: TxConfirmationOptions) => Promise<import('@solana/web3.js').RpcResponseAndContext<import('@solana/web3.js').SignatureResult>>;

package/common/src/functions/utils/tx-confirmation.utils.mjs

@@ -2,26 +2,29 @@ import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { Logger as r } from "../../error-handling/logger.mjs";
 import { createCustomSolanaConnection as i, createJsonRpcProvider as a } from "./create-provider.mjs";
-import { TX_CONFIRMATION_TIMEOUT_EXTENDED as o } from "../../constants/tx-confirmation.constants.mjs";
+import { SOLANA_TX_CONFIRMATION_TIMEOUT as o, TX_CONFIRMATION_TIMEOUT_EXTENDED as s } from "../../constants/tx-confirmation.constants.mjs";
 import "../../constants/index.mjs";
 //#region libs/shared/common/src/functions/utils/tx-confirmation.utils.ts
-var s = "confirmed", c = async (e, t, r = {}) => {
-	let { evmConfirmations: i = 1, evmTimeoutMs: s = o } = r, c = t.startsWith("0x") ? t : `0x${t}`, l = await a(e).waitForTransaction(c, i, s);
+var c = "confirmed", l = async (e, t, r = {}) => {
+	let { evmConfirmations: i = 1, evmTimeoutMs: o = s } = r, c = t.startsWith("0x") ? t : `0x${t}`, l = await a(e).waitForTransaction(c, i, o);
 	if (!l || l.status !== 1) throw Error(n.TRANSACTION_NOT_CONFIRMED);
 	return l;
-}, l = async (e, n, r = {}) => {
-	let { solanaCommitment: a = s } = r, { rpcUrl: o } = t[e];
-	if (!o) throw Error("RPC URL not found for the specified chain ID");
-	let c = await i(o, a).confirmTransaction(n, a);
-	if (c.value.err) throw Error("Transaction failed");
-	return c;
-}, u = async (t, n, i = {}) => {
+}, u = async (e, n, r = {}) => {
+	let { solanaCommitment: a = c, solanaTimeoutMs: s = o } = r, { rpcUrl: l } = t[e];
+	if (!l) throw Error("RPC URL not found for the specified chain ID");
+	let u = await i(l, {
+		commitment: a,
+		confirmTransactionInitialTimeout: s
+	}).confirmTransaction(n, a);
+	if (u.value.err) throw Error("Transaction failed");
+	return u;
+}, d = async (t, n, i = {}) => {
 	try {
 		if (e(t)) {
-			await l(t, n, i);
+			await u(t, n, i);
 			return;
 		}
-		await c(t, n.startsWith("0x") ? n : `0x${n}`, i);
+		await l(t, n.startsWith("0x") ? n : `0x${n}`, i);
 	} catch (e) {
 		throw r.error("waitForTransactionConfirmation failed", {
 			chainId: t,
@@ -31,4 +34,4 @@ var s = "confirmed", c = async (e, t, r = {}) => {
 	}
 };
 //#endregion
-export { c as waitForEthereumTransactionConfirmation, l as waitForSolanaTransactionConfirmation, u as waitForTransactionConfirmation };
+export { l as waitForEthereumTransactionConfirmation, u as waitForSolanaTransactionConfirmation, d as waitForTransactionConfirmation };

package/common/src/functions/web3/events/getInputUtxoAndBalance.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../utils/caseInsensitive.utils.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/upToDateState.cjs`),i=require(`../../utils/cacheFunctions.cjs`),a=require(`../../utils/encodeTokenWithId.cjs`),o=require(`../../utils/solanaMint.utils.cjs`),s=require(`./getInputUtxosEnclave.cjs`),c=require(`../../utils/customEnclaveFunctionsRegister.cjs`),l=require(`../../utils/addresses.cjs`),u=require(`../../../API/scheduled-transactions-calls.cjs`),d=require(`../../utils/tron.utils.cjs`);var f=new(require(`async-mutex`)).Mutex,p=async(e,t)=>e.allowParallelBalanceLocalDecryption?t():f.runExclusive(t),m=e=>e?.[0]===0n&&e?.[1]===1n,h=async(e,t,n,a,o,s,c,l,u)=>p(e,async()=>{u+=1;let d=s.slice(u),{lastOutput:f,additionalEncryptedOutputs:p}=await e.utxoUtils.batchProcess(d,l,t,n),m=[...c,...p];return await r.checkAddressNotUpdated(e,a),i.setHinkalCache({lastOutput:f,encryptedOutputs:m},e,n,o),await e.utxoUtils.buildBatchProcess(m,t,n)}),g=async(e,t,n,r,a,o,c,l,u,d)=>{try{let{utxos:r,encryptedOutputs:o,lastOutput:c}=await s.getInputUtxosEnclave(n,t,d);return i.setHinkalCache({encryptedOutputs:o,lastOutput:c},e,n,a),r}catch{return h(e,t,n,r,a,o,c,l,u)}},_=e=>{if(Array.isArray(e))return e;if(e!==void 0)return[e]},v=async(e,t,n)=>await e.utxoUtils.batchFilterUtxosWithNullifier(t,n),y=(e,t,r,i,a,o,s)=>{for(e.sort((e,t)=>e.amount<=t.amount?1:-1);e.length<t||e.length>t&&e.length<6;)if(e.push(new n.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:s,nullifyingKey:i,spendingPublicKey:a})),r)for(;e.length>6;)e.splice(e.length-1)},b=async({hinkal:e,chainId:t,passedShieldedPublicKey:n=void 0,ethAddress:a=void 0,resetCacheBefore:o=!1,useBlockedUtxos:s=!1})=>{let l=a??await e.getEthereumAddress(),u=n??e.userKeys.getShieldedPublicKey(),{userKeys:d}=e,f=e.encryptedOutputsByChain[t],p=e.nullifiersByChain[t],_=Array.from(f);o&&i.resetCache(e,t,u);let{encryptedOutputs:y,lastOutput:b}=i.getHinkalCache(e,t,u);await r.checkAddressNotUpdated(e,l);let x=b!==``,S=_.findIndex(e=>e.value===b),C=S>-1,w=!x&&S===-1,T=e.areMerkleTreeUpdatesDisabled(),E=c.getCustomUtxoDecryptor(),D=!T&&(C||!E&&w),O=!T&&!!E&&w,k=!D&&!O,A=[];D?A=await h(e,d,t,l,u,_,y,b,S):O&&E?A=await g(e,d,t,l,u,_,y,b,S,E):k&&(A=await e.utxoUtils.buildBatchProcess(y,d,t)),await r.checkAddressNotUpdated(e,l);let j=await v(e,A,p);return{inputUtxos:(s?j.filter(e=>e.isBlocked):j.filter(e=>!e.isBlocked)).filter(e=>!m(e.H0))}},x=async({hinkal:t,chainId:n,passedShieldedPublicKey:r=void 0,ethAddress:i=void 0,resetCacheBefore:a=!1})=>{let o=i??await t.getEthereumAddressByChain(n),s=l.hashEthereumAddress(e.isTronLike(n)?d.addressToHexFormat(o):o),{inputUtxos:c}=await b({hinkal:t,chainId:n,passedShieldedPublicKey:r,ethAddress:o,resetCacheBefore:a,useBlockedUtxos:!0});if(!c.length)return{inputUtxos:[]};let{indexes:f}=await u.getScheduledTransactionsNullifierIndexes({hashedEthereumAddress:s,nullifiers:c.map(e=>e.getNullifier())});return{inputUtxos:f.map(e=>c[e]).filter(e=>!!e)}},S=async({hinkal:n,tokenWithId:r,minInput:i=2,sliceIfMore6:s=!0,chainId:c,passedShieldedPrivateKey:l=void 0,passedShieldedPublicKey:u=void 0,ethAddress:d=void 0,resetCacheBefore:f=!1,ensuredTokensWithId:p,useBlockedUtxos:m=!1})=>{let h=l??n.userKeys.getShieldedPrivateKey(),g=n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,{inputUtxos:v}=m?await x({hinkal:n,chainId:c,ethAddress:d,passedShieldedPrivateKey:l,resetCacheBefore:f}):await b({hinkal:n,tokenWithId:r,minInput:i,sliceIfMore6:s,chainId:c,passedShieldedPrivateKey:l,passedShieldedPublicKey:u,ethAddress:d,resetCacheBefore:f}),S=_(r),C=new Map;v.forEach(e=>{let n=e.getTokenAddress(c);if(S&&!S.some(e=>t.caseInsensitiveEqual(e,n)))return;let r=a.normalizeTokenAddress(c,n),i=C.get(r)??[];C.set(r,[...i,e])}),p?.forEach(e=>{let t=a.normalizeTokenAddress(c,e);C.set(t,C.get(t)??[])});for(let[t,n]of C){let r=t,a=e.isSolanaLike(c),l=a?r:void 0;y(n,i,s,h,g,a?o.formatMintAddress(r).compressedAddress.toLowerCase():r.toLowerCase(),l)}return C};exports.getInputUtxoAndBalance=b,exports.getInputUtxoAndBalanceOfStuckUtxos=x,exports.getInputUtxoAndBalancePerToken=S;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../utils/caseInsensitive.utils.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/upToDateState.cjs`),i=require(`../../utils/cacheFunctions.cjs`),a=require(`../../utils/encodeTokenWithId.cjs`),o=require(`../../utils/solanaMint.utils.cjs`),s=require(`./getInputUtxosEnclave.cjs`),c=require(`../../utils/customEnclaveFunctionsRegister.cjs`),l=require(`../../utils/tron.utils.cjs`),u=require(`../../utils/addresses.cjs`),d=require(`../../../API/scheduled-transactions-calls.cjs`);var f=new(require(`async-mutex`)).Mutex,p=async(e,t)=>e.allowParallelBalanceLocalDecryption?t():f.runExclusive(t),m=e=>e?.[0]===0n&&e?.[1]===1n,h=async(e,t,n,a,o,s,c,l,u)=>p(e,async()=>{u+=1;let d=s.slice(u),{lastOutput:f,additionalEncryptedOutputs:p}=await e.utxoUtils.batchProcess(d,l,t,n),m=[...c,...p];return await r.checkAddressNotUpdated(e,a),i.setHinkalCache({lastOutput:f,encryptedOutputs:m},e,n,o),await e.utxoUtils.buildBatchProcess(m,t,n)}),g=async(e,t,n,r,a,o,c,l,u,d)=>{try{let{utxos:r,encryptedOutputs:o,lastOutput:c}=await s.getInputUtxosEnclave(n,t,d);return i.setHinkalCache({encryptedOutputs:o,lastOutput:c},e,n,a),r}catch{return h(e,t,n,r,a,o,c,l,u)}},_=e=>{if(Array.isArray(e))return e;if(e!==void 0)return[e]},v=async(e,t,n)=>await e.utxoUtils.batchFilterUtxosWithNullifier(t,n),y=(e,t,r,i,a,o,s)=>{for(e.sort((e,t)=>e.amount<=t.amount?1:-1);e.length<t||e.length>t&&e.length<6;)if(e.push(new n.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:s,nullifyingKey:i,spendingPublicKey:a})),r)for(;e.length>6;)e.splice(e.length-1)},b=async({hinkal:e,chainId:t,passedShieldedPublicKey:n=void 0,ethAddress:a=void 0,resetCacheBefore:o=!1,useBlockedUtxos:s=!1})=>{let l=a??await e.getEthereumAddress(),u=n??e.userKeys.getShieldedPublicKey(),{userKeys:d}=e,f=e.encryptedOutputsByChain[t],p=e.nullifiersByChain[t],_=Array.from(f);o&&i.resetCache(e,t,u);let{encryptedOutputs:y,lastOutput:b}=i.getHinkalCache(e,t,u);await r.checkAddressNotUpdated(e,l);let x=b!==``,S=_.findIndex(e=>e.value===b),C=S>-1,w=!x&&S===-1,T=e.areMerkleTreeUpdatesDisabled(),E=c.getCustomUtxoDecryptor(),D=!T&&(C||!E&&w),O=!T&&!!E&&w,k=!D&&!O,A=[];D?A=await h(e,d,t,l,u,_,y,b,S):O&&E?A=await g(e,d,t,l,u,_,y,b,S,E):k&&(A=await e.utxoUtils.buildBatchProcess(y,d,t)),await r.checkAddressNotUpdated(e,l);let j=await v(e,A,p);return{inputUtxos:(s?j.filter(e=>e.isBlocked):j.filter(e=>!e.isBlocked)).filter(e=>!m(e.H0))}},x=async({hinkal:t,chainId:n,passedShieldedPublicKey:r=void 0,ethAddress:i=void 0,resetCacheBefore:a=!1})=>{let o=i??await t.getEthereumAddressByChain(n),s=u.hashEthereumAddress(e.isTronLike(n)?l.addressToHexFormat(o):o),{inputUtxos:c}=await b({hinkal:t,chainId:n,passedShieldedPublicKey:r,ethAddress:o,resetCacheBefore:a,useBlockedUtxos:!0});if(!c.length)return{inputUtxos:[]};let{indexes:f}=await d.getScheduledTransactionsNullifierIndexes({hashedEthereumAddress:s,nullifiers:c.map(e=>e.getNullifier())});return{inputUtxos:f.map(e=>c[e]).filter(e=>!!e)}},S=async({hinkal:n,tokenWithId:r,minInput:i=2,sliceIfMore6:s=!0,chainId:c,passedShieldedPrivateKey:l=void 0,passedShieldedPublicKey:u=void 0,ethAddress:d=void 0,resetCacheBefore:f=!1,ensuredTokensWithId:p,useBlockedUtxos:m=!1})=>{let h=l??n.userKeys.getShieldedPrivateKey(),g=n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,{inputUtxos:v}=m?await x({hinkal:n,chainId:c,ethAddress:d,passedShieldedPrivateKey:l,resetCacheBefore:f}):await b({hinkal:n,tokenWithId:r,minInput:i,sliceIfMore6:s,chainId:c,passedShieldedPrivateKey:l,passedShieldedPublicKey:u,ethAddress:d,resetCacheBefore:f}),S=_(r),C=new Map;v.forEach(e=>{let n=e.getTokenAddress(c);if(S&&!S.some(e=>t.caseInsensitiveEqual(e,n)))return;let r=a.normalizeTokenAddress(c,n),i=C.get(r)??[];C.set(r,[...i,e])}),p?.forEach(e=>{let t=a.normalizeTokenAddress(c,e);C.set(t,C.get(t)??[])});for(let[t,n]of C){let r=t,a=e.isSolanaLike(c),l=a?r:void 0;y(n,i,s,h,g,a?o.formatMintAddress(r).compressedAddress.toLowerCase():r.toLowerCase(),l)}return C};exports.getInputUtxoAndBalance=b,exports.getInputUtxoAndBalanceOfStuckUtxos=x,exports.getInputUtxoAndBalancePerToken=S;

package/common/src/functions/web3/events/getInputUtxoAndBalance.mjs

@@ -7,9 +7,9 @@ import { normalizeTokenAddress as c } from "../../utils/encodeTokenWithId.mjs";
 import { formatMintAddress as l } from "../../utils/solanaMint.utils.mjs";
 import { getInputUtxosEnclave as u } from "./getInputUtxosEnclave.mjs";
 import { getCustomUtxoDecryptor as d } from "../../utils/customEnclaveFunctionsRegister.mjs";
-import { hashEthereumAddress as f } from "../../utils/addresses.mjs";
-import { getScheduledTransactionsNullifierIndexes as p } from "../../../API/scheduled-transactions-calls.mjs";
-import { addressToHexFormat as m } from "../../utils/tron.utils.mjs";
+import { addressToHexFormat as f } from "../../utils/tron.utils.mjs";
+import { hashEthereumAddress as p } from "../../utils/addresses.mjs";
+import { getScheduledTransactionsNullifierIndexes as m } from "../../../API/scheduled-transactions-calls.mjs";
 import { Mutex as h } from "async-mutex";
 //#region libs/shared/common/src/functions/web3/events/getInputUtxoAndBalance.ts
 var g = new h(), _ = async (e, t) => e.allowParallelBalanceLocalDecryption ? t() : g.runExclusive(t), v = (e) => e?.[0] === 0n && e?.[1] === 1n, y = async (e, t, n, r, a, o, c, l, u) => _(e, async () => {
@@ -50,7 +50,7 @@ var g = new h(), _ = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
 	let M = await S(e, j, m);
 	return { inputUtxos: (c ? M.filter((e) => e.isBlocked) : M.filter((e) => !e.isBlocked)).filter((e) => !v(e.H0)) };
 }, T = async ({ hinkal: e, chainId: n, passedShieldedPublicKey: r = void 0, ethAddress: i = void 0, resetCacheBefore: a = !1 }) => {
-	let o = i ?? await e.getEthereumAddressByChain(n), s = f(t(n) ? m(o) : o), { inputUtxos: c } = await w({
+	let o = i ?? await e.getEthereumAddressByChain(n), s = p(t(n) ? f(o) : o), { inputUtxos: c } = await w({
 		hinkal: e,
 		chainId: n,
 		passedShieldedPublicKey: r,
@@ -59,7 +59,7 @@ var g = new h(), _ = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
 		useBlockedUtxos: !0
 	});
 	if (!c.length) return { inputUtxos: [] };
-	let { indexes: l } = await p({
+	let { indexes: l } = await m({
 		hashedEthereumAddress: s,
 		nullifiers: c.map((e) => e.getNullifier())
 	});

package/common/src/functions/web3/events/getInputUtxosEnclave.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../data-structures/crypto-keys/keys.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/encodeTokenWithId.cjs`),i=require(`../../utils/encryptInputForEnclave.cjs`),a=require(`../../utils/solanaMint.utils.cjs`),o=require(`../../utils/serialize-utxos.utils.cjs`);let s=require(`ethers`);var c=async(r,i,c)=>{let l=i.getShieldedPrivateKey(),{privateKey:u,publicKey:d}=t.UserKeys.getEncryptionKeyPair(l),f=i.getSpendingKeyPair().pubSpendingBJJPoint,p=s.ethers.solidityPacked([`uint256`,`uint256`,`uint256`],[d,u,l]),{utxos:m,lastOutput:h,encryptedOutputs:g}=await c(r,s.ethers.getBytes(p));return{utxos:m.map(t=>{let i=t;if(e.isSolanaLike(r)){let e=a.normalizeSolanaMintAddress(t.mintAddress);if(!e)throw Error(`Invalid mint address`);i={...i,erc20TokenAddress:e.compressedAddress,mintAddress:e.mintBase58}}return new n.Utxo({...o.deserializeUtxoConstructorParams(i),nullifyingKey:l,spendingPublicKey:f})}),encryptedOutputs:g,lastOutput:h}},l=(t,n)=>{if(e.isSolanaLike(t)){let e=a.normalizeSolanaMintAddress(n);if(!e)throw Error(`Invalid mint address in enclave balance: ${n}`);return r.normalizeTokenAddress(t,e.mintBase58)}return r.normalizeTokenAddress(t,n.startsWith(`0x`)?n:s.ethers.toBeHex(BigInt(n),20))},u=async(e,t,n,r=!1,a)=>{let{keyCiphertext:o,inputCiphertext:c}=await i.makeEnclaveHandshakeAndEncryptUint8Array(s.ethers.getBytes(s.ethers.solidityPacked([`uint256`],[n]))),{preConfirmedBalances:u}=await e.getAPI().getBalancesEnclaveCall(t,o,c,r,a),d=new Map;return u.forEach(({erc20TokenAddress:e,amount:n})=>{d.set(l(t,e),BigInt(n))}),d};exports.getInputUtxosEnclave=c,exports.getRemoteManagedTokenBalances=u;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../data-structures/crypto-keys/keys.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/encodeTokenWithId.cjs`),i=require(`../../utils/encryptInputForEnclave.cjs`),a=require(`../../utils/solanaMint.utils.cjs`),o=require(`../../utils/serialize-utxos.utils.cjs`),s=require(`../../../error-handling/logger.cjs`);let c=require(`ethers`);var l=async(r,i,s)=>{let l=i.getShieldedPrivateKey(),{privateKey:u,publicKey:d}=t.UserKeys.getEncryptionKeyPair(l),f=i.getSpendingKeyPair().pubSpendingBJJPoint,p=c.ethers.solidityPacked([`uint256`,`uint256`,`uint256`],[d,u,l]),{utxos:m,lastOutput:h,encryptedOutputs:g}=await s(r,c.ethers.getBytes(p));return{utxos:m.map(t=>{let i=t;if(e.isSolanaLike(r)){let e=a.normalizeSolanaMintAddress(t.mintAddress);if(!e)throw Error(`Invalid mint address`);i={...i,erc20TokenAddress:e.compressedAddress,mintAddress:e.mintBase58}}return new n.Utxo({...o.deserializeUtxoConstructorParams(i),nullifyingKey:l,spendingPublicKey:f})}),encryptedOutputs:g,lastOutput:h}},u=(t,n)=>{if(e.isSolanaLike(t)){let e=a.normalizeSolanaMintAddress(n);if(!e)throw Error(`Invalid mint address in enclave balance: ${n}`);return r.normalizeTokenAddress(t,e.mintBase58)}return r.normalizeTokenAddress(t,n.startsWith(`0x`)?n:c.ethers.toBeHex(BigInt(n),20))},d=async(e,t,n,r=!1,a)=>{let o=await i.makeEnclaveHandshakeAndEncryptUint8Array(c.ethers.getBytes(c.ethers.solidityPacked([`uint256`],[n]))),{results:l}=await e.getAPI().getBalancesEnclaveCall(t,o,r,a),d=new Map;return l.forEach(({chainId:e,preConfirmedBalances:t,error:n})=>{if(n){s.Logger.error(`Enclave balance fetch failed for chainId ${e}:`,n);return}let r=new Map;t.forEach(({erc20TokenAddress:t,amount:n})=>{r.set(u(e,t),BigInt(n))}),d.set(e,r)}),d};exports.getInputUtxosEnclave=l,exports.getRemoteManagedTokenBalances=d;

package/common/src/functions/web3/events/getInputUtxosEnclave.d.ts

@@ -7,4 +7,4 @@ export declare const getInputUtxosEnclave: (chainId: number, userKeys: UserKeys,
     encryptedOutputs: import('../../..').EncryptedOutputWithSign<boolean>[];
     lastOutput: string;
 }>;
-export declare const getRemoteManagedTokenBalances: (hinkal: IHinkal, chainId: number, shieldedPrivateKey: string, useBlockedUtxos?: boolean, hashedEthereumAddress?: string) => Promise<Map<string, bigint>>;
+export declare const getRemoteManagedTokenBalances: (hinkal: IHinkal, chainIds: number[], shieldedPrivateKey: string, useBlockedUtxos?: boolean, hashedEthereumAddress?: string) => Promise<Map<number, Map<string, bigint>>>;

package/common/src/functions/web3/events/getInputUtxosEnclave.mjs

@@ -5,10 +5,11 @@ import { normalizeTokenAddress as r } from "../../utils/encodeTokenWithId.mjs";
 import { makeEnclaveHandshakeAndEncryptUint8Array as i } from "../../utils/encryptInputForEnclave.mjs";
 import { normalizeSolanaMintAddress as a } from "../../utils/solanaMint.utils.mjs";
 import { deserializeUtxoConstructorParams as o } from "../../utils/serialize-utxos.utils.mjs";
-import { ethers as s } from "ethers";
+import { Logger as s } from "../../../error-handling/logger.mjs";
+import { ethers as c } from "ethers";
 //#region libs/shared/common/src/functions/web3/events/getInputUtxosEnclave.ts
-var c = async (r, i, c) => {
-	let l = i.getShieldedPrivateKey(), { privateKey: u, publicKey: d } = t.getEncryptionKeyPair(l), f = i.getSpendingKeyPair().pubSpendingBJJPoint, p = s.solidityPacked([
+var l = async (r, i, s) => {
+	let l = i.getShieldedPrivateKey(), { privateKey: u, publicKey: d } = t.getEncryptionKeyPair(l), f = i.getSpendingKeyPair().pubSpendingBJJPoint, p = c.solidityPacked([
 		"uint256",
 		"uint256",
 		"uint256"
@@ -16,7 +17,7 @@ var c = async (r, i, c) => {
 		d,
 		u,
 		l
-	]), { utxos: m, lastOutput: h, encryptedOutputs: g } = await c(r, s.getBytes(p));
+	]), { utxos: m, lastOutput: h, encryptedOutputs: g } = await s(r, c.getBytes(p));
 	return {
 		utxos: m.map((t) => {
 			let i = t;
@@ -38,18 +39,25 @@ var c = async (r, i, c) => {
 		encryptedOutputs: g,
 		lastOutput: h
 	};
-}, l = (t, n) => {
+}, u = (t, n) => {
 	if (e(t)) {
 		let e = a(n);
 		if (!e) throw Error(`Invalid mint address in enclave balance: ${n}`);
 		return r(t, e.mintBase58);
 	}
-	return r(t, n.startsWith("0x") ? n : s.toBeHex(BigInt(n), 20));
-}, u = async (e, t, n, r = !1, a) => {
-	let { keyCiphertext: o, inputCiphertext: c } = await i(s.getBytes(s.solidityPacked(["uint256"], [n]))), { preConfirmedBalances: u } = await e.getAPI().getBalancesEnclaveCall(t, o, c, r, a), d = /* @__PURE__ */ new Map();
-	return u.forEach(({ erc20TokenAddress: e, amount: n }) => {
-		d.set(l(t, e), BigInt(n));
+	return r(t, n.startsWith("0x") ? n : c.toBeHex(BigInt(n), 20));
+}, d = async (e, t, n, r = !1, a) => {
+	let o = await i(c.getBytes(c.solidityPacked(["uint256"], [n]))), { results: l } = await e.getAPI().getBalancesEnclaveCall(t, o, r, a), d = /* @__PURE__ */ new Map();
+	return l.forEach(({ chainId: e, preConfirmedBalances: t, error: n }) => {
+		if (n) {
+			s.error(`Enclave balance fetch failed for chainId ${e}:`, n);
+			return;
+		}
+		let r = /* @__PURE__ */ new Map();
+		t.forEach(({ erc20TokenAddress: t, amount: n }) => {
+			r.set(u(e, t), BigInt(n));
+		}), d.set(e, r);
 	}), d;
 };
 //#endregion
-export { c as getInputUtxosEnclave, u as getRemoteManagedTokenBalances };
+export { l as getInputUtxosEnclave, d as getRemoteManagedTokenBalances };

package/common/src/functions/web3/events/getShieldedBalance.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/vite.constants.cjs`),t=require(`../../../constants/chains.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../etherFunctions.cjs`),a=require(`../../../data-structures/utxo/Utxo.cjs`),o=require(`../../../error-handling/customErrors/ErrorWithAmount.cjs`);require(`../../../error-handling/customErrors/index.cjs`);const s=require(`../../utils/encodeTokenWithId.cjs`),c=require(`../../utils/solanaMint.utils.cjs`),l=require(`./getInputUtxosEnclave.cjs`),u=require(`../../utils/addresses.cjs`),d=require(`../../utils/tron.utils.cjs`),f=require(`./getInputUtxoAndBalance.cjs`),p=require(`../../../data-structures/TokenDBs/PrivateTokensDB.cjs`),m=require(`../../utils/map.utils.cjs`),h=require(`../../utils/mutexes.utils.cjs`),g=require(`../../utils/erc20tokenFunctions.cjs`);let _=require(`async-mutex`);var v=async(r,i,a,o,c,v=!1,y=!1,b=!1)=>m.getOrCreateMapValue(r.balanceFetchingMutexByChain,i,()=>new _.Mutex).runExclusive(async()=>h.getChainBalanceFetchingMutex(i).runShared(async()=>{if(r.generateProofRemotely){let n=await l.getRemoteManagedTokenBalances(r,i,a,b,b?u.hashEthereumAddress(t.isTronLike(i)?d.addressToHexFormat(c):c):void 0);y&&e.isExtension&&await p.privateTokensDB.fetchAndUpdatePrivateTokens([...n.keys()],i,c);let o=e.isExtension?await p.privateTokensDB.getPrivateTokens(i,c):await g.getErc20TokensForChainAPI(i),f=new Map;return o.forEach(e=>{f.set(e.erc20TokenAddress.toLowerCase(),{token:e,balance:n.get(s.normalizeTokenAddress(i,e.erc20TokenAddress))??0n,nfts:[]})}),f}let{inputUtxos:m}=b?await f.getInputUtxoAndBalanceOfStuckUtxos({hinkal:r,chainId:i,ethAddress:c,passedShieldedPrivateKey:a,resetCacheBefore:v}):await f.getInputUtxoAndBalance({hinkal:r,sliceIfMore6:!1,chainId:i,passedShieldedPrivateKey:a,passedShieldedPublicKey:o,ethAddress:c,resetCacheBefore:v});y&&e.isExtension&&await p.privateTokensDB.fetchAndUpdatePrivateTokens(m.map(e=>e.getTokenAddress(i)).filter(e=>e!==void 0),i,c);let h=(e.isExtension?await p.privateTokensDB.getPrivateTokens(i,c):await g.getErc20TokensForChainAPI(i)).map(e=>({token:e,balance:m.reduce((t,r)=>{let a=e.erc20TokenAddress;return n.caseInsensitiveEqual(a,r.getTokenAddress(i))?t+r.amount:t},0n),timestamp:m.filter(t=>n.caseInsensitiveEqual(t.getTokenAddress(i),e.erc20TokenAddress))[0]?.timeStamp,nfts:[]})),_=new Map;return h.forEach(e=>{_.set(e.token.erc20TokenAddress.toLowerCase(),e)}),_})),y=async(e,n,l,u,d=6,p=!1,m=!1)=>{let{userKeys:h}=e,_=h.getSpendingKeyPair().pubSpendingBJJPoint,v=[],y=[];if(l.length===0)return[];if(p){for(let e=0;e<l.length;e+=1){let r=t.isSolanaLike(n),i=r?l[e]:void 0,o=r?c.formatMintAddress(l[e]).compressedAddress:l[e];v.push(Array.from({length:d},()=>new a.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:i,nullifyingKey:h.getShieldedPrivateKey(),spendingPublicKey:_})))}return v}let b=await f.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:l,useBlockedUtxos:m,chainId:n}),x=0;for(let e=0;e<l.length;e+=1){let t=b.get(s.normalizeTokenAddress(n,l[e]))??[];if(!t)throw Error(`Missing utxos for token`);x=Math.max(t.length,x),y.push(t)}if(x===2)return y;for(let[e,s]of y.entries())if(s.length>d){let t=s.slice(0,d),a=t.reduce((e,t)=>e+t.amount,0n);if(u[e]<0n&&a<-u[e]){let t=await g.getErc20TokenFromAPI(n,l[e]);if(!t)throw Error(`Token not found`);let s=t.decimals===18?6:2,c=Number(i.getAmountWithPrecision(a,t,s));throw new o.ErrorWithAmount(c,`${r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.UTXO_LIMITATIONS}. Please try again with ${c} ${t.symbol}, including gas fees.`)}v.push(t)}else if(s.length<=d){let r=[...s],i=d-s.length;for(;i>0;){--i;let o=t.isSolanaLike(n),s=o?l[e]:void 0,u=o?c.formatMintAddress(l[e]).compressedAddress:l[e];r.push(new a.Utxo({amount:0n,erc20TokenAddress:u,mintAddress:s,nullifyingKey:h.getShieldedPrivateKey(),spendingPublicKey:_}))}v.push(r)}return v};exports.addPaddingToUtxos=y,exports.getShieldedBalance=v;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/vite.constants.cjs`),t=require(`../../../constants/chains.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../etherFunctions.cjs`),a=require(`../../../data-structures/utxo/Utxo.cjs`),o=require(`../../../error-handling/customErrors/ErrorWithAmount.cjs`);require(`../../../error-handling/customErrors/index.cjs`);const s=require(`../../utils/encodeTokenWithId.cjs`),c=require(`../../utils/solanaMint.utils.cjs`),l=require(`../../../error-handling/logger.cjs`),u=require(`./getInputUtxosEnclave.cjs`),d=require(`../../utils/addresses.cjs`),f=require(`./getInputUtxoAndBalance.cjs`),p=require(`../../../data-structures/TokenDBs/PrivateTokensDB.cjs`),m=require(`../../utils/map.utils.cjs`),h=require(`../../utils/mutexes.utils.cjs`),g=require(`../../utils/erc20tokenFunctions.cjs`);let _=require(`async-mutex`);var v=(e,t,n)=>m.getOrCreateMapValue(e.balanceFetchingMutexByChain,t,()=>new _.Mutex).runExclusive(()=>h.getChainBalanceFetchingMutex(t).runShared(n)),y=async(t,n,r,i,a)=>(r&&e.isExtension&&await p.privateTokensDB.fetchAndUpdatePrivateTokens(i,t,n),(e.isExtension?await p.privateTokensDB.getPrivateTokens(t,n):await g.getErc20TokensForChainAPI(t)).map(e=>({token:e,nfts:[],...a(e)}))),b=async(e,t,n,r,i)=>{let a=new Map;t.forEach((e,t)=>{m.getOrCreateMapValue(a,i?d.hashOwnerAddressForChain(t,e):``,()=>[]).push(t)});let o=new Map;await Promise.all([...a].map(async([t,r])=>{try{(await u.getRemoteManagedTokenBalances(e,r,n,i,t||void 0)).forEach((e,t)=>o.set(t,e))}catch(e){l.Logger.error(`Error fetching remote shielded balances for chainIds ${r.join(`, `)}:`,e)}}));let c=new Map;return await Promise.all([...o].map(async([n,i])=>{try{await v(e,n,async()=>{let e=await y(n,t.get(n),r,[...i.keys()],e=>({balance:i.get(s.normalizeTokenAddress(n,e.erc20TokenAddress))??0n}));c.set(n,e)})}catch(e){l.Logger.error(`Error fetching shielded balance for chainId ${n}:`,e)}})),c},x=async(e,t,r,i,a,o,s,c)=>{let{inputUtxos:l}=c?await f.getInputUtxoAndBalanceOfStuckUtxos({hinkal:e,chainId:t,ethAddress:a,passedShieldedPrivateKey:r,resetCacheBefore:o}):await f.getInputUtxoAndBalance({hinkal:e,sliceIfMore6:!1,chainId:t,passedShieldedPrivateKey:r,passedShieldedPublicKey:i,ethAddress:a,resetCacheBefore:o});return y(t,a,s,l.map(e=>e.getTokenAddress(t)).filter(e=>e!==void 0),e=>{let r=l.filter(r=>n.caseInsensitiveEqual(r.getTokenAddress(t),e.erc20TokenAddress));return{balance:r.reduce((e,t)=>e+t.amount,0n),timestamp:r[0]?.timeStamp}})},S=async(e,t,n,r,i=!1,a=!1,o=!1)=>{if(e.generateProofRemotely)return b(e,t,n,a,o);let s=new Map;return await Promise.all([...t].map(async([t,c])=>{try{let l=await v(e,t,()=>x(e,t,n,r,c,i,a,o));s.set(t,l)}catch(e){l.Logger.error(`Error fetching shielded balance for chainId ${t}:`,e)}})),s},C=(e,n,r,i,o)=>{let s=t.isSolanaLike(r),l=s?i:void 0,u=s?c.formatMintAddress(i).compressedAddress:i;return Array.from({length:o},()=>new a.Utxo({amount:0n,erc20TokenAddress:u,mintAddress:l,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:n}))},w=async(e,t,n,a,c=6,l=!1,u=!1,d)=>{let{userKeys:p}=e,m=p.getSpendingKeyPair().pubSpendingBJJPoint,h=[],_=[];if(n.length===0)return[];if(l){for(let e=0;e<n.length;e+=1)h.push(C(p,m,t,n[e],c));return h}let v=await f.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:n,useBlockedUtxos:u,chainId:t}),y=0;for(let e=0;e<n.length;e+=1){let r=v.get(s.normalizeTokenAddress(t,n[e]))??[];if(!r)throw Error(`Missing utxos for token`);let i=d?.[e]?C(p,m,t,n[e],2):r;y=Math.max(i.length,y),_.push(i)}if(y===2)return _;for(let[e,s]of _.entries())if(s.length>c){let l=s.slice(0,c),u=l.reduce((e,t)=>e+t.amount,0n);if(a[e]<0n&&u<-a[e]){let a=await g.getErc20TokenFromAPI(t,n[e]);if(!a)throw Error(`Token not found`);let s=a.decimals===18?6:2,c=Number(i.getAmountWithPrecision(u,a,s));throw new o.ErrorWithAmount(c,`${r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.UTXO_LIMITATIONS}. Please try again with ${c} ${a.symbol}, including gas fees.`)}h.push(l)}else if(s.length<=c){let r=c-s.length;h.push([...s,...C(p,m,t,n[e],r)])}return h};exports.addPaddingToUtxos=w,exports.getShieldedBalances=S;

package/common/src/functions/web3/events/getShieldedBalance.d.ts

@@ -3,10 +3,10 @@ import { Utxo } from '../../../data-structures/utxo/Utxo';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 /**
  *
- * @param UserKeys to access user's encryption keys
- * @returns shielded balance
+ * @param ethAddressByChain address holding the shielded balance, per chain to read
+ * @returns shielded balances per chain, without the chains that failed
  */
-export declare const getShieldedBalance: (hinkal: IHinkal, chainId: number, passedShieldedPrivateKey: string, passedShieldedPublicKey: string, ethAddress: string, resetCacheBefore?: boolean, updateTokensListBefore?: boolean, useBlockedUtxos?: boolean) => Promise<Map<string, TokenBalance>>;
+export declare const getShieldedBalances: (hinkal: IHinkal, ethAddressByChain: Map<number, string>, passedShieldedPrivateKey: string, passedShieldedPublicKey: string, resetCacheBefore?: boolean, updateTokensListBefore?: boolean, useBlockedUtxos?: boolean) => Promise<Map<number, TokenBalance[]>>;
 /**
  *
  * @param hinkal hinkal instance to get userKeys
@@ -15,4 +15,4 @@ export declare const getShieldedBalance: (hinkal: IHinkal, chainId: number, pass
  * @param maxInput to pad until maxInput number
  * @returns return padded UTXOs for every erc20 token
  */
-export declare const addPaddingToUtxos: (hinkal: IHinkal, chainId: number, erc20Addresses: string[], amountChanges: bigint[], maxInput?: number, forceEmptyUtxos?: boolean, useBlockedUtxos?: boolean) => Promise<Utxo[][]>;
+export declare const addPaddingToUtxos: (hinkal: IHinkal, chainId: number, erc20Addresses: string[], amountChanges: bigint[], maxInput?: number, forceEmptyUtxos?: boolean, useBlockedUtxos?: boolean, onChainCreation?: boolean[]) => Promise<Utxo[][]>;

package/common/src/functions/web3/events/getShieldedBalance.mjs

@@ -1,118 +1,129 @@
 import { isExtension as e } from "../../../constants/vite.constants.mjs";
-import { isSolanaLike as t, isTronLike as n } from "../../../constants/chains.constants.mjs";
-import { caseInsensitiveEqual as r } from "../../utils/caseInsensitive.utils.mjs";
-import { DIRECTLY_SHOW_MESSAGE_ERROR_CODES as i } from "../../../error-handling/error-codes.constants.mjs";
-import { getAmountWithPrecision as a } from "../etherFunctions.mjs";
-import { Utxo as o } from "../../../data-structures/utxo/Utxo.mjs";
-import { ErrorWithAmount as s } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
+import { isSolanaLike as t } from "../../../constants/chains.constants.mjs";
+import { caseInsensitiveEqual as n } from "../../utils/caseInsensitive.utils.mjs";
+import { DIRECTLY_SHOW_MESSAGE_ERROR_CODES as r } from "../../../error-handling/error-codes.constants.mjs";
+import { getAmountWithPrecision as i } from "../etherFunctions.mjs";
+import { Utxo as a } from "../../../data-structures/utxo/Utxo.mjs";
+import { ErrorWithAmount as o } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
 import "../../../error-handling/customErrors/index.mjs";
-import { normalizeTokenAddress as c } from "../../utils/encodeTokenWithId.mjs";
-import { formatMintAddress as l } from "../../utils/solanaMint.utils.mjs";
+import { normalizeTokenAddress as s } from "../../utils/encodeTokenWithId.mjs";
+import { formatMintAddress as c } from "../../utils/solanaMint.utils.mjs";
+import { Logger as l } from "../../../error-handling/logger.mjs";
 import { getRemoteManagedTokenBalances as u } from "./getInputUtxosEnclave.mjs";
-import { hashEthereumAddress as d } from "../../utils/addresses.mjs";
-import { addressToHexFormat as f } from "../../utils/tron.utils.mjs";
-import { getInputUtxoAndBalance as p, getInputUtxoAndBalanceOfStuckUtxos as m, getInputUtxoAndBalancePerToken as h } from "./getInputUtxoAndBalance.mjs";
-import { privateTokensDB as g } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
-import { getOrCreateMapValue as _ } from "../../utils/map.utils.mjs";
-import { getChainBalanceFetchingMutex as v } from "../../utils/mutexes.utils.mjs";
-import { getErc20TokenFromAPI as y, getErc20TokensForChainAPI as b } from "../../utils/erc20tokenFunctions.mjs";
-import { Mutex as x } from "async-mutex";
+import { hashOwnerAddressForChain as d } from "../../utils/addresses.mjs";
+import { getInputUtxoAndBalance as f, getInputUtxoAndBalanceOfStuckUtxos as p, getInputUtxoAndBalancePerToken as m } from "./getInputUtxoAndBalance.mjs";
+import { privateTokensDB as h } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
+import { getOrCreateMapValue as g } from "../../utils/map.utils.mjs";
+import { getChainBalanceFetchingMutex as _ } from "../../utils/mutexes.utils.mjs";
+import { getErc20TokenFromAPI as v, getErc20TokensForChainAPI as y } from "../../utils/erc20tokenFunctions.mjs";
+import { Mutex as b } from "async-mutex";
 //#region libs/shared/common/src/functions/web3/events/getShieldedBalance.ts
-var S = async (t, i, a, o, s, l = !1, h = !1, y = !1) => _(t.balanceFetchingMutexByChain, i, () => new x()).runExclusive(async () => v(i).runShared(async () => {
-	if (t.generateProofRemotely) {
-		let r = await u(t, i, a, y, y ? d(n(i) ? f(s) : s) : void 0);
-		h && e && await g.fetchAndUpdatePrivateTokens([...r.keys()], i, s);
-		let o = e ? await g.getPrivateTokens(i, s) : await b(i), l = /* @__PURE__ */ new Map();
-		return o.forEach((e) => {
-			l.set(e.erc20TokenAddress.toLowerCase(), {
-				token: e,
-				balance: r.get(c(i, e.erc20TokenAddress)) ?? 0n,
-				nfts: []
+var x = (e, t, n) => g(e.balanceFetchingMutexByChain, t, () => new b()).runExclusive(() => _(t).runShared(n)), S = async (t, n, r, i, a) => (r && e && await h.fetchAndUpdatePrivateTokens(i, t, n), (e ? await h.getPrivateTokens(t, n) : await y(t)).map((e) => ({
+	token: e,
+	nfts: [],
+	...a(e)
+}))), C = async (e, t, n, r, i) => {
+	let a = /* @__PURE__ */ new Map();
+	t.forEach((e, t) => {
+		g(a, i ? d(t, e) : "", () => []).push(t);
+	});
+	let o = /* @__PURE__ */ new Map();
+	await Promise.all([...a].map(async ([t, r]) => {
+		try {
+			(await u(e, r, n, i, t || void 0)).forEach((e, t) => o.set(t, e));
+		} catch (e) {
+			l.error(`Error fetching remote shielded balances for chainIds ${r.join(", ")}:`, e);
+		}
+	}));
+	let c = /* @__PURE__ */ new Map();
+	return await Promise.all([...o].map(async ([n, i]) => {
+		try {
+			await x(e, n, async () => {
+				let e = await S(n, t.get(n), r, [...i.keys()], (e) => ({ balance: i.get(s(n, e.erc20TokenAddress)) ?? 0n }));
+				c.set(n, e);
 			});
-		}), l;
-	}
-	let { inputUtxos: _ } = y ? await m({
-		hinkal: t,
-		chainId: i,
-		ethAddress: s,
-		passedShieldedPrivateKey: a,
-		resetCacheBefore: l
-	}) : await p({
-		hinkal: t,
+		} catch (e) {
+			l.error(`Error fetching shielded balance for chainId ${n}:`, e);
+		}
+	})), c;
+}, w = async (e, t, r, i, a, o, s, c) => {
+	let { inputUtxos: l } = c ? await p({
+		hinkal: e,
+		chainId: t,
+		ethAddress: a,
+		passedShieldedPrivateKey: r,
+		resetCacheBefore: o
+	}) : await f({
+		hinkal: e,
 		sliceIfMore6: !1,
-		chainId: i,
-		passedShieldedPrivateKey: a,
-		passedShieldedPublicKey: o,
-		ethAddress: s,
-		resetCacheBefore: l
+		chainId: t,
+		passedShieldedPrivateKey: r,
+		passedShieldedPublicKey: i,
+		ethAddress: a,
+		resetCacheBefore: o
 	});
-	h && e && await g.fetchAndUpdatePrivateTokens(_.map((e) => e.getTokenAddress(i)).filter((e) => e !== void 0), i, s);
-	let v = (e ? await g.getPrivateTokens(i, s) : await b(i)).map((e) => ({
-		token: e,
-		balance: _.reduce((t, n) => {
-			let a = e.erc20TokenAddress;
-			return r(a, n.getTokenAddress(i)) ? t + n.amount : t;
-		}, 0n),
-		timestamp: _.filter((t) => r(t.getTokenAddress(i), e.erc20TokenAddress))[0]?.timeStamp,
-		nfts: []
-	})), x = /* @__PURE__ */ new Map();
-	return v.forEach((e) => {
-		x.set(e.token.erc20TokenAddress.toLowerCase(), e);
-	}), x;
-})), C = async (e, n, r, u, d = 6, f = !1, p = !1) => {
-	let { userKeys: m } = e, g = m.getSpendingKeyPair().pubSpendingBJJPoint, _ = [], v = [];
-	if (r.length === 0) return [];
-	if (f) {
-		for (let e = 0; e < r.length; e += 1) {
-			let i = t(n), a = i ? r[e] : void 0, s = i ? l(r[e]).compressedAddress : r[e];
-			_.push(Array.from({ length: d }, () => new o({
-				amount: 0n,
-				erc20TokenAddress: s,
-				mintAddress: a,
-				nullifyingKey: m.getShieldedPrivateKey(),
-				spendingPublicKey: g
-			})));
+	return S(t, a, s, l.map((e) => e.getTokenAddress(t)).filter((e) => e !== void 0), (e) => {
+		let r = l.filter((r) => n(r.getTokenAddress(t), e.erc20TokenAddress));
+		return {
+			balance: r.reduce((e, t) => e + t.amount, 0n),
+			timestamp: r[0]?.timeStamp
+		};
+	});
+}, T = async (e, t, n, r, i = !1, a = !1, o = !1) => {
+	if (e.generateProofRemotely) return C(e, t, n, a, o);
+	let s = /* @__PURE__ */ new Map();
+	return await Promise.all([...t].map(async ([t, c]) => {
+		try {
+			let l = await x(e, t, () => w(e, t, n, r, c, i, a, o));
+			s.set(t, l);
+		} catch (e) {
+			l.error(`Error fetching shielded balance for chainId ${t}:`, e);
 		}
-		return _;
+	})), s;
+}, E = (e, n, r, i, o) => {
+	let s = t(r), l = s ? i : void 0, u = s ? c(i).compressedAddress : i;
+	return Array.from({ length: o }, () => new a({
+		amount: 0n,
+		erc20TokenAddress: u,
+		mintAddress: l,
+		nullifyingKey: e.getShieldedPrivateKey(),
+		spendingPublicKey: n
+	}));
+}, D = async (e, t, n, a, c = 6, l = !1, u = !1, d) => {
+	let { userKeys: f } = e, p = f.getSpendingKeyPair().pubSpendingBJJPoint, h = [], g = [];
+	if (n.length === 0) return [];
+	if (l) {
+		for (let e = 0; e < n.length; e += 1) h.push(E(f, p, t, n[e], c));
+		return h;
 	}
-	let b = await h({
+	let _ = await m({
 		hinkal: e,
 		sliceIfMore6: !1,
-		ensuredTokensWithId: r,
-		useBlockedUtxos: p,
-		chainId: n
-	}), x = 0;
-	for (let e = 0; e < r.length; e += 1) {
-		let t = b.get(c(n, r[e])) ?? [];
-		if (!t) throw Error("Missing utxos for token");
-		x = Math.max(t.length, x), v.push(t);
+		ensuredTokensWithId: n,
+		useBlockedUtxos: u,
+		chainId: t
+	}), y = 0;
+	for (let e = 0; e < n.length; e += 1) {
+		let r = _.get(s(t, n[e])) ?? [];
+		if (!r) throw Error("Missing utxos for token");
+		let i = d?.[e] ? E(f, p, t, n[e], 2) : r;
+		y = Math.max(i.length, y), g.push(i);
 	}
-	if (x === 2) return v;
-	for (let [e, c] of v.entries()) if (c.length > d) {
-		let t = c.slice(0, d), o = t.reduce((e, t) => e + t.amount, 0n);
-		if (u[e] < 0n && o < -u[e]) {
-			let t = await y(n, r[e]);
-			if (!t) throw Error("Token not found");
-			let c = t.decimals === 18 ? 6 : 2, l = Number(a(o, t, c));
-			throw new s(l, `${i.UTXO_LIMITATIONS}. Please try again with ${l} ${t.symbol}, including gas fees.`);
-		}
-		_.push(t);
-	} else if (c.length <= d) {
-		let i = [...c], a = d - c.length;
-		for (; a > 0;) {
-			--a;
-			let s = t(n), c = s ? r[e] : void 0, u = s ? l(r[e]).compressedAddress : r[e];
-			i.push(new o({
-				amount: 0n,
-				erc20TokenAddress: u,
-				mintAddress: c,
-				nullifyingKey: m.getShieldedPrivateKey(),
-				spendingPublicKey: g
-			}));
+	if (y === 2) return g;
+	for (let [e, s] of g.entries()) if (s.length > c) {
+		let l = s.slice(0, c), u = l.reduce((e, t) => e + t.amount, 0n);
+		if (a[e] < 0n && u < -a[e]) {
+			let a = await v(t, n[e]);
+			if (!a) throw Error("Token not found");
+			let s = a.decimals === 18 ? 6 : 2, c = Number(i(u, a, s));
+			throw new o(c, `${r.UTXO_LIMITATIONS}. Please try again with ${c} ${a.symbol}, including gas fees.`);
 		}
-		_.push(i);
+		h.push(l);
+	} else if (s.length <= c) {
+		let r = c - s.length;
+		h.push([...s, ...E(f, p, t, n[e], r)]);
 	}
-	return _;
+	return h;
 };
 //#endregion
-export { C as addPaddingToUtxos, S as getShieldedBalance };
+export { D as addPaddingToUtxos, T as getShieldedBalances };

package/common/src/functions/web3/functionCalls/transactCallDirectTron.cjs

@@ -1 +1 @@
-const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../../utils/tron.utils.cjs`),a=require(`../../../error-handling/logger.cjs`),o=require(`../../../externalABIs/index.cjs`),s=require(`./waitForErc20Approvals.cjs`),c=require(`../../utils/tronSimulation.utils.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!0,y)=>{let b=Array.isArray(d)?d:[d],x=Array.isArray(f)?f:[f];if(b.length!==x.length)throw Error(`token and amount length mismatch`);let S=l.getTronWeb(),C=await l.getEthereumAddressByChain(u),{hinkalAddress:w,hinkalABI:T}=e.networkRegistry[u].contractData,E=S.contract(T,i.evmHexToTronBase58Address(w)),D=g??E,O=_??E;if(!D.address)throw Error(`contractForApproval address not set`);if(!O.address)throw Error(`contractForTransaction address not set`);let k=x.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),A=k===-1?0n:b[k],j=A>0n?A:0n;if(x.some(({erc20TokenAddress:e},r)=>!n.caseInsensitiveEqual(e,t.zeroAddress)&&b[r]>0n)){let e=D.address;if(!e)throw Error(`token approval spender not set`);let r=[];for(let a=0;a<x.length;a+=1){let s=x[a],c=b[a];if(c>0n&&!n.caseInsensitiveEqual(s.erc20TokenAddress,t.zeroAddress)){let n=i.evmHexToTronBase58Address(s.erc20TokenAddress),a=await S.contract(o.ERC20ABI,n).allowance(C,e).call({from:C});if(BigInt(String(a))<c){let{transaction:i}=await S.transactionBuilder.triggerSmartContract(n,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:e},{type:`uint256`,value:c.toString()}],C),a=await S.trx.sign(i),o=await S.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}r.push({tokenAddress:n,requiredAmount:c})}}}r.length>0&&await s.waitForTronErc20Approvals(S,C,e,r)}let{a:M,b:N,c:P}=i.parseZkCalldata(p),F=y??await i.reorderZkCallData(!0,p,h,m,u,!1);if(!F)throw Error(`Tron proof signature not found`);let I=[F.v,F.r,F.s],L=[h.tokenNumber,h.nullifierAmount,h.outputAmount],R=i.circomDataToArray(m);if(v){await c.simulateTronTransaction(u,O.address,`transact`,O.abi,[I,M,N,P,L,R],C,j);let e=BigInt(await S.trx.getBalance(C)),n=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=i.createTronCallData(O.abi,`transact`,[I,M,N,P,L,R]);n=await i.estimateTronFeeSunWithPadding(S,u,O.address,C,e,j)}catch(e){a.Logger.error(`Error estimating Tron transact fee`,e)}if(e<j+n)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let z=await O.transact(I,M,N,P,L,R).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(j)}),B=typeof z==`string`?z:z?.txid??z?.transaction?.txID??z?.transaction?.txid;if(!B)throw Error(`Tron transact failed (missing txid)`);return B},u=async(r,a,o,s,c,l,u,d)=>{let f=Array.isArray(o)?o:[o],p=Array.isArray(s)?s:[s];if(f.length!==p.length)throw Error(`token and amount length mismatch`);let{hinkalAddress:m,hinkalABI:h}=e.networkRegistry[a].contractData;if(!m||!h)throw Error(`Missing Tron contract data (hinkalAddress/hinkalABI)`);let g=r.getTronWeb(),_=await r.getEthereumAddressByChain(a),v=p.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),y=v===-1?0n:f[v],b=y>0n?y:0n,{a:x,b:S,c:C}=i.parseZkCalldata(c),w=d??await i.reorderZkCallData(!0,c,u,l,a,!1);if(!w)throw Error(`Tron proof signature not found`);let T=i.createTronCallData(h,`transact`,[[w.v,w.r,w.s],x,S,C,[u.tokenNumber,u.nullifierAmount,u.outputAmount],i.circomDataToArray(l)]),{transaction:E}=await g.transactionBuilder.triggerSmartContract(i.evmHexToTronBase58Address(m),``,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(b),input:T},[],_);return E};exports.buildTronUnsignedTransactTransaction=u,exports.transactCallDirectTron=l;
+const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../../../error-handling/logger.cjs`),a=require(`../../utils/tron.utils.cjs`),o=require(`../../../externalABIs/index.cjs`),s=require(`./waitForErc20Approvals.cjs`),c=require(`../../utils/tronSimulation.utils.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!0,y)=>{let b=Array.isArray(d)?d:[d],x=Array.isArray(f)?f:[f];if(b.length!==x.length)throw Error(`token and amount length mismatch`);let S=l.getTronWeb(),C=await l.getEthereumAddressByChain(u),{hinkalAddress:w,hinkalABI:T}=e.networkRegistry[u].contractData,E=S.contract(T,a.evmHexToTronBase58Address(w)),D=g??E,O=_??E;if(!D.address)throw Error(`contractForApproval address not set`);if(!O.address)throw Error(`contractForTransaction address not set`);let k=x.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),A=k===-1?0n:b[k],j=A>0n?A:0n;if(x.some(({erc20TokenAddress:e},r)=>!n.caseInsensitiveEqual(e,t.zeroAddress)&&b[r]>0n)){let e=D.address;if(!e)throw Error(`token approval spender not set`);let r=[];for(let i=0;i<x.length;i+=1){let s=x[i],c=b[i];if(c>0n&&!n.caseInsensitiveEqual(s.erc20TokenAddress,t.zeroAddress)){let n=a.evmHexToTronBase58Address(s.erc20TokenAddress),i=await S.contract(o.ERC20ABI,n).allowance(C,e).call({from:C});if(BigInt(String(i))<c){let{transaction:i}=await S.transactionBuilder.triggerSmartContract(n,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:e},{type:`uint256`,value:c.toString()}],C),a=await S.trx.sign(i),o=await S.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}r.push({tokenAddress:n,requiredAmount:c})}}}r.length>0&&await s.waitForTronErc20Approvals(S,C,e,r)}let{a:M,b:N,c:P}=a.parseZkCalldata(p),F=y??await a.reorderZkCallData(!0,p,h,m,u,!1);if(!F)throw Error(`Tron proof signature not found`);let I=[F.v,F.r,F.s],L=[h.tokenNumber,h.nullifierAmount,h.outputAmount],R=a.circomDataToArray(m);if(v){await c.simulateTronTransaction(u,O.address,`transact`,O.abi,[I,M,N,P,L,R],C,j);let e=BigInt(await S.trx.getBalance(C)),n=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=a.createTronCallData(O.abi,`transact`,[I,M,N,P,L,R]);n=await a.estimateTronFeeSunWithPadding(S,u,O.address,C,e,j)}catch(e){i.Logger.error(`Error estimating Tron transact fee`,e)}if(e<j+n)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let z=await O.transact(I,M,N,P,L,R).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(j)}),B=typeof z==`string`?z:z?.txid??z?.transaction?.txID??z?.transaction?.txid;if(!B)throw Error(`Tron transact failed (missing txid)`);return B},u=async(r,i,o,s,c,l,u,d)=>{let f=Array.isArray(o)?o:[o],p=Array.isArray(s)?s:[s];if(f.length!==p.length)throw Error(`token and amount length mismatch`);let{hinkalAddress:m,hinkalABI:h}=e.networkRegistry[i].contractData;if(!m||!h)throw Error(`Missing Tron contract data (hinkalAddress/hinkalABI)`);let g=r.getTronWeb(),_=await r.getEthereumAddressByChain(i),v=p.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),y=v===-1?0n:f[v],b=y>0n?y:0n,{a:x,b:S,c:C}=a.parseZkCalldata(c),w=d??await a.reorderZkCallData(!0,c,u,l,i,!1);if(!w)throw Error(`Tron proof signature not found`);let T=a.createTronCallData(h,`transact`,[[w.v,w.r,w.s],x,S,C,[u.tokenNumber,u.nullifierAmount,u.outputAmount],a.circomDataToArray(l)]),{transaction:E}=await g.transactionBuilder.triggerSmartContract(a.evmHexToTronBase58Address(m),``,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(b),input:T},[],_);return E};exports.buildTronUnsignedTransactTransaction=u,exports.transactCallDirectTron=l;