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

package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts

@@ -72,34 +72,6 @@ export class EVMSpokePoolClient extends SpokePoolClient {
     return Object.keys(this._availableEventsOnSpoke(knownEventNames));
   }
 
-  /**
-   * Retrieve the on-chain time at a specific block.
-   * EVM reads SpokePool.getCurrentTime() via multicall with a historical blockTag.
-   * @param blockNumber The block number to query.
-   * @returns The on-chain time as a number.
-   */
-  protected async _getCurrentTime(blockNumber: number): Promise<number> {
-    const { spokePool } = this;
-    const multicallFunctions = ["getCurrentTime"];
-    const multicallOutput = await spokePool.callStatic.multicall(
-      multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)),
-      { blockTag: blockNumber }
-    );
-
-    const [currentTime] = multicallFunctions.map(
-      (fn, idx) => spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]
-    );
-
-    if (!BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
-      const errMsg = BigNumber.isBigNumber(currentTime)
-        ? `currentTime: ${currentTime} < ${toBN(this.currentTime)}`
-        : `currentTime is not a BigNumber: ${JSON.stringify(currentTime)}`;
-      throw new Error(`EVMSpokePoolClient::update: ${errMsg}`);
-    }
-
-    return currentTime.toNumber();
-  }
-
   protected override async _update(eventsToQuery: string[]): Promise<SpokePoolUpdate> {
     const searchConfig = await this.updateSearchConfig(this.spokePool.provider);
     if (isUpdateFailureReason(searchConfig)) {
@@ -135,14 +107,25 @@ export class EVMSpokePoolClient extends SpokePoolClient {
     });
 
     const timerStart = Date.now();
-    const [currentTime, ...events] = await Promise.all([
-      this._getCurrentTime(searchConfig.to),
+    const multicallFunctions = ["getCurrentTime"];
+    const [multicallOutput, ...events] = await Promise.all([
+      spokePool.callStatic.multicall(
+        multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)),
+        { blockTag: searchConfig.to }
+      ),
       ...eventSearchConfigs.map((config) => paginatedEventQuery(this.spokePool, config.filter, config.searchConfig)),
     ]);
     this.log("debug", `Time to query new events from RPC for ${this.chainId}: ${Date.now() - timerStart} ms`);
 
-    if (currentTime < this.currentTime) {
-      throw new Error(`EVMSpokePoolClient::update: currentTime: ${currentTime} < ${this.currentTime}`);
+    const [currentTime] = multicallFunctions.map(
+      (fn, idx) => spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]
+    );
+
+    if (!BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
+      const errMsg = BigNumber.isBigNumber(currentTime)
+        ? `currentTime: ${currentTime} < ${toBN(this.currentTime)}`
+        : `currentTime is not a BigNumber: ${JSON.stringify(currentTime)}`;
+      throw new Error(`EVMSpokePoolClient::update: ${errMsg}`);
     }
 
     // Sort all events to ensure they are stored in a consistent order.
@@ -155,7 +138,7 @@ export class EVMSpokePoolClient extends SpokePoolClient {
 
     return {
       success: true,
-      currentTime,
+      currentTime: currentTime.toNumber(), // uint32
       searchEndBlock: searchConfig.to,
       events: eventsWithBlockNumber,
     };
@@ -207,21 +190,12 @@ export class EVMSpokePoolClient extends SpokePoolClient {
     return _getTimestampForBlock(this.spokePool.provider, blockNumber);
   }
 
-  /**
-   * Find the block at which a deposit was created.
-   * EVM uses a binary-search over historical numberOfDeposits().
-   * TVM overrides this with an event-based lookup.
-   */
-  protected _findDepositBlock(depositId: BigNumber, lowBlock: number, highBlock?: number): Promise<number | undefined> {
-    return findDepositBlock(this.spokePool, depositId, lowBlock, highBlock);
-  }
-
-  protected async queryDepositEvents(
+  private async queryDepositEvents(
     depositId: BigNumber
   ): Promise<{ event: Log; elapsedMs: number } | { reason: string }> {
     const tStart = Date.now();
     const upperBound = this.latestHeightSearched || undefined;
-    const from = await this._findDepositBlock(depositId, this.deploymentBlock, upperBound);
+    const from = await findDepositBlock(this.spokePool, depositId, this.deploymentBlock, upperBound);
     const chain = getNetworkName(this.chainId);
 
     if (!from) {

package/src/clients/SpokePoolClient/index.ts

@@ -1,13 +1,11 @@
 import { EVMSpokePoolClient } from "./EVMSpokePoolClient";
 import { SVMSpokePoolClient } from "./SVMSpokePoolClient";
-import { TVMSpokePoolClient } from "./TVMSpokePoolClient";
 import { SpokePoolClient } from "./SpokePoolClient";
-import { EVM_SPOKE_POOL_CLIENT_TYPE, SVM_SPOKE_POOL_CLIENT_TYPE, TVM_SPOKE_POOL_CLIENT_TYPE } from "./types";
+import { EVM_SPOKE_POOL_CLIENT_TYPE, SVM_SPOKE_POOL_CLIENT_TYPE } from "./types";
 
 export { EVMSpokePoolClient } from "./EVMSpokePoolClient";
 export { SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
 export { SVMSpokePoolClient } from "./SVMSpokePoolClient";
-export { TVMSpokePoolClient } from "./TVMSpokePoolClient";
 export { SpokePoolManager } from "./SpokePoolClientManager";
 
 /**
@@ -29,12 +27,3 @@ export function isSVMSpokePoolClient(spokePoolClient: SpokePoolClient): spokePoo
   // @TODO: Should we handle the case where spokePoolClient is undefined?
   return spokePoolClient?.type === SVM_SPOKE_POOL_CLIENT_TYPE;
 }
-
-/**
- * Checks if a SpokePoolClient is a TVMSpokePoolClient.
- * @param spokePoolClient The SpokePoolClient to check.
- * @returns True if the SpokePoolClient is a TVMSpokePoolClient, false otherwise.
- */
-export function isTVMSpokePoolClient(spokePoolClient: SpokePoolClient): spokePoolClient is TVMSpokePoolClient {
-  return spokePoolClient?.type === TVM_SPOKE_POOL_CLIENT_TYPE;
-}

package/src/clients/SpokePoolClient/types.ts

@@ -1,3 +1,2 @@
 export const EVM_SPOKE_POOL_CLIENT_TYPE = "EVM";
 export const SVM_SPOKE_POOL_CLIENT_TYPE = "SVM";
-export const TVM_SPOKE_POOL_CLIENT_TYPE = "TVM";

package/src/clients/index.ts

@@ -11,10 +11,8 @@ export {
   SpokePoolUpdate,
   EVMSpokePoolClient,
   SVMSpokePoolClient,
-  TVMSpokePoolClient,
   isEVMSpokePoolClient,
   isSVMSpokePoolClient,
-  isTVMSpokePoolClient,
   SpokePoolManager,
 } from "./SpokePoolClient";
 export * as BundleDataClient from "./BundleDataClient";

package/src/clients/mocks/MockSvmCpiEventsClient.ts

@@ -5,7 +5,7 @@ import { hexlify, arrayify, hexZeroPad } from "ethers/lib/utils";
 import { random } from "lodash";
 import { Address, UnixTimestamp, signature } from "@solana/kit";
 import { Idl } from "@coral-xyz/anchor";
-import { SvmSpokeClient } from "@across-protocol/contracts";
+import { SvmSpokeClient } from "../../svm";
 import { CHAIN_IDs } from "@across-protocol/constants";
 
 import { MockSolanaRpcFactory } from "../../providers/mocks";

package/src/clients/mocks/MockSvmSpokePoolClient.ts

@@ -1,5 +1,5 @@
 import winston from "winston";
-import { SvmSpokeClient } from "@across-protocol/contracts";
+import { SvmSpokeClient } from "../../svm";
 import { Address } from "@solana/kit";
 import { DepositWithBlock, RelayerRefundExecution, SortableEvent, SlowFillLeaf, Log } from "../../interfaces";
 import {

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/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/svm/assets/idl/index.ts

@@ -0,0 +1,21 @@
+// This file has been autogenerated. Do not edit manually.
+// Generated by scripts/svm/generateSvmAssets.sh
+
+const MessageTransmitterIdl = require("./message_transmitter.json");
+const MessageTransmitterV2Idl = require("./message_transmitter_v2.json");
+const MulticallHandlerIdl = require("./multicall_handler.json");
+const SponsoredCctpSrcPeripheryIdl = require("./sponsored_cctp_src_periphery.json");
+const SvmSpokeIdl = require("./svm_spoke.json");
+const TestIdl = require("./test.json");
+const TokenMessengerMinterIdl = require("./token_messenger_minter.json");
+const TokenMessengerMinterV2Idl = require("./token_messenger_minter_v2.json");
+export {
+  MessageTransmitterIdl,
+  MessageTransmitterV2Idl,
+  MulticallHandlerIdl,
+  SponsoredCctpSrcPeripheryIdl,
+  SvmSpokeIdl,
+  TestIdl,
+  TokenMessengerMinterIdl,
+  TokenMessengerMinterV2Idl
+};