feat: Add oldest time searched to SpokePoolClient

src/clients/SpokePoolClient.ts

@@ -55,6 +55,8 @@ type Block = providers.Block;
 type _SpokePoolUpdate = {
   success: boolean;
   currentTime: number;
+  oldestTime: number;
+  fillDeadlineBuffer: number;
   firstDepositId: number;
   latestDepositId: number;
   events: Event[][];
@@ -70,6 +72,8 @@ export type SpokePoolUpdate = { success: false } | _SpokePoolUpdate;
  */
 export class SpokePoolClient extends BaseAbstractClient {
   protected currentTime = 0;
+  protected oldestTime = 0;
+  protected fillDeadlineBuffer = Number.MAX_SAFE_INTEGER;
   protected depositHashes: { [depositHash: string]: DepositWithBlock } = {};
   protected depositHashesToFills: { [depositHash: string]: FillWithBlock[] } = {};
   protected speedUps: { [depositorAddress: string]: { [depositId: number]: SpeedUp[] } } = {};
@@ -573,9 +577,13 @@ export class SpokePoolClient extends BaseAbstractClient {
     });
 
     const timerStart = Date.now();
-    const [numberOfDeposits, currentTime, ...events] = await Promise.all([
+    // TODO: Once the SpokePools are updated and have the `fillDeadlineBuffer()` method, load it dynamically here.
+    const fillDeadlineBuffer = 2 * 60 * 60; // 2 hours. We're assuming this is hardcoded to the same value that the
+    // V3 spoke pools will be instantiated with.
+    const [numberOfDeposits, currentTime, oldestTime, ...events] = await Promise.all([
       this.spokePool.numberOfDeposits({ blockTag: searchConfig.toBlock }),
       this.spokePool.getCurrentTime({ 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`);
@@ -619,6 +627,8 @@ export class SpokePoolClient extends BaseAbstractClient {
     return {
       success: true,
       currentTime: currentTime.toNumber(), // uint32
+      oldestTime: oldestTime.toNumber(),
+      fillDeadlineBuffer,
       firstDepositId,
       latestDepositId: Math.max(numberOfDeposits - 1, 0),
       searchEndBlock: searchConfig.toBlock,
@@ -651,7 +661,7 @@ export class SpokePoolClient extends BaseAbstractClient {
       // understand why we see this in test. @todo: Resolve.
       return;
     }
-    const { events: queryResults, blocks, currentTime, searchEndBlock } = update;
+    const { events: queryResults, blocks, currentTime, oldestTime, searchEndBlock, fillDeadlineBuffer } = update;
 
     if (eventsToQuery.includes("TokensBridged")) {
       for (const event of queryResults[eventsToQuery.indexOf("TokensBridged")]) {
@@ -828,6 +838,8 @@ 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.fillDeadlineBuffer = fillDeadlineBuffer;
     this.firstDepositIdForSpokePool = update.firstDepositId;
     this.latestBlockSearched = searchEndBlock;
     this.lastDepositIdForSpokePool = update.latestDepositId;
@@ -930,12 +942,29 @@ export class SpokePoolClient extends BaseAbstractClient {
 
   /**
    * Retrieves the current time from the SpokePool contract.
-   * @returns The current time.
+   * @returns The current time, which will be 0 if there has been no update() yet.
    */
   public getCurrentTime(): number {
     return this.currentTime;
   }
 
+  /**
+   * 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.
+   */
+  public getOldestTime(): number {
+    return this.oldestTime;
+  }
+
+  /**
+   * Returns the latest fill deadline buffer for this SpokePool.
+   * @returns The latest fill deadline buffer for this SpokePool contract, which will be the max integer value
+   * if there has been no update() yet.
+   */
+  public getFillDeadlineBuffer(): number {
+    return this.fillDeadlineBuffer;
+  }
+
   /**
    * Finds a deposit for a given deposit ID, destination chain ID and depositor address. This method will search for
    * the deposit in the SpokePool contract and return it if found. If the deposit is not found, this method will

src/clients/mocks/MockSpokePoolClient.ts

@@ -119,6 +119,8 @@ export class MockSpokePoolClient extends SpokePoolClient {
       firstDepositId: 0,
       latestDepositId,
       currentTime,
+      oldestTime: 0,
+      fillDeadlineBuffer: 0,
       events,
       blocks,
       searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,

test/SpokePoolClient.fills.ts

@@ -174,7 +174,7 @@ describe("SpokePoolClient: Fills", function () {
     await hre.network.provider.send("evm_mine");
 
     // Now search for the fill _after_ it was filled and expect an exception.
-   const srcChain = getNetworkName(deposit.originChainId);
+    const srcChain = getNetworkName(deposit.originChainId);
     await assertPromiseError(
       findFillBlock(spokePool, deposit as RelayData, lateBlockNumber),
       `${srcChain} deposit ${deposit.depositId} filled on `