improve(indexer): add block timestamp to depositevent data (#129)

Signed-off-by: david <[email protected]>

packages/indexer-database/src/entities/evm/V3FundsDeposited.ts

@@ -89,4 +89,7 @@ export class V3FundsDeposited {
 
   @CreateDateColumn()
   createdAt: Date;
+
+  @Column({ nullable: true })
+  blockTimestamp?: number;
 }

packages/indexer-database/src/migrations/1733407862578-V3FundsDeposited.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class V3FundsDeposited1733407862578 implements MigrationInterface {
+  name = "V3FundsDeposited1733407862578";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "evm"."v3_funds_deposited" ADD "blockTimestamp" integer`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "evm"."v3_funds_deposited" DROP COLUMN "blockTimestamp"`,
+    );
+  }
+}

packages/indexer/src/data-indexing/service/SpokePoolIndexerDataHandler.ts

@@ -33,6 +33,7 @@ export type FetchEventsResult = {
   relayedRootBundleEvents: across.interfaces.RootBundleRelayWithBlock[];
   executedRelayerRefundRootEvents: across.interfaces.RelayerRefundExecutionWithBlock[];
   tokensBridgedEvents: across.interfaces.TokensBridged[];
+  blockTimes: Record<number, number>;
 };
 
 export type StoreEventsResult = {
@@ -114,6 +115,26 @@ export class SpokePoolIndexerDataHandler implements IndexerDataHandler {
     await this.updateNewDepositsWithIntegratorId(newInsertedDeposits);
     await this.spokePoolProcessor.process(storedEvents);
   }
+  private async getBlockTime(blockNumber: number): Promise<number> {
+    const block = await this.provider.getBlock(blockNumber);
+    if (!block) {
+      throw new Error(`Block with number ${blockNumber} not found`);
+    }
+    return block.timestamp;
+  }
+
+  private async getBlockTimes(
+    blockNumbers: number[],
+  ): Promise<Record<number, number>> {
+    const blockTimes: Record<number, number> = {};
+    for (const blockNumber of blockNumbers) {
+      // ensure we dont query more than we need to
+      if (blockTimes[blockNumber] === undefined) {
+        blockTimes[blockNumber] = await this.getBlockTime(blockNumber);
+      }
+    }
+    return blockTimes;
+  }
 
   private async fetchEventsByRange(
     blockRange: BlockRange,
@@ -147,6 +168,13 @@ export class SpokePoolIndexerDataHandler implements IndexerDataHandler {
     const executedRelayerRefundRootEvents =
       spokePoolClient.getRelayerRefundExecutions();
     const tokensBridgedEvents = spokePoolClient.getTokensBridged();
+    // It may be the case we add more events in the future, but right now we just
+    // care about deposit event block ranges, we can have dupe block numbers here,
+    // but getBlockTimes will make sure we dont query more than we need to.
+    const v3FundsDepositedBlockNumbers = v3FundsDepositedEvents.map(
+      (deposit) => deposit.blockNumber,
+    );
+    const blockTimes = await this.getBlockTimes(v3FundsDepositedBlockNumbers);
 
     return {
       v3FundsDepositedEvents,
@@ -156,6 +184,7 @@ export class SpokePoolIndexerDataHandler implements IndexerDataHandler {
       relayedRootBundleEvents,
       executedRelayerRefundRootEvents,
       tokensBridgedEvents,
+      blockTimes,
     };
   }
 
@@ -172,11 +201,13 @@ export class SpokePoolIndexerDataHandler implements IndexerDataHandler {
       relayedRootBundleEvents,
       executedRelayerRefundRootEvents,
       tokensBridgedEvents,
+      blockTimes,
     } = params;
     const savedV3FundsDepositedEvents =
       await spokePoolClientRepository.formatAndSaveV3FundsDepositedEvents(
         v3FundsDepositedEvents,
         lastFinalisedBlock,
+        blockTimes,
       );
     const savedV3RequestedSlowFills =
       await spokePoolClientRepository.formatAndSaveRequestedV3SlowFillEvents(

packages/indexer/src/database/SpokePoolRepository.ts

@@ -38,6 +38,7 @@ export class SpokePoolRepository extends dbUtils.BlockchainEventRepository {
   public async formatAndSaveV3FundsDepositedEvents(
     v3FundsDepositedEvents: utils.V3FundsDepositedWithIntegradorId[],
     lastFinalisedBlock: number,
+    blockTimes: Record<number, number>,
   ) {
     const formattedEvents = v3FundsDepositedEvents.map((event) => {
       // delete fields that are not needed for the database table
@@ -52,6 +53,7 @@ export class SpokePoolRepository extends dbUtils.BlockchainEventRepository {
         ...this.formatRelayData(event),
         quoteTimestamp: new Date(event.quoteTimestamp * 1000),
         finalised: event.blockNumber <= lastFinalisedBlock,
+        blockTimestamp: blockTimes[event.blockNumber],
       };
     });
     const chunkedEvents = across.utils.chunk(formattedEvents, this.chunkSize);
@@ -65,7 +67,23 @@ export class SpokePoolRepository extends dbUtils.BlockchainEventRepository {
         ),
       ),
     );
-    return savedEvents.flat();
+    const result = savedEvents.flat();
+
+    // Log the time difference for each deposit event for profiling in datadog
+    const now = Date.now();
+    formattedEvents.forEach((event) => {
+      if (event.blockTimestamp === undefined) return;
+      const timeDifference = now - event.blockTimestamp * 1000;
+      this.logger.info({
+        message: "V3FundsDepositedEvent profile",
+        depositId: event.depositId,
+        chainId: event.originChainId,
+        timeDifference,
+        now,
+        blockTimestamp: event.blockTimestamp,
+      });
+    });
+    return result;
   }
 
   public async formatAndSaveFilledV3RelayEvents(