@across-protocol/sdk 4.1.63-beta.3 → 4.1.64-alpha.0

package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts

@@ -39,17 +39,20 @@ export class EVMSpokePoolClient extends SpokePoolClient {
     hubPoolClient: HubPoolClient | null,
     chainId: number,
     deploymentBlock: number,
-    eventSearchConfig: MakeOptional<EventSearchConfig, "to"> = { from: 0, maxLookBack: 0 }
+    eventSearchConfig: MakeOptional<EventSearchConfig, "toBlock"> = { fromBlock: 0, maxBlockLookBack: 0 }
   ) {
     super(logger, hubPoolClient, chainId, deploymentBlock, eventSearchConfig);
   }
 
-  public override relayFillStatus(relayData: RelayData, atHeight?: number): Promise<FillStatus> {
-    return relayFillStatus(this.spokePool, relayData, atHeight, this.chainId);
+  public override relayFillStatus(relayData: RelayData, blockTag?: number | "latest"): Promise<FillStatus> {
+    return relayFillStatus(this.spokePool, relayData, blockTag, this.chainId);
   }
 
-  public override fillStatusArray(relayData: RelayData[], atHeight?: number): Promise<(FillStatus | undefined)[]> {
-    return fillStatusArray(this.spokePool, relayData, atHeight);
+  public override fillStatusArray(
+    relayData: RelayData[],
+    blockTag?: number | "latest"
+  ): Promise<(FillStatus | undefined)[]> {
+    return fillStatusArray(this.spokePool, relayData, blockTag);
   }
 
   public override getMaxFillDeadlineInRange(startBlock: number, endBlock: number): Promise<number> {
@@ -86,7 +89,7 @@ export class EVMSpokePoolClient extends SpokePoolClient {
       // However, certain events have special overriding requirements to their search ranges:
       // - EnabledDepositRoute: The full history is always required, so override the requested fromBlock.
       if (eventName === "EnabledDepositRoute" && !this.isUpdated) {
-        _searchConfig.from = this.deploymentBlock;
+        _searchConfig.fromBlock = this.deploymentBlock;
       }
 
       return {
@@ -107,7 +110,7 @@ export class EVMSpokePoolClient extends SpokePoolClient {
     const [multicallOutput, ...events] = await Promise.all([
       spokePool.callStatic.multicall(
         multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)),
-        { blockTag: searchConfig.to }
+        { blockTag: searchConfig.toBlock }
       ),
       ...eventSearchConfigs.map((config) => paginatedEventQuery(this.spokePool, config.filter, config.searchConfig)),
     ]);
@@ -121,22 +124,17 @@ export class EVMSpokePoolClient extends SpokePoolClient {
       const errMsg = BigNumber.isBigNumber(currentTime)
         ? `currentTime: ${currentTime} < ${toBN(this.currentTime)}`
         : `currentTime is not a BigNumber: ${JSON.stringify(currentTime)}`;
-      throw new Error(`EVMSpokePoolClient::update: ${errMsg}`);
+      throw new Error(`SpokePoolClient::update: ${errMsg}`);
     }
 
     // Sort all events to ensure they are stored in a consistent order.
     events.forEach((events) => sortEventsAscendingInPlace(events.map(logToSortableEvent)));
 
-    // Map events to SortableEvent
-    const eventsWithBlockNumber = events.map((eventList) =>
-      eventList.map((event) => spreadEventWithBlockNumber(event))
-    );
-
     return {
       success: true,
       currentTime: currentTime.toNumber(), // uint32
-      searchEndBlock: searchConfig.to,
-      events: eventsWithBlockNumber,
+      searchEndBlock: searchConfig.toBlock,
+      events,
     };
   }
 
@@ -151,31 +149,31 @@ export class EVMSpokePoolClient extends SpokePoolClient {
     }
 
     // No deposit found; revert to searching for it.
-    const upperBound = this.latestHeightSearched || undefined; // Don't permit block 0 as the high block.
-    const from = await findDepositBlock(this.spokePool, depositId, this.deploymentBlock, upperBound);
+    const upperBound = this.latestBlockSearched || undefined; // Don't permit block 0 as the high block.
+    const fromBlock = await findDepositBlock(this.spokePool, depositId, this.deploymentBlock, upperBound);
     const chain = getNetworkName(this.chainId);
-    if (!from) {
+    if (!fromBlock) {
       const reason =
         `Unable to find ${chain} depositId ${depositId}` +
         ` within blocks [${this.deploymentBlock}, ${upperBound ?? "latest"}].`;
       return { found: false, code: InvalidFill.DepositIdNotFound, reason };
     }
 
-    const to = from;
+    const toBlock = fromBlock;
     const tStart = Date.now();
     // Check both V3FundsDeposited and FundsDeposited events to look for a specified depositId.
-    const { maxLookBack } = this.eventSearchConfig;
+    const { maxBlockLookBack } = this.eventSearchConfig;
     const query = (
       await Promise.all([
         paginatedEventQuery(
           this.spokePool,
           this.spokePool.filters.V3FundsDeposited(null, null, null, null, null, depositId),
-          { from, to, maxLookBack }
+          { fromBlock, toBlock, maxBlockLookBack }
         ),
         paginatedEventQuery(
           this.spokePool,
           this.spokePool.filters.FundsDeposited(null, null, null, null, null, depositId),
-          { from, to, maxLookBack }
+          { fromBlock, toBlock, maxBlockLookBack }
         ),
       ])
     ).flat();
@@ -186,7 +184,7 @@ export class EVMSpokePoolClient extends SpokePoolClient {
       return {
         found: false,
         code: InvalidFill.DepositIdNotFound,
-        reason: `${chain} depositId ${depositId} not found at block ${from}.`,
+        reason: `${chain} depositId ${depositId} not found at block ${fromBlock}.`,
       };
     }
 

package/src/clients/SpokePoolClient/SpokePoolClient.ts

@@ -18,22 +18,25 @@ import {
   toAddress,
   validateFillForDeposit,
   chainIsEvm,
-  chainIsProd,
 } from "../../utils";
-import { duplicateEvent, sortEventsAscendingInPlace } from "../../utils/EventUtils";
+import {
+  duplicateEvent,
+  sortEventsAscendingInPlace,
+  spreadEvent,
+  spreadEventWithBlockNumber,
+} from "../../utils/EventUtils";
 import { ZERO_ADDRESS } from "../../constants";
 import {
   Deposit,
   DepositWithBlock,
-  EnabledDepositRouteWithBlock,
   Fill,
   FillStatus,
   FillWithBlock,
+  Log,
   RelayData,
   RelayerRefundExecutionWithBlock,
   RootBundleRelayWithBlock,
   SlowFillRequestWithBlock,
-  SortableEvent,
   SpeedUpWithBlock,
   TokensBridged,
 } from "../../interfaces";
@@ -45,7 +48,7 @@ import { HubPoolClient } from "../HubPoolClient";
 export type SpokePoolUpdateSuccess = {
   success: true;
   currentTime: number;
-  events: SortableEvent[][];
+  events: Log[][];
   searchEndBlock: number;
 };
 export type SpokePoolUpdateFailure = {
@@ -102,11 +105,11 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
     readonly hubPoolClient: HubPoolClient | null,
     readonly chainId: number,
     public deploymentBlock: number,
-    eventSearchConfig: MakeOptional<EventSearchConfig, "to"> = { from: 0, maxLookBack: 0 }
+    eventSearchConfig: MakeOptional<EventSearchConfig, "toBlock"> = { fromBlock: 0, maxBlockLookBack: 0 }
   ) {
     super(eventSearchConfig);
-    this.firstHeightToSearch = eventSearchConfig.from;
-    this.latestHeightSearched = 0;
+    this.firstBlockToSearch = eventSearchConfig.fromBlock;
+    this.latestBlockSearched = 0;
     this.configStoreClient = hubPoolClient?.configStoreClient;
   }
 
@@ -350,7 +353,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
     fillCount: number;
     invalidFills: FillWithBlock[];
   } {
-    const { outputAmount, originChainId } = deposit;
+    const { outputAmount } = deposit;
     const fillsForDeposit = this.depositHashesToFills[this.getDepositHash(deposit)];
     // If no fills then the full amount is remaining.
     if (fillsForDeposit === undefined || fillsForDeposit.length === 0) {
@@ -370,7 +373,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
           const { chainToSendRefundTo: repaymentChainId } = getRefundInformationFromFill(
             fillRepaymentData,
             this.hubPoolClient!,
-            this.hubPoolClient!.latestHeightSearched
+            this.hubPoolClient!.latestBlockSearched
           );
           // In order to keep this function sync, we can't call verifyFillRepayment so we'll log any fills where
           // the filler-specified repayment chain and repayment address is not a valid repayment upon
@@ -406,10 +409,8 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
       }
       return newInvalidFill;
     });
-    // Log invalid and unrepayable fills as warns if we are on a production network.
-    const logLevel = chainIsProd(originChainId) ? "warn" : "debug";
     if (invalidFillsForDeposit.length > 0) {
-      this.logger[logLevel]({
+      this.logger.warn({
         at: "SpokePoolClient",
         chainId: this.chainId,
         message: "Invalid fills found matching deposit ID",
@@ -420,7 +421,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
     }
     const unrepayableFillsForDeposit = unrepayableFills.filter((x) => x.depositId.eq(deposit.depositId));
     if (unrepayableFillsForDeposit.length > 0) {
-      this.logger[logLevel]({
+      this.logger.warn({
         at: "SpokePoolClient",
         chainId: this.chainId,
         message: "Unrepayable fills found where we need to switch repayment address and or chain",
@@ -485,7 +486,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
    * @see _update
    */
   public async update(eventsToQuery = this._queryableEventNames()): Promise<void> {
-    const duplicateEvents: SortableEvent[] = [];
+    const duplicateEvents: Log[] = [];
     if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
       throw new Error("HubPoolClient not updated");
     }
@@ -497,14 +498,14 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
     const { events: queryResults, currentTime, searchEndBlock } = update;
 
     if (eventsToQuery.includes("TokensBridged")) {
-      for (const event of queryResults[eventsToQuery.indexOf("TokensBridged")] as TokensBridged[]) {
-        this.tokensBridged.push(event);
+      for (const event of queryResults[eventsToQuery.indexOf("TokensBridged")]) {
+        this.tokensBridged.push(spreadEventWithBlockNumber(event) as TokensBridged);
       }
     }
 
     // Performs the indexing of a deposit-like spoke pool event.
     const queryDepositEvents = async (eventName: string) => {
-      const depositEvents = (queryResults[eventsToQuery.indexOf(eventName)] ?? []) as DepositWithBlock[];
+      const depositEvents = queryResults[eventsToQuery.indexOf(eventName)] ?? [];
       if (depositEvents.length > 0) {
         this.log(
           "debug",
@@ -517,20 +518,22 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
 
       // For each deposit, resolve its quoteTimestamp to a block number on the HubPool.
       // Don't bother filtering for uniqueness; the HubPoolClient handles this efficienctly.
-      const quoteBlockNumbers = await this.getBlockNumbers(depositEvents.map((e) => e.quoteTimestamp));
+      const quoteBlockNumbers = await this.getBlockNumbers(
+        depositEvents.map(({ args }) => Number(args["quoteTimestamp"]))
+      );
       for (const event of depositEvents) {
-        const quoteBlockNumber = quoteBlockNumbers[Number(event.quoteTimestamp)];
+        const quoteBlockNumber = quoteBlockNumbers[Number(event.args["quoteTimestamp"])];
 
         // Derive and append the common properties that are not part of the onchain event.
         const deposit = {
-          ...event,
-          messageHash: getMessageHash(event.message),
+          ...spreadEventWithBlockNumber(event),
+          messageHash: getMessageHash(event.args.message),
           quoteBlockNumber,
           originChainId: this.chainId,
           // The following properties are placeholders to be updated immediately.
           fromLiteChain: true,
           toLiteChain: true,
-        };
+        } as DepositWithBlock;
 
         deposit.fromLiteChain = this.isOriginLiteChain(deposit);
         deposit.toLiteChain = this.isDestinationLiteChain(deposit);
@@ -561,10 +564,10 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
 
     // Performs indexing of a "speed up deposit"-like event.
     const querySpeedUpDepositEvents = (eventName: string) => {
-      const speedUpEvents = (queryResults[eventsToQuery.indexOf(eventName)] ?? []) as SpeedUpWithBlock[];
+      const speedUpEvents = queryResults[eventsToQuery.indexOf(eventName)] ?? [];
 
       for (const event of speedUpEvents) {
-        const speedUp = { ...event, originChainId: this.chainId };
+        const speedUp = { ...spreadEventWithBlockNumber(event), originChainId: this.chainId } as SpeedUpWithBlock;
         assign(this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
 
         // Find deposit hash matching this speed up event and update the deposit data associated with the hash,
@@ -589,12 +592,12 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
 
     // Performs indexing of "requested slow fill"-like events.
     const queryRequestedSlowFillEvents = (eventName: string) => {
-      const slowFillRequests = (queryResults[eventsToQuery.indexOf(eventName)] ?? []) as SlowFillRequestWithBlock[];
+      const slowFillRequests = queryResults[eventsToQuery.indexOf(eventName)];
       for (const event of slowFillRequests) {
         const slowFillRequest = {
-          ...event,
+          ...spreadEventWithBlockNumber(event),
           destinationChainId: this.chainId,
-        };
+        } as SlowFillRequestWithBlock;
 
         if (eventName === "RequestedV3SlowFill") {
           slowFillRequest.messageHash = getMessageHash(slowFillRequest.message);
@@ -620,7 +623,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
 
     // Performs indexing of filled relay-like events.
     const queryFilledRelayEvents = (eventName: string) => {
-      const fillEvents = (queryResults[eventsToQuery.indexOf(eventName)] ?? []) as FillWithBlock[];
+      const fillEvents = queryResults[eventsToQuery.indexOf(eventName)] ?? [];
 
       if (fillEvents.length > 0) {
         this.log("debug", `Using ${fillEvents.length} newly queried ${eventName} events for chain ${this.chainId}`, {
@@ -632,13 +635,13 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
       // test that the types are complete. A broader change in strategy for safely unpacking events will be introduced.
       for (const event of fillEvents) {
         const fill = {
-          ...event,
+          ...spreadEventWithBlockNumber(event),
           destinationChainId: this.chainId,
-        };
+        } as FillWithBlock;
 
         if (eventName === "FilledV3Relay") {
-          fill.messageHash = getMessageHash((event as unknown as { message: string }).message);
-          fill.relayExecutionInfo.updatedMessageHash = getMessageHash(event.relayExecutionInfo.updatedMessage!);
+          fill.messageHash = getMessageHash(event.args.message);
+          fill.relayExecutionInfo.updatedMessageHash = getMessageHash(event.args.relayExecutionInfo.updatedMessage);
         }
 
         // Sanity check that this event is not a duplicate.
@@ -661,27 +664,30 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
     });
 
     if (eventsToQuery.includes("EnabledDepositRoute")) {
-      const enableDepositsEvents = (queryResults[eventsToQuery.indexOf("EnabledDepositRoute")] ??
-        []) as EnabledDepositRouteWithBlock[];
+      const enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")];
 
       for (const event of enableDepositsEvents) {
-        assign(this.depositRoutes, [event.originToken, event.destinationChainId], event.enabled);
+        const enableDeposit = spreadEvent(event.args);
+        assign(
+          this.depositRoutes,
+          [enableDeposit.originToken, enableDeposit.destinationChainId],
+          enableDeposit.enabled
+        );
       }
     }
 
     if (eventsToQuery.includes("RelayedRootBundle")) {
-      const relayedRootBundleEvents = (queryResults[eventsToQuery.indexOf("RelayedRootBundle")] ??
-        []) as RootBundleRelayWithBlock[];
+      const relayedRootBundleEvents = queryResults[eventsToQuery.indexOf("RelayedRootBundle")];
       for (const event of relayedRootBundleEvents) {
-        this.rootBundleRelays.push(event);
+        this.rootBundleRelays.push(spreadEventWithBlockNumber(event) as RootBundleRelayWithBlock);
       }
     }
 
     if (eventsToQuery.includes("ExecutedRelayerRefundRoot")) {
-      const refundEvents = (queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")] ??
-        []) as RelayerRefundExecutionWithBlock[];
+      const refundEvents = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")];
       for (const event of refundEvents) {
-        this.relayerRefundExecutions.push(event);
+        const executedRefund = spreadEventWithBlockNumber(event) as RelayerRefundExecutionWithBlock;
+        this.relayerRefundExecutions.push(executedRefund);
       }
     }
 
@@ -694,12 +700,12 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
 
     // Next iteration should start off from where this one ended.
     this.currentTime = currentTime;
-    this.latestHeightSearched = searchEndBlock;
-    this.firstHeightToSearch = searchEndBlock + 1;
-    this.eventSearchConfig.to = undefined; // Caller can re-set on subsequent updates if necessary
+    this.latestBlockSearched = searchEndBlock;
+    this.firstBlockToSearch = searchEndBlock + 1;
+    this.eventSearchConfig.toBlock = undefined; // Caller can re-set on subsequent updates if necessary
     this.isUpdated = true;
     this.log("debug", `SpokePool client for chain ${this.chainId} updated!`, {
-      nextFirstHeightToSearch: this.firstHeightToSearch,
+      nextFirstBlockToSearch: this.firstBlockToSearch,
     });
   }
 
@@ -842,16 +848,19 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
   /**
    * Retrieves the fill status for a given relay data.
    * @param relayData The relay data to retrieve the fill status for.
-   * @param atHeight The height at which to query the fill status.
+   * @param blockTag The block at which to query the fill status.
    * @returns The fill status for the given relay data.
    */
-  public abstract relayFillStatus(relayData: RelayData, atHeight?: number): Promise<FillStatus>;
+  public abstract relayFillStatus(relayData: RelayData, blockTag?: number | "latest"): Promise<FillStatus>;
 
   /**
    * Retrieves the fill status for an array of given relay data.
    * @param relayData The array relay data to retrieve the fill status for.
-   * @param atHeight The height at which to query the fill status.
+   * @param blockTag The block at which to query the fill status.
    * @returns The fill status for each of the given relay data.
    */
-  public abstract fillStatusArray(relayData: RelayData[], atHeight?: number): Promise<(FillStatus | undefined)[]>;
+  public abstract fillStatusArray(
+    relayData: RelayData[],
+    blockTag?: number | "latest"
+  ): Promise<(FillStatus | undefined)[]>;
 }

package/src/clients/SpokePoolClient/index.ts

@@ -1,10 +1,8 @@
 import { EVMSpokePoolClient } from "./EVMSpokePoolClient";
-import { SvmSpokePoolClient } from "./SVMSpokePoolClient";
 import { SpokePoolClient } from "./SpokePoolClient";
 
 export { EVMSpokePoolClient } from "./EVMSpokePoolClient";
 export { SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
-export { SvmSpokePoolClient } from "./SVMSpokePoolClient";
 
 /**
  * Checks if a SpokePoolClient is an EVMSpokePoolClient.
@@ -14,12 +12,3 @@ export { SvmSpokePoolClient } from "./SVMSpokePoolClient";
 export function isEVMSpokePoolClient(spokePoolClient: SpokePoolClient): spokePoolClient is EVMSpokePoolClient {
   return spokePoolClient instanceof EVMSpokePoolClient;
 }
-
-/**
- * Checks if a SpokePoolClient is an SVMSpokePoolClient.
- * @param spokePoolClient The SpokePoolClient to check.
- * @returns True if the SpokePoolClient is an SVMSpokePoolClient, false otherwise.
- */
-export function isSvmSpokePoolClient(spokePoolClient: SpokePoolClient): spokePoolClient is SvmSpokePoolClient {
-  return spokePoolClient instanceof SvmSpokePoolClient;
-}

package/src/clients/index.ts

@@ -6,6 +6,6 @@ export {
 } from "./AcrossConfigStoreClient";
 export { UpdateFailureReason } from "./BaseAbstractClient";
 export { HubPoolClient, LpFeeRequest } from "./HubPoolClient";
-export { SpokePoolClient, SpokePoolUpdate, EVMSpokePoolClient, SvmSpokePoolClient } from "./SpokePoolClient";
+export { SpokePoolClient, SpokePoolUpdate, EVMSpokePoolClient } from "./SpokePoolClient";
 export * as BundleDataClient from "./BundleDataClient";
 export * as mocks from "./mocks";

package/src/clients/mocks/MockConfigStoreClient.ts

@@ -33,7 +33,7 @@ export class MockConfigStoreClient extends AcrossConfigStoreClient {
   constructor(
     logger: winston.Logger,
     configStore: Contract,
-    eventSearchConfig: MakeOptional<EventSearchConfig, "to"> = { from: 0, maxLookBack: 0 },
+    eventSearchConfig: MakeOptional<EventSearchConfig, "toBlock"> = { fromBlock: 0, maxBlockLookBack: 0 },
     configStoreVersion: number,
     chainId = 1,
     mockUpdate = false,
@@ -97,7 +97,7 @@ export class MockConfigStoreClient extends AcrossConfigStoreClient {
     return Promise.resolve({
       success: true,
       chainId: this.chainId as number,
-      searchEndBlock: this.eventSearchConfig.to || latestBlockSearched,
+      searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,
       events: {
         updatedGlobalConfigEvents: events["UpdatedGlobalConfig"].map(spreadEventWithBlockNumber),
         globalConfigUpdateTimes,

package/src/clients/mocks/MockHubPoolClient.ts

@@ -79,7 +79,7 @@ export class MockHubPoolClient extends HubPoolClient {
   }
 
   setLatestBlockNumber(blockNumber: number) {
-    this.latestHeightSearched = blockNumber;
+    this.latestBlockSearched = blockNumber;
   }
 
   addL1Token(l1Token: L1Token) {
@@ -158,7 +158,7 @@ export class MockHubPoolClient extends HubPoolClient {
       latestBlockSearched,
       pendingRootBundleProposal: this.rootBundleProposal,
       events,
-      searchEndBlock: this.eventSearchConfig.to || latestBlockSearched,
+      searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,
     });
   }
 

package/src/clients/mocks/MockSpokePoolClient.ts

@@ -27,7 +27,6 @@ import {
   bnOne,
   toAddress,
   toBytes32,
-  spreadEventWithBlockNumber,
 } from "../../utils";
 import { EVMSpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
@@ -51,7 +50,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     opts: { hubPoolClient: HubPoolClient | null } = { hubPoolClient: null }
   ) {
     super(logger, spokePool, opts.hubPoolClient, chainId, deploymentBlock);
-    this.latestHeightSearched = deploymentBlock;
+    this.latestBlockSearched = deploymentBlock;
     this.eventManager = getEventManager(chainId, this.eventSignatures, deploymentBlock);
   }
 
@@ -68,7 +67,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
   }
 
   setLatestBlockNumber(blockNumber: number): void {
-    this.latestHeightSearched = blockNumber;
+    this.latestBlockSearched = blockNumber;
   }
 
   setDepositIds(_depositIds: BigNumber[]): void {
@@ -107,16 +106,12 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
         }
       });
 
-    const eventsWithBlockNumber = events.map((eventList) =>
-      eventList.map((event) => spreadEventWithBlockNumber(event))
-    );
-
     return Promise.resolve({
       success: true,
       firstDepositId: bnZero,
       currentTime,
-      events: eventsWithBlockNumber,
-      searchEndBlock: this.eventSearchConfig.to || latestBlockSearched,
+      events,
+      searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,
     });
   }
 

package/src/clients/mocks/index.ts

@@ -1,5 +1,3 @@
 export * from "./MockConfigStoreClient";
 export * from "./MockHubPoolClient";
 export * from "./MockSpokePoolClient";
-export * from "./MockSvmCpiEventsClient";
-export * from "./MockSvmSpokePoolClient";

package/src/constants.ts

@@ -54,7 +54,6 @@ export const DEFAULT_CACHING_TTL = 60 * 60 * 24 * 7 * 2; // 2 Weeks
 export const DEFAULT_CACHING_SAFE_LAG = 60 * 60; // 1 hour
 
 export const DEFAULT_SIMULATED_RELAYER_ADDRESS = "0x07aE8551Be970cB1cCa11Dd7a11F47Ae82e70E67";
-export const DEFAULT_SIMULATED_RELAYER_ADDRESS_SVM = "FmMK62wrtWVb5SVoTZftSCGw3nEDA79hDbZNTRnC1R6t";
 export const DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D"; // Görli, ...
 
 export const DEFAULT_ARWEAVE_STORAGE_ADDRESS = "Z6hjBM8FHu90lYWB8o5jR1dfX92FlV2WBaND9xgp8Lg";

package/src/gasPriceOracle/adapters/arbitrum.ts

@@ -1,6 +1,6 @@
 import { providers } from "ethers";
 import { bnOne } from "../../utils";
-import { EvmGasPriceEstimate } from "../types";
+import { GasPriceEstimate } from "../types";
 import * as ethereum from "./ethereum";
 import { GasPriceEstimateOptions } from "../oracle";
 
@@ -16,10 +16,7 @@ import { GasPriceEstimateOptions } from "../oracle";
  * function.
  * @returns GasPriceEstimate
  */
-export async function eip1559(
-  provider: providers.Provider,
-  opts: GasPriceEstimateOptions
-): Promise<EvmGasPriceEstimate> {
+export async function eip1559(provider: providers.Provider, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate> {
   const { maxFeePerGas: _maxFeePerGas, maxPriorityFeePerGas } = await ethereum.eip1559(provider, opts);
 
   // eip1559() sets maxFeePerGas = lastBaseFeePerGas + maxPriorityFeePerGas, so back out priority fee.

package/src/gasPriceOracle/adapters/ethereum.ts

@@ -1,7 +1,7 @@
 import assert from "assert";
 import { providers } from "ethers";
 import { BigNumber, bnZero, fixedPointAdjustment, getNetworkName, parseUnits } from "../../utils";
-import { EvmGasPriceEstimate } from "../types";
+import { GasPriceEstimate } from "../types";
 import { gasPriceError } from "../util";
 import { GasPriceEstimateOptions } from "../oracle";
 
@@ -13,7 +13,7 @@ import { GasPriceEstimateOptions } from "../oracle";
  * @param priorityFeeMultiplier Amount to multiply priority fee or unused for legacy gas pricing.
  * @returns Promise of gas price estimate object.
  */
-export function eip1559(provider: providers.Provider, opts: GasPriceEstimateOptions): Promise<EvmGasPriceEstimate> {
+export function eip1559(provider: providers.Provider, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate> {
   return eip1559Raw(provider, opts.chainId, opts.baseFeeMultiplier, opts.priorityFeeMultiplier);
 }
 
@@ -29,7 +29,7 @@ export async function eip1559Raw(
   chainId: number,
   baseFeeMultiplier: BigNumber,
   priorityFeeMultiplier: BigNumber
-): Promise<EvmGasPriceEstimate> {
+): Promise<GasPriceEstimate> {
   const [{ baseFeePerGas }, _maxPriorityFeePerGas] = await Promise.all([
     provider.getBlock("pending"),
     (provider as providers.JsonRpcProvider).send("eth_maxPriorityFeePerGas", []),
@@ -54,10 +54,7 @@ export async function eip1559Raw(
  * @dev Its recommended to use the eip1559Raw method over this one where possible as it will be more accurate.
  * @returns GasPriceEstimate
  */
-export async function legacy(
-  provider: providers.Provider,
-  opts: GasPriceEstimateOptions
-): Promise<EvmGasPriceEstimate> {
+export async function legacy(provider: providers.Provider, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate> {
   const { chainId, baseFeeMultiplier } = opts;
   const gasPrice = await provider.getGasPrice();
 

package/src/gasPriceOracle/adapters/linea-viem.ts

@@ -1,4 +1,3 @@
-import { PopulatedTransaction } from "ethers";
 import { Address, Hex, PublicClient } from "viem";
 import { estimateGas } from "viem/linea";
 import { DEFAULT_SIMULATED_RELAYER_ADDRESS as account } from "../../constants";
@@ -27,8 +26,7 @@ export async function eip1559(
   provider: PublicClient,
   opts: GasPriceEstimateOptions
 ): Promise<InternalGasPriceEstimate> {
-  const { unsignedTx: _unsignedTx, priorityFeeMultiplier } = opts;
-  const unsignedTx = _unsignedTx as PopulatedTransaction; // Cast the opaque unsignedTx type to an ethers PopulatedTransaction.
+  const { unsignedTx, priorityFeeMultiplier } = opts;
   const { baseFeePerGas, priorityFeePerGas: _priorityFeePerGas } = await estimateGas(provider, {
     account: (unsignedTx?.from as Address) ?? account,
     to: (unsignedTx?.to as Address) ?? account,

package/src/gasPriceOracle/adapters/polygon.ts

@@ -2,7 +2,7 @@ import { providers } from "ethers";
 import { BaseHTTPAdapter, BaseHTTPAdapterArgs } from "../../priceClient/adapters/baseAdapter";
 import { BigNumber, bnZero, fixedPointAdjustment, isDefined, parseUnits } from "../../utils";
 import { CHAIN_IDs } from "../../constants";
-import { EvmGasPriceEstimate } from "../types";
+import { GasPriceEstimate } from "../types";
 import { gasPriceError } from "../util";
 import { eip1559 } from "./ethereum";
 import { GasPriceEstimateOptions } from "../oracle";
@@ -38,7 +38,7 @@ export class PolygonGasStation extends BaseHTTPAdapter {
     this.chainId = chainId;
   }
 
-  async getFeeData(strategy: "safeLow" | "standard" | "fast" = "fast"): Promise<EvmGasPriceEstimate> {
+  async getFeeData(strategy: "safeLow" | "standard" | "fast" = "fast"): Promise<GasPriceEstimate> {
     const gas = await this.query("v2", {});
 
     const gasPrice = (gas as GasStationV2Response)?.[strategy];
@@ -69,7 +69,7 @@ export class PolygonGasStation extends BaseHTTPAdapter {
 }
 
 class MockRevertingPolygonGasStation extends PolygonGasStation {
-  getFeeData(): Promise<EvmGasPriceEstimate> {
+  getFeeData(): Promise<GasPriceEstimate> {
     throw new Error();
   }
 }
@@ -78,7 +78,7 @@ export const MockPolygonGasStationBaseFee = () => parseUnits("12", 9);
 export const MockPolygonGasStationPriorityFee = () => parseUnits("1", 9);
 
 class MockPolygonGasStation extends PolygonGasStation {
-  getFeeData(): Promise<EvmGasPriceEstimate> {
+  getFeeData(): Promise<GasPriceEstimate> {
     return Promise.resolve({
       maxPriorityFeePerGas: MockPolygonGasStationPriorityFee(),
       maxFeePerGas: MockPolygonGasStationBaseFee().add(MockPolygonGasStationPriorityFee()),
@@ -90,12 +90,12 @@ class MockPolygonGasStation extends PolygonGasStation {
  * @notice Returns the gas price suggested by the Polygon GasStation API or reconstructs it using
  * the eip1559() method as a fallback.
  * @param provider Ethers Provider.
- * @returns EvmGasPriceEstimate
+ * @returns GasPriceEstimate
  */
 export async function gasStation(
   provider: providers.Provider,
   opts: GasPriceEstimateOptions
-): Promise<EvmGasPriceEstimate> {
+): Promise<GasPriceEstimate> {
   const { chainId, baseFeeMultiplier, priorityFeeMultiplier } = opts;
   let gasStation: PolygonGasStation;
   if (process.env.TEST_POLYGON_GAS_STATION === "true") {

package/src/gasPriceOracle/index.ts

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