@hinkal/common 0.3.2 → 0.3.4

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(`./getInputUtxoAndBalance.cjs`),u=require(`../../../data-structures/TokenDBs/PrivateTokensDB.cjs`),d=require(`../../utils/map.utils.cjs`),f=require(`../../utils/mutexes.utils.cjs`),p=require(`../../utils/erc20tokenFunctions.cjs`);let m=require(`async-mutex`);var h=async(t,r,i,a,o,s=!1,c,h=!1,g=!1)=>d.getOrCreateMapValue(t.balanceFetchingMutexByChain,r,()=>new m.Mutex).runExclusive(async()=>f.getChainBalanceFetchingMutex(r).runShared(async()=>{let{inputUtxos:d}=g?await l.getInputUtxoAndBalanceOfStuckUtxos({hinkal:t,chainId:r,ethAddress:o,passedShieldedPrivateKey:i,resetCacheBefore:s,allowRemoteDecryption:c}):await l.getInputUtxoAndBalance({hinkal:t,sliceIfMore6:!1,chainId:r,passedShieldedPrivateKey:i,passedShieldedPublicKey:a,ethAddress:o,resetCacheBefore:s,allowRemoteDecryption:c});h&&e.isExtension&&await u.privateTokensDB.fetchAndUpdatePrivateTokens(d.map(e=>e.getTokenAddress(r)).filter(e=>e!==void 0),r,o);let f=(e.isExtension?await u.privateTokensDB.getPrivateTokens(r,o):await p.getErc20TokensForChainAPI(r)).map(e=>({token:e,balance:d.reduce((t,i)=>{let a=e.erc20TokenAddress;return n.caseInsensitiveEqual(a,i.getTokenAddress(r))?t+i.amount:t},0n),timestamp:d.filter(t=>n.caseInsensitiveEqual(t.getTokenAddress(r),e.erc20TokenAddress))[0]?.timeStamp,nfts:[]})),m=new Map;return f.forEach(e=>{m.set(e.token.erc20TokenAddress.toLowerCase(),e)}),m})),g=async(e,n,u,d,f=6,m=!1,h=!1)=>{let{userKeys:g}=e,_=g.getSpendingKeyPair().pubSpendingBJJPoint,v=[],y=[];if(u.length===0)return[];if(m){for(let e=0;e<u.length;e+=1){let r=t.isSolanaLike(n),i=r?u[e]:void 0,o=r?c.formatMintAddress(u[e]).compressedAddress:u[e];v.push(Array.from({length:f},()=>new a.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:i,nullifyingKey:g.getShieldedPrivateKey(),spendingPublicKey:_})))}return v}let b=await l.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:u,allowRemoteDecryption:e.generateProofRemotely,useBlockedUtxos:h,chainId:n}),x=0;for(let e=0;e<u.length;e+=1){let t=b.get(s.normalizeTokenAddress(n,u[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>f){let t=s.slice(0,f),a=t.reduce((e,t)=>e+t.amount,0n);if(d[e]<0n&&a<-d[e]){let t=await p.getErc20TokenFromAPI(n,u[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<=f){let r=[...s],i=f-s.length;for(;i>0;){--i;let o=t.isSolanaLike(n),s=o?u[e]:void 0,l=o?c.formatMintAddress(u[e]).compressedAddress:u[e];r.push(new a.Utxo({amount:0n,erc20TokenAddress:l,mintAddress:s,nullifyingKey:g.getShieldedPrivateKey(),spendingPublicKey:_}))}v.push(r)}return v};exports.addPaddingToUtxos=g,exports.getShieldedBalance=h;
+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;

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

@@ -6,7 +6,7 @@ import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
  * @param UserKeys to access user's encryption keys
  * @returns shielded balance
  */
-export declare const getShieldedBalance: (hinkal: IHinkal, chainId: number, passedShieldedPrivateKey: string, passedShieldedPublicKey: string, ethAddress: string, resetCacheBefore?: boolean, allowRemoteDecryption?: boolean, updateTokensListBefore?: boolean, useBlockedUtxos?: boolean) => Promise<Map<string, TokenBalance>>;
+export declare const getShieldedBalance: (hinkal: IHinkal, chainId: number, passedShieldedPrivateKey: string, passedShieldedPublicKey: string, ethAddress: string, resetCacheBefore?: boolean, updateTokensListBefore?: boolean, useBlockedUtxos?: boolean) => Promise<Map<string, TokenBalance>>;
 /**
  *
  * @param hinkal hinkal instance to get userKeys

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

@@ -1,106 +1,118 @@
 import { isExtension as e } from "../../../constants/vite.constants.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 { 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 "../../../error-handling/customErrors/index.mjs";
-import { normalizeTokenAddress as s } from "../../utils/encodeTokenWithId.mjs";
-import { formatMintAddress as c } from "../../utils/solanaMint.utils.mjs";
-import { getInputUtxoAndBalance as l, getInputUtxoAndBalanceOfStuckUtxos as u, getInputUtxoAndBalancePerToken as d } from "./getInputUtxoAndBalance.mjs";
-import { privateTokensDB as f } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
-import { getOrCreateMapValue as p } from "../../utils/map.utils.mjs";
-import { getChainBalanceFetchingMutex as m } from "../../utils/mutexes.utils.mjs";
-import { getErc20TokenFromAPI as h, getErc20TokensForChainAPI as g } from "../../utils/erc20tokenFunctions.mjs";
-import { Mutex as _ } from "async-mutex";
+import { normalizeTokenAddress as c } from "../../utils/encodeTokenWithId.mjs";
+import { formatMintAddress as l } from "../../utils/solanaMint.utils.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";
 //#region libs/shared/common/src/functions/web3/events/getShieldedBalance.ts
-var v = async (t, r, i, a, o, s = !1, c, d = !1, h = !1) => p(t.balanceFetchingMutexByChain, r, () => new _()).runExclusive(async () => m(r).runShared(async () => {
-	let { inputUtxos: p } = h ? await u({
+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: []
+			});
+		}), l;
+	}
+	let { inputUtxos: _ } = y ? await m({
 		hinkal: t,
-		chainId: r,
-		ethAddress: o,
-		passedShieldedPrivateKey: i,
-		resetCacheBefore: s,
-		allowRemoteDecryption: c
-	}) : await l({
+		chainId: i,
+		ethAddress: s,
+		passedShieldedPrivateKey: a,
+		resetCacheBefore: l
+	}) : await p({
 		hinkal: t,
 		sliceIfMore6: !1,
-		chainId: r,
-		passedShieldedPrivateKey: i,
-		passedShieldedPublicKey: a,
-		ethAddress: o,
-		resetCacheBefore: s,
-		allowRemoteDecryption: c
+		chainId: i,
+		passedShieldedPrivateKey: a,
+		passedShieldedPublicKey: o,
+		ethAddress: s,
+		resetCacheBefore: l
 	});
-	d && e && await f.fetchAndUpdatePrivateTokens(p.map((e) => e.getTokenAddress(r)).filter((e) => e !== void 0), r, o);
-	let m = (e ? await f.getPrivateTokens(r, o) : await g(r)).map((e) => ({
+	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: p.reduce((t, i) => {
+		balance: _.reduce((t, n) => {
 			let a = e.erc20TokenAddress;
-			return n(a, i.getTokenAddress(r)) ? t + i.amount : t;
+			return r(a, n.getTokenAddress(i)) ? t + n.amount : t;
 		}, 0n),
-		timestamp: p.filter((t) => n(t.getTokenAddress(r), e.erc20TokenAddress))[0]?.timeStamp,
+		timestamp: _.filter((t) => r(t.getTokenAddress(i), e.erc20TokenAddress))[0]?.timeStamp,
 		nfts: []
-	})), _ = /* @__PURE__ */ new Map();
-	return m.forEach((e) => {
-		_.set(e.token.erc20TokenAddress.toLowerCase(), e);
-	}), _;
-})), y = async (e, n, l, u, f = 6, p = !1, m = !1) => {
-	let { userKeys: g } = e, _ = g.getSpendingKeyPair().pubSpendingBJJPoint, v = [], y = [];
-	if (l.length === 0) return [];
-	if (p) {
-		for (let e = 0; e < l.length; e += 1) {
-			let r = t(n), i = r ? l[e] : void 0, o = r ? c(l[e]).compressedAddress : l[e];
-			v.push(Array.from({ length: f }, () => new a({
+	})), 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: o,
-				mintAddress: i,
-				nullifyingKey: g.getShieldedPrivateKey(),
-				spendingPublicKey: _
+				erc20TokenAddress: s,
+				mintAddress: a,
+				nullifyingKey: m.getShieldedPrivateKey(),
+				spendingPublicKey: g
 			})));
 		}
-		return v;
+		return _;
 	}
-	let b = await d({
+	let b = await h({
 		hinkal: e,
 		sliceIfMore6: !1,
-		ensuredTokensWithId: l,
-		allowRemoteDecryption: e.generateProofRemotely,
-		useBlockedUtxos: m,
+		ensuredTokensWithId: r,
+		useBlockedUtxos: p,
 		chainId: n
 	}), x = 0;
-	for (let e = 0; e < l.length; e += 1) {
-		let t = b.get(s(n, l[e])) ?? [];
+	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), y.push(t);
+		x = Math.max(t.length, x), v.push(t);
 	}
-	if (x === 2) return y;
-	for (let [e, s] of y.entries()) if (s.length > f) {
-		let t = s.slice(0, f), a = t.reduce((e, t) => e + t.amount, 0n);
-		if (u[e] < 0n && a < -u[e]) {
-			let t = await h(n, l[e]);
+	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 s = t.decimals === 18 ? 6 : 2, c = Number(i(a, t, s));
-			throw new o(c, `${r.UTXO_LIMITATIONS}. Please try again with ${c} ${t.symbol}, including gas fees.`);
+			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.`);
 		}
-		v.push(t);
-	} else if (s.length <= f) {
-		let r = [...s], i = f - s.length;
-		for (; i > 0;) {
-			--i;
-			let o = t(n), s = o ? l[e] : void 0, u = o ? c(l[e]).compressedAddress : l[e];
-			r.push(new a({
+		_.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: s,
-				nullifyingKey: g.getShieldedPrivateKey(),
-				spendingPublicKey: _
+				mintAddress: c,
+				nullifyingKey: m.getShieldedPrivateKey(),
+				spendingPublicKey: g
 			}));
 		}
-		v.push(r);
+		_.push(i);
 	}
-	return v;
+	return _;
 };
 //#endregion
-export { y as addPaddingToUtxos, v as getShieldedBalance };
+export { C as addPaddingToUtxos, S as getShieldedBalance };

package/common/src/functions/web3/fetchSolanaMerkleTreeRootHash.cjs

@@ -1 +1 @@
-const e=require(`../utils/bytes32.utils.cjs`);require(`../utils/index.cjs`);var t=async(t,n)=>{let r=await t.account.merkle.fetch(n,`confirmed`),i=Number(e.convertBytes32ToBigInt(r.rootIndex));return e.convertBytes32ToBigInt(r.roots.at(i-1))};exports.fetchSolanaMerkleTreeRootHash=t;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../pre-transaction/solana.cjs`),n=require(`../utils/bytes32.utils.cjs`);var r=32,i=async(i,a)=>{let o=await t.fetchSolanaMIndex(i,a),s=t.getMerkleMinimumIndex(e.MERKLE_LEVELS);if(o<=s)return 0n;let c=o-1n-s,l=t.getRootBucketIndex(c),u=t.getRootBucketSlot(c),d=t.getRootBucketPublicKey(i.programId,a,l),f=await i.provider.connection.getAccountInfo(d,`confirmed`),p=Number(u)*r;return!f||f.data.length<p+r?0n:n.convertBytes32ToBigInt([...f.data.subarray(p,p+r)])};exports.fetchSolanaMerkleTreeRootHash=i;

package/common/src/functions/web3/fetchSolanaMerkleTreeRootHash.mjs

@@ -1,9 +1,12 @@
-import { convertBytes32ToBigInt as e } from "../utils/bytes32.utils.mjs";
-import "../utils/index.mjs";
+import { MERKLE_LEVELS as e } from "../../constants/protocol.constants.mjs";
+import { fetchSolanaMIndex as t, getMerkleMinimumIndex as n, getRootBucketIndex as r, getRootBucketPublicKey as i, getRootBucketSlot as a } from "../pre-transaction/solana.mjs";
+import { convertBytes32ToBigInt as o } from "../utils/bytes32.utils.mjs";
 //#region libs/shared/common/src/functions/web3/fetchSolanaMerkleTreeRootHash.ts
-var t = async (t, n) => {
-	let r = await t.account.merkle.fetch(n, "confirmed"), i = Number(e(r.rootIndex));
-	return e(r.roots.at(i - 1));
+var s = 32, c = async (c, l) => {
+	let u = await t(c, l), d = n(e);
+	if (u <= d) return 0n;
+	let f = u - 1n - d, p = r(f), m = a(f), h = i(c.programId, l, p), g = await c.provider.connection.getAccountInfo(h, "confirmed"), _ = Number(m) * s;
+	return !g || g.data.length < _ + s ? 0n : o([...g.data.subarray(_, _ + s)]);
 };
 //#endregion
-export { t as fetchSolanaMerkleTreeRootHash };
+export { c as fetchSolanaMerkleTreeRootHash };

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

@@ -1 +1 @@
-const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../utils/getContractAddress.cjs`),r=require(`../../utils/getSignerFromContract.cjs`),i=require(`./recoverTransactionFromError.cjs`);var a=async(e,t,n)=>{let i=r.getSignerFromContract(n);return await n.allowance(await i.getAddress(),t.target)>=e},o=async(t,i,a,o,s)=>{if(e.getNonLocalhostChainId(i)!==e.chainIds.ethMainnet||o.symbol.toLowerCase()!==`usdt`||BigInt(await s.allowance(await r.getSignerFromContract(s).getAddress(),a.target))===0n)return;let c=await s.approve(n.getContractAddress(a),0n);c&&`hash`in c&&await t.waitForTransaction(i,c.hash)},s=async(s,c,l,u,d)=>{let f=s.getContractWithSigner(c,t.ContractType.ERC20Contract,d.erc20TokenAddress);if(await a(u,l,f))return;await o(s,c,l,d,f);let p=c===e.chainIds.base?2:1;try{let e=await f.approve(n.getContractAddress(l),u);e&&`hash`in e&&await s.waitForTransaction(c,e.hash,p)}catch(e){if(!e?.transactionHash||!await i.recoverTransactionFromError(r.getProviderFromContract(f),e.transactionHash,p))throw e}};exports.approveTokenToHinkal=s;
+const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../utils/getContractAddress.cjs`),r=require(`./recoverTransactionFromError.cjs`),i=require(`../../utils/getSignerFromContract.cjs`);var a=async(e,t,n)=>{let r=i.getSignerFromContract(n);return await n.allowance(await r.getAddress(),t.target)>=e},o=async(t,r,a,o,s)=>{if(e.getNonLocalhostChainId(r)!==e.chainIds.ethMainnet||o.symbol.toLowerCase()!==`usdt`||BigInt(await s.allowance(await i.getSignerFromContract(s).getAddress(),a.target))===0n)return;let c=await s.approve(n.getContractAddress(a),0n);c&&`hash`in c&&await t.waitForTransaction(r,c.hash)},s=async(s,c,l,u,d)=>{let f=s.getContractWithSigner(c,t.ContractType.ERC20Contract,d.erc20TokenAddress);if(await a(u,l,f))return;await o(s,c,l,d,f);let p=c===e.chainIds.base?2:1;try{let e=await f.approve(n.getContractAddress(l),u);e&&`hash`in e&&await s.waitForTransaction(c,e.hash,p)}catch(e){if(!e?.transactionHash||!await r.recoverTransactionFromError(i.getProviderFromContract(f),e.transactionHash,p))throw e}};exports.approveTokenToHinkal=s;

package/common/src/functions/web3/functionCalls/approveToken.mjs

@@ -1,26 +1,26 @@
 import { chainIds as e, getNonLocalhostChainId as t } from "../../../constants/chains.constants.mjs";
 import { ContractType as n } from "../../../types/ethereum-network.types.mjs";
 import { getContractAddress as r } from "../../utils/getContractAddress.mjs";
-import { getProviderFromContract as i, getSignerFromContract as a } from "../../utils/getSignerFromContract.mjs";
-import { recoverTransactionFromError as o } from "./recoverTransactionFromError.mjs";
+import { recoverTransactionFromError as i } from "./recoverTransactionFromError.mjs";
+import { getProviderFromContract as a, getSignerFromContract as o } from "../../utils/getSignerFromContract.mjs";
 //#region libs/shared/common/src/functions/web3/functionCalls/approveToken.ts
 var s = async (e, t, n) => {
-	let r = a(n);
+	let r = o(n);
 	return await n.allowance(await r.getAddress(), t.target) >= e;
-}, c = async (n, i, o, s, c) => {
-	if (t(i) !== e.ethMainnet || s.symbol.toLowerCase() !== "usdt" || BigInt(await c.allowance(await a(c).getAddress(), o.target)) === 0n) return;
-	let l = await c.approve(r(o), 0n);
+}, c = async (n, i, a, s, c) => {
+	if (t(i) !== e.ethMainnet || s.symbol.toLowerCase() !== "usdt" || BigInt(await c.allowance(await o(c).getAddress(), a.target)) === 0n) return;
+	let l = await c.approve(r(a), 0n);
 	l && "hash" in l && await n.waitForTransaction(i, l.hash);
-}, l = async (t, a, l, u, d) => {
-	let f = t.getContractWithSigner(a, n.ERC20Contract, d.erc20TokenAddress);
+}, l = async (t, o, l, u, d) => {
+	let f = t.getContractWithSigner(o, n.ERC20Contract, d.erc20TokenAddress);
 	if (await s(u, l, f)) return;
-	await c(t, a, l, d, f);
-	let p = a === e.base ? 2 : 1;
+	await c(t, o, l, d, f);
+	let p = o === e.base ? 2 : 1;
 	try {
 		let e = await f.approve(r(l), u);
-		e && "hash" in e && await t.waitForTransaction(a, e.hash, p);
+		e && "hash" in e && await t.waitForTransaction(o, e.hash, p);
 	} catch (e) {
-		if (!e?.transactionHash || !await o(i(f), e.transactionHash, p)) throw e;
+		if (!e?.transactionHash || !await i(a(f), e.transactionHash, p)) throw e;
 	}
 };
 //#endregion

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

@@ -0,0 +1 @@
+const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../utils/tron.utils.cjs`),n=require(`../../../types/transact.types.cjs`),r=require(`./transactCallDirect.cjs`),i=require(`./transactCallDirectTron.cjs`),a=require(`./transactCallRelayer.cjs`);var o=async(e,t,i)=>{let{chainId:o,submit:s}=t,{zkCallData:c,circomData:l,dimData:u,commitmentValidationData:d}=i;switch(s.mode){case n.SubmitMode.ProofOnly:return i;case n.SubmitMode.Self:return r.transactCallDirect(e,o,s.approvalAmounts,s.erc20Tokens,c,l,u,void 0,void 0,s.preEstimateGas,s.returnTxData);case n.SubmitMode.Relayer:return a.transactCallRelayer(o,c,u,l,d,s.withUniswapWorkAround,s.authorizationData,s.adminData);default:throw Error(`submitEvm: unhandled submit mode ${JSON.stringify(s)}`)}},s=async(e,r,o)=>{let{chainId:s,submit:c}=r,{zkCallData:l,circomData:u,dimData:d,commitmentValidationData:f}=o;if(c.mode===n.SubmitMode.Self)return c.returnTxData?i.buildTronUnsignedTransactTransaction(e,s,c.approvalAmounts,c.erc20Tokens,l,u,d,o.tronProofSignature):i.transactCallDirectTron(e,s,c.approvalAmounts,c.erc20Tokens,l,u,d,void 0,void 0,c.preEstimateGas,o.tronProofSignature);let{tronProofSignature:p}=o;return p?t.swapTronBCoordinate(l):p=await t.reorderZkCallData(!0,l,d,u,s),c.mode===n.SubmitMode.ProofOnly?{...o,tronProofSignature:p}:a.transactCallRelayer(s,l,d,u,f,c.withUniswapWorkAround,c.authorizationData,c.adminData,p)},c=(t,n,r)=>(e.isTronLike(n.chainId)?s:o)(t,n,r);exports.submitProof=c;

package/common/src/functions/web3/functionCalls/submitProof.d.ts

@@ -0,0 +1,5 @@
+import { HinkalTransactParams, TransactProof, TransactResult } from '../../../types/transact.types';
+import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
+type ProofSubmitter = (hinkal: IHinkal, params: HinkalTransactParams, proof: TransactProof) => Promise<TransactResult>;
+export declare const submitProof: ProofSubmitter;
+export {};

package/common/src/functions/web3/functionCalls/submitProof.mjs

@@ -0,0 +1,26 @@
+import { isTronLike as e } from "../../../constants/chains.constants.mjs";
+import { reorderZkCallData as t, swapTronBCoordinate as n } from "../../utils/tron.utils.mjs";
+import { SubmitMode as r } from "../../../types/transact.types.mjs";
+import { transactCallDirect as i } from "./transactCallDirect.mjs";
+import { buildTronUnsignedTransactTransaction as a, transactCallDirectTron as o } from "./transactCallDirectTron.mjs";
+import { transactCallRelayer as s } from "./transactCallRelayer.mjs";
+//#region libs/shared/common/src/functions/web3/functionCalls/submitProof.ts
+var c = async (e, t, n) => {
+	let { chainId: a, submit: o } = t, { zkCallData: c, circomData: l, dimData: u, commitmentValidationData: d } = n;
+	switch (o.mode) {
+		case r.ProofOnly: return n;
+		case r.Self: return i(e, a, o.approvalAmounts, o.erc20Tokens, c, l, u, void 0, void 0, o.preEstimateGas, o.returnTxData);
+		case r.Relayer: return s(a, c, u, l, d, o.withUniswapWorkAround, o.authorizationData, o.adminData);
+		default: throw Error(`submitEvm: unhandled submit mode ${JSON.stringify(o)}`);
+	}
+}, l = async (e, i, c) => {
+	let { chainId: l, submit: u } = i, { zkCallData: d, circomData: f, dimData: p, commitmentValidationData: m } = c;
+	if (u.mode === r.Self) return u.returnTxData ? a(e, l, u.approvalAmounts, u.erc20Tokens, d, f, p, c.tronProofSignature) : o(e, l, u.approvalAmounts, u.erc20Tokens, d, f, p, void 0, void 0, u.preEstimateGas, c.tronProofSignature);
+	let { tronProofSignature: h } = c;
+	return h ? n(d) : h = await t(!0, d, p, f, l), u.mode === r.ProofOnly ? {
+		...c,
+		tronProofSignature: h
+	} : s(l, d, p, f, m, u.withUniswapWorkAround, u.authorizationData, u.adminData, h);
+}, u = (t, n, r) => (e(n.chainId) ? l : c)(t, n, r);
+//#endregion
+export { u as submitProof };

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(`../../../externalABIs/index.cjs`),a=require(`../../../error-handling/logger.cjs`),o=require(`../../utils/tron.utils.cjs`),s=require(`../../utils/tronSimulation.utils.cjs`),c=require(`./waitForErc20Approvals.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!0)=>{let y=Array.isArray(d)?d:[d],b=Array.isArray(f)?f:[f];if(y.length!==b.length)throw Error(`token and amount length mismatch`);let x=l.getTronWeb(),S=await l.getEthereumAddressByChain(u),{hinkalAddress:C,hinkalABI:w}=e.networkRegistry[u].contractData,T=x.contract(w,o.evmHexToTronBase58Address(C)),E=g??T,D=_??T;if(!E.address)throw Error(`contractForApproval address not set`);if(!D.address)throw Error(`contractForTransaction address not set`);let O=b.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),k=O===-1?0n:y[O],A=k>0n?k:0n;if(b.some(({erc20TokenAddress:e},r)=>!n.caseInsensitiveEqual(e,t.zeroAddress)&&y[r]>0n)){let e=E.address;if(!e)throw Error(`token approval spender not set`);let r=[];for(let a=0;a<b.length;a+=1){let s=b[a],c=y[a];if(c>0n&&!n.caseInsensitiveEqual(s.erc20TokenAddress,t.zeroAddress)){let n=o.evmHexToTronBase58Address(s.erc20TokenAddress),a=await x.contract(i.ERC20ABI,n).allowance(S,e).call({from:S});if(BigInt(String(a))<c){let{transaction:i}=await x.transactionBuilder.triggerSmartContract(n,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:e},{type:`uint256`,value:c.toString()}],S),a=await x.trx.sign(i),o=await x.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 c.waitForTronErc20Approvals(x,S,e,r)}let{a:j,b:M,c:N}=o.parseZkCalldata(p),P=await o.reorderZkCallData(!0,p,h,m,!1);if(!P)throw Error(`Tron proof signature not found`);let F=[P.v,P.r,P.s],I=[h.tokenNumber,h.nullifierAmount,h.outputAmount],L=o.circomDataToArray(m);if(v){await s.simulateTronTransaction(u,D.address,`transact`,D.abi,[F,j,M,N,I,L],S,A);let e=o.evmHexToTronBase58Address(S),n=x,i=async e=>{try{return e?(await x.trx.getBalance(e)).toString():`empty-addr`}catch(e){return`ERR:${e?.message??String(e)}`}},c=async e=>{try{if(!e)return`empty-addr`;let t=await x.trx.getAccount(e);return t&&Object.keys(t).length>0?`exists(balance=${t.balance??0})`:`not-found`}catch(e){return`ERR:${e?.message??String(e)}`}},l=n?.defaultAddress?.base58||``,[d,f,p,m]=await Promise.all([i(S),i(e),i(l),c(e)]);a.Logger.error(`Tron balance read debug`,{chainId:u,rawEthereumAddress:S,rawAddrPrefix:S?.slice(0,4),balanceQueryAddress:e,tronWebDefaultBase58:l||`none`,tronWebDefaultHex:n?.defaultAddress?.hex??`none`,balanceWithRawAddr:d,balanceWithConvertedAddr:f,balanceWithTronWebDefault:p,accountLookupConverted:m,fullNodeHost:n?.fullNode?.host??`unknown`,solidityNodeHost:n?.solidityNode?.host??`unknown`});let h=BigInt(await x.trx.getBalance(S)),g=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=o.createTronCallData(D.abi,`transact`,[F,j,M,N,I,L]);g=await o.estimateTronFeeSunWithPadding(x,u,D.address,S,e,A)}catch(e){a.Logger.error(`Error estimating Tron transact fee`,e)}if(h<A+g)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let R=await D.transact(F,j,M,N,I,L).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(A)}),z=typeof R==`string`?R:R?.txid??R?.transaction?.txID??R?.transaction?.txid;if(!z)throw Error(`Tron transact failed (missing txid)`);return z};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(`../../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;

package/common/src/functions/web3/functionCalls/transactCallDirectTron.d.ts

@@ -1,12 +1,16 @@
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
-import { createTronCallData } from '../../utils/tron.utils';
 import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { ERC20Token } from '../../../types/token.types';
+import { TronProofSignature } from '../../../types/transact.types';
 import { Types as TronWebTypes } from 'tronweb';
 export declare const transactCallDirectTron: (hinkal: IHinkal, chainId: number, amount: bigint | bigint[], tokenToApprove: ERC20Token | ERC20Token[], // in hex format
 newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: TronWebTypes.ContractInstance<any>, // in base58 format
 contractTransaction?: TronWebTypes.ContractInstance<any>, // in base58 format
-preEstimateGas?: boolean) => Promise<string>;
+preEstimateGas?: boolean, precomputedProofSignature?: {
+    v: number;
+    r: string;
+    s: string;
+}) => Promise<string>;
 /** Builds an unsigned Tron `transact` transaction (no approve/send). Used for PAL / deposit-and-withdraw prepare flows. */
-export declare const buildTronUnsignedTransactTransaction: (hinkal: IHinkal, chainId: number, amount: bigint, token: ERC20Token, newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractAddressHex: string, contractAbi: Parameters<typeof createTronCallData>[0]) => Promise<TronWebTypes.Transaction>;
+export declare const buildTronUnsignedTransactTransaction: (hinkal: IHinkal, chainId: number, amount: bigint | bigint[], token: ERC20Token | ERC20Token[], newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, precomputedProofSignature?: TronProofSignature) => Promise<TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;

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

@@ -2,124 +2,118 @@ import { networkRegistry as e } from "../../../constants/chains.constants.mjs";
 import { TRON_DEFAULT_FEE_LIMIT_SUN as t, zeroAddress as n } from "../../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as r } from "../../utils/caseInsensitive.utils.mjs";
 import { insufficientResourcesErrorCodes as i } from "../../../error-handling/error-codes.constants.mjs";
-import { ERC20ABI as a } from "../../../externalABIs/index.mjs";
-import { Logger as o } from "../../../error-handling/logger.mjs";
-import { circomDataToArray as s, createTronCallData as c, estimateTronFeeSunWithPadding as l, evmHexToTronBase58Address as u, parseZkCalldata as d, reorderZkCallData as f } from "../../utils/tron.utils.mjs";
-import { simulateTronTransaction as p } from "../../utils/tronSimulation.utils.mjs";
-import { waitForTronErc20Approvals as m } from "./waitForErc20Approvals.mjs";
+import { circomDataToArray as a, createTronCallData as o, estimateTronFeeSunWithPadding as s, evmHexToTronBase58Address as c, parseZkCalldata as l, reorderZkCallData as u } from "../../utils/tron.utils.mjs";
+import { Logger as d } from "../../../error-handling/logger.mjs";
+import { ERC20ABI as f } from "../../../externalABIs/index.mjs";
+import { waitForTronErc20Approvals as p } from "./waitForErc20Approvals.mjs";
+import { simulateTronTransaction as m } from "../../utils/tronSimulation.utils.mjs";
 //#region libs/shared/common/src/functions/web3/functionCalls/transactCallDirectTron.ts
-var h = async (h, g, _, v, y, b, x, S, C, w = !0) => {
-	let T = Array.isArray(_) ? _ : [_], E = Array.isArray(v) ? v : [v];
-	if (T.length !== E.length) throw Error("token and amount length mismatch");
-	let D = h.getTronWeb(), O = await h.getEthereumAddressByChain(g), { hinkalAddress: k, hinkalABI: A } = e[g].contractData, j = D.contract(A, u(k)), M = S ?? j, N = C ?? j;
-	if (!M.address) throw Error("contractForApproval address not set");
-	if (!N.address) throw Error("contractForTransaction address not set");
-	let P = E.findIndex(({ erc20TokenAddress: e }) => r(e, n)), F = P === -1 ? 0n : T[P], I = F > 0n ? F : 0n;
-	if (E.some(({ erc20TokenAddress: e }, t) => !r(e, n) && T[t] > 0n)) {
-		let e = M.address;
+var h = async (h, g, _, v, y, b, x, S, C, w = !0, T) => {
+	let E = Array.isArray(_) ? _ : [_], D = Array.isArray(v) ? v : [v];
+	if (E.length !== D.length) throw Error("token and amount length mismatch");
+	let O = h.getTronWeb(), k = await h.getEthereumAddressByChain(g), { hinkalAddress: A, hinkalABI: j } = e[g].contractData, M = O.contract(j, c(A)), N = S ?? M, P = C ?? M;
+	if (!N.address) throw Error("contractForApproval address not set");
+	if (!P.address) throw Error("contractForTransaction address not set");
+	let F = D.findIndex(({ erc20TokenAddress: e }) => r(e, n)), I = F === -1 ? 0n : E[F], L = I > 0n ? I : 0n;
+	if (D.some(({ erc20TokenAddress: e }, t) => !r(e, n) && E[t] > 0n)) {
+		let e = N.address;
 		if (!e) throw Error("token approval spender not set");
 		let i = [];
-		for (let o = 0; o < E.length; o += 1) {
-			let s = E[o], c = T[o];
-			if (c > 0n && !r(s.erc20TokenAddress, n)) {
-				let n = u(s.erc20TokenAddress), r = await D.contract(a, n).allowance(O, e).call({ from: O });
-				if (BigInt(String(r)) < c) {
-					let { transaction: r } = await D.transactionBuilder.triggerSmartContract(n, "approve(address,uint256)", { feeLimit: t }, [{
+		for (let a = 0; a < D.length; a += 1) {
+			let o = D[a], s = E[a];
+			if (s > 0n && !r(o.erc20TokenAddress, n)) {
+				let n = c(o.erc20TokenAddress), r = await O.contract(f, n).allowance(k, e).call({ from: k });
+				if (BigInt(String(r)) < s) {
+					let { transaction: r } = await O.transactionBuilder.triggerSmartContract(n, "approve(address,uint256)", { feeLimit: t }, [{
 						type: "address",
 						value: e
 					}, {
 						type: "uint256",
-						value: c.toString()
-					}], O), a = await D.trx.sign(r), o = await D.trx.sendRawTransaction(a);
+						value: s.toString()
+					}], k), a = await O.trx.sign(r), o = await O.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}`);
 					}
 					i.push({
 						tokenAddress: n,
-						requiredAmount: c
+						requiredAmount: s
 					});
 				}
 			}
 		}
-		i.length > 0 && await m(D, O, e, i);
+		i.length > 0 && await p(O, k, e, i);
 	}
-	let { a: L, b: R, c: z } = d(y), B = await f(!0, y, x, b, !1);
-	if (!B) throw Error("Tron proof signature not found");
-	let V = [
-		B.v,
-		B.r,
-		B.s
-	], H = [
+	let { a: R, b: z, c: B } = l(y), V = T ?? await u(!0, y, x, b, g, !1);
+	if (!V) throw Error("Tron proof signature not found");
+	let H = [
+		V.v,
+		V.r,
+		V.s
+	], U = [
 		x.tokenNumber,
 		x.nullifierAmount,
 		x.outputAmount
-	], U = s(b);
+	], W = a(b);
 	if (w) {
-		await p(g, N.address, "transact", N.abi, [
-			V,
-			L,
+		await m(g, P.address, "transact", P.abi, [
+			H,
 			R,
 			z,
-			H,
-			U
-		], O, I);
-		let e = u(O), n = D, r = async (e) => {
-			try {
-				return e ? (await D.trx.getBalance(e)).toString() : "empty-addr";
-			} catch (e) {
-				return `ERR:${e?.message ?? String(e)}`;
-			}
-		}, a = async (e) => {
-			try {
-				if (!e) return "empty-addr";
-				let t = await D.trx.getAccount(e);
-				return t && Object.keys(t).length > 0 ? `exists(balance=${t.balance ?? 0})` : "not-found";
-			} catch (e) {
-				return `ERR:${e?.message ?? String(e)}`;
-			}
-		}, s = n?.defaultAddress?.base58 || "", [d, f, m, h] = await Promise.all([
-			r(O),
-			r(e),
-			r(s),
-			a(e)
-		]);
-		o.error("Tron balance read debug", {
-			chainId: g,
-			rawEthereumAddress: O,
-			rawAddrPrefix: O?.slice(0, 4),
-			balanceQueryAddress: e,
-			tronWebDefaultBase58: s || "none",
-			tronWebDefaultHex: n?.defaultAddress?.hex ?? "none",
-			balanceWithRawAddr: d,
-			balanceWithConvertedAddr: f,
-			balanceWithTronWebDefault: m,
-			accountLookupConverted: h,
-			fullNodeHost: n?.fullNode?.host ?? "unknown",
-			solidityNodeHost: n?.solidityNode?.host ?? "unknown"
-		});
-		let _ = BigInt(await D.trx.getBalance(O)), v = BigInt(t);
+			B,
+			U,
+			W
+		], k, L);
+		let e = BigInt(await O.trx.getBalance(k)), n = BigInt(t);
 		try {
-			let e = c(N.abi, "transact", [
-				V,
-				L,
+			let e = o(P.abi, "transact", [
+				H,
 				R,
 				z,
-				H,
-				U
+				B,
+				U,
+				W
 			]);
-			v = await l(D, g, N.address, O, e, I);
+			n = await s(O, g, P.address, k, e, L);
 		} catch (e) {
-			o.error("Error estimating Tron transact fee", e);
+			d.error("Error estimating Tron transact fee", e);
 		}
-		if (_ < I + v) throw Error(i.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
+		if (e < L + n) throw Error(i.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
 	}
-	let W = await N.transact(V, L, R, z, H, U).send({
+	let G = await P.transact(H, R, z, B, U, W).send({
+		feeLimit: t,
+		callValue: Number(L)
+	}), K = typeof G == "string" ? G : G?.txid ?? G?.transaction?.txID ?? G?.transaction?.txid;
+	if (!K) throw Error("Tron transact failed (missing txid)");
+	return K;
+}, g = async (i, s, d, f, p, m, h, g) => {
+	let _ = Array.isArray(d) ? d : [d], v = Array.isArray(f) ? f : [f];
+	if (_.length !== v.length) throw Error("token and amount length mismatch");
+	let { hinkalAddress: y, hinkalABI: b } = e[s].contractData;
+	if (!y || !b) throw Error("Missing Tron contract data (hinkalAddress/hinkalABI)");
+	let x = i.getTronWeb(), S = await i.getEthereumAddressByChain(s), C = v.findIndex(({ erc20TokenAddress: e }) => r(e, n)), w = C === -1 ? 0n : _[C], T = w > 0n ? w : 0n, { a: E, b: D, c: O } = l(p), k = g ?? await u(!0, p, h, m, s, !1);
+	if (!k) throw Error("Tron proof signature not found");
+	let A = o(b, "transact", [
+		[
+			k.v,
+			k.r,
+			k.s
+		],
+		E,
+		D,
+		O,
+		[
+			h.tokenNumber,
+			h.nullifierAmount,
+			h.outputAmount
+		],
+		a(m)
+	]), { transaction: j } = await x.transactionBuilder.triggerSmartContract(c(y), "", {
 		feeLimit: t,
-		callValue: Number(I)
-	}), G = typeof W == "string" ? W : W?.txid ?? W?.transaction?.txID ?? W?.transaction?.txid;
-	if (!G) throw Error("Tron transact failed (missing txid)");
-	return G;
+		callValue: Number(T),
+		input: A
+	}, [], S);
+	return j;
 };
 //#endregion
-export { h as transactCallDirectTron };
+export { g as buildTronUnsignedTransactTransaction, h as transactCallDirectTron };

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

@@ -1 +1 @@
-const e=require(`../../../error-handling/customErrors/ErrorWithTx.cjs`),t=require(`../../../constants/server.constants.cjs`),n=require(`../../../API/getServerURL.cjs`),r=require(`../../../data-structures/http/HttpClient.cjs`),i=require(`../../../API/callRelayer.cjs`),a=require(`../../snarkjs/common.snarkjs.cjs`);require(`../../../error-handling/index.cjs`),require(`../../snarkjs/index.cjs`);var o=t=>{if(t.status===`success`)return t.message;throw t.message&&t.error?new e.ErrorWithRelayerTransaction(t.error,t.message):Error(t.error)},s=async(e,t,n,r,s,c,l,u,d)=>{let f=a.serializeCircomData(r);return o(await i.callRelayerTransactAPI({chainId:e,a:t[0],b:t[1],c:t[2],dimData:n,circomData:f,withUniswapWorkAround:c,authorizationData:l,adminData:u,tronProofSignature:d,commitmentValidationData:s}))},c=async e=>o(await r.httpClient.post(`${n.RELAYER_URL}${t.RELAYER_CONFIG.SOLANA_TRANSACT}`,e)),l=e=>{if(e.status===`success`)return e.message.scheduleId;throw Error(e.error||`Batch transaction failed`)},u=async(e,t,n,r,o,s)=>{let c=t.map(e=>a.serializeCircomData(e.circomData));return l(await i.callRelayerTransactBatchAPI({chainId:e,transactions:t.map((t,n)=>({chainId:e,a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2],dimData:t.dimData,circomData:c[n],commitmentValidationData:t.commitmentValidationData,withUniswapWorkAround:t.withUniswapWorkAround,authorizationData:t.authorizationData,adminData:t.adminData,recipientAddress:t.recipientAddress,tronProofSignature:t.tronProofSignature})),txCompletionTime:r,hashedEthereumAddress:n,ref:o,hashedDashboardAccountId:s}))},d=async(e,t,n,r,a,o)=>l(await i.callRelayerSolanaTransactBatchAPI({chainId:e,transactions:t,hashedEthereumAddress:n,txCompletionTime:r,ref:a,hashedDashboardAccountId:o}));exports.solanaTransactCallRelayer=c,exports.solanaTransactCallRelayerBatch=d,exports.transactCallRelayer=s,exports.transactCallRelayerBatch=u;
+const e=require(`../../../error-handling/customErrors/ErrorWithTx.cjs`),t=require(`../../../constants/server.constants.cjs`),n=require(`../../../API/getServerURL.cjs`),r=require(`../../../data-structures/http/HttpClient.cjs`),i=require(`../../../API/callRelayer.cjs`),a=require(`../../snarkjs/common.snarkjs.cjs`);require(`../../../error-handling/index.cjs`);var o=t=>{if(t.status===`success`)return t.message;throw t.message&&t.error?new e.ErrorWithRelayerTransaction(t.error,t.message):Error(t.error)},s=async(e,t,n,r,s,c,l,u,d)=>{let f=a.serializeCircomData(r);return o(await i.callRelayerTransactAPI({chainId:e,a:t[0],b:t[1],c:t[2],dimData:n,circomData:f,withUniswapWorkAround:c,authorizationData:l,adminData:u,tronProofSignature:d,commitmentValidationData:s}))},c=async e=>o(await r.httpClient.post(`${n.RELAYER_URL}${t.RELAYER_CONFIG.SOLANA_TRANSACT}`,e)),l=e=>{if(e.status===`success`)return e.message.scheduleId;throw Error(e.error||`Batch transaction failed`)},u=async(e,t,n,r,o,s)=>{let c=t.map(e=>a.serializeCircomData(e.circomData));return l(await i.callRelayerTransactBatchAPI({chainId:e,transactions:t.map((t,n)=>({chainId:e,a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2],dimData:t.dimData,circomData:c[n],commitmentValidationData:t.commitmentValidationData,withUniswapWorkAround:t.withUniswapWorkAround,authorizationData:t.authorizationData,adminData:t.adminData,recipientAddress:t.recipientAddress,tronProofSignature:t.tronProofSignature,destinationChainId:t.destinationChainId,destinationTokenAddress:t.destinationTokenAddress,destinationTokenAmount:t.destinationTokenAmount})),txCompletionTime:r,hashedEthereumAddress:n,ref:o,hashedDashboardAccountId:s}))},d=async(e,t,n,r,a,o)=>l(await i.callRelayerSolanaTransactBatchAPI({chainId:e,transactions:t,hashedEthereumAddress:n,txCompletionTime:r,ref:a,hashedDashboardAccountId:o}));exports.solanaTransactCallRelayer=c,exports.solanaTransactCallRelayerBatch=d,exports.transactCallRelayer=s,exports.transactCallRelayerBatch=u;