improve(spokePoolProcessor): improved logic for setting refunded stat…

…us (#109)
across-protocol · Nov 21, 2024 · c5bab8b · c5bab8b
1 parent 37439d4
commit c5bab8b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 38 deletions.
diff --git a/packages/indexer/src/services/BundleIncludedEventsService.ts b/packages/indexer/src/services/BundleIncludedEventsService.ts
@@ -1,13 +1,9 @@
-import { CHAIN_IDs } from "@across-protocol/constants";
 import * as across from "@across-protocol/sdk";
 import Redis from "ioredis";
 import winston from "winston";
 import { DataSource, entities } from "@repo/indexer-database";
 import { BaseIndexer } from "../generics";
-import {
-  BlockRangeInsertType,
-  BundleRepository,
-} from "../database/BundleRepository";
+import { BundleRepository } from "../database/BundleRepository";
 import * as utils from "../utils";
 import { getBlockTime } from "../web3/constants";
 import {

diff --git a/packages/indexer/src/services/spokePoolProcessor.ts b/packages/indexer/src/services/spokePoolProcessor.ts
@@ -71,7 +71,9 @@ export class SpokePoolProcessor {
     // here...
 
     await this.updateExpiredRelays();
-    await this.updateRefundedDepositsStatus();
+    const refundedDeposits = await this.updateRefundedDepositsStatus();
+    // TODO: for refunded deposits, notify status change to refunded
+    // here...
   }
 
   /**
@@ -166,45 +168,37 @@ export class SpokePoolProcessor {
    * Calls the database to find expired relays and looks for related
    * refunds in the bundle events table.
    * When a matching refund is found, updates the relay status to refunded
-   * @returns A void promise
+   * @returns An array with the updated relays
    */
-  private async updateRefundedDepositsStatus(): Promise<void> {
+  private async updateRefundedDepositsStatus(): Promise<
+    entities.RelayHashInfo[]
+  > {
     this.logger.info({
       at: "SpokePoolProcessor#updateRefundedDepositsStatus",
       message: `Updating status for refunded deposits`,
     });
-    const relayHashInfoRepository = this.postgres.getRepository(
-      entities.RelayHashInfo,
-    );
     const bundleEventsRepository = this.postgres.getRepository(
       entities.BundleEvent,
     );
-
-    const expiredDeposits = await relayHashInfoRepository
-      .createQueryBuilder("rhi")
-      .select("rhi.relayHash")
-      .where("rhi.status = :expired", { expired: entities.RelayStatus.Expired })
+    const refundEvents = await bundleEventsRepository
+      .createQueryBuilder("be")
+      .innerJoinAndSelect("be.bundle", "bundle")
+      .innerJoin(entities.RelayHashInfo, "rhi", "be.relayHash = rhi.relayHash")
+      .where("be.type = :expiredDeposit", {
+        expiredDeposit: entities.BundleEventType.ExpiredDeposit,
+      })
+      .andWhere("rhi.status = :expired", {
+        expired: entities.RelayStatus.Expired,
+      })
       .andWhere("rhi.originChainId = :chainId", { chainId: this.chainId })
+      .orderBy("be.bundleId", "DESC")
       .limit(100)
       .getMany();
 
-    let updatedRows = 0;
-    for (const expiredDeposit of expiredDeposits) {
-      // Check if this deposited is associated with a bundle
-      const refundBundleEvent = await bundleEventsRepository
-        .createQueryBuilder("be")
-        .leftJoinAndSelect("bundle", "bundle", "be.bundleId = bundle.id")
-        .where("be.type = :expiredDeposit", {
-          expiredDeposit: entities.BundleEventType.ExpiredDeposit,
-        })
-        .andWhere("be.relayHash = :expiredDepositRelayHash", {
-          expiredDepositRelayHash: expiredDeposit.relayHash,
-        })
-        .getOne();
-      if (!refundBundleEvent) continue;
-
+    let updatedRows = [];
+    for (const refundEvent of refundEvents) {
       // Get the relayerRefundRoot that included this refund
-      const relayerRefundRoot = refundBundleEvent.bundle.relayerRefundRoot;
+      const relayerRefundRoot = refundEvent.bundle.relayerRefundRoot;
 
       // Look for a relayed root bundle event that matches the relayerRefundRoot
       const relayRootBundleRepo = this.postgres.getRepository(
@@ -235,25 +229,31 @@ export class SpokePoolProcessor {
       if (!executedRelayerRefundRootEvent) continue;
 
       // If we found the execution of the relayer refund root, we can update the relay status
-      await relayHashInfoRepository
+      const relayHashInfoRepo = this.postgres.getRepository(
+        entities.RelayHashInfo,
+      );
+      await relayHashInfoRepo
         .createQueryBuilder()
         .update()
         .set({
           status: entities.RelayStatus.Refunded,
           depositRefundTxHash: executedRelayerRefundRootEvent.transactionHash,
         })
         .where("relayHash = :relayHash", {
-          relayHash: expiredDeposit.relayHash,
+          relayHash: refundEvent.relayHash,
         })
         .execute();
-
-      updatedRows += 1;
+      const updatedRow = await relayHashInfoRepo.findOne({
+        where: { relayHash: refundEvent.relayHash },
+      });
+      updatedRow && updatedRows.push(updatedRow);
     }
-    if (updatedRows > 0) {
+    if (updatedRows.length > 0) {
       this.logger.info({
         at: "SpokePoolProcessor#updateRefundedDepositsStatus",
-        message: `Updated ${updatedRows} refunded deposits`,
+        message: `Updated ${updatedRows.length} refunded deposits`,
       });
     }
+    return updatedRows;
   }
 }