@hinkal/common 0.3.1 → 0.3.3

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 { 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 u = async (e, t, n) => {
-	let r = s(n);
+var s = async (e, t, n) => {
+	let r = o(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, 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, o, l, u, d) => {
+	let f = t.getContractWithSigner(o, n.ERC20Contract, d.erc20TokenAddress);
+	if (await s(u, l, f)) return;
+	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(o, e.hash, p);
+	} catch (e) {
+		if (!e?.transactionHash || !await i(a(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/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=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(`../../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,90 +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 = BigInt(await D.trx.getBalance(O)), n = 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
 			]);
-			n = 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 (e < I + n) 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;

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

@@ -1,15 +1,11 @@
-import { AdminDataType, AuthorizationData, CircomDataType, CommitmentValidationDataType, DimDataType, NewZkCallDataType } from '../../../types';
+import { AdminDataType, AuthorizationData, CircomDataType, CommitmentValidationDataType, DimDataType, NewZkCallDataType, TronProofSignature } 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, commitmentValidationData?: CommitmentValidationDataType, withUniswapWorkAround?: boolean, authorizationData?: AuthorizationData, adminData?: AdminDataType, tronProofSignature?: {
-    v: number;
-    r: string;
-    s: string;
-}) => Promise<string>;
+export declare const transactCallRelayer: (chainId: number, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, commitmentValidationData?: CommitmentValidationDataType, withUniswapWorkAround?: boolean, authorizationData?: AuthorizationData, adminData?: AdminDataType, tronProofSignature?: TronProofSignature) => Promise<string>;
 export declare const solanaTransactCallRelayer: (body: SolanaTransactionBody) => Promise<string>;
 export interface RelayerBatchResponseInterface {
     status: string;
@@ -27,11 +23,10 @@ export interface BatchTransactionParams {
     authorizationData?: AuthorizationData;
     adminData?: AdminDataType;
     recipientAddress?: string;
-    tronProofSignature?: {
-        v: number;
-        r: string;
-        s: string;
-    };
+    tronProofSignature?: TronProofSignature;
+    destinationChainId?: number;
+    destinationTokenAddress?: string;
+    destinationTokenAmount?: 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/common/src/functions/web3/functionCalls/transactCallRelayer.mjs

@@ -5,7 +5,6 @@ import { httpClient as r } from "../../../data-structures/http/HttpClient.mjs";
 import { callRelayerSolanaTransactBatchAPI as i, callRelayerTransactAPI as a, callRelayerTransactBatchAPI as o } from "../../../API/callRelayer.mjs";
 import { serializeCircomData as s } from "../../snarkjs/common.snarkjs.mjs";
 import "../../../error-handling/index.mjs";
-import "../../snarkjs/index.mjs";
 //#region libs/shared/common/src/functions/web3/functionCalls/transactCallRelayer.ts
 var c = (t) => {
 	if (t.status === "success") return t.message;
@@ -44,7 +43,10 @@ var c = (t) => {
 			authorizationData: t.authorizationData,
 			adminData: t.adminData,
 			recipientAddress: t.recipientAddress,
-			tronProofSignature: t.tronProofSignature
+			tronProofSignature: t.tronProofSignature,
+			destinationChainId: t.destinationChainId,
+			destinationTokenAddress: t.destinationTokenAddress,
+			destinationTokenAmount: t.destinationTokenAmount
 		})),
 		txCompletionTime: r,
 		hashedEthereumAddress: n,

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

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

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

@@ -20,4 +20,4 @@ var o = (n, r) => {
 	return new a.Contract(n(c), s.abi, i);
 }, c = (e, t, n = void 0) => s(t, e, n, r(e));
 //#endregion
-export { s as getContract, o as getContractMetadata, c as getContractWithFetcherByChainId };
+export { s as getContract, c as getContractWithFetcherByChainId };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`);require(`../../data-structures/http/index.cjs`),require(`../../externalABIs/index.cjs`),require(`../utils/index.cjs`),require(`ethers`),e.chainIds.base,e.chainIds.optimism,e.chainIds.arbMainnet,e.chainIds.polygon,e.chainIds.ethMainnet;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../data-structures/http/index.cjs`),require(`../../error-handling/logger.cjs`),require(`../../externalABIs/index.cjs`),require(`../utils/index.cjs`);let t=require(`ethers`);e.chainIds.base,e.chainIds.optimism,e.chainIds.arbMainnet,e.chainIds.polygon,e.chainIds.ethMainnet,e.chainIds.sepoliaTestnet,t.ethers.id(`Transfer(address,address,uint256)`);

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

@@ -1,7 +1,8 @@
 import { chainIds as e } from "../../constants/chains.constants.mjs";
 import "../../data-structures/http/index.mjs";
+import "../../error-handling/logger.mjs";
 import "../../externalABIs/index.mjs";
 import "../utils/index.mjs";
-import "ethers";
-e.base, e.optimism, e.arbMainnet, e.polygon, e.ethMainnet;
+import { ethers as t } from "ethers";
+e.base, e.optimism, e.arbMainnet, e.polygon, e.ethMainnet, e.sepoliaTestnet, t.id("Transfer(address,address,uint256)");
 //#endregion

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

@@ -1 +1 @@
-require(`./etherFunctions.cjs`),require(`./events/getInputUtxoAndBalance.cjs`),require(`./events/getShieldedBalance.cjs`),require(`./getSolanaPriorityFee.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(`./etherFunctions.cjs`),require(`./events/getInputUtxoAndBalance.cjs`),require(`./events/getShieldedBalance.cjs`),require(`./getSolanaPriorityFee.cjs`),require(`./events/index.cjs`),require(`./lifiAPI.cjs`),require(`./okxAPI.cjs`),require(`./runContractFunction.cjs`),require(`./getTokenHolder.cjs`),require(`./EIP-712.cjs`),require(`./signAndSendSerializedTransaction.cjs`),require(`./connectors.utils.cjs`);

package/common/src/functions/web3/index.d.ts

@@ -1,8 +1,5 @@
 export * from './etherFunctions';
 export * from './events';
-export * from './uniswapAPI';
-export * from './odosAPI';
-export * from './oneInchAPI';
 export * from './lifiAPI';
 export * from './okxAPI';
 export * from './runContractFunction';

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

@@ -3,9 +3,6 @@ import "./events/getInputUtxoAndBalance.mjs";
 import "./events/getShieldedBalance.mjs";
 import "./getSolanaPriorityFee.mjs";
 import "./events/index.mjs";
-import "./uniswapAPI.mjs";
-import "./odosAPI.mjs";
-import "./oneInchAPI.mjs";
 import "./lifiAPI.mjs";
 import "./okxAPI.mjs";
 import "./runContractFunction.mjs";

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

@@ -1 +1 @@
-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(`../utils/tron.utils.cjs`),a=require(`../../constants/lifi.constants.cjs`),o=require(`../../API/callLifiAPI.cjs`);var s=async(s,c,l,u,d,f)=>{try{let n=r.getAmountInWei(s,l),p=e.isTronLike(c.chainId),{lifiResponse:m}=await o.callLifiAPI({fromChain:a.getLifiChainId(s.chainId),toChain:a.getLifiChainId(c.chainId),fromToken:s.erc20TokenAddress,toToken:p?i.toTronBase58IfHex(c.erc20TokenAddress):c.erc20TokenAddress,fromAddress:d,fromAmount:n.toString(),order:`FASTEST`,slippage:u,...f&&{toAddress:p?i.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-n:h}}catch{throw Error(n.transactionErrorCodes.NO_LIFI_PRICE)}};exports.getLifiPrice=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(`../utils/tron.utils.cjs`),a=require(`../../constants/lifi.constants.cjs`),o=require(`../../API/callLifiAPI.cjs`);var s=async(s,c,l,u,d,f)=>{try{let n=r.getAmountInWei(s,l),p=e.isTronLike(c.chainId),{lifiResponse:m}=await o.callLifiAPI({fromChain:a.getLifiChainId(s.chainId),toChain:a.getLifiChainId(c.chainId),fromToken:s.erc20TokenAddress,toToken:p?i.toTronBase58IfHex(c.erc20TokenAddress):c.erc20TokenAddress,fromAddress:d,fromAmount:n.toString(),order:`FASTEST`,slippage:u,...f&&{toAddress:p?i.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-n:h}}catch{throw Error(n.UserFriendlyErrorCodes.NO_LIFI_PRICE)}};exports.getLifiPrice=s;

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

@@ -1,6 +1,6 @@
 import { isSolanaLike as e, isTronLike as t } from "../../constants/chains.constants.mjs";
 import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
+import { UserFriendlyErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
 import { getAmountInWei as i } from "./etherFunctions.mjs";
 import { toTronBase58IfHex as a } from "../utils/tron.utils.mjs";
 import { getLifiChainId as o } from "../../constants/lifi.constants.mjs";