@gurge/sdk 0.3.150 → 0.3.151

package/common/src/functions/utils/solanaMint.utils.d.ts

@@ -1,10 +1,17 @@
 import { PublicKey } from '@solana/web3.js';
+import { ERC20Token } from '../../types/token.types';
 type FormattedMintAddress = {
     mintAccountPart1: bigint;
     mintAccountPart2: bigint;
     compressedAddress: string;
     mintPublicKey: PublicKey;
 };
+export declare const getSolanaTokenProgramId: (is2022Program?: boolean) => PublicKey;
+export declare const getSolanaAtaAddress: (token: ERC20Token, owner: PublicKey) => Promise<PublicKey>;
 export declare const convertPublicKeyToBigint: (key: PublicKey) => bigint;
 export declare const formatMintAddress: (mint: PublicKey | string) => FormattedMintAddress;
+export declare const normalizeSolanaMintAddress: (mintHex?: string) => {
+    mintBase58: string;
+    compressedAddress: string;
+} | undefined;
 export {};

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

@@ -1,18 +1,28 @@
 import { poseidonHash as e } from "../../crypto/poseidon.mjs";
 import { ethers as t } from "ethers";
 import { PublicKey as n } from "@solana/web3.js";
+import { TOKEN_2022_PROGRAM_ID as r, TOKEN_PROGRAM_ID as i, getAssociatedTokenAddress as a } from "@solana/spl-token";
 //#region libs/shared/common/src/functions/utils/solanaMint.utils.ts
-var r = (e) => {
+var o = (e) => e ? r : i, s = (e, t) => a(new n(e.erc20TokenAddress), t, !0, o(e.is2022Program)), c = (e) => {
 	let n = e.toBytes();
 	return BigInt(t.hexlify(n));
-}, i = (t) => {
-	let i = typeof t == "string" ? new n(t) : t, a = r(i), o = a / 2n ** 128n, s = a % 2n ** 128n;
+}, l = (t) => {
+	let r = typeof t == "string" ? new n(t) : t, i = c(r), a = i / 2n ** 128n, o = i % 2n ** 128n;
 	return {
-		mintAccountPart1: o,
-		mintAccountPart2: s,
-		compressedAddress: e(o, s),
-		mintPublicKey: i
+		mintAccountPart1: a,
+		mintAccountPart2: o,
+		compressedAddress: e(a, o),
+		mintPublicKey: r
+	};
+}, u = (e) => {
+	if (!e) return;
+	let r = t.getBytes(e);
+	if (r.length !== 32) return;
+	let i = new n(r), a = i.toBase58(), { compressedAddress: o } = l(i);
+	return {
+		mintBase58: a,
+		compressedAddress: o
 	};
 };
 //#endregion
-export { r as convertPublicKeyToBigint, i as formatMintAddress };
+export { c as convertPublicKeyToBigint, l as formatMintAddress, s as getSolanaAtaAddress, o as getSolanaTokenProgramId, u as normalizeSolanaMintAddress };

package/common/src/functions/utils/sponsored-shield.utils.cjs

@@ -0,0 +1 @@
+require(`../../constants/chains.constants.cjs`),require(`../pre-transaction/solana.cjs`),require(`@solana/web3.js`);

package/common/src/functions/utils/sponsored-shield.utils.d.ts

@@ -0,0 +1,3 @@
+import { SolanaTransactionParams } from '../../types/solana.types';
+import { ERC20Token } from '../../types/token.types';
+export declare const getSolanaShieldFeeParams: (chainId: number, token: ERC20Token) => SolanaTransactionParams | undefined;

package/common/src/functions/utils/sponsored-shield.utils.mjs

@@ -0,0 +1,3 @@
+import "../../constants/chains.constants.mjs";
+import "../pre-transaction/solana.mjs";
+import "@solana/web3.js";

package/common/src/functions/utils/temp-wallet.utils.cjs

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`./tron.utils.cjs`),n=require(`../../data-structures/AccountActions/AccountActions.cjs`),r=require(`./proxyAvatar.utils.cjs`);var i=e=>({index:Number(e),name:`Hinkal Bridge Temp Wallet`,createdAt:new Date().toISOString(),isHidden:!1,isFavorite:!1,isImported:!1,iconIndex:r.getRandomProxyAvatarIndex()}),a=(r,i)=>{if(e.isSolanaLike(r)){let e=n.AccountActions.getSolanaPrivateKeyFromEvmPrivateKey(i);return{address:n.AccountActions.getSolanaSignerFromPrivateKey(e).publicKey.toString(),privateKey:e}}let a=n.AccountActions.getSignerAddressFromPrivateKey(r,i);return{address:e.isTronLike(r)?t.evmHexToTronBase58Address(a):a,privateKey:i}},o=(e,t,n)=>a(t,e.userKeys.getSignerPrivateKeyFromNonce(n)),s=(e,t,n)=>({...i(e),privateKey:t,ethAddress:n}),c=(e,t,n)=>({...i(e),solanaPrivateKey:t,solanaAddress:n}),l=(t,n,{address:r,privateKey:i})=>e.isSolanaLike(n)?c(t,i,r):s(t,i,r),u=(e,t,n)=>l(n,t,o(e,t,n)),d=(e,t,n,r)=>{let i=e.userKeys.getSignerPrivateKeyFromNonce(r),o=a(t,i),s=a(n,i);return{sourceSubAccount:l(r,t,o),destinationSubAccount:l(r,n,s)}};exports.buildSolanaTempSubAccount=c,exports.buildTempSubAccount=s,exports.buildTempSubAccountForChain=u,exports.deriveBridgeTempWallets=d,exports.deriveTempWallet=o;

package/common/src/functions/utils/temp-wallet.utils.d.ts

@@ -0,0 +1,8 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { SubAccount } from '../../types/proxy.types';
+import { BridgeTempWallets, DerivedTempWallet } from '../../types/temp-wallet.types';
+export declare const deriveTempWallet: (hinkal: IHinkal, chainId: number, nonce: bigint) => DerivedTempWallet;
+export declare const buildTempSubAccount: (nonce: bigint, privateKey: string, ethAddress: string) => SubAccount;
+export declare const buildSolanaTempSubAccount: (nonce: bigint, solanaPrivateKey: string, solanaAddress: string) => SubAccount;
+export declare const buildTempSubAccountForChain: (hinkal: IHinkal, chainId: number, nonce: bigint) => SubAccount;
+export declare const deriveBridgeTempWallets: (hinkal: IHinkal, sourceChainId: number, destinationChainId: number, nonce: bigint) => BridgeTempWallets;

package/common/src/functions/utils/temp-wallet.utils.mjs

@@ -0,0 +1,43 @@
+import { isSolanaLike as e, isTronLike as t } from "../../constants/chains.constants.mjs";
+import { evmHexToTronBase58Address as n } from "./tron.utils.mjs";
+import { AccountActions as r } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { getRandomProxyAvatarIndex as i } from "./proxyAvatar.utils.mjs";
+//#region libs/shared/common/src/functions/utils/temp-wallet.utils.ts
+var a = (e) => ({
+	index: Number(e),
+	name: "Hinkal Bridge Temp Wallet",
+	createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+	isHidden: !1,
+	isFavorite: !1,
+	isImported: !1,
+	iconIndex: i()
+}), o = (i, a) => {
+	if (e(i)) {
+		let e = r.getSolanaPrivateKeyFromEvmPrivateKey(a);
+		return {
+			address: r.getSolanaSignerFromPrivateKey(e).publicKey.toString(),
+			privateKey: e
+		};
+	}
+	let o = r.getSignerAddressFromPrivateKey(i, a);
+	return {
+		address: t(i) ? n(o) : o,
+		privateKey: a
+	};
+}, s = (e, t, n) => o(t, e.userKeys.getSignerPrivateKeyFromNonce(n)), c = (e, t, n) => ({
+	...a(e),
+	privateKey: t,
+	ethAddress: n
+}), l = (e, t, n) => ({
+	...a(e),
+	solanaPrivateKey: t,
+	solanaAddress: n
+}), u = (t, n, { address: r, privateKey: i }) => e(n) ? l(t, i, r) : c(t, i, r), d = (e, t, n) => u(n, t, s(e, t, n)), f = (e, t, n, r) => {
+	let i = e.userKeys.getSignerPrivateKeyFromNonce(r), a = o(t, i), s = o(n, i);
+	return {
+		sourceSubAccount: u(r, t, a),
+		destinationSubAccount: u(r, n, s)
+	};
+};
+//#endregion
+export { l as buildSolanaTempSubAccount, c as buildTempSubAccount, d as buildTempSubAccountForChain, f as deriveBridgeTempWallets, s as deriveTempWallet };

package/common/src/functions/utils/temporary-wallet-recovery.utils.cjs

@@ -0,0 +1 @@
+require(`../../error-handling/error-codes.constants.cjs`),require(`../web3/etherFunctions.cjs`),require(`../../data-structures/crypto-keys/keys.cjs`),require(`./addresses.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./fees.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`../../data-structures/Hinkal/hinkalSolanaSponsoredShield.cjs`),require(`./enclave-recipient-info-storage.cjs`);

package/common/src/functions/utils/temporary-wallet-recovery.utils.d.ts

@@ -0,0 +1,7 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { CallInfo } from '../../types/API.types';
+import { SubAccount } from '../../types/proxy.types';
+import { ERC20Token } from '../../types/token.types';
+export declare const resolveRecoveryRecipientInfo: (hinkal: IHinkal, chainId: number, shieldEligible: boolean, enteredAddress: string | undefined) => Promise<string | null>;
+export declare const recoverSolanaBalance: (hinkal: IHinkal, chainId: number, token: ERC20Token, amount: bigint, subAccount: SubAccount, shieldEligible: boolean, enteredAddress: string | undefined) => Promise<void>;
+export declare const recoverEvmBalance: (hinkal: IHinkal, chainId: number, token: ERC20Token, amount: bigint, subAccount: SubAccount, recipientAddress: string, shieldEligible: boolean, enteredAddress: string | undefined, withdrawCalls: CallInfo[]) => Promise<void>;

package/common/src/functions/utils/temporary-wallet-recovery.utils.mjs

@@ -0,0 +1,10 @@
+import "../../error-handling/error-codes.constants.mjs";
+import "../web3/etherFunctions.mjs";
+import "../../data-structures/crypto-keys/keys.mjs";
+import "./addresses.mjs";
+import "../pre-transaction/getFeeStructure.mjs";
+import "./getRecipientInfoFromUserKeys.mjs";
+import "./fees.utils.mjs";
+import "./enclave-utxo-storage.mjs";
+import "../../data-structures/Hinkal/hinkalSolanaSponsoredShield.mjs";
+import "./enclave-recipient-info-storage.mjs";

package/common/src/functions/utils/transfer-claimable.utils.cjs

@@ -1 +1 @@
-require(`./solanaMint.utils.cjs`),require(`./token-check.utils.cjs`),require(`../../error-handling/index.cjs`),require(`../pre-transaction/index.cjs`),require(`../../constants/index.cjs`),require(`../../data-structures/crypto-keys/index.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./tx-confirmation.utils.cjs`);
+require(`./token-check.utils.cjs`),require(`../../error-handling/index.cjs`),require(`../../constants/index.cjs`),require(`../../data-structures/crypto-keys/index.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./tx-confirmation.utils.cjs`);

package/common/src/functions/utils/transfer-claimable.utils.d.ts

@@ -1,9 +1,8 @@
 import { ErrorWithIndex } from '../../error-handling';
 import { PrivateSendAllocation } from '../../API';
-import { AdminTransactionType, ERC20Token, FeeStructure, PendingEnclaveUtxo, RecipientRequest } from '../../types';
+import { AdminTransactionType, ERC20Token, FeeStructure, RecipientRequest } from '../../types';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 export declare const transferClaimableUtxos: (hinkal: IHinkal, token: ERC20Token, recipients: RecipientRequest[], allocations: PrivateSendAllocation[], baseNonce: bigint, feeToken?: string, feeStructure?: FeeStructure, action?: AdminTransactionType) => Promise<{
-    pendingEnclaveUtxos: PendingEnclaveUtxo[];
     txHashes: string[];
     failedRecipientErrorMessage: ErrorWithIndex | undefined;
 }>;

package/common/src/functions/utils/transfer-claimable.utils.mjs

@@ -1,10 +1,7 @@
-import "./solanaMint.utils.mjs";
 import "./token-check.utils.mjs";
 import "../../error-handling/index.mjs";
-import "../pre-transaction/index.mjs";
 import "../../constants/index.mjs";
 import "../../data-structures/crypto-keys/index.mjs";
 import "./getRecipientInfoFromUserKeys.mjs";
-import "./getUtxosFromReceipt.utils.mjs";
-import "./getUtxosFromReceiptSolana.mjs";
+import "./enclave-utxo-storage.mjs";
 import "./tx-confirmation.utils.mjs";

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../snarkjs/constant.cjs`),a=require(`../../data-structures/http/HttpClient.cjs`),o=require(`../../externalABIs/index.cjs`),s=require(`../../error-handling/logger.cjs`);let c=require(`ethers`),l=require(`tronweb`);var u=2000n,d=e=>{let t=e.trim(),n=t.startsWith(`0x`)?t.slice(2):t;if(!/^[0-9a-fA-F]{64}$/.test(n))throw Error(`Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix`);return n},f=(t,n)=>{let r=e.networkRegistry[t].fetchRpcUrl,i=n?d(n):void 0,a=i?new l.TronWeb({fullHost:r,privateKey:i}):new l.TronWeb({fullHost:r});return n||a.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),a},p=e=>e?.startsWith(`T`)?e:l.TronWeb.address.fromHex(e),m=e=>e.startsWith(`0x`)?p(e):e,h=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return h(l.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},g=t=>{if(t===e.chainIds.tronNile)return`https://nile.trongrid.io`;if(t===e.chainIds.tronMainnet)return`https://api.trongrid.io`;throw Error(`Unsupported Tron chain for wallet RPC: ${t}`)},_=(e,t)=>e.map(e=>Array.isArray(e)?_(e,t):t(e)),v=(e,t,n)=>{let r=new c.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let i=_(n,e=>typeof e==`string`&&e.startsWith(`T`)?h(e):e);return r.encodeFunctionData(t,i)},y=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,b=(e,t)=>{let n=e.find(e=>e.key===t);if(!n||typeof n.value!=`number`)throw Error(`Missing Tron chain parameter: ${t}`);return BigInt(n.value)},x=async e=>{let t=`${g(e)}/wallet/getchainparameters`,n=await a.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},S=async(e,t)=>{let n=`${g(e)}/wallet/getaccountresource`,r=h(t),i=r.startsWith(`0x`)?`41${r.slice(2)}`:r;return await a.httpClient.post(n,{address:i,visible:!1})},C=async(e,n,r,i,a,o)=>{let s={input:a,callValue:Number(o),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[c,l]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,s,[],i),e.transactionBuilder.triggerConstantContract(r,``,s,[],i)]),d=await x(n),f=b(d,`getEnergyFee`),p=b(d,`getTransactionFee`),m=await S(n,i),h=BigInt(c?.energy_required??l?.energy_used??0),g=y(m,`EnergyLimit`,`EnergyUsed`),_=(h>g?h-g:0n)*f,v=BigInt(Math.ceil((l?.transaction?.raw_data_hex?.length??0)/2)),C=y(m,`freeNetLimit`,`freeNetUsed`)+y(m,`NetLimit`,`NetUsed`),w=_+(v>C?v-C:0n)*p,T=w+w*u/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},w=e=>{let t=e[0].map(BigInt),n=e[1][0].map(BigInt),r=e[1][1].map(BigInt),i=e[2].map(BigInt),a=e[3].map(BigInt);return{a:t,b:[[n[1],n[0]],[r[1],r[0]]],c:i,publicSignals:a}},T=(e,t)=>{let n=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`uint16`,`uint16`,`uint256`],[e.tokenNumber,e.nullifierAmount,e.outputAmount,t]);return BigInt(c.ethers.keccak256(n))},E=async(e,t,n,r,o,s)=>{let l=T(o,s),u=e.map(String),d=n.map(String),f=r.map(String),p={a:u,b:[t[0].map(String),t[1].map(String)],c:d,inputs:f,verifier_id:String(l)},m=await a.httpClient.post(`${i.ENCLAVE_URL}/sign-proof`,p),{v:h,r:g,s:_}=c.ethers.Signature.from(m.signature.trim());return{v:h,r:g,s:_}},D=e=>[e.rootHashHinkal,e.erc20TokenAddresses,e.tokenIds,e.amountChanges,e.onChainCreation,e.slippageValues,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,[e.stealthAddressStructure.extraRandomization,e.stealthAddressStructure.stealthAddress,e.stealthAddressStructure.H0,e.stealthAddressStructure.H1],e.rootHashAccessToken,e.calldataHash,e.publicSignalCount,e.relay,e.externalAddress,e.externalActionId,e.externalActionMetadata,[e.hinkalLogicArgs.hinkalLogicAction,e.hinkalLogicArgs.inHinkalAddress,e.hinkalLogicArgs.executeApprovalChanges,e.hinkalLogicArgs.doPreTxApproval,e.hinkalLogicArgs.useApprovalUtxoData.map(e=>[e.approvalChanges,e.externalApprovalAddresses,e.conversionInHinkalAddress])],[e.hookData.preHookContract,e.hookData.hookContract,e.hookData.preHookMetadata,e.hookData.postHookMetadata],[e.signatureData.v,e.signatureData.r,e.signatureData.s,e.signatureData.accessKey,e.signatureData.nonce,e.signatureData.ethereumAddress],e.originalSender],O=async(e,t,n,r,i=!0)=>{if(e){let{a:e,b:a,c:o,publicSignals:s}=w(t),c=await E(e,a,o,s,n,BigInt(r.externalActionId)),l={v:c.v,r:c.r,s:c.s};return i&&(t[1]=[[t[1][0][1],t[1][0][0]],[t[1][1][1],t[1][1][0]]]),l}},k=(e,r)=>{let i=0n,a=new Map;for(let o=0;o<e.length;o+=1)if(n.caseInsensitiveEqual(e[o].erc20TokenAddress,t.zeroAddress))i+=r[o];else{let t=p(e[o].erc20TokenAddress);a.set(t,(a.get(t)??0n)+r[o])}return{totalTrxValue:i,tokensNeedingApproval:a}},A=async(e,n,i,a,o,c)=>{let l=BigInt(await e.trx.getBalance(a)),u=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{u=await C(e,n,i,a,o,c)}catch(e){s.Logger.error(`Error estimating Tron deposit fee`,e)}if(l<c+u)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)},j=async(e,n,r,i)=>{let a=Array.from(i.entries());for(let i=0;i<a.length;i+=1){let[s,c]=a[i],l=await e.contract(o.ERC20ABI,s).allowance(n,r).call({from:n});if(BigInt(String(l))<c){let{transaction:i}=await e.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:r},{type:`uint256`,value:c.toString()}],n),a=await e.trx.sign(i),o=await e.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}`)}}}};exports.addressToHexFormat=h,exports.approveTronTokens=j,exports.assertTronSufficientBalance=A,exports.circomDataToArray=D,exports.createTronCallData=v,exports.createTronWeb=f,exports.estimateTronFeeSunWithPadding=C,exports.evmHexToTronBase58Address=p,exports.fetchTronAccountResources=S,exports.fetchTronChainParameters=x,exports.generateProofSignatureRemotely=E,exports.getAvailableResource=y,exports.getChainParameterValue=b,exports.getTronWalletRpcUrl=g,exports.getVerifierId=T,exports.normalizeTronPrivateKey=d,exports.parseZkCalldata=w,exports.reorderZkCallData=O,exports.splitTronTokensByNative=k,exports.toTronBase58IfHex=m;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../snarkjs/constant.cjs`),r=require(`../../data-structures/http/HttpClient.cjs`);let i=require(`ethers`),a=require(`tronweb`);var o=2000n,s=e=>{let t=e.trim(),n=t.startsWith(`0x`)?t.slice(2):t;if(!/^[0-9a-fA-F]{64}$/.test(n))throw Error(`Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix`);return n},c=(t,n)=>{let{rpcUrl:r}=e.networkRegistry[t],i=n?s(n):void 0,o=i?new a.TronWeb({fullHost:r,privateKey:i}):new a.TronWeb({fullHost:r});return n||o.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),o},l=e=>e?.startsWith(`T`)?e:a.TronWeb.address.fromHex(e),u=e=>e.startsWith(`0x`)?l(e):e,d=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return d(a.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},f=t=>{if(t===e.chainIds.tronNile)return`https://nile.trongrid.io`;if(t===e.chainIds.tronMainnet)return`https://api.trongrid.io`;throw Error(`Unsupported Tron chain for wallet RPC: ${t}`)},p=(e,t)=>e.map(e=>Array.isArray(e)?p(e,t):t(e)),m=(e,t,n)=>{let r=new i.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let a=p(n,e=>typeof e==`string`&&e.startsWith(`T`)?d(e):e);return r.encodeFunctionData(t,a)},h=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,g=(e,t)=>{let n=e.find(e=>e.key===t);if(!n||typeof n.value!=`number`)throw Error(`Missing Tron chain parameter: ${t}`);return BigInt(n.value)},_=async e=>{let t=`${f(e)}/wallet/getchainparameters`,n=await r.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},v=async(e,t)=>{let n=`${f(e)}/wallet/getaccountresource`,i=d(t),a=i.startsWith(`0x`)?`41${i.slice(2)}`:i;return await r.httpClient.post(n,{address:a,visible:!1})},y=async(e,n,r,i,a,s)=>{let c={input:a,callValue:Number(s),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[l,u]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,c,[],i),e.transactionBuilder.triggerConstantContract(r,``,c,[],i)]),d=await _(n),f=g(d,`getEnergyFee`),p=g(d,`getTransactionFee`),m=await v(n,i),y=BigInt(l?.energy_required??u?.energy_used??0),b=h(m,`EnergyLimit`,`EnergyUsed`),x=(y>b?y-b:0n)*f,S=BigInt(Math.ceil((u?.transaction?.raw_data_hex?.length??0)/2)),C=h(m,`freeNetLimit`,`freeNetUsed`)+h(m,`NetLimit`,`NetUsed`),w=x+(S>C?S-C:0n)*p,T=w+w*o/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},b=e=>{let t=e[0].map(BigInt),n=e[1][0].map(BigInt),r=e[1][1].map(BigInt),i=e[2].map(BigInt),a=e[3].map(BigInt);return{a:t,b:[[n[1],n[0]],[r[1],r[0]]],c:i,publicSignals:a}},x=async(e,t,a,o,s,c,l,u=!1)=>{let d=e.map(String),f=a.map(String),p=o.map(String),m={chainId:l,a:d,b:[t[0].map(String),t[1].map(String)],c:f,inputs:p,externalActionId:String(c),tokenNumber:s.tokenNumber,nullifierAmount:s.nullifierAmount,outputAmount:s.outputAmount,skipLock:u},h=await r.httpClient.post(`${n.ENCLAVE_URL}/sign-proof`,m),{v:g,r:_,s:v}=i.ethers.Signature.from(h.signature.trim());return{v:g,r:_,s:v}},S=e=>{if(e.newRootHash===void 0)throw Error(`circomData.newRootHash is required for Tron transactions`);if(e.insertedLeafIndex===void 0)throw Error(`circomData.insertedLeafIndex is required for Tron transactions`);return[e.rootHashHinkal,e.rootHashHinkalIndex,e.erc20TokenAddresses,e.amountChanges,e.newRootHash,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,e.slippageValues,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,e.calldataHash,e.emporiumMessage,e.publicSignalCount,e.relay,[e.externalActionData.externalAddress,e.externalActionData.externalActionId,e.externalActionData.externalActionMetadata],[e.hookData.preHookContract,e.hookData.postHookContract,e.hookData.preHookMetadata,e.hookData.postHookMetadata],e.originalSender,e.extraData,e.insertedLeafIndex,e.createBlockedUtxos??!1]},C=e=>{e[1]=[[e[1][0][1],e[1][0][0]],[e[1][1][1],e[1][1][0]]]},w=async(e,t,n,r,i,a=!0,o=!1)=>{if(e){let{a:e,b:s,c,publicSignals:l}=b(t),u=await x(e,s,c,l,n,BigInt(r.externalActionData.externalActionId),i,o),d={v:u.v,r:u.r,s:u.s};return a&&C(t),d}};exports.addressToHexFormat=d,exports.circomDataToArray=S,exports.createTronCallData=m,exports.createTronWeb=c,exports.estimateTronFeeSunWithPadding=y,exports.evmHexToTronBase58Address=l,exports.fetchTronAccountResources=v,exports.fetchTronChainParameters=_,exports.generateProofSignatureRemotely=x,exports.getAvailableResource=h,exports.getChainParameterValue=g,exports.getTronWalletRpcUrl=f,exports.normalizeTronPrivateKey=s,exports.parseZkCalldata=b,exports.reorderZkCallData=w,exports.swapTronBCoordinate=C,exports.toTronBase58IfHex=u;

package/common/src/functions/utils/tron.utils.d.ts

@@ -2,8 +2,8 @@ import { ethers } from 'ethers';
 import { CircomDataType, DimDataType } from '../../types/circom-data.types';
 import { NewZkCallDataType } from '../../types/snark.types';
 import { TronAccountResources, TronChainParameter } from '../../types/tron.types';
+import { TronProofSignature } from '../../types/transact.types';
 import { TronWeb } from 'tronweb';
-import { ERC20Token } from '../../types/token.types';
 export declare const detectTronChainIdFromHost: (fullNodeHost: string) => number;
 export declare const normalizeTronPrivateKey: (privateKey: string) => string;
 export declare const createTronWeb: (chainId: number, privateKey?: string) => TronWeb;
@@ -25,20 +25,11 @@ export declare const parseZkCalldata: (zkCallData: NewZkCallDataType) => {
     publicSignals: bigint[];
 };
 export declare const getVerifierId: (dimensionsArg: DimDataType, externalActionId: bigint) => bigint;
-export declare const generateProofSignatureRemotely: (a: bigint[], b: bigint[][], c: bigint[], input: bigint[], dimensionsArg: DimDataType, externalActionId: bigint) => Promise<{
+export declare const generateProofSignatureRemotely: (a: bigint[], b: bigint[][], c: bigint[], input: bigint[], dimensionsArg: DimDataType, externalActionId: bigint, chainId: number, skipLock?: boolean) => Promise<{
     v: number;
     r: string;
     s: string;
 }>;
-export declare const circomDataToArray: (circomData: CircomDataType) => (string | number | bigint | (string | number)[] | string[][] | (string | bigint)[] | (bigint | boolean | import('../..').HinkalLogicAction | bigint[] | (string[] | bigint[])[][])[] | undefined)[];
-export declare const reorderZkCallData: (isTron: boolean, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, modifyZkCallData?: boolean) => Promise<{
-    v: number;
-    r: string;
-    s: string;
-} | undefined>;
-export declare const splitTronTokensByNative: (erc20Tokens: ERC20Token[], amountChanges: bigint[]) => {
-    totalTrxValue: bigint;
-    tokensNeedingApproval: Map<string, bigint>;
-};
-export declare const assertTronSufficientBalance: (tronWeb: TronWeb, chainId: number, contractBase58: string, ownerAddress: string, callData: string, totalTrxValue: bigint) => Promise<void>;
-export declare const approveTronTokens: (tronWeb: TronWeb, ethereumAddress: string, spenderBase58: string, tokensNeedingApproval: Map<string, bigint>) => Promise<void>;
+export declare const circomDataToArray: (circomData: CircomDataType) => (string | number | bigint | boolean | string[][] | (string | bigint)[] | undefined)[];
+export declare const swapTronBCoordinate: (zkCallData: NewZkCallDataType) => void;
+export declare const reorderZkCallData: (isTron: boolean, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, chainId: number, modifyZkCallData?: boolean, skipLock?: boolean) => Promise<TronProofSignature | undefined>;

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

@@ -1,60 +1,56 @@
 import { chainIds as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
-import { TRON_DEFAULT_FEE_LIMIT_SUN as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as i } from "./caseInsensitive.utils.mjs";
-import { insufficientResourcesErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { ENCLAVE_URL as o } from "../snarkjs/constant.mjs";
-import { httpClient as s } from "../../data-structures/http/HttpClient.mjs";
-import { ERC20ABI as c } from "../../externalABIs/index.mjs";
-import { Logger as l } from "../../error-handling/logger.mjs";
-import { ethers as u } from "ethers";
-import { TronWeb as d } from "tronweb";
+import { TRON_DEFAULT_FEE_LIMIT_SUN as n } from "../../constants/protocol.constants.mjs";
+import { ENCLAVE_URL as r } from "../snarkjs/constant.mjs";
+import { httpClient as i } from "../../data-structures/http/HttpClient.mjs";
+import { ethers as a } from "ethers";
+import { TronWeb as o } from "tronweb";
 //#region libs/shared/common/src/functions/utils/tron.utils.ts
-var f = 2000n, p = (e) => {
+var s = 2000n, c = (e) => {
 	let t = e.trim(), n = t.startsWith("0x") ? t.slice(2) : t;
 	if (!/^[0-9a-fA-F]{64}$/.test(n)) throw Error("Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix");
 	return n;
-}, m = (e, n) => {
-	let r = t[e].fetchRpcUrl, i = n ? p(n) : void 0, a = i ? new d({
+}, l = (e, n) => {
+	let { rpcUrl: r } = t[e], i = n ? c(n) : void 0, a = i ? new o({
 		fullHost: r,
 		privateKey: i
-	}) : new d({ fullHost: r });
+	}) : new o({ fullHost: r });
 	return n || a.setAddress("T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb"), a;
-}, h = (e) => e?.startsWith("T") ? e : d.address.fromHex(e), g = (e) => e.startsWith("0x") ? h(e) : e, _ = (e) => {
+}, u = (e) => e?.startsWith("T") ? e : o.address.fromHex(e), d = (e) => e.startsWith("0x") ? u(e) : e, f = (e) => {
 	if (e.startsWith("0x")) return e;
 	if (e.startsWith("41")) return e.replace("41", "0x");
-	if (e.startsWith("T")) return _(d.address.toHex(e));
+	if (e.startsWith("T")) return f(o.address.toHex(e));
 	throw Error("Failed to convert address to hex format");
-}, v = (t) => {
+}, p = (t) => {
 	if (t === e.tronNile) return "https://nile.trongrid.io";
 	if (t === e.tronMainnet) return "https://api.trongrid.io";
 	throw Error(`Unsupported Tron chain for wallet RPC: ${t}`);
-}, y = (e, t) => e.map((e) => Array.isArray(e) ? y(e, t) : t(e)), b = (e, t, n) => {
-	let r = new u.Interface(e);
+}, m = (e, t) => e.map((e) => Array.isArray(e) ? m(e, t) : t(e)), h = (e, t, n) => {
+	let r = new a.Interface(e);
 	if (!r.getFunction(t)) throw Error(`${t} ABI is missing for Tron call data creation`);
-	let i = y(n, (e) => typeof e == "string" && e.startsWith("T") ? _(e) : e);
+	let i = m(n, (e) => typeof e == "string" && e.startsWith("T") ? f(e) : e);
 	return r.encodeFunctionData(t, i);
-}, x = (e, t, n) => e ? BigInt(Math.max((e[t] ?? 0) - (e[n] ?? 0), 0)) : 0n, S = (e, t) => {
+}, g = (e, t, n) => e ? BigInt(Math.max((e[t] ?? 0) - (e[n] ?? 0), 0)) : 0n, _ = (e, t) => {
 	let n = e.find((e) => e.key === t);
 	if (!n || typeof n.value != "number") throw Error(`Missing Tron chain parameter: ${t}`);
 	return BigInt(n.value);
-}, C = async (e) => {
-	let t = `${v(e)}/wallet/getchainparameters`, n = await s.post(t, {});
+}, v = async (e) => {
+	let t = `${p(e)}/wallet/getchainparameters`, n = await i.post(t, {});
 	if (!n?.chainParameter?.length) throw Error("Failed to fetch Tron chain parameters from wallet RPC");
 	return n.chainParameter;
-}, w = async (e, t) => {
-	let n = `${v(e)}/wallet/getaccountresource`, r = _(t), i = r.startsWith("0x") ? `41${r.slice(2)}` : r;
-	return await s.post(n, {
-		address: i,
+}, y = async (e, t) => {
+	let n = `${p(e)}/wallet/getaccountresource`, r = f(t), a = r.startsWith("0x") ? `41${r.slice(2)}` : r;
+	return await i.post(n, {
+		address: a,
 		visible: !1
 	});
-}, T = async (e, t, r, i, a, o) => {
-	let s = {
+}, b = async (e, t, r, i, a, o) => {
+	let c = {
 		input: a,
 		callValue: Number(o),
 		feeLimit: n
-	}, [c, l] = await Promise.all([e.transactionBuilder.estimateEnergy(r, "", s, [], i), e.transactionBuilder.triggerConstantContract(r, "", s, [], i)]), u = await C(t), d = S(u, "getEnergyFee"), p = S(u, "getTransactionFee"), m = await w(t, i), h = BigInt(c?.energy_required ?? l?.energy_used ?? 0), g = x(m, "EnergyLimit", "EnergyUsed"), _ = (h > g ? h - g : 0n) * d, v = BigInt(Math.ceil((l?.transaction?.raw_data_hex?.length ?? 0) / 2)), y = x(m, "freeNetLimit", "freeNetUsed") + x(m, "NetLimit", "NetUsed"), b = _ + (v > y ? v - y : 0n) * p, T = b + b * f / 10000n;
+	}, [l, u] = await Promise.all([e.transactionBuilder.estimateEnergy(r, "", c, [], i), e.transactionBuilder.triggerConstantContract(r, "", c, [], i)]), d = await v(t), f = _(d, "getEnergyFee"), p = _(d, "getTransactionFee"), m = await y(t, i), h = BigInt(l?.energy_required ?? u?.energy_used ?? 0), b = g(m, "EnergyLimit", "EnergyUsed"), x = (h > b ? h - b : 0n) * f, S = BigInt(Math.ceil((u?.transaction?.raw_data_hex?.length ?? 0) / 2)), C = g(m, "freeNetLimit", "freeNetUsed") + g(m, "NetLimit", "NetUsed"), w = x + (S > C ? S - C : 0n) * p, T = w + w * s / 10000n;
 	return T > BigInt(1e9) ? BigInt(n) : T;
-}, E = (e) => {
+}, x = (e) => {
 	let t = e[0].map(BigInt), n = e[1][0].map(BigInt), r = e[1][1].map(BigInt), i = e[2].map(BigInt), a = e[3].map(BigInt);
 	return {
 		a: t,
@@ -62,133 +58,74 @@ var f = 2000n, p = (e) => {
 		c: i,
 		publicSignals: a
 	};
-}, D = (e, t) => {
-	let n = u.AbiCoder.defaultAbiCoder().encode([
-		"uint16",
-		"uint16",
-		"uint16",
-		"uint256"
-	], [
-		e.tokenNumber,
-		e.nullifierAmount,
-		e.outputAmount,
-		t
-	]);
-	return BigInt(u.keccak256(n));
-}, O = async (e, t, n, r, i, a) => {
-	let c = D(i, a), l = e.map(String), d = n.map(String), f = r.map(String), p = {
-		a: l,
+}, S = async (e, t, n, o, s, c, l, u = !1) => {
+	let d = e.map(String), f = n.map(String), p = o.map(String), m = {
+		chainId: l,
+		a: d,
 		b: [t[0].map(String), t[1].map(String)],
-		c: d,
-		inputs: f,
-		verifier_id: String(c)
-	}, m = await s.post(`${o}/sign-proof`, p), { v: h, r: g, s: _ } = u.Signature.from(m.signature.trim());
+		c: f,
+		inputs: p,
+		externalActionId: String(c),
+		tokenNumber: s.tokenNumber,
+		nullifierAmount: s.nullifierAmount,
+		outputAmount: s.outputAmount,
+		skipLock: u
+	}, h = await i.post(`${r}/sign-proof`, m), { v: g, r: _, s: v } = a.Signature.from(h.signature.trim());
 	return {
-		v: h,
-		r: g,
-		s: _
+		v: g,
+		r: _,
+		s: v
 	};
-}, k = (e) => [
-	e.rootHashHinkal,
-	e.erc20TokenAddresses,
-	e.tokenIds,
-	e.amountChanges,
-	e.onChainCreation,
-	e.slippageValues,
-	e.inputNullifiers,
-	e.outCommitments,
-	e.encryptedOutputs,
-	[
-		e.feeStructure.feeToken,
-		e.feeStructure.flatFee,
-		e.feeStructure.variableRate
-	],
-	e.timeStamp,
-	[
-		e.stealthAddressStructure.extraRandomization,
-		e.stealthAddressStructure.stealthAddress,
-		e.stealthAddressStructure.H0,
-		e.stealthAddressStructure.H1
-	],
-	e.rootHashAccessToken,
-	e.calldataHash,
-	e.publicSignalCount,
-	e.relay,
-	e.externalAddress,
-	e.externalActionId,
-	e.externalActionMetadata,
-	[
-		e.hinkalLogicArgs.hinkalLogicAction,
-		e.hinkalLogicArgs.inHinkalAddress,
-		e.hinkalLogicArgs.executeApprovalChanges,
-		e.hinkalLogicArgs.doPreTxApproval,
-		e.hinkalLogicArgs.useApprovalUtxoData.map((e) => [
-			e.approvalChanges,
-			e.externalApprovalAddresses,
-			e.conversionInHinkalAddress
-		])
-	],
-	[
-		e.hookData.preHookContract,
-		e.hookData.hookContract,
-		e.hookData.preHookMetadata,
-		e.hookData.postHookMetadata
-	],
-	[
-		e.signatureData.v,
-		e.signatureData.r,
-		e.signatureData.s,
-		e.signatureData.accessKey,
-		e.signatureData.nonce,
-		e.signatureData.ethereumAddress
-	],
-	e.originalSender
-], A = async (e, t, n, r, i = !0) => {
+}, C = (e) => {
+	if (e.newRootHash === void 0) throw Error("circomData.newRootHash is required for Tron transactions");
+	if (e.insertedLeafIndex === void 0) throw Error("circomData.insertedLeafIndex is required for Tron transactions");
+	return [
+		e.rootHashHinkal,
+		e.rootHashHinkalIndex,
+		e.erc20TokenAddresses,
+		e.amountChanges,
+		e.newRootHash,
+		e.inputNullifiers,
+		e.outCommitments,
+		e.encryptedOutputs,
+		e.slippageValues,
+		[
+			e.feeStructure.feeToken,
+			e.feeStructure.flatFee,
+			e.feeStructure.variableRate
+		],
+		e.timeStamp,
+		e.calldataHash,
+		e.emporiumMessage,
+		e.publicSignalCount,
+		e.relay,
+		[
+			e.externalActionData.externalAddress,
+			e.externalActionData.externalActionId,
+			e.externalActionData.externalActionMetadata
+		],
+		[
+			e.hookData.preHookContract,
+			e.hookData.postHookContract,
+			e.hookData.preHookMetadata,
+			e.hookData.postHookMetadata
+		],
+		e.originalSender,
+		e.extraData,
+		e.insertedLeafIndex,
+		e.createBlockedUtxos ?? !1
+	];
+}, w = (e) => {
+	e[1] = [[e[1][0][1], e[1][0][0]], [e[1][1][1], e[1][1][0]]];
+}, T = async (e, t, n, r, i, a = !0, o = !1) => {
 	if (e) {
-		let { a: e, b: a, c: o, publicSignals: s } = E(t), c = await O(e, a, o, s, n, BigInt(r.externalActionId)), l = {
-			v: c.v,
-			r: c.r,
-			s: c.s
+		let { a: e, b: s, c, publicSignals: l } = x(t), u = await S(e, s, c, l, n, BigInt(r.externalActionData.externalActionId), i, o), d = {
+			v: u.v,
+			r: u.r,
+			s: u.s
 		};
-		return i && (t[1] = [[t[1][0][1], t[1][0][0]], [t[1][1][1], t[1][1][0]]]), l;
-	}
-}, j = (e, t) => {
-	let n = 0n, a = /* @__PURE__ */ new Map();
-	for (let o = 0; o < e.length; o += 1) if (i(e[o].erc20TokenAddress, r)) n += t[o];
-	else {
-		let n = h(e[o].erc20TokenAddress);
-		a.set(n, (a.get(n) ?? 0n) + t[o]);
-	}
-	return {
-		totalTrxValue: n,
-		tokensNeedingApproval: a
-	};
-}, M = async (e, t, r, i, o, s) => {
-	let c = BigInt(await e.trx.getBalance(i)), u = BigInt(n);
-	try {
-		u = await T(e, t, r, i, o, s);
-	} catch (e) {
-		l.error("Error estimating Tron deposit fee", e);
-	}
-	if (c < s + u) throw Error(a.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
-}, N = async (e, t, r, i) => {
-	let a = Array.from(i.entries());
-	for (let i = 0; i < a.length; i += 1) {
-		let [o, s] = a[i], l = await e.contract(c, o).allowance(t, r).call({ from: t });
-		if (BigInt(String(l)) < s) {
-			let { transaction: i } = await e.transactionBuilder.triggerSmartContract(o, "approve(address,uint256)", { feeLimit: n }, [{
-				type: "address",
-				value: r
-			}, {
-				type: "uint256",
-				value: s.toString()
-			}], t), a = await e.trx.sign(i), c = await e.trx.sendRawTransaction(a);
-			if (!c.result) {
-				let e = c.code ?? "UNKNOWN", t = c.message ? Buffer.from(c.message, "hex").toString() : "no message";
-				throw Error(`Tron token approval failed: ${e} - ${t}`);
-			}
-		}
+		return a && w(t), d;
 	}
 };
 //#endregion
-export { _ as addressToHexFormat, N as approveTronTokens, M as assertTronSufficientBalance, k as circomDataToArray, b as createTronCallData, m as createTronWeb, T as estimateTronFeeSunWithPadding, h as evmHexToTronBase58Address, w as fetchTronAccountResources, C as fetchTronChainParameters, O as generateProofSignatureRemotely, x as getAvailableResource, S as getChainParameterValue, v as getTronWalletRpcUrl, D as getVerifierId, p as normalizeTronPrivateKey, E as parseZkCalldata, A as reorderZkCallData, j as splitTronTokensByNative, g as toTronBase58IfHex };
+export { f as addressToHexFormat, C as circomDataToArray, h as createTronCallData, l as createTronWeb, b as estimateTronFeeSunWithPadding, u as evmHexToTronBase58Address, y as fetchTronAccountResources, v as fetchTronChainParameters, S as generateProofSignatureRemotely, g as getAvailableResource, _ as getChainParameterValue, p as getTronWalletRpcUrl, c as normalizeTronPrivateKey, x as parseZkCalldata, T as reorderZkCallData, w as swapTronBCoordinate, d as toTronBase58IfHex };

package/common/src/functions/utils/tronSimulation.utils.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`./tron.utils.cjs`);var r=async(r,i,a,o,s,c,l)=>{let u=n.addressToHexFormat(i),d=n.addressToHexFormat(c),f=e.networkRegistry[r].fetchRpcUrl;if(!f)throw Error(`missing rpc url for tron simulation`);let p=n.createTronCallData(o,a,s),m=await t.httpClient.post(f,{jsonrpc:`2.0`,id:1,method:`eth_call`,params:[{from:d,to:u,data:p,value:l?`0x${(l??0n).toString(16)}`:void 0},`latest`]});if(m.error){let e=m.error.message||`Unknown revert`;throw Error(`Tron Transaction Simulation reverted: ${e}`)}};exports.simulateTronTransaction=r;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`./tron.utils.cjs`);var r=async(r,i,a,o,s,c,l)=>{let u=n.addressToHexFormat(i),d=n.addressToHexFormat(c),{rpcUrl:f}=e.networkRegistry[r],p=f.includes(`.g.alchemy.com/`)?f:`${f}/jsonrpc`,m=n.createTronCallData(o,a,s),h=await t.httpClient.post(p,{jsonrpc:`2.0`,id:1,method:`eth_call`,params:[{from:d,to:u,data:m,value:l?`0x${(l??0n).toString(16)}`:void 0},`latest`]});if(h.error){let e=h.error.message||`Unknown revert`;throw Error(`Tron Transaction Simulation reverted: ${e}`)}};exports.simulateTronTransaction=r;

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

@@ -3,21 +3,19 @@ import { httpClient as t } from "../../data-structures/http/HttpClient.mjs";
 import { addressToHexFormat as n, createTronCallData as r } from "./tron.utils.mjs";
 //#region libs/shared/common/src/functions/utils/tronSimulation.utils.ts
 var i = async (i, a, o, s, c, l, u) => {
-	let d = n(a), f = n(l), p = e[i].fetchRpcUrl;
-	if (!p) throw Error("missing rpc url for tron simulation");
-	let m = r(s, o, c), h = await t.post(p, {
+	let d = n(a), f = n(l), { rpcUrl: p } = e[i], m = p.includes(".g.alchemy.com/") ? p : `${p}/jsonrpc`, h = r(s, o, c), g = await t.post(m, {
 		jsonrpc: "2.0",
 		id: 1,
 		method: "eth_call",
 		params: [{
 			from: f,
 			to: d,
-			data: m,
+			data: h,
 			value: u ? `0x${(u ?? 0n).toString(16)}` : void 0
 		}, "latest"]
 	});
-	if (h.error) {
-		let e = h.error.message || "Unknown revert";
+	if (g.error) {
+		let e = g.error.message || "Unknown revert";
 		throw Error(`Tron Transaction Simulation reverted: ${e}`);
 	}
 };

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

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

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

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