@hinkal/common 0.3.1 → 0.3.2

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

@@ -3,7 +3,7 @@ import { caseInsensitiveEqual as n } from "../../utils/caseInsensitive.utils.mjs
 import { Utxo as r } from "../../../data-structures/utxo/Utxo.mjs";
 import { checkAddressNotUpdated as i } from "../../utils/upToDateState.mjs";
 import { getHinkalCache as a, resetCache as o, setHinkalCache as s } from "../../utils/cacheFunctions.mjs";
-import { encodeTokenWithId as c } from "../../utils/encodeTokenWithId.mjs";
+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 { hashEthereumAddress as d } from "../../utils/addresses.mjs";
@@ -33,14 +33,13 @@ var h = new m(), g = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
 }, x = (e) => {
 	if (Array.isArray(e)) return e;
 	if (e !== void 0) return [e];
-}, S = async (e, t, n) => await e.utxoUtils.batchFilterUtxosWithNullifier(t, n), C = (e, t, n, i, a, o, s, c) => {
+}, S = async (e, t, n) => await e.utxoUtils.batchFilterUtxosWithNullifier(t, n), C = (e, t, n, 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 r({
 		amount: 0n,
 		erc20TokenAddress: o,
-		mintAddress: c,
+		mintAddress: s,
 		nullifyingKey: i,
-		spendingPublicKey: a,
-		isNewStyle: !0
+		spendingPublicKey: a
 	})), n) for (; e.length > 6;) e.splice(e.length - 1);
 }, w = async ({ hinkal: e, chainId: t, passedShieldedPublicKey: n = void 0, ethAddress: r = void 0, resetCacheBefore: s = !1, allowRemoteDecryption: c = !1, useBlockedUtxos: l = !1 }) => {
 	let u = r ?? await e.getEthereumAddress(), d = n ?? e.userKeys.getShieldedPublicKey(), { userKeys: f } = e, p = e.encryptedOutputsByChain[t], m = e.nullifiersByChain[t], h = Array.from(p);
@@ -89,22 +88,16 @@ var h = new m(), g = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
 	}), y = x(r), b = /* @__PURE__ */ new Map();
 	v.forEach((e) => {
 		let t = e.getTokenAddress(o);
-		if (y && !y.some((e) => n(e.erc20TokenAddress, t))) return;
-		let r = c(o, {
-			erc20TokenAddress: t,
-			tokenId: 0
-		}), i = b.get(r) ?? [];
+		if (y && !y.some((e) => n(e, t))) return;
+		let r = c(o, t), i = b.get(r) ?? [];
 		b.set(r, [...i, e]);
 	}), p?.forEach((e) => {
-		let t = c(o, {
-			erc20TokenAddress: e.erc20TokenAddress,
-			tokenId: 0
-		});
+		let t = c(o, e);
 		b.set(t, b.get(t) ?? []);
 	});
 	for (let [t, n] of b) {
-		let r = t.split("-")[0], s = Number(t.split("-")[1]), c = e(o), u = c ? r : void 0;
-		C(n, i, a, g, _, c ? l(r).compressedAddress.toLowerCase() : r.toLowerCase(), s, u);
+		let r = t, s = e(o), c = s ? r : void 0;
+		C(n, i, a, g, _, s ? l(r).compressedAddress.toLowerCase() : r.toLowerCase(), c);
 	}
 	return b;
 };

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=u.map(()=>0),h=!1,g=!1)=>{let{userKeys:_}=e,v=_.getSpendingKeyPair().pubSpendingBJJPoint,y=[],b=[];if(u.length===0)return[];if(h){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];y.push(Array.from({length:f},()=>new a.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:i,nullifyingKey:_.getShieldedPrivateKey(),spendingPublicKey:v,isNewStyle:!0})))}return y}let x=await l.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:u.map((e,t)=>({erc20TokenAddress:u[t],tokenId:m[t]})),allowRemoteDecryption:e.generateProofRemotely,useBlockedUtxos:g,chainId:n}),S=0;for(let e=0;e<u.length;e+=1){let t=x.get(s.encodeTokenWithId(n,{erc20TokenAddress:u[e],tokenId:m[e]}))??[];if(!t)throw Error(`Missing utxos for token`);S=Math.max(t.length,S),b.push(t)}if(S===2)return b;for(let[e,s]of b.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.`)}y.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:_.getShieldedPrivateKey(),spendingPublicKey:v,isNewStyle:!0}))}y.push(r)}return y};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(`./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;

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

@@ -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, tokenIds?: 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) => Promise<Utxo[][]>;

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

@@ -6,7 +6,7 @@ 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 { encodeTokenWithId as s } from "../../utils/encodeTokenWithId.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";
@@ -46,44 +46,37 @@ var v = async (t, r, i, a, o, s = !1, c, d = !1, h = !1) => p(t.balanceFetchingM
 	return m.forEach((e) => {
 		_.set(e.token.erc20TokenAddress.toLowerCase(), e);
 	}), _;
-})), y = async (e, n, l, u, f = 6, p = l.map(() => 0), m = !1, g = !1) => {
-	let { userKeys: _ } = e, v = _.getSpendingKeyPair().pubSpendingBJJPoint, y = [], b = [];
+})), 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 (m) {
+	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];
-			y.push(Array.from({ length: f }, () => new a({
+			v.push(Array.from({ length: f }, () => new a({
 				amount: 0n,
 				erc20TokenAddress: o,
 				mintAddress: i,
-				nullifyingKey: _.getShieldedPrivateKey(),
-				spendingPublicKey: v,
-				isNewStyle: !0
+				nullifyingKey: g.getShieldedPrivateKey(),
+				spendingPublicKey: _
 			})));
 		}
-		return y;
+		return v;
 	}
-	let x = await d({
+	let b = await d({
 		hinkal: e,
 		sliceIfMore6: !1,
-		ensuredTokensWithId: l.map((e, t) => ({
-			erc20TokenAddress: l[t],
-			tokenId: p[t]
-		})),
+		ensuredTokensWithId: l,
 		allowRemoteDecryption: e.generateProofRemotely,
-		useBlockedUtxos: g,
+		useBlockedUtxos: m,
 		chainId: n
-	}), S = 0;
+	}), x = 0;
 	for (let e = 0; e < l.length; e += 1) {
-		let t = x.get(s(n, {
-			erc20TokenAddress: l[e],
-			tokenId: p[e]
-		})) ?? [];
+		let t = b.get(s(n, l[e])) ?? [];
 		if (!t) throw Error("Missing utxos for token");
-		S = Math.max(t.length, S), b.push(t);
+		x = Math.max(t.length, x), y.push(t);
 	}
-	if (S === 2) return b;
-	for (let [e, s] of b.entries()) if (s.length > f) {
+	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]);
@@ -91,7 +84,7 @@ var v = async (t, r, i, a, o, s = !1, c, d = !1, h = !1) => p(t.balanceFetchingM
 			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.`);
 		}
-		y.push(t);
+		v.push(t);
 	} else if (s.length <= f) {
 		let r = [...s], i = f - s.length;
 		for (; i > 0;) {
@@ -101,14 +94,13 @@ var v = async (t, r, i, a, o, s = !1, c, d = !1, h = !1) => p(t.balanceFetchingM
 				amount: 0n,
 				erc20TokenAddress: u,
 				mintAddress: s,
-				nullifyingKey: _.getShieldedPrivateKey(),
-				spendingPublicKey: v,
-				isNewStyle: !0
+				nullifyingKey: g.getShieldedPrivateKey(),
+				spendingPublicKey: _
 			}));
 		}
-		y.push(r);
+		v.push(r);
 	}
-	return y;
+	return v;
 };
 //#endregion
 export { y as addPaddingToUtxos, v as getShieldedBalance };

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

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../../types/ethereum-network.types.cjs`),r=require(`../../../types/token.types.cjs`),i=require(`../../utils/getContractAddress.cjs`),a=require(`../../utils/getSignerFromContract.cjs`),o=require(`./recoverTransactionFromError.cjs`);let s=require(`ethers`);var c=async(e,t,n)=>{let r=a.getSignerFromContract(n);return await n.allowance(await r.getAddress(),t.target)>=e},l=async(t,n,r,o,s)=>{if(e.getNonLocalhostChainId(n)!==e.chainIds.ethMainnet||o.symbol.toLowerCase()!==`usdt`||BigInt(await s.allowance(await a.getSignerFromContract(s).getAddress(),r.target))===0n)return;let c=await s.approve(i.getContractAddress(r),0n);c&&`hash`in c&&await t.waitForTransaction(n,c.hash)},u=async(u,d,f,p,m)=>{let h=u.getContractWithSigner(d,n.ContractType.ERC20Contract,m.erc20TokenAddress),g=m.approvalType??r.ApprovalType.Classic;if(g===r.ApprovalType.Classic||!u.isPermitterAvailable(d)){if(await c(p,f,h))return;await l(u,d,f,m,h);let t=d===e.chainIds.base?2:1;try{let e=await h.approve(i.getContractAddress(f),p);e&&`hash`in e&&await u.waitForTransaction(d,e.hash,t)}catch(e){if(!e?.transactionHash||!await o.recoverTransactionFromError(a.getProviderFromContract(h),e.transactionHash,t))throw e}return}let _=await u.getEthereumAddressByChain(d),v=u.getContract(d,n.ContractType.PermitterContract),y=await u.getContractWithFetcher(d,n.ContractType.ContractWithNonces,m.erc20TokenAddress).nonces(_),b=BigInt(Date.now()+t.permitSignatureValidFor)/1000n,x={owner:_,holder:_,spender:i.getContractAddress(v),value:p,nonce:y,deadline:b,expiry:b,allowed:!0},{v:S,r:C,s:w}=s.ethers.Signature.from(await u.signTypedData({name:await h.name(),chainId:d,version:`1`,verifyingContract:m.erc20TokenAddress},{Permit:g===r.ApprovalType.ERC20Permit?[{name:`owner`,type:`address`},{name:`spender`,type:`address`},{name:`value`,type:`uint256`},{name:`nonce`,type:`uint256`},{name:`deadline`,type:`uint256`}]:[{name:`holder`,type:`address`},{name:`spender`,type:`address`},{name:`nonce`,type:`uint256`},{name:`expiry`,type:`uint256`},{name:`allowed`,type:`bool`}]},x));if(g===r.ApprovalType.ERC20Permit){let e=new s.ethers.Interface([`function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external`]);return s.ethers.getBytesCopy(e.encodeFunctionData(`permit`,[x.owner,x.spender,x.value,x.deadline,S,s.ethers.getBytesCopy(C),s.ethers.getBytesCopy(w)])).slice(4)}let T=new s.ethers.Interface([`function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external`]);return s.ethers.getBytesCopy(T.encodeFunctionData(`permit`,[x.holder,x.spender,x.nonce,x.expiry,x.allowed,S,s.ethers.getBytesCopy(C),s.ethers.getBytesCopy(w)])).slice(4)};exports.approveTokenToHinkal=u;
+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;

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

@@ -1,4 +1,4 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { ERC20Token } from '../../../types/token.types';
-export declare const approveTokenToHinkal: (hinkal: IHinkal, chainId: number, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<Uint8Array | undefined>;
+export declare const approveTokenToHinkal: (hinkal: IHinkal, chainId: number, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<void>;

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

@@ -1,113 +1,27 @@
 import { chainIds as e, getNonLocalhostChainId as t } from "../../../constants/chains.constants.mjs";
-import { permitSignatureValidFor as n } from "../../../constants/protocol.constants.mjs";
-import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
-import { ApprovalType as i } from "../../../types/token.types.mjs";
-import { getContractAddress as a } from "../../utils/getContractAddress.mjs";
-import { getProviderFromContract as o, getSignerFromContract as s } from "../../utils/getSignerFromContract.mjs";
-import { recoverTransactionFromError as c } from "./recoverTransactionFromError.mjs";
-import { ethers as l } from "ethers";
+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";
 //#region libs/shared/common/src/functions/web3/functionCalls/approveToken.ts
-var u = async (e, t, n) => {
-	let r = s(n);
+var s = async (e, t, n) => {
+	let r = a(n);
 	return await n.allowance(await r.getAddress(), t.target) >= e;
-}, d = async (n, r, i, o, c) => {
-	if (t(r) !== e.ethMainnet || o.symbol.toLowerCase() !== "usdt" || BigInt(await c.allowance(await s(c).getAddress(), i.target)) === 0n) return;
-	let l = await c.approve(a(i), 0n);
-	l && "hash" in l && await n.waitForTransaction(r, l.hash);
-}, f = async (t, s, f, p, m) => {
-	let h = t.getContractWithSigner(s, r.ERC20Contract, m.erc20TokenAddress), g = m.approvalType ?? i.Classic;
-	if (g === i.Classic || !t.isPermitterAvailable(s)) {
-		if (await u(p, f, h)) return;
-		await d(t, s, f, m, h);
-		let n = s === e.base ? 2 : 1;
-		try {
-			let e = await h.approve(a(f), p);
-			e && "hash" in e && await t.waitForTransaction(s, e.hash, n);
-		} catch (e) {
-			if (!e?.transactionHash || !await c(o(h), e.transactionHash, n)) throw e;
-		}
-		return;
+}, 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);
+	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);
+	if (await s(u, l, f)) return;
+	await c(t, a, l, d, f);
+	let p = a === e.base ? 2 : 1;
+	try {
+		let e = await f.approve(r(l), u);
+		e && "hash" in e && await t.waitForTransaction(a, e.hash, p);
+	} catch (e) {
+		if (!e?.transactionHash || !await o(i(f), e.transactionHash, p)) throw e;
 	}
-	let _ = await t.getEthereumAddressByChain(s), v = t.getContract(s, r.PermitterContract), y = await t.getContractWithFetcher(s, r.ContractWithNonces, m.erc20TokenAddress).nonces(_), b = BigInt(Date.now() + n) / 1000n, x = {
-		owner: _,
-		holder: _,
-		spender: a(v),
-		value: p,
-		nonce: y,
-		deadline: b,
-		expiry: b,
-		allowed: !0
-	}, { v: S, r: C, s: w } = l.Signature.from(await t.signTypedData({
-		name: await h.name(),
-		chainId: s,
-		version: "1",
-		verifyingContract: m.erc20TokenAddress
-	}, { Permit: g === i.ERC20Permit ? [
-		{
-			name: "owner",
-			type: "address"
-		},
-		{
-			name: "spender",
-			type: "address"
-		},
-		{
-			name: "value",
-			type: "uint256"
-		},
-		{
-			name: "nonce",
-			type: "uint256"
-		},
-		{
-			name: "deadline",
-			type: "uint256"
-		}
-	] : [
-		{
-			name: "holder",
-			type: "address"
-		},
-		{
-			name: "spender",
-			type: "address"
-		},
-		{
-			name: "nonce",
-			type: "uint256"
-		},
-		{
-			name: "expiry",
-			type: "uint256"
-		},
-		{
-			name: "allowed",
-			type: "bool"
-		}
-	] }, x));
-	if (g === i.ERC20Permit) {
-		let e = new l.Interface(["function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external"]);
-		return l.getBytesCopy(e.encodeFunctionData("permit", [
-			x.owner,
-			x.spender,
-			x.value,
-			x.deadline,
-			S,
-			l.getBytesCopy(C),
-			l.getBytesCopy(w)
-		])).slice(4);
-	}
-	let T = new l.Interface(["function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external"]);
-	return l.getBytesCopy(T.encodeFunctionData("permit", [
-		x.holder,
-		x.spender,
-		x.nonce,
-		x.expiry,
-		x.allowed,
-		S,
-		l.getBytesCopy(C),
-		l.getBytesCopy(w)
-	])).slice(4);
 };
 //#endregion
-export { f as approveTokenToHinkal };
+export { l as approveTokenToHinkal };

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

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../externalABIs/index.cjs`),t=require(`../../utils/getContractAddress.cjs`);let n=require(`ethers`);var r=(t,r)=>new n.ethers.Interface(e.ERC20ABI).encodeFunctionData(`approve`,[t,r]),i=(e,t,n,r)=>r.encodeFunctionData(`transact`,[e[0],e[1],e[2],t,n]),a=(e,t,n,r,i)=>i.encodeFunctionData(`prooflessDeposit`,[e,t,n,r]),o=(e,t,i,a,o,s)=>{let c=[];for(let a=0;a<e.length;a+=1){let o=e[a],s=t[a];o!==n.ethers.ZeroAddress&&s>0n&&c.push({to:o,value:`0x0`,data:r(i,s)})}return c.push({to:a,value:s>0n?`0x${s.toString(16)}`:`0x0`,data:o}),c},s=(e,a,o,s,c,l,u,d)=>{let f=[];for(let t=0;t<e.length;t+=1){let i=e[t],s=a[t];i!==n.ethers.ZeroAddress&&s>0n&&f.push({to:i,value:`0x0`,data:r(o,s)})}return f.push({to:t.getContractAddress(s),value:d>0n?`0x${d.toString(16)}`:`0x0`,data:i(c,l,u,s.interface)}),f},c=(e,t,n,r,i,a,o,s)=>e.encodeFunctionData(`prooflessDeposit`,[t,n,r,i,a,o,s]),l=(e,t,n,r,i,a,s,l,u,d,f,p)=>o(e,t,n,n,c(r,i,a,s,l,u,d,f),p),u=(e,n,r,i,s,c,l,u,d)=>{let f=a(s,c,l,u,i.interface);return o(e,n,r,t.getContractAddress(i),f,d)};exports.buildApproveAndDepositWrapperCalls=l,exports.buildApproveAndProoflessDepositCalls=u,exports.buildApproveAndTransactCalls=s;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../externalABIs/index.cjs`),t=require(`../../utils/getContractAddress.cjs`);let n=require(`ethers`);var r=(t,r)=>new n.ethers.Interface(e.ERC20ABI).encodeFunctionData(`approve`,[t,r]),i=(e,t,n,r)=>r.encodeFunctionData(`transact`,[e[0],e[1],e[2],t,n]),a=(e,t,n,r,i,a,o,s)=>{let c=a?[e,t,n,r,i,a,o]:[e,t,n,r,i,o];return s.encodeFunctionData(`prooflessDeposit`,c)},o=(e,t,i,a,o,s)=>{let c=[];for(let a=0;a<e.length;a+=1){let o=e[a],s=t[a];o!==n.ethers.ZeroAddress&&s>0n&&c.push({to:o,value:`0x0`,data:r(i,s)})}return c.push({to:a,value:s>0n?`0x${s.toString(16)}`:`0x0`,data:o}),c},s=(e,a,o,s,c,l,u,d)=>{let f=[];for(let t=0;t<e.length;t+=1){let i=e[t],s=a[t];i!==n.ethers.ZeroAddress&&s>0n&&f.push({to:i,value:`0x0`,data:r(o,s)})}return f.push({to:t.getContractAddress(s),value:d>0n?`0x${d.toString(16)}`:`0x0`,data:i(c,l,u,s.interface)}),f},c=(e,n,r,i,s,c,l,u,d,f,p,m)=>{let h=a(s,c,l,u,d,f,p,i.interface);return o(e,n,r,t.getContractAddress(i),h,m)};exports.buildApproveAndProoflessDepositCalls=c,exports.buildApproveAndTransactCalls=s;

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

@@ -2,6 +2,6 @@ import { ethers } from 'ethers';
 import { CircomDataType, DimDataType, StealthAddressStructure } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { Call } from '../../../types/eip5792.types';
+import { ProoflessFeeStructure } from '../../../types/hinkal.types';
 export declare const buildApproveAndTransactCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, ethValue: bigint) => Call[];
-export declare const buildApproveAndDepositWrapperCalls: (tokenAddresses: string[], amounts: bigint[], wrapperAddress: string, wrapperInterface: ethers.Interface, feeRecipient: string, feeToken: string, feeAmount: bigint, depositErc20Addresses: string[], depositAmounts: bigint[], depositTokenIds: bigint[], stealthAddressStructures: StealthAddressStructure[], ethValue: bigint) => Call[];
-export declare const buildApproveAndProoflessDepositCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, prooflessDepositTokenAddresses: string[], prooflessDepositAmountChanges: bigint[], prooflessDepositTokenIds: bigint[], stealthAddressStructures: StealthAddressStructure[], ethValue: bigint) => Call[];
+export declare const buildApproveAndProoflessDepositCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, prooflessDepositTokenAddresses: string[], prooflessDepositAmountChanges: bigint[], stealthAddressStructures: StealthAddressStructure[], encryptedOutputs: string[], createBlockedUtxos: boolean, feeStructure: ProoflessFeeStructure | undefined, orderId: string, ethValue: bigint) => Call[];

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

@@ -8,12 +8,25 @@ var r = (t, r) => new n.Interface(e).encodeFunctionData("approve", [t, r]), i =
 	e[2],
 	t,
 	n
-]), a = (e, t, n, r, i) => i.encodeFunctionData("prooflessDeposit", [
-	e,
-	t,
-	n,
-	r
-]), o = (e, t, i, a, o, s) => {
+]), a = (e, t, n, r, i, a, o, s) => {
+	let c = a ? [
+		e,
+		t,
+		n,
+		r,
+		i,
+		a,
+		o
+	] : [
+		e,
+		t,
+		n,
+		r,
+		i,
+		o
+	];
+	return s.encodeFunctionData("prooflessDeposit", c);
+}, o = (e, t, i, a, o, s) => {
 	let c = [];
 	for (let a = 0; a < e.length; a += 1) {
 		let o = e[a], s = t[a];
@@ -43,17 +56,9 @@ var r = (t, r) => new n.Interface(e).encodeFunctionData("approve", [t, r]), i =
 		value: d > 0n ? `0x${d.toString(16)}` : "0x0",
 		data: i(c, l, u, s.interface)
 	}), f;
-}, c = (e, t, n, r, i, a, o, s) => e.encodeFunctionData("prooflessDeposit", [
-	t,
-	n,
-	r,
-	i,
-	a,
-	o,
-	s
-]), l = (e, t, n, r, i, a, s, l, u, d, f, p) => o(e, t, n, n, c(r, i, a, s, l, u, d, f), p), u = (e, n, r, i, s, c, l, u, d) => {
-	let f = a(s, c, l, u, i.interface);
-	return o(e, n, r, t(i), f, d);
+}, c = (e, n, r, i, s, c, l, u, d, f, p, m) => {
+	let h = a(s, c, l, u, d, f, p, i.interface);
+	return o(e, n, r, t(i), h, m);
 };
 //#endregion
-export { l as buildApproveAndDepositWrapperCalls, u as buildApproveAndProoflessDepositCalls, s as buildApproveAndTransactCalls };
+export { c as buildApproveAndProoflessDepositCalls, s as buildApproveAndTransactCalls };

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=BigInt(await x.trx.getBalance(S)),n=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=o.createTronCallData(D.abi,`transact`,[F,j,M,N,I,L]);n=await o.estimateTronFeeSunWithPadding(x,u,D.address,S,e,A)}catch(e){a.Logger.error(`Error estimating Tron transact fee`,e)}if(e<A+n)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(`../../../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;

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

@@ -64,7 +64,41 @@ var h = async (h, g, _, v, y, b, x, S, C, w = !0) => {
 			H,
 			U
 		], O, I);
-		let e = BigInt(await D.trx.getBalance(O)), n = BigInt(t);
+		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);
 		try {
 			let e = c(N.abi, "transact", [
 				V,
@@ -74,11 +108,11 @@ var h = async (h, g, _, v, y, b, x, S, C, w = !0) => {
 				H,
 				U
 			]);
-			n = await l(D, g, N.address, O, e, I);
+			v = await l(D, g, N.address, O, e, I);
 		} catch (e) {
 			o.error("Error estimating Tron transact fee", e);
 		}
-		if (e < I + n) throw Error(i.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
+		if (_ < I + v) throw Error(i.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
 	}
 	let W = await N.transact(V, L, R, z, H, U).send({
 		feeLimit: t,

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

@@ -1 +1 @@
-const e=require(`../../../constants/protocol.constants.cjs`),t=require(`../../utils/caseInsensitive.utils.cjs`),n=require(`../../utils/time.utils.cjs`),r=require(`../../../types/ethereum-network.types.cjs`),i=require(`../../../externalABIs/index.cjs`);var a=async(i,a,o,s,c,l=30,u=1e3)=>{let d=c.filter(({tokenAddress:n,requiredAmount:r})=>r>0n&&!t.caseInsensitiveEqual(n,e.zeroAddress));if(d.length===0)return;let f=d.map(({tokenAddress:e})=>i.getContractWithSigner(a,r.ContractType.ERC20Contract,e));for(let e=0;e<l;e+=1){let e=!0;for(let t=0;t<d.length;t+=1){let{requiredAmount:n}=d[t],r=f[t];if(BigInt(await r.allowance(o,s))<n){e=!1;break}}if(e)break;await n.waitLittle(u)}},o=async(r,a,o,s,c=30,l=1e3)=>{let u=s.filter(({tokenAddress:n,requiredAmount:r})=>r>0n&&!t.caseInsensitiveEqual(n,e.zeroAddress)&&!!n);if(u.length===0)return;let d=await Promise.all(u.map(async({tokenAddress:e})=>r.contract(i.ERC20ABI,e)));for(let e=0;e<c;e+=1){let e=!0;for(let t=0;t<u.length;t+=1){let{requiredAmount:n}=u[t],r=await d[t].allowance(a,o).call({from:a});if(BigInt(String(r))<n){e=!1;break}}if(e)break;await n.waitLittle(l)}};exports.waitForErc20Approvals=a,exports.waitForTronErc20Approvals=o;
+const e=require(`../../../constants/protocol.constants.cjs`),t=require(`../../utils/caseInsensitive.utils.cjs`),n=require(`../../utils/time.utils.cjs`),r=require(`../../../externalABIs/index.cjs`),i=require(`../../../types/ethereum-network.types.cjs`);var a=async(r,a,o,s,c,l=30,u=1e3)=>{let d=c.filter(({tokenAddress:n,requiredAmount:r})=>r>0n&&!t.caseInsensitiveEqual(n,e.zeroAddress));if(d.length===0)return;let f=d.map(({tokenAddress:e})=>r.getContractWithSigner(a,i.ContractType.ERC20Contract,e));for(let e=0;e<l;e+=1){let e=!0;for(let t=0;t<d.length;t+=1){let{requiredAmount:n}=d[t],r=f[t];if(BigInt(await r.allowance(o,s))<n){e=!1;break}}if(e)break;await n.waitLittle(u)}},o=async(i,a,o,s,c=30,l=1e3)=>{let u=s.filter(({tokenAddress:n,requiredAmount:r})=>r>0n&&!t.caseInsensitiveEqual(n,e.zeroAddress)&&!!n);if(u.length===0)return;let d=await Promise.all(u.map(async({tokenAddress:e})=>i.contract(r.ERC20ABI,e)));for(let e=0;e<c;e+=1){let e=!0;for(let t=0;t<u.length;t+=1){let{requiredAmount:n}=u[t],r=await d[t].allowance(a,o).call({from:a});if(BigInt(String(r))<n){e=!1;break}}if(e)break;await n.waitLittle(l)}};exports.waitForErc20Approvals=a,exports.waitForTronErc20Approvals=o;

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

@@ -1,13 +1,13 @@
 import { zeroAddress as e } from "../../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as t } from "../../utils/caseInsensitive.utils.mjs";
 import { waitLittle as n } from "../../utils/time.utils.mjs";
-import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
-import { ERC20ABI as i } from "../../../externalABIs/index.mjs";
+import { ERC20ABI as r } from "../../../externalABIs/index.mjs";
+import { ContractType as i } from "../../../types/ethereum-network.types.mjs";
 //#region libs/shared/common/src/functions/web3/functionCalls/waitForErc20Approvals.ts
-var a = async (i, a, o, s, c, l = 30, u = 1e3) => {
+var a = async (r, a, o, s, c, l = 30, u = 1e3) => {
 	let d = c.filter(({ tokenAddress: n, requiredAmount: r }) => r > 0n && !t(n, e));
 	if (d.length === 0) return;
-	let f = d.map(({ tokenAddress: e }) => i.getContractWithSigner(a, r.ERC20Contract, e));
+	let f = d.map(({ tokenAddress: e }) => r.getContractWithSigner(a, i.ERC20Contract, e));
 	for (let e = 0; e < l; e += 1) {
 		let e = !0;
 		for (let t = 0; t < d.length; t += 1) {
@@ -20,10 +20,10 @@ var a = async (i, a, o, s, c, l = 30, u = 1e3) => {
 		if (e) break;
 		await n(u);
 	}
-}, o = async (r, a, o, s, c = 30, l = 1e3) => {
+}, o = async (i, a, o, s, c = 30, l = 1e3) => {
 	let u = s.filter(({ tokenAddress: n, requiredAmount: r }) => r > 0n && !t(n, e) && !!n);
 	if (u.length === 0) return;
-	let d = await Promise.all(u.map(async ({ tokenAddress: e }) => r.contract(i, e)));
+	let d = await Promise.all(u.map(async ({ tokenAddress: e }) => i.contract(r, e)));
 	for (let e = 0; e < c; e += 1) {
 		let e = !0;
 		for (let t = 0; t < u.length; t += 1) {

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`./etherFunctions.cjs`),r=require(`../../types/ethereum-network.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);const a=require(`./getContractMetadata.cjs`);require(`../../constants/index.cjs`);const o=require(`../../API/callOneInchAPI.cjs`);var s=async(s,c,l,u,d=.7)=>{try{let t=await o.callOneInchAPI(s,{fromTokenAddress:c.erc20TokenAddress===e.zeroAddress?e.oneInchZeroAddress:c.erc20TokenAddress,toTokenAddress:l.erc20TokenAddress===e.zeroAddress?e.oneInchZeroAddress:l.erc20TokenAddress,fromAddress:e.zeroAddress,destReceiver:a.getContractMetadata(r.ContractType.OneInchExternalActionContract,s).address,amount:n.getAmountInWei(c,u),slippage:d,disableEstimate:!0,allowPartialFill:!1});if(!t||!t.tx)throw Error(`OneInch API price fetch error`);return{outSwapAmountValue:BigInt(t.toAmount),oneInchDataValue:t.tx.data}}catch(e){throw i.Logger.log({error:e}),Error(t.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=s;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`./etherFunctions.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../../types/ethereum-network.types.cjs`);require(`../../types/index.cjs`),require(`../../error-handling/index.cjs`);const o=require(`./getContractMetadata.cjs`);require(`../../constants/index.cjs`);const s=require(`../../API/callOneInchAPI.cjs`);var c=`angstrom`,l=[e.chainIds.base],u=async e=>{if(l.includes(e))try{let t=await s.getOneInchLiquiditySources(e),n=t.filter(({id:e,title:t})=>!`${e} ${t}`.toLowerCase().includes(c));return!n.length||n.length===t.length?void 0:n.map(({id:e})=>e).join(`,`)}catch(e){i.Logger.log({error:e});return}},d=async(e,c,l,d,f=.7)=>{try{let n=await u(e),i=await s.callOneInchAPI(e,{fromTokenAddress:c.erc20TokenAddress===t.zeroAddress?t.oneInchZeroAddress:c.erc20TokenAddress,toTokenAddress:l.erc20TokenAddress===t.zeroAddress?t.oneInchZeroAddress:l.erc20TokenAddress,fromAddress:t.zeroAddress,destReceiver:o.getContractMetadata(a.ContractType.OneInchExternalActionContract,e).address,amount:r.getAmountInWei(c,d),slippage:f,disableEstimate:!0,allowPartialFill:!1,protocols:n});if(!i||!i.tx)throw Error(`OneInch API price fetch error`);return{outSwapAmountValue:BigInt(i.toAmount),oneInchDataValue:i.tx.data}}catch(e){throw i.Logger.log({error:e}),Error(n.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=d;

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

@@ -1,34 +1,44 @@
-import { oneInchZeroAddress as e, zeroAddress as t } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInWei as r } from "./etherFunctions.mjs";
-import { ContractType as i } from "../../types/ethereum-network.types.mjs";
-import "../../types/index.mjs";
+import { chainIds as e } from "../../constants/chains.constants.mjs";
+import { oneInchZeroAddress as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInWei as i } from "./etherFunctions.mjs";
 import { Logger as a } from "../../error-handling/logger.mjs";
+import { ContractType as o } from "../../types/ethereum-network.types.mjs";
+import "../../types/index.mjs";
 import "../../error-handling/index.mjs";
-import { getContractMetadata as o } from "./getContractMetadata.mjs";
+import { getContractMetadata as s } from "./getContractMetadata.mjs";
 import "../../constants/index.mjs";
-import { callOneInchAPI as s } from "../../API/callOneInchAPI.mjs";
+import { callOneInchAPI as c, getOneInchLiquiditySources as l } from "../../API/callOneInchAPI.mjs";
 //#region libs/shared/common/src/functions/web3/oneInchAPI.ts
-var c = async (c, l, u, d, f = .7) => {
+var u = "angstrom", d = [e.base], f = async (e) => {
+	if (d.includes(e)) try {
+		let t = await l(e), n = t.filter(({ id: e, title: t }) => !`${e} ${t}`.toLowerCase().includes(u));
+		return !n.length || n.length === t.length ? void 0 : n.map(({ id: e }) => e).join(",");
+	} catch (e) {
+		a.log({ error: e });
+		return;
+	}
+}, p = async (e, l, u, d, p = .7) => {
 	try {
-		let n = await s(c, {
-			fromTokenAddress: l.erc20TokenAddress === t ? e : l.erc20TokenAddress,
-			toTokenAddress: u.erc20TokenAddress === t ? e : u.erc20TokenAddress,
-			fromAddress: t,
-			destReceiver: o(i.OneInchExternalActionContract, c).address,
-			amount: r(l, d),
-			slippage: f,
+		let r = await f(e), a = await c(e, {
+			fromTokenAddress: l.erc20TokenAddress === n ? t : l.erc20TokenAddress,
+			toTokenAddress: u.erc20TokenAddress === n ? t : u.erc20TokenAddress,
+			fromAddress: n,
+			destReceiver: s(o.OneInchExternalActionContract, e).address,
+			amount: i(l, d),
+			slippage: p,
 			disableEstimate: !0,
-			allowPartialFill: !1
+			allowPartialFill: !1,
+			protocols: r
 		});
-		if (!n || !n.tx) throw Error("OneInch API price fetch error");
+		if (!a || !a.tx) throw Error("OneInch API price fetch error");
 		return {
-			outSwapAmountValue: BigInt(n.toAmount),
-			oneInchDataValue: n.tx.data
+			outSwapAmountValue: BigInt(a.toAmount),
+			oneInchDataValue: a.tx.data
 		};
 	} catch (e) {
-		throw a.log({ error: e }), Error(n.NO_ONEINCH_PRICE);
+		throw a.log({ error: e }), Error(r.NO_ONEINCH_PRICE);
 	}
 };
 //#endregion
-export { c as getOneInchPrice };
+export { p as getOneInchPrice };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`./etherFunctions.cjs`),i=require(`../../types/ethereum-network.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../error-handling/logError.cjs`);require(`../../error-handling/index.cjs`),require(`../../constants/index.cjs`);let o=require(`ethers`);var s=async(e,r,i,a)=>{let o=(await Promise.all([100,500,3e3,1e4].map(async e=>({poolAddress:await r.getPool(i,a,e),fee:e})))).filter(({poolAddress:e})=>e!==t.zeroAddress),s=await Promise.all(o.map(async t=>({poolAddress:t.poolAddress,fee:t.fee,token1Balance:await e.balanceOf(t.poolAddress)}))),c=s.map(e=>e.token1Balance).reduce((e,t)=>t>=e?t:e,0n);if(c===0n)throw Error(n.transactionErrorCodes.UNISWAP_NOT_ENOUGH_LIQUIDITY);return s.find(e=>e.token1Balance===c)},c=async(t,n,r,o,s,c)=>{try{if(!e.networkRegistry[n].quoterV2Address)throw Error(`No Quoter Contract Provided`);return(await t.getContractWithFetcherByChainId(n,i.ContractType.UniswapV3QuoterContract,e.networkRegistry[n].quoterV2Address).quoteExactInputSingle.staticCall({tokenIn:r.wrappedErc20TokenAddress??r.erc20TokenAddress,tokenOut:o.wrappedErc20TokenAddress??o.erc20TokenAddress,fee:s,amountIn:c,sqrtPriceLimitX96:0})).amountOut}catch(e){throw a.logError(e),e}},l=async(t,n,r,a)=>{try{let o=t.getContractWithFetcherByChainId(n,i.ContractType.UniswapV3FactoryContract,e.networkRegistry[n].uniswapV3FactoryAddress),{fee:c}=await s(t.getContractWithFetcherByChainId(n,i.ContractType.ERC20Contract,a.wrappedErc20TokenAddress??a.erc20TokenAddress),o,r.wrappedErc20TokenAddress??r.erc20TokenAddress,a.wrappedErc20TokenAddress??a.erc20TokenAddress);return c}catch(e){throw console.log(`Error in getUniswapFee`,e),e}},u=async(e,t,i,a,s)=>{try{let n=await l(e,t,a,s),u=o.ethers.AbiCoder.defaultAbiCoder().encode([`uint24`],[n]);return{tokenPrice:await c(e,t,a,s,n,r.getAmountInWei(a,i)),poolFee:u}}catch{throw Error(n.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=l,exports.getUniswapPrice=u,exports.getUniswapPriceHelper=c,exports.searchPoolAndFee=s;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`./etherFunctions.cjs`),i=require(`../../error-handling/logError.cjs`),a=require(`../../types/ethereum-network.types.cjs`);require(`../../types/index.cjs`),require(`../../error-handling/index.cjs`),require(`../../constants/index.cjs`);let o=require(`ethers`);var s=async(e,r,i,a)=>{let o=(await Promise.all([100,500,3e3,1e4].map(async e=>({poolAddress:await r.getPool(i,a,e),fee:e})))).filter(({poolAddress:e})=>e!==t.zeroAddress),s=await Promise.all(o.map(async t=>({poolAddress:t.poolAddress,fee:t.fee,token1Balance:await e.balanceOf(t.poolAddress)}))),c=s.map(e=>e.token1Balance).reduce((e,t)=>t>=e?t:e,0n);if(c===0n)throw Error(n.transactionErrorCodes.UNISWAP_NOT_ENOUGH_LIQUIDITY);return s.find(e=>e.token1Balance===c)},c=async(t,n,r,o,s,c)=>{try{if(!e.networkRegistry[n].quoterV2Address)throw Error(`No Quoter Contract Provided`);return(await t.getContractWithFetcherByChainId(n,a.ContractType.UniswapV3QuoterContract,e.networkRegistry[n].quoterV2Address).quoteExactInputSingle.staticCall({tokenIn:r.wrappedErc20TokenAddress??r.erc20TokenAddress,tokenOut:o.wrappedErc20TokenAddress??o.erc20TokenAddress,fee:s,amountIn:c,sqrtPriceLimitX96:0})).amountOut}catch(e){throw i.logError(e),e}},l=async(t,n,r,i)=>{try{let o=t.getContractWithFetcherByChainId(n,a.ContractType.UniswapV3FactoryContract,e.networkRegistry[n].uniswapV3FactoryAddress),{fee:c}=await s(t.getContractWithFetcherByChainId(n,a.ContractType.ERC20Contract,i.wrappedErc20TokenAddress??i.erc20TokenAddress),o,r.wrappedErc20TokenAddress??r.erc20TokenAddress,i.wrappedErc20TokenAddress??i.erc20TokenAddress);return c}catch(e){throw console.log(`Error in getUniswapFee`,e),e}},u=async(e,t,i,a,s)=>{try{let n=await l(e,t,a,s),u=o.ethers.AbiCoder.defaultAbiCoder().encode([`uint24`],[n]);return{tokenPrice:await c(e,t,a,s,n,r.getAmountInWei(a,i)),poolFee:u}}catch{throw Error(n.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=l,exports.getUniswapPrice=u,exports.getUniswapPriceHelper=c,exports.searchPoolAndFee=s;