@hinkal/common 0.2.31 → 0.2.32

package/functions/web3/functionCalls/transactCallDirectTron.mjs

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

package/functions/web3/functionCalls/transactCallRelayer.cjs

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

package/functions/web3/functionCalls/transactCallRelayer.d.ts

@@ -1,11 +1,11 @@
-import { AdminDataType, AuthorizationData, CircomDataType, DimDataType, NewZkCallDataType } from '../../../types';
+import { AdminDataType, AuthorizationData, CircomDataType, CommitmentValidationDataType, DimDataType, NewZkCallDataType } from '../../../types';
 import { SolanaTransactionBody } from '../../../types/solana.types';
 export interface RelayerResponseInterface {
     status: string;
     message: string;
     error?: string;
 }
-export declare const transactCallRelayer: (chainId: number, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, withUniswapWorkAround?: boolean, authorizationData?: AuthorizationData, adminData?: AdminDataType, tronProofSignature?: {
+export declare const transactCallRelayer: (chainId: number, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, commitmentValidationData?: CommitmentValidationDataType, withUniswapWorkAround?: boolean, authorizationData?: AuthorizationData, adminData?: AdminDataType, tronProofSignature?: {
     v: number;
     r: string;
     s: string;
@@ -22,6 +22,7 @@ export interface BatchTransactionParams {
     zkCallData: NewZkCallDataType;
     dimData: DimDataType;
     circomData: CircomDataType;
+    commitmentValidationData?: CommitmentValidationDataType;
     withUniswapWorkAround?: boolean;
     authorizationData?: AuthorizationData;
     adminData?: AdminDataType;
@@ -32,5 +33,5 @@ export interface BatchTransactionParams {
         s: string;
     };
 }
-export declare const transactCallRelayerBatch: (chainId: number, transactions: BatchTransactionParams[], hashedEthereumAddress: string, txCompletionTime?: number, ref?: string) => Promise<string>;
-export declare const solanaTransactCallRelayerBatch: (chainId: number, transactions: SolanaTransactionBody[], hashedEthereumAddress: string, txCompletionTime?: number, ref?: string) => Promise<string>;
+export declare const transactCallRelayerBatch: (chainId: number, transactions: BatchTransactionParams[], hashedEthereumAddress: string, txCompletionTime?: number, ref?: string, hashedDashboardAccountId?: string) => Promise<string>;
+export declare const solanaTransactCallRelayerBatch: (chainId: number, transactions: SolanaTransactionBody[], hashedEthereumAddress: string, txCompletionTime?: number, ref?: string, hashedDashboardAccountId?: string) => Promise<string>;

package/functions/web3/functionCalls/transactCallRelayer.mjs

@@ -10,25 +10,26 @@ import "../../snarkjs/index.mjs";
 var c = (e) => {
 	if (e.status === "success") return e.message;
 	throw e.message && e.error ? new o(e.error, e.message) : Error(e.error);
-}, l = async (e, t, n, r, a, o, l, u) => {
-	let d = s(r);
+}, l = async (e, t, n, r, a, o, l, u, d) => {
+	let f = s(r);
 	return c(await i({
 		chainId: e,
 		a: t[0],
 		b: t[1],
 		c: t[2],
 		dimData: n,
-		circomData: d,
-		withUniswapWorkAround: a,
-		authorizationData: o,
-		adminData: l,
-		tronProofSignature: u
+		circomData: f,
+		withUniswapWorkAround: o,
+		authorizationData: l,
+		adminData: u,
+		tronProofSignature: d,
+		commitmentValidationData: a
 	}));
 }, u = async (r) => c(await n.post(`${t}${e.SOLANA_TRANSACT}`, r)), d = (e) => {
 	if (e.status === "success") return e.message.scheduleId;
 	throw Error(e.error || "Batch transaction failed");
-}, f = async (e, t, n, r, i) => {
-	let o = t.map((e) => s(e.circomData));
+}, f = async (e, t, n, r, i, o) => {
+	let c = t.map((e) => s(e.circomData));
 	return d(await a({
 		chainId: e,
 		transactions: t.map((t, n) => ({
@@ -37,7 +38,8 @@ var c = (e) => {
 			b: t.zkCallData[1],
 			c: t.zkCallData[2],
 			dimData: t.dimData,
-			circomData: o[n],
+			circomData: c[n],
+			commitmentValidationData: t.commitmentValidationData,
 			withUniswapWorkAround: t.withUniswapWorkAround,
 			authorizationData: t.authorizationData,
 			adminData: t.adminData,
@@ -46,14 +48,16 @@ var c = (e) => {
 		})),
 		txCompletionTime: r,
 		hashedEthereumAddress: n,
-		ref: i
+		ref: i,
+		hashedDashboardAccountId: o
 	}));
-}, p = async (e, t, n, i, a) => d(await r({
+}, p = async (e, t, n, i, a, o) => d(await r({
 	chainId: e,
 	transactions: t,
 	hashedEthereumAddress: n,
 	txCompletionTime: i,
-	ref: a
+	ref: a,
+	hashedDashboardAccountId: o
 }));
 //#endregion
 export { u as solanaTransactCallRelayer, p as solanaTransactCallRelayerBatch, l as transactCallRelayer, f as transactCallRelayerBatch };

package/functions/web3/getContractMetadata.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/contracts.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../utils/tron.utils.cjs`),i=require(`../utils/create-provider.cjs`);let a=require(`ethers`);var o=(r,i)=>{let a=e.networkRegistry[i];if(!a)throw Error(n.transactionErrorCodes.UNSUPPORTED_NETWORK);let o=t.contractMetadataMapping[r];if(!o)throw Error(`Unsupported contractType: ${r}`);return o(a.contractData)},s=(e,t,n,i)=>{let s=o(e,t);if(!s.abi)throw Error(`No ABI configured for contractType: ${e}`);if(s.address&&n)throw Error(`Overriding address is not supported for contractType: ${e}`);let c=s.address??n;if(!c)throw Error(`No contractAddress configured for contractType: ${e}`);return new a.ethers.Contract(r.addressToHexFormat(c),s.abi,i)},c=(e,t,n=void 0)=>s(t,e,n,i.createCustomRpcProvider(e));exports.getContract=s,exports.getContractMetadata=o,exports.getContractWithFetcherByChainId=c;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/contracts.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../utils/tron.utils.cjs`),i=require(`../utils/create-provider.cjs`);let a=require(`ethers`);var o=(r,i)=>{let a=e.networkRegistry[i];if(!a)throw Error(n.transactionErrorCodes.UNSUPPORTED_NETWORK);let o=t.contractMetadataMapping[r];if(!o)throw Error(`Unsupported contractType: ${r}`);return o(a.contractData)},s=(e,t,n,i)=>{let s=o(e,t);if(!s.abi)throw Error(`No ABI configured for contractType: ${e}`);if(s.address&&n)throw Error(`Overriding address is not supported for contractType: ${e}`);let c=s.address??n;if(!c)throw Error(`No contractAddress configured for contractType: ${e}`);return new a.ethers.Contract(r.addressToHexFormat(c),s.abi,i)},c=(e,t,n=void 0)=>s(t,e,n,i.createJsonRpcProvider(e));exports.getContract=s,exports.getContractMetadata=o,exports.getContractWithFetcherByChainId=c;

package/functions/web3/getContractMetadata.mjs

@@ -2,7 +2,7 @@ import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { contractMetadataMapping as t } from "../../constants/contracts.constants.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { addressToHexFormat as r } from "../utils/tron.utils.mjs";
-import { createCustomRpcProvider as i } from "../utils/create-provider.mjs";
+import { createJsonRpcProvider as i } from "../utils/create-provider.mjs";
 import { ethers as a } from "ethers";
 //#region libs/shared/common/src/functions/web3/getContractMetadata.ts
 var o = (r, i) => {

package/functions/web3/getTokenHolder.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`../../externalABIs/index.cjs`),r=require(`../utils/create-provider.cjs`);require(`../utils/index.cjs`);let i=require(`ethers`);var a={[e.chainIds.base]:`base`,[e.chainIds.optimism]:`optimism`,[e.chainIds.arbMainnet]:`arbitrum`,[e.chainIds.polygon]:`polygon`,[e.chainIds.ethMainnet]:`eth`},o=async(e,o)=>{let s=`https://${a[e]}.blockscout.com/api?module=token&action=getTokenHolders&contractaddress=${o}&page=0&offset=10`,{result:c}=await t.httpClient.get(s),l=r.createCustomRpcProvider(e),u=new i.ethers.Contract(o,n.ERC20ABI,l);for(let{address:e}of c){let t=await u.balanceOf(e);if(BigInt(t)!==0n)return e}},s=async(e,n)=>{let r=`https://api.routescan.io/v2/network/mainnet/evm/${e}/etherscan/api?module=token&action=tokenholderlist&contractaddress=${n}&page=1&offset=10&apikey=YourApiKeyToken`,{result:i}=await t.httpClient.get(r);return i.at(0)?.TokenHolderAddress},c=async(e,t)=>{try{if(!(e in a))throw Error(`Chain is not supported by blockscout`);let n=await o(e,t);if(!n||!i.ethers.isAddress(n))throw Error(`Token holder not found in blockscout`);return n}catch{return await s(e,t)}};exports.getTokenHolder=c;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`../../externalABIs/index.cjs`),r=require(`../utils/create-provider.cjs`);require(`../utils/index.cjs`);let i=require(`ethers`);var a={[e.chainIds.base]:`base`,[e.chainIds.optimism]:`optimism`,[e.chainIds.arbMainnet]:`arbitrum`,[e.chainIds.polygon]:`polygon`,[e.chainIds.ethMainnet]:`eth`},o=async(e,o)=>{let s=`https://${a[e]}.blockscout.com/api?module=token&action=getTokenHolders&contractaddress=${o}&page=0&offset=10`,{result:c}=await t.httpClient.get(s),l=r.createJsonRpcProvider(e),u=new i.ethers.Contract(o,n.ERC20ABI,l);for(let{address:e}of c){let t=await u.balanceOf(e);if(BigInt(t)!==0n)return e}},s=async(e,n)=>{let r=`https://api.routescan.io/v2/network/mainnet/evm/${e}/etherscan/api?module=token&action=tokenholderlist&contractaddress=${n}&page=1&offset=10&apikey=YourApiKeyToken`,{result:i}=await t.httpClient.get(r);return i.at(0)?.TokenHolderAddress},c=async(e,t)=>{try{if(!(e in a))throw Error(`Chain is not supported by blockscout`);let n=await o(e,t);if(!n||!i.ethers.isAddress(n))throw Error(`Token holder not found in blockscout`);return n}catch{return await s(e,t)}};exports.getTokenHolder=c;

package/functions/web3/getTokenHolder.mjs

@@ -2,7 +2,7 @@ import { chainIds as e } from "../../constants/chains.constants.mjs";
 import { httpClient as t } from "../../data-structures/http/HttpClient.mjs";
 import "../../data-structures/http/index.mjs";
 import { ERC20ABI as n } from "../../externalABIs/index.mjs";
-import { createCustomRpcProvider as r } from "../utils/create-provider.mjs";
+import { createJsonRpcProvider as r } from "../utils/create-provider.mjs";
 import "../utils/index.mjs";
 import { ethers as i } from "ethers";
 //#region libs/shared/common/src/functions/web3/getTokenHolder.ts

package/functions/web3/index.cjs

@@ -1 +1 @@
-require(`./etherFunctions.cjs`),require(`./events/getInputUtxoAndBalance.cjs`),require(`./events/getShieldedBalance.cjs`),require(`./getSolanaPriorityFee.cjs`),require(`./events/balanceChangedHandler.cjs`),require(`./events/balanceChangedCustomHandler.cjs`),require(`./events/getApprovedBalance.cjs`),require(`./events/getTransactionLogEvents.cjs`),require(`./events/index.cjs`),require(`./uniswapAPI.cjs`),require(`./odosAPI.cjs`),require(`./oneInchAPI.cjs`),require(`./lifiAPI.cjs`),require(`./okxAPI.cjs`),require(`./runContractFunction.cjs`),require(`./getTokenHolder.cjs`),require(`./EIP-712.cjs`),require(`./signAndSendSerializedTransaction.cjs`),require(`./connectors.utils.cjs`),require(`./tron-wagmi-adapter.cjs`),require(`./crypto.cjs`);
+require(`./etherFunctions.cjs`),require(`./events/getInputUtxoAndBalance.cjs`),require(`./events/getShieldedBalance.cjs`),require(`./getSolanaPriorityFee.cjs`),require(`./events/balanceChangedHandler.cjs`),require(`./events/getTransactionLogEvents.cjs`),require(`./events/index.cjs`),require(`./uniswapAPI.cjs`),require(`./odosAPI.cjs`),require(`./oneInchAPI.cjs`),require(`./lifiAPI.cjs`),require(`./okxAPI.cjs`),require(`./runContractFunction.cjs`),require(`./getTokenHolder.cjs`),require(`./EIP-712.cjs`),require(`./signAndSendSerializedTransaction.cjs`),require(`./connectors.utils.cjs`),require(`./crypto.cjs`);

package/functions/web3/index.d.ts

@@ -10,6 +10,5 @@ export * from './getTokenHolder';
 export * from './EIP-712';
 export * from './signAndSendSerializedTransaction';
 export * from './connectors.utils';
-export * from './tron-wagmi-adapter';
 export * from './crypto';
 export * from './getSolanaPriorityFee';

package/functions/web3/index.mjs

@@ -3,8 +3,6 @@ import "./events/getInputUtxoAndBalance.mjs";
 import "./events/getShieldedBalance.mjs";
 import "./getSolanaPriorityFee.mjs";
 import "./events/balanceChangedHandler.mjs";
-import "./events/balanceChangedCustomHandler.mjs";
-import "./events/getApprovedBalance.mjs";
 import "./events/getTransactionLogEvents.mjs";
 import "./events/index.mjs";
 import "./uniswapAPI.mjs";
@@ -17,5 +15,4 @@ import "./getTokenHolder.mjs";
 import "./EIP-712.mjs";
 import "./signAndSendSerializedTransaction.mjs";
 import "./connectors.utils.mjs";
-import "./tron-wagmi-adapter.mjs";
 import "./crypto.mjs";

package/functions/web3/lifiAPI.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../API/callLifiAPI.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`./etherFunctions.cjs`);var i=async(i,a,o,s,c,l)=>{try{let n=r.getAmountInWei(i,o),{lifiResponse:u}=await t.callLifiAPI({fromChain:i.chainId,toChain:a.chainId,fromToken:i.erc20TokenAddress,toToken:a.erc20TokenAddress,fromAddress:c,fromAmount:n.toString(),order:`FASTEST`,slippage:s,...l&&{toAddress:l}});return{lifiDataValue:u.transactionRequest.data,outSwapAmountValue:BigInt(u.estimate.toAmount),extraNativeTokenFee:i.erc20TokenAddress===e.zeroAddress?BigInt(u.transactionRequest.value)-n:BigInt(u.transactionRequest.value)}}catch{throw Error(n.transactionErrorCodes.NO_LIFI_PRICE)}};exports.getLifiPrice=i;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../API/callLifiAPI.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`./etherFunctions.cjs`),a=require(`../../constants/lifi.constants.cjs`),o=require(`../utils/tron.utils.cjs`);var s=async(s,c,l,u,d,f)=>{try{let r=i.getAmountInWei(s,l),p=e.isTronLike(c.chainId),{lifiResponse:m}=await n.callLifiAPI({fromChain:a.getLifiChainId(s.chainId),toChain:a.getLifiChainId(c.chainId),fromToken:s.erc20TokenAddress,toToken:p?o.toTronBase58IfHex(c.erc20TokenAddress):c.erc20TokenAddress,fromAddress:d,fromAmount:r.toString(),order:`FASTEST`,slippage:u,...f&&{toAddress:p?o.toTronBase58IfHex(f):f}});if(e.isSolanaLike(s.chainId))return{lifiDataValue:m.transactionRequest.data,outSwapAmountValue:BigInt(m.estimate.toAmount),extraNativeTokenFee:0n};let h=BigInt(m.transactionRequest.value||`0`);return{lifiDataValue:m.transactionRequest.data,outSwapAmountValue:BigInt(m.estimate.toAmount),extraNativeTokenFee:s.erc20TokenAddress===t.zeroAddress?h-r:h}}catch{throw Error(r.transactionErrorCodes.NO_LIFI_PRICE)}};exports.getLifiPrice=s;

package/functions/web3/lifiAPI.mjs

@@ -1,29 +1,38 @@
-import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
-import { callLifiAPI as t } from "../../API/callLifiAPI.mjs";
-import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInWei as r } from "./etherFunctions.mjs";
+import { isSolanaLike as e, isTronLike as t } from "../../constants/chains.constants.mjs";
+import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { callLifiAPI as r } from "../../API/callLifiAPI.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInWei as a } from "./etherFunctions.mjs";
+import { getLifiChainId as o } from "../../constants/lifi.constants.mjs";
+import { toTronBase58IfHex as s } from "../utils/tron.utils.mjs";
 //#region libs/shared/common/src/functions/web3/lifiAPI.ts
-var i = async (i, a, o, s, c, l) => {
+var c = async (c, l, u, d, f, p) => {
 	try {
-		let n = r(i, o), { lifiResponse: u } = await t({
-			fromChain: i.chainId,
-			toChain: a.chainId,
-			fromToken: i.erc20TokenAddress,
-			toToken: a.erc20TokenAddress,
-			fromAddress: c,
-			fromAmount: n.toString(),
+		let i = a(c, u), m = t(l.chainId), { lifiResponse: h } = await r({
+			fromChain: o(c.chainId),
+			toChain: o(l.chainId),
+			fromToken: c.erc20TokenAddress,
+			toToken: m ? s(l.erc20TokenAddress) : l.erc20TokenAddress,
+			fromAddress: f,
+			fromAmount: i.toString(),
 			order: "FASTEST",
-			slippage: s,
-			...l && { toAddress: l }
+			slippage: d,
+			...p && { toAddress: m ? s(p) : p }
 		});
+		if (e(c.chainId)) return {
+			lifiDataValue: h.transactionRequest.data,
+			outSwapAmountValue: BigInt(h.estimate.toAmount),
+			extraNativeTokenFee: 0n
+		};
+		let g = BigInt(h.transactionRequest.value || "0");
 		return {
-			lifiDataValue: u.transactionRequest.data,
-			outSwapAmountValue: BigInt(u.estimate.toAmount),
-			extraNativeTokenFee: i.erc20TokenAddress === e ? BigInt(u.transactionRequest.value) - n : BigInt(u.transactionRequest.value)
+			lifiDataValue: h.transactionRequest.data,
+			outSwapAmountValue: BigInt(h.estimate.toAmount),
+			extraNativeTokenFee: c.erc20TokenAddress === n ? g - i : g
 		};
 	} catch {
-		throw Error(n.NO_LIFI_PRICE);
+		throw Error(i.NO_LIFI_PRICE);
 	}
 };
 //#endregion
-export { i as getLifiPrice };
+export { c as getLifiPrice };

package/functions/web3/oneInchAPI.cjs

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

package/functions/web3/oneInchAPI.mjs

@@ -6,8 +6,8 @@ import { transactionErrorCodes as i } from "../../error-handling/error-codes.con
 import { getAmountInWei as a } from "./etherFunctions.mjs";
 import "../../constants/index.mjs";
 import { Logger as o } from "../../error-handling/logger.mjs";
-import "../../error-handling/index.mjs";
 import { getContractMetadata as s } from "./getContractMetadata.mjs";
+import "../../error-handling/index.mjs";
 //#region libs/shared/common/src/functions/web3/oneInchAPI.ts
 var c = async (c, l, u, d, f = .7) => {
 	try {