@across-protocol/sdk 4.3.137-alpha.3 → 4.3.137

package/src/coingecko/Coingecko.ts

@@ -1,7 +1,5 @@
-import axios, { AxiosError } from "axios";
 import assert from "assert";
-import get from "lodash.get";
-import { getCoingeckoTokenIdByAddress, retry } from "../utils";
+import { fetchWithTimeout, getCoingeckoTokenIdByAddress, retry } from "../utils";
 import { Logger } from "../relayFeeCalculator";
 
 export function msToS(ms: number) {
@@ -386,19 +384,19 @@ export class Coingecko {
 
       // If no pro api key, only send basic request:
       if (this.apiKey === undefined) {
-        return (await this._callBasic(path)) as T;
+        return await this._callBasic<T>(path);
       }
 
       // If pro api key, try basic and use pro as fallback.
       try {
-        return (await this._callBasic(path, this.basicApiTimeout)) as T;
+        return await this._callBasic<T>(path, this.basicApiTimeout);
       } catch (err) {
         this.logger.debug({
           at: "sdk/coingecko",
           message: `Basic CG url request failed, falling back to CG PRO host ${proHost}`,
-          errMessage: (err as AxiosError).message,
+          errMessage: (err as Error).message,
         });
-        return await this._callPro(path);
+        return await this._callPro<T>(path);
       }
     };
 
@@ -502,29 +500,15 @@ export class Coingecko {
     }
   }
 
-  private async _callBasic(path: string, timeout?: number) {
+  private async _callBasic<T>(path: string, timeout?: number): Promise<T> {
     const url = `${this.host}/${path}`;
 
-    try {
-      // Don't use timeout if there is no pro API to fallback to.
-      const result = await axios(url, { timeout });
-      return result.data;
-    } catch (err) {
-      const msg = get(err, "response.data.error", get(err, "response.statusText", (err as AxiosError).message));
-      throw new Error(msg);
-    }
+    // Don't use timeout if there is no pro API to fallback to.
+    return await fetchWithTimeout<T>(url, {}, {}, timeout);
   }
 
-  private async _callPro(path: string) {
+  private async _callPro<T>(path: string): Promise<T> {
     const url = `${this.proHost}/${path}`;
-
-    try {
-      // Don't use timeout if there is no pro API to fallback to.
-      const result = await axios(url, { params: { x_cg_pro_api_key: this.apiKey } });
-      return result.data;
-    } catch (err) {
-      const msg = get(err, "response.data.error", get(err, "response.statusText", (err as AxiosError).message));
-      throw new Error(msg);
-    }
+    return await fetchWithTimeout<T>(url, { x_cg_pro_api_key: this.apiKey });
   }
 }

package/src/gasPriceOracle/index.ts

@@ -1,2 +1,2 @@
 export { getGasPriceEstimate, GasPriceEstimateOptions } from "./oracle";
-export { GasPriceEstimate, EvmGasPriceEstimate, SvmGasPriceEstimate, TvmGasPriceEstimate } from "./types";
+export { GasPriceEstimate, EvmGasPriceEstimate, SvmGasPriceEstimate } from "./types";

package/src/gasPriceOracle/oracle.ts

@@ -2,17 +2,15 @@ import assert from "assert";
 import { Transport } from "viem";
 import { providers } from "ethers";
 import { CHAIN_IDs } from "../constants";
-import { BigNumber, fixedPointAdjustment, isEvmProvider, isTvmProvider, toBNWei, isDefined } from "../utils";
+import { BigNumber, fixedPointAdjustment, isEvmProvider, toBNWei, isDefined } from "../utils";
 import { SVMProvider as SolanaProvider } from "../arch/svm";
-import { TronWeb } from "tronweb";
-import { EvmGasPriceEstimate, GasPriceEstimate, SvmGasPriceEstimate, TvmGasPriceEstimate } from "./types";
+import { EvmGasPriceEstimate, GasPriceEstimate, SvmGasPriceEstimate } from "./types";
 import { getPublicClient } from "./util";
 import * as arbitrum from "./adapters/arbitrum";
 import * as ethereum from "./adapters/ethereum";
 import * as polygon from "./adapters/polygon";
 import * as lineaViem from "./adapters/linea-viem";
 import * as solana from "./adapters/solana";
-import * as tron from "./adapters/tron";
 import { EvmProvider } from "../arch/evm/types";
 
 export interface GasPriceEstimateOptions {
@@ -58,12 +56,6 @@ export async function getGasPriceEstimate(
   opts?: Partial<GasPriceEstimateOptions>
 ): Promise<SvmGasPriceEstimate>;
 
-// Overload For TVM providers
-export async function getGasPriceEstimate(
-  provider: TronWeb,
-  opts?: Partial<GasPriceEstimateOptions>
-): Promise<TvmGasPriceEstimate>;
-
 /**
  * Provide an estimate for the current gas price for a particular chain.
  * @param provider A valid ethers provider.
@@ -71,24 +63,12 @@ export async function getGasPriceEstimate(
  * @returns An  object of type GasPriceEstimate.
  */
 export async function getGasPriceEstimate(
-  provider: EvmProvider | SolanaProvider | TronWeb,
+  provider: EvmProvider | SolanaProvider,
   opts: Partial<GasPriceEstimateOptions> = {}
 ): Promise<GasPriceEstimate> {
   const baseFeeMultiplier = opts.baseFeeMultiplier ?? toBNWei("1");
   const priorityFeeMultiplier = opts.priorityFeeMultiplier ?? toBNWei("1");
 
-  // Exit here if we need to estimate on TRON.
-  if (isTvmProvider(provider)) {
-    const optsWithDefaults: GasPriceEstimateOptions = {
-      ...GAS_PRICE_ESTIMATE_DEFAULTS,
-      baseFeeMultiplier,
-      priorityFeeMultiplier,
-      ...opts,
-      chainId: opts.chainId ?? CHAIN_IDs.TRON,
-    };
-    return tron.gasPrices(provider, optsWithDefaults);
-  }
-
   // Exit here if we need to estimate on Solana.
   if (!isEvmProvider(provider)) {
     const optsWithDefaults: GasPriceEstimateOptions = {

package/src/gasPriceOracle/types.ts

@@ -2,7 +2,7 @@ import { type Chain, type Transport, PublicClient, FeeValuesEIP1559 } from "viem
 import { BigNumber, bnZero, isDefined } from "../utils";
 
 export type InternalGasPriceEstimate = FeeValuesEIP1559;
-export type GasPriceEstimate = EvmGasPriceEstimate | SvmGasPriceEstimate | TvmGasPriceEstimate;
+export type GasPriceEstimate = EvmGasPriceEstimate | SvmGasPriceEstimate;
 
 export type EvmGasPriceEstimate = {
   maxFeePerGas: BigNumber;
@@ -14,11 +14,6 @@ export type SvmGasPriceEstimate = {
   microLamportsPerComputeUnit: BigNumber;
 };
 
-export type TvmGasPriceEstimate = {
-  energyPrice: BigNumber;
-  bandwidthPrice: BigNumber;
-};
-
 export interface GasPriceFeed {
   (provider: PublicClient<Transport, Chain>, chainId: number): Promise<InternalGasPriceEstimate>;
 }
@@ -40,8 +35,3 @@ export function isSVMGasPrice(gasPrice: GasPriceEstimate): gasPrice is SvmGasPri
   const { baseFee, microLamportsPerComputeUnit } = gasPrice as SvmGasPriceEstimate;
   return isDefined(baseFee) && isDefined(microLamportsPerComputeUnit);
 }
-
-export function isTVMGasPrice(gasPrice: GasPriceEstimate): gasPrice is TvmGasPriceEstimate {
-  const { energyPrice, bandwidthPrice } = gasPrice as TvmGasPriceEstimate;
-  return isDefined(energyPrice) && isDefined(bandwidthPrice);
-}

package/src/priceClient/adapters/baseAdapter.ts

@@ -1,5 +1,5 @@
+import { fetchWithTimeout, FetchQueryParams } from "../../utils";
 import assert from "assert";
-import axios from "axios";
 
 export type BaseHTTPAdapterArgs = {
   timeout?: number;
@@ -37,21 +37,21 @@ export class BaseHTTPAdapter {
     this.timeout = timeout; // ms
   }
 
-  protected async query(path: string, urlArgs?: object): Promise<unknown> {
+  protected async query(path: string, urlArgs?: FetchQueryParams): Promise<unknown> {
     const url = `https://${this.host}/${path ?? ""}`;
-    const args = {
-      headers: { "User-Agent": process.env.ACROSS_USER_AGENT ?? "across-protocol" },
-      timeout: this.timeout,
-      params: urlArgs ?? {},
-    };
 
     const errs: string[] = [];
     let tries = 0;
     do {
       try {
-        return (await axios(url, args)).data;
+        return await fetchWithTimeout<unknown>(
+          url,
+          urlArgs ?? {},
+          { "User-Agent": process.env.ACROSS_USER_AGENT ?? "across-protocol" },
+          this.timeout
+        );
       } catch (err) {
-        const errMsg = axios.isAxiosError(err) || err instanceof Error ? err.message : "unknown error";
+        const errMsg = err instanceof Error ? err.message : "unknown error";
         errs.push(errMsg);
         if (++tries <= this.retries) await this.sleep(Math.pow(1.5, tries) * 1000); // simple backoff
       }

package/src/relayFeeCalculator/chain-queries/factory.ts

@@ -3,15 +3,13 @@ import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 import { getDeployedAddress } from "@across-protocol/contracts";
 import { asL2Provider } from "@eth-optimism/sdk";
 import { providers } from "ethers";
-import { TronWeb } from "tronweb";
 import { CUSTOM_GAS_TOKENS } from "../../constants";
-import { chainIsEvm, chainIsOPStack, isDefined, chainIsSvm, chainIsTvm, SvmAddress } from "../../utils";
+import { chainIsEvm, chainIsOPStack, isDefined, chainIsSvm, SvmAddress } from "../../utils";
 import { QueryBase } from "./baseQuery";
 import { SVMProvider as svmProvider } from "../../arch/svm";
 import { DEFAULT_LOGGER, getDefaultRelayer, Logger } from "../relayFeeCalculator";
 import { CustomGasTokenQueries } from "./customGasToken";
 import { SvmQuery } from "./svmQuery";
-import { TvmQuery } from "./tvmQuery";
 
 /**
  * Some chains have a fixed gas price that is applied to the gas estimates. We should override
@@ -24,14 +22,14 @@ const fixedGasPrice = {
 export class QueryBase__factory {
   static create(
     chainId: number,
-    provider: providers.Provider | svmProvider | TronWeb,
+    provider: providers.Provider | svmProvider,
     symbolMapping = TOKEN_SYMBOLS_MAP,
     spokePoolAddress = getDeployedAddress("SpokePool", chainId),
     relayerAddress = getDefaultRelayer(chainId),
     coingeckoProApiKey?: string,
     logger: Logger = DEFAULT_LOGGER,
     coingeckoBaseCurrency = "eth"
-  ): QueryBase | SvmQuery | TvmQuery {
+  ): QueryBase | SvmQuery {
     assert(isDefined(spokePoolAddress));
 
     const customGasTokenSymbol = CUSTOM_GAS_TOKENS[chainId];
@@ -64,19 +62,6 @@ export class QueryBase__factory {
         coingeckoBaseCurrency
       );
     }
-    if (chainIsTvm(chainId)) {
-      assert(relayerAddress.isEVM());
-      return new TvmQuery(
-        provider as TronWeb,
-        symbolMapping,
-        spokePoolAddress,
-        relayerAddress,
-        logger,
-        coingeckoProApiKey,
-        fixedGasPrice[chainId],
-        coingeckoBaseCurrency
-      );
-    }
 
     // For OPStack chains, we need to wrap the provider in an L2Provider
     provider = chainIsOPStack(chainId)

package/src/relayFeeCalculator/chain-queries/index.ts

@@ -2,4 +2,3 @@ export * from "./baseQuery";
 export * from "./factory";
 export * from "./customGasToken";
 export * from "./svmQuery";
-export * from "./tvmQuery";

package/src/utils/AddressUtils.ts

@@ -1,8 +1,7 @@
 import { isAddress } from "viem";
 import { providers, utils } from "ethers";
 import bs58 from "bs58";
-import { TronWeb } from "tronweb";
-import { BigNumber, chainIsEvm, chainIsSvm, chainIsTvm } from "./";
+import { BigNumber, chainIsEvm, chainIsSvm } from "./";
 
 /**
  * Verify whether an address' bytecode resembles an EIP-7702 delegation.
@@ -108,7 +107,6 @@ export function toAddressType(address: string, chainId: number): Address {
 
   if (chainIsEvm(chainId) && EvmAddress.validate(rawAddress)) return new EvmAddress(rawAddress);
   else if (chainIsSvm(chainId) && SvmAddress.validate(rawAddress)) return new SvmAddress(rawAddress);
-  else if (chainIsTvm(chainId)) return TvmAddress.from(address);
 
   return new RawAddress(rawAddress);
 }
@@ -189,7 +187,6 @@ export abstract class Address {
   isValidOn(chainId: number): boolean {
     if (chainIsEvm(chainId)) return EvmAddress.validate(this.rawAddress);
     if (chainIsSvm(chainId)) return SvmAddress.validate(this.rawAddress);
-    if (chainIsTvm(chainId)) return TvmAddress.validate(this.rawAddress);
     return false;
   }
 
@@ -230,10 +227,6 @@ export abstract class Address {
   isSVM(): this is SvmAddress {
     return false;
   }
-
-  isTVM(): this is TvmAddress {
-    return false;
-  }
 }
 
 // Subclass of address which strictly deals with 20-byte addresses. These addresses are guaranteed to be valid EVM addresses, so `toAddress` will always succeed.
@@ -311,59 +304,6 @@ export class SvmAddress extends Address {
   }
 }
 
-// Subclass of address which handles TRON (TVM) addresses. Internally stores a 20-byte address (same as EVM),
-// but toNative() returns the TRON Base58Check-encoded address (T...).
-export class TvmAddress extends Address {
-  private readonly _type = "tvm";
-  private nativeAddress: string | undefined = undefined;
-
-  constructor(rawAddress: Uint8Array) {
-    if (!TvmAddress.validate(rawAddress)) {
-      throw new Error(`${utils.hexlify(rawAddress)} is not a valid TVM address`);
-    }
-
-    super(rawAddress);
-    this._type; // tsc noUnusedLocals appeasement.
-  }
-
-  static validate(rawAddress: Uint8Array): boolean {
-    return (
-      rawAddress.length == 20 || (rawAddress.length === 32 && rawAddress.slice(0, 12).every((field) => field === 0))
-    );
-  }
-
-  override isTVM(): this is TvmAddress {
-    return true;
-  }
-
-  // Returns the TRON Base58Check-encoded address (T...).
-  override toNative(): string {
-    const computeNative = () => {
-      const hexString = utils.hexlify(this.rawAddress);
-      // Strip leading zeros to get the 20-byte portion, then convert to TRON format.
-      const evmHex = utils.hexZeroPad(utils.hexStripZeros(hexString), 20);
-      return TronWeb.address.fromHex(evmHex);
-    };
-    return (this.nativeAddress ??= computeNative());
-  }
-
-  override toHexString(): string {
-    return this.toEvmAddress();
-  }
-
-  // Constructs a new TvmAddress from a string. Accepts both 0x-prefixed hex and TRON Base58Check addresses.
-  static from(address: string): TvmAddress {
-    if (address.startsWith("0x")) {
-      return new this(utils.arrayify(address));
-    }
-    // For base58 Tron addresses, convert via TronWeb to get the hex representation.
-    const hex = TronWeb.address.toHex(address);
-    // TronWeb returns hex with a 0x41 prefix (TRON's address byte). Strip 0x41 to get 20 bytes.
-    const rawHex = "0x" + hex.slice(2);
-    return new this(utils.arrayify(rawHex));
-  }
-}
-
 export class RawAddress extends Address {
   private readonly _type = "raw";
 

package/src/utils/CCTPUtils.ts

@@ -1,9 +1,9 @@
 import { PUBLIC_NETWORKS, CCTP_NO_DOMAIN, PRODUCTION_NETWORKS, TEST_NETWORKS } from "@across-protocol/constants";
+import { fetchWithTimeout } from "./FetchUtils";
 import { BigNumber, ethers } from "ethers";
 
 import { Log } from "@ethersproject/abstract-provider";
 import { isDefined } from "./TypeGuards";
-import axios from "axios";
 import { chainIsProd } from "./NetworkUtils";
 import assert from "assert";
 import { bnZero } from "./BigNumberUtils";
@@ -236,10 +236,10 @@ export async function hasCCTPMessageBeenProcessedEvm(nonceHash: string, contract
  * @link https://developers.circle.com/api-reference/cctp/all/get-fast-burn-usdc-allowance
  */
 export async function getV2FastBurnAllowance(isMainnet: boolean): Promise<string> {
-  const httpResponse = await axios.get<CCTPV2APIGetFastBurnAllowanceResponse>(
+  const data = await fetchWithTimeout<CCTPV2APIGetFastBurnAllowanceResponse>(
     `https://iris-api${isMainnet ? "" : "-sandbox"}.circle.com/v2/fastBurn/USDC/allowance`
   );
-  return httpResponse.data.allowance.toString();
+  return data.allowance.toString();
 }
 
 /**
@@ -261,13 +261,13 @@ export async function getV2MinTransferFees(
   const endpoint = `https://iris-api${
     isMainnet ? "" : "-sandbox"
   }.circle.com/v2/burn/USDC/fees/${sourceDomain}/${destinationDomain}`;
-  const httpResponse = await axios.get<CCTPV2APIGetFeesResponse>(endpoint);
-  const standardFee = httpResponse.data.find((fee) => fee.finalityThreshold === CCTPV2_FINALITY_THRESHOLD_STANDARD);
+  const data = await fetchWithTimeout<CCTPV2APIGetFeesResponse>(endpoint);
+  const standardFee = data.find((fee) => fee.finalityThreshold === CCTPV2_FINALITY_THRESHOLD_STANDARD);
   assert(
     isDefined(standardFee?.minimumFee),
     `CCTPUtils#getTransferFees: Standard fee not found in API response: ${endpoint}`
   );
-  const fastFee = httpResponse.data.find((fee) => fee.finalityThreshold === CCTPV2_FINALITY_THRESHOLD_FAST);
+  const fastFee = data.find((fee) => fee.finalityThreshold === CCTPV2_FINALITY_THRESHOLD_FAST);
   assert(isDefined(fastFee?.minimumFee), `CCTPUtils#getTransferFees: Fast fee not found in API response: ${endpoint}`);
   return {
     standard: BigNumber.from(standardFee.minimumFee),
@@ -288,13 +288,11 @@ export async function fetchAttestationsForTxn(
   transactionHash: string,
   isMainnet: boolean
 ): Promise<CCTPV2APIGetAttestationResponse> {
-  const httpResponse = await axios.get<CCTPV2APIGetAttestationResponse>(
+  return await fetchWithTimeout<CCTPV2APIGetAttestationResponse>(
     `https://iris-api${
       isMainnet ? "" : "-sandbox"
     }.circle.com/v2/messages/${sourceDomainId}?transactionHash=${transactionHash}`
   );
-
-  return httpResponse.data;
 }
 
 /**

package/src/utils/FetchUtils.ts

@@ -0,0 +1,66 @@
+export type FetchHeaders = { [key: string]: unknown };
+export type FetchQueryParams = Record<string, unknown>;
+
+const toStringRecord = (headers: FetchHeaders): Record<string, string> => {
+  const normalizedHeaders: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (value !== undefined && value !== null) {
+      normalizedHeaders[key] = String(value);
+    }
+  }
+  return normalizedHeaders;
+};
+
+const applyQueryParams = (url: string, params: FetchQueryParams): string => {
+  if (Object.keys(params).length === 0) return url;
+
+  const parsedUrl = new URL(url);
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== undefined && value !== null) {
+      parsedUrl.searchParams.append(key, String(value));
+    }
+  }
+
+  return parsedUrl.toString();
+};
+
+export async function fetchWithTimeout<T = unknown>(
+  url: string,
+  params: FetchQueryParams = {},
+  headers: FetchHeaders = {},
+  timeout?: number,
+  responseType: "json" | "text" = "json"
+): Promise<T> {
+  const fullUrl = applyQueryParams(url, params);
+  const response = await fetch(fullUrl, {
+    headers: toStringRecord(headers),
+    ...(timeout && timeout > 0 && { signal: AbortSignal.timeout(timeout) }),
+  });
+
+  // Read body as text first — body can only be consumed once, and we need
+  // the raw text for meaningful error messages if JSON parsing fails.
+  const text = await response.text();
+
+  if (!response.ok) {
+    let errorMessage: string | undefined;
+    try {
+      errorMessage = (JSON.parse(text) as { error?: string })?.error;
+    } catch {
+      // Response body wasn't JSON — fall through to default message.
+    }
+    throw new Error(errorMessage ?? `HTTP ${response.status}: ${response.statusText}`);
+  }
+
+  if (responseType === "text") {
+    return text as T;
+  }
+
+  try {
+    return JSON.parse(text) as T;
+  } catch {
+    const contentType = response.headers.get("content-type") ?? "unknown";
+    throw new Error(
+      `Expected JSON response from ${fullUrl} but received content-type: ${contentType} (body: ${text.slice(0, 256)})`
+    );
+  }
+}

package/src/utils/IPFSUtils.ts

@@ -1,5 +1,5 @@
 import PinataClient from "@pinata/sdk";
-import axios from "axios";
+import { fetchWithTimeout } from "./FetchUtils";
 
 /**
  * Build an IPFS client for interacting with the IPFS API
@@ -18,17 +18,14 @@ export function buildIPFSClient(APIKey: string, secretAPIKey: string): PinataCli
  * @returns The value retrieved from the IPFS gateway
  * @throws Error if the value could not be retrieved
  */
-export async function retrieveValueFromIPFS(contentHash: string, publicGatewayURL: string): Promise<string> {
-  const result = await axios.get(`${publicGatewayURL}/ipfs/${contentHash}`, {
-    // We need to set the Accept header to text/plain to avoid
-    // any anomalies with the response
-    headers: {
-      Accept: "text/plain",
-    },
-    // We want just the raw response, not the parsed response
-    transformResponse: (r) => r,
-  });
-  return result.data;
+export function retrieveValueFromIPFS(contentHash: string, publicGatewayURL: string): Promise<string> {
+  return fetchWithTimeout<string>(
+    `${publicGatewayURL}/ipfs/${contentHash}`,
+    {},
+    { Accept: "text/plain" },
+    undefined,
+    "text"
+  );
 }
 
 /**

package/src/utils/Multicall.ts

@@ -21,7 +21,6 @@ const MULTICALL_DEPLOYER = "0x05f32B3cC3888453ff71B01135B34FF8e41263F2";
 
 const NON_DETERMINISTIC_MULTICALL_ADDRESSES = {
   [CHAIN_IDs.LENS]: "0x6b6dEa4D80e3077D076733A04c48F63c3BA49320",
-  [CHAIN_IDs.TRON]: "0x32a4f47a74a6810bd0bf861cabab99656a75de9e", // @todo: Base58?
   [CHAIN_IDs.ZK_SYNC]: "0xF9cda624FBC7e059355ce98a31693d299FACd963",
   [CHAIN_IDs.LENS_SEPOLIA]: "0x8A44EDE8a6843a997bC0Cc4659e4dB1Da8f91116",
 };

package/src/utils/NetworkUtils.ts

@@ -134,15 +134,6 @@ export function chainIsSvm(chainId: number): boolean {
   return PUBLIC_NETWORKS[chainId]?.family === ChainFamily.SVM;
 }
 
-/**
- * Determines whether a chain ID runs on a TVM-like execution layer (e.g. TRON).
- * @param chainId Chain ID to evaluate.
- * @returns True if chain corresponding to chainId has a TVM-like execution layer.
- */
-export function chainIsTvm(chainId: number): boolean {
-  return PUBLIC_NETWORKS[chainId]?.family === ChainFamily.TVM;
-}
-
 /**
  * Determines whether a chain ID has a native gas token.
  * @param chainId Chain ID to evaluate.
@@ -175,14 +166,13 @@ export function chainIsOFTEnabled(chainId: number): boolean {
   // This is backwards vs. CCTP logic because Across support for OFTs is limited vs. OFT deployments.
   const oftEnabled = [
     CHAIN_IDs.ARBITRUM,
+    CHAIN_IDs.POLYGON,
     CHAIN_IDs.HYPEREVM,
-    CHAIN_IDs.INK,
-    CHAIN_IDs.MEGAETH,
     CHAIN_IDs.MONAD,
     CHAIN_IDs.PLASMA,
-    CHAIN_IDs.POLYGON,
-    CHAIN_IDs.TRON, // tbd!!!
+    CHAIN_IDs.MEGAETH,
     CHAIN_IDs.UNICHAIN,
+    CHAIN_IDs.INK,
   ];
   return oftEnabled.includes(chainId) && PRODUCTION_NETWORKS[chainId]?.oftEid !== OFT_NO_EID;
 }

package/src/utils/TypeGuards.ts

@@ -1,7 +1,6 @@
 import { SVMProvider } from "../arch/svm/types";
 import { EvmProvider } from "../arch/evm/types";
 import { providers } from "ethers";
-import { TronWeb } from "tronweb";
 
 export function isPromiseFulfilled<T>(
   promiseSettledResult: PromiseSettledResult<T>
@@ -19,10 +18,6 @@ export function isDefined<T>(input: T | null | undefined): input is T {
   return input !== null && input !== undefined;
 }
 
-export function isTvmProvider(provider: EvmProvider | SVMProvider | TronWeb): provider is TronWeb {
-  return typeof (provider as TronWeb)?.trx?.getEnergyPrices === "function";
-}
-
-export function isEvmProvider(provider: EvmProvider | SVMProvider | TronWeb): provider is EvmProvider {
+export function isEvmProvider(provider: EvmProvider | SVMProvider): provider is EvmProvider {
   return provider instanceof providers.Provider;
 }

package/src/utils/abi/typechain/factories/index.ts

@@ -254,7 +254,6 @@ export { ProxyAdmin__factory } from "./ProxyAdmin__factory";
 export { ReentrancyGuard__factory } from "./ReentrancyGuard__factory";
 export { ReentrancyGuardUpgradeable__factory } from "./ReentrancyGuardUpgradeable__factory";
 export { Router_Adapter__factory } from "./Router_Adapter__factory";
-export { SP1AutoVerifier__factory } from "./SP1AutoVerifier__factory";
 export { SP1Helios__factory } from "./SP1Helios__factory";
 export { SafeCast__factory } from "./SafeCast__factory";
 export { SafeERC20__factory } from "./SafeERC20__factory";

package/src/utils/abi/typechain/index.ts

@@ -254,7 +254,6 @@ export type { ProxyAdmin } from "./ProxyAdmin";
 export type { ReentrancyGuard } from "./ReentrancyGuard";
 export type { ReentrancyGuardUpgradeable } from "./ReentrancyGuardUpgradeable";
 export type { Router_Adapter } from "./Router_Adapter";
-export type { SP1AutoVerifier } from "./SP1AutoVerifier";
 export type { SP1Helios } from "./SP1Helios";
 export type { SafeCast } from "./SafeCast";
 export type { SafeERC20 } from "./SafeERC20";
@@ -573,7 +572,6 @@ export { ShortStrings__factory } from "./factories/ShortStrings__factory";
 export { SimpleContract__factory } from "./factories/SimpleContract__factory";
 export { SkinnyOptimisticOracleInterface__factory } from "./factories/SkinnyOptimisticOracleInterface__factory";
 export { Solana_Adapter__factory } from "./factories/Solana_Adapter__factory";
-export { SP1AutoVerifier__factory } from "./factories/SP1AutoVerifier__factory";
 export { SP1Helios__factory } from "./factories/SP1Helios__factory";
 export { SpokePool__factory } from "./factories/SpokePool__factory";
 export { SpokePoolEIP7702Test__factory } from "./factories/SpokePoolEIP7702Test__factory";

package/src/utils/index.ts

@@ -29,3 +29,4 @@ export * from "./AddressUtils";
 export * from "./SpokeUtils";
 export * from "./CCTPUtils";
 export * from "./HyperLiquidUtils";
+export * from "./FetchUtils";

package/dist/cjs/src/arch/evm/UpgradeUtils.d.ts

@@ -1,2 +0,0 @@
-import { Contract } from "ethers";
-export declare function get1967Upgrades(contract: Contract, startBlock?: number, endBlock?: number): Promise<number[]>;

package/dist/cjs/src/arch/evm/UpgradeUtils.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.get1967Upgrades = get1967Upgrades;
-var tslib_1 = require("tslib");
-var utils_1 = require("../../utils");
-function get1967Upgrades(contract, startBlock, endBlock) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var from, to, _a, events;
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    from = startBlock !== null && startBlock !== void 0 ? startBlock : 0;
-                    if (!(endBlock !== null && endBlock !== void 0)) return [3, 1];
-                    _a = endBlock;
-                    return [3, 3];
-                case 1: return [4, contract.provider.getBlockNumber()];
-                case 2:
-                    _a = (_b.sent());
-                    _b.label = 3;
-                case 3:
-                    to = _a;
-                    return [4, (0, utils_1.paginatedEventQuery)(contract, contract.filters.Upgraded(), { from: from, to: to })];
-                case 4:
-                    events = _b.sent();
-                    return [2, events.map(function (_a) {
-                            var blockNumber = _a.blockNumber;
-                            return blockNumber;
-                        })];
-            }
-        });
-    });
-}
-//# sourceMappingURL=UpgradeUtils.js.map

package/dist/cjs/src/arch/evm/UpgradeUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"UpgradeUtils.js","sourceRoot":"","sources":["../../../../../src/arch/evm/UpgradeUtils.ts"],"names":[],"mappings":";;AAUA,0CAOC;;AAhBD,qCAAkD;AASlD,SAAsB,eAAe,CAAC,QAAkB,EAAE,UAAmB,EAAE,QAAiB;;;;;;oBACxF,IAAI,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,CAAC,CAAC;0BAClB,QAAQ,aAAR,QAAQ;oBAAR,KAAA,QAAQ,CAAA;;wBAAK,WAAM,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAA;;oBAAzC,KAAA,CAAC,SAAwC,CAAC,CAAA;;;oBAA3D,EAAE,KAAyD;oBAElD,WAAM,IAAA,2BAAmB,EAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,MAAA,EAAE,EAAE,IAAA,EAAE,CAAC,EAAA;;oBAAvF,MAAM,GAAG,SAA8E;oBAE7F,WAAO,MAAM,CAAC,GAAG,CAAC,UAAC,EAAe;gCAAb,WAAW,iBAAA;4BAAO,OAAA,WAAW;wBAAX,CAAW,CAAC,EAAC;;;;CACrD"}

package/dist/cjs/src/arch/tvm/BlockUtils.d.ts

@@ -1 +0,0 @@
-export { averageBlockTime, EVMBlockFinder as TVMBlockFinder } from "../evm/BlockUtils";

package/dist/cjs/src/arch/tvm/BlockUtils.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TVMBlockFinder = exports.averageBlockTime = void 0;
-var BlockUtils_1 = require("../evm/BlockUtils");
-Object.defineProperty(exports, "averageBlockTime", { enumerable: true, get: function () { return BlockUtils_1.averageBlockTime; } });
-Object.defineProperty(exports, "TVMBlockFinder", { enumerable: true, get: function () { return BlockUtils_1.EVMBlockFinder; } });
-//# sourceMappingURL=BlockUtils.js.map