@across-protocol/sdk 4.1.10-beta.0 → 4.1.10

package/src/clients/HubPoolClient.ts

@@ -776,15 +776,19 @@ export class HubPoolClient extends BaseAbstractClient {
     return endBlock > 0 ? endBlock + 1 : 0;
   }
 
-  getLatestExecutedRootBundleContainingL1Token(block: number, chain: number, l1Token: string): ExecutedRootBundle {
+  getLatestExecutedRootBundleContainingL1Token(
+    block: number,
+    chain: number,
+    l1Token: string
+  ): ExecutedRootBundle | undefined {
     // Search ExecutedRootBundles in descending block order to find the most recent event before the target block.
     return sortEventsDescending(this.executedRootBundles).find((executedLeaf: ExecutedRootBundle) => {
       return (
         executedLeaf.blockNumber <= block &&
         executedLeaf.chainId === chain &&
-        executedLeaf.l1Tokens.map((l1Token) => l1Token.toLowerCase()).includes(l1Token.toLowerCase())
+        executedLeaf.l1Tokens.some((token) => token.toLowerCase() === l1Token.toLowerCase())
       );
-    }) as ExecutedRootBundle;
+    });
   }
 
   getRunningBalanceBeforeBlockForChain(block: number, chain: number, l1Token: string): TokenRunningBalance {
@@ -793,18 +797,19 @@ export class HubPoolClient extends BaseAbstractClient {
     return this.getRunningBalanceForToken(l1Token, executedRootBundle);
   }
 
-  public getRunningBalanceForToken(l1Token: string, executedRootBundle: ExecutedRootBundle): TokenRunningBalance {
+  public getRunningBalanceForToken(
+    l1Token: string,
+    executedRootBundle: ExecutedRootBundle | undefined
+  ): TokenRunningBalance {
     let runningBalance = toBN(0);
-    let incentiveBalance = toBN(0);
     if (executedRootBundle) {
       const indexOfL1Token = executedRootBundle.l1Tokens
         .map((l1Token) => l1Token.toLowerCase())
         .indexOf(l1Token.toLowerCase());
       runningBalance = executedRootBundle.runningBalances[indexOfL1Token];
-      incentiveBalance = executedRootBundle.incentiveBalances[indexOfL1Token];
     }
 
-    return { runningBalance, incentiveBalance };
+    return { runningBalance };
   }
 
   async _update(eventNames: HubPoolEvent[]): Promise<HubPoolUpdate> {
@@ -1009,8 +1014,6 @@ export class HubPoolClient extends BaseAbstractClient {
           );
         }
         executedRootBundle.runningBalances = runningBalances.slice(0, nTokens);
-        executedRootBundle.incentiveBalances =
-          runningBalances.length > nTokens ? runningBalances.slice(nTokens) : runningBalances.map(() => toBN(0));
         this.executedRootBundles.push(executedRootBundle);
       }
     }

package/src/clients/SpokePoolClient.ts

@@ -1,9 +1,11 @@
+import assert from "assert";
 import { Contract, EventFilter } from "ethers";
 import winston from "winston";
 import {
   AnyObject,
   BigNumber,
   bnZero,
+  bnUint32Max,
   DefaultLogLevels,
   EventSearchConfig,
   MAX_BIG_INT,
@@ -54,7 +56,6 @@ import { getRepaymentChainId, forceDestinationRepayment } from "./BundleDataClie
 type SpokePoolUpdateSuccess = {
   success: true;
   currentTime: number;
-  oldestTime: number;
   firstDepositId: BigNumber;
   latestDepositId: BigNumber;
   events: Log[][];
@@ -72,7 +73,6 @@ export type SpokePoolUpdate = SpokePoolUpdateSuccess | SpokePoolUpdateFailure;
  */
 export class SpokePoolClient extends BaseAbstractClient {
   protected currentTime = 0;
-  protected oldestTime = 0;
   protected depositHashes: { [depositHash: string]: DepositWithBlock } = {};
   protected duplicateDepositHashes: { [depositHash: string]: DepositWithBlock[] } = {};
   protected depositHashesToFills: { [depositHash: string]: FillWithBlock[] } = {};
@@ -543,12 +543,11 @@ export class SpokePoolClient extends BaseAbstractClient {
 
     const timerStart = Date.now();
     const multicallFunctions = ["getCurrentTime", "numberOfDeposits"];
-    const [multicallOutput, oldestTime, ...events] = await Promise.all([
+    const [multicallOutput, ...events] = await Promise.all([
       spokePool.callStatic.multicall(
         multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)),
         { blockTag: searchConfig.toBlock }
       ),
-      this.spokePool.getCurrentTime({ blockTag: Math.max(searchConfig.fromBlock, this.deploymentBlock) }),
       ...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`);
@@ -571,7 +570,6 @@ export class SpokePoolClient extends BaseAbstractClient {
     return {
       success: true,
       currentTime: currentTime.toNumber(), // uint32
-      oldestTime: oldestTime.toNumber(),
       firstDepositId,
       latestDepositId: _latestDepositId.gt(bnZero) ? _latestDepositId : bnZero,
       searchEndBlock: searchConfig.toBlock,
@@ -597,7 +595,7 @@ export class SpokePoolClient extends BaseAbstractClient {
     if (!update.success) {
       return;
     }
-    const { events: queryResults, currentTime, oldestTime, searchEndBlock } = update;
+    const { events: queryResults, currentTime, searchEndBlock } = update;
 
     if (eventsToQuery.includes("TokensBridged")) {
       // Temporarily query old spoke pool events as well to ease migration:
@@ -660,11 +658,7 @@ export class SpokePoolClient extends BaseAbstractClient {
         if (this.depositHashes[getRelayEventKey(deposit)] !== undefined) {
           // Sanity check that this event is not a duplicate, even though the relay data hash is a duplicate.
           const allDeposits = this._getDuplicateDeposits(deposit).concat(this.depositHashes[getRelayEventKey(deposit)]);
-          if (
-            allDeposits.some((e) => {
-              return duplicateEvent(deposit, e);
-            })
-          ) {
+          if (allDeposits.some((e) => duplicateEvent(deposit, e))) {
             duplicateEvents.push(event);
             continue;
           }
@@ -830,7 +824,6 @@ export class SpokePoolClient extends BaseAbstractClient {
 
     // Next iteration should start off from where this one ended.
     this.currentTime = currentTime;
-    if (this.oldestTime === 0) this.oldestTime = oldestTime; // Set oldest time only after the first update.
     this.firstDepositIdForSpokePool = update.firstDepositId;
     this.latestBlockSearched = searchEndBlock;
     this.lastDepositIdForSpokePool = update.latestDepositId;
@@ -920,11 +913,13 @@ export class SpokePoolClient extends BaseAbstractClient {
   }
 
   /**
-   * Retrieves the oldest time searched on the SpokePool contract.
-   * @returns The oldest time searched, which will be 0 if there has been no update() yet.
+   * Retrieves the time from the SpokePool contract at a particular block.
+   * @returns The time at the specified block tag.
    */
-  public getOldestTime(): number {
-    return this.oldestTime;
+  public async getTimeAt(blockNumber: number): Promise<number> {
+    const currentTime = await this.spokePool.getCurrentTime({ blockTag: blockNumber });
+    assert(BigNumber.isBigNumber(currentTime) && currentTime.lt(bnUint32Max));
+    return currentTime.toNumber();
   }
 
   async findDeposit(depositId: BigNumber, destinationChainId: number): Promise<DepositWithBlock> {

package/src/interfaces/HubPool.ts

@@ -54,7 +54,6 @@ export interface ExecutedRootBundle extends SortableEvent {
   bundleLpFees: BigNumber[];
   netSendAmounts: BigNumber[];
   runningBalances: BigNumber[];
-  incentiveBalances: BigNumber[];
   leafId: number;
   l1Tokens: string[];
   proof: string[];
@@ -62,17 +61,15 @@ export interface ExecutedRootBundle extends SortableEvent {
 
 export type ExecutedRootBundleStringified = Omit<
   ExecutedRootBundle,
-  "bundleLpFees" | "netSendAmounts" | "runningBalances" | "incentiveBalances"
+  "bundleLpFees" | "netSendAmounts" | "runningBalances"
 > & {
   bundleLpFees: string[];
   netSendAmounts: string[];
   runningBalances: string[];
-  incentiveBalances: string[];
 };
 
 export type TokenRunningBalance = {
   runningBalance: BigNumber;
-  incentiveBalance: BigNumber;
 };
 
 export interface RelayerRefundLeafWithGroup extends RelayerRefundLeaf {

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

@@ -13,10 +13,10 @@ import {
   BigNumber,
   toBNWei,
   bnZero,
-  assert,
   chainIsOPStack,
   fixedPointAdjustment,
 } from "../../utils";
+import assert from "assert";
 import { Logger, QueryInterface } from "../relayFeeCalculator";
 import { Transport } from "viem";
 import { getGasPriceEstimate } from "../../gasPriceOracle/oracle";

package/src/utils/CachingUtils.ts

@@ -1,6 +1,6 @@
 import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL } from "../constants";
 import { CachingMechanismInterface, Deposit, Fill, SlowFillRequest } from "../interfaces";
-import { assert } from "./LogUtils";
+import assert from "assert";
 import { composeRevivers, objectWithBigNumberReviver } from "./ReviverUtils";
 import { getRelayEventKey } from "./SpokeUtils";
 import { getCurrentTime } from "./TimeUtils";

package/src/utils/LogUtils.ts

@@ -24,15 +24,3 @@ export function formattedLog(
     });
   }
 }
-
-/**
- * Asserts the truth of a condition. If the condition is false, an error is thrown with the provided message.
- * @param condition The condition to assert.
- * @param message The message to throw if the condition is false.
- * @throws Error if the condition is false.
- */
-export function assert(condition: boolean, message: string): void {
-  if (!condition) {
-    throw new Error(message);
-  }
-}