feat: production release 🚀 (#260)

Author: amateima

packages/indexer-database/src/entities/RelayHashInfo.ts

@@ -37,6 +37,7 @@ export enum RelayStatus {
   "fillDeadline",
   "status",
 ])
+@Index("IX_rhi_status", ["status"])
 export class RelayHashInfo {
   @PrimaryGeneratedColumn()
   id: number;

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

@@ -23,6 +23,7 @@ import {
   "logIndex",
 ])
 @Index("IX_v3FundsDeposited_blockTimestamp", ["blockTimestamp"])
+@Index("IX_v3FundsDeposited_depositor", ["depositor"])
 export class V3FundsDeposited {
   @PrimaryGeneratedColumn()
   id: number;

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

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class V3FundsDeposited1744307085174 implements MigrationInterface {
+  name = "V3FundsDeposited1744307085174";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE INDEX "IX_v3FundsDeposited_depositor" ON "evm"."v3_funds_deposited" ("depositor") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IX_rhi_status" ON "relay_hash_info" ("status") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "public"."IX_rhi_status"`);
+    await queryRunner.query(`DROP INDEX "evm"."IX_v3FundsDeposited_depositor"`);
+  }
+}

packages/indexer/package.json

@@ -26,6 +26,7 @@
     "@across-protocol/sdk": "^4.1.30",
     "@repo/error-handling": "workspace:*",
     "@repo/webhooks": "workspace:*",
+    "@solana/kit": "^2.1.0",
     "@types/express": "^4.17.21",
     "@types/lodash": "^4.17.7",
     "@types/luxon": "^3.4.2",

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

@@ -15,7 +15,6 @@ import { BlockRange } from "../model";
 import { IndexerDataHandler } from "./IndexerDataHandler";
 
 import * as utils from "../../utils";
-import { getIntegratorId } from "../../utils/spokePoolUtils";
 import { SpokePoolRepository } from "../../database/SpokePoolRepository";
 import { SwapBeforeBridgeRepository } from "../../database/SwapBeforeBridgeRepository";
 import { SpokePoolProcessor } from "../../services/spokePoolProcessor";
@@ -586,7 +585,7 @@ export class SpokePoolIndexerDataHandler implements IndexerDataHandler {
     deposits: entities.V3FundsDeposited[],
   ) {
     await across.utils.forEachAsync(deposits, async (deposit) => {
-      const integratorId = await getIntegratorId(
+      const integratorId = await utils.getIntegratorId(
         this.provider,
         deposit.quoteTimestamp,
         deposit.transactionHash,

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

@@ -5,10 +5,11 @@ import {
   getDeployedBlockNumber,
   SvmSpokeClient,
 } from "@across-protocol/contracts";
+import { Signature, Address, UnixTimestamp } from "@solana/kit";
 
+import * as utils from "../../utils";
 import { BlockRange } from "../model";
 import { IndexerDataHandler } from "./IndexerDataHandler";
-
 import { getMaxBlockLookBack } from "../../web3/constants";
 import { SvmProvider } from "../../web3/RetryProvidersFactory";
 
@@ -17,6 +18,36 @@ export type FetchEventsResult = {
   fillEvents: any; // TODO: fix type. Needs SDK changes
 };
 
+// TODO: Export this type from the SDK and use it from there.
+export type EventData =
+  | SvmSpokeClient.FilledRelay
+  | SvmSpokeClient.FundsDeposited;
+
+// TODO: Export this type from the SDK and use it from there.
+export enum SVMEventNames {
+  FilledRelay = "FilledRelay",
+  FundsDeposited = "FundsDeposited",
+}
+
+// TODO: Export this type from the SDK and use it from there.
+export type EventName = keyof typeof SVMEventNames;
+
+// TODO: Export this type from the SDK and use it from there.
+export type EventWithData<T extends EventData> = {
+  confirmationStatus: string | null;
+  blockTime: UnixTimestamp | null;
+  signature: Signature;
+  slot: bigint;
+  name: EventName;
+  data: T;
+  program: Address;
+};
+
+// Teach BigInt how to be represented as JSON.
+(BigInt.prototype as any).toJSON = function () {
+  return this.toString();
+};
+
 export class SvmSpokePoolIndexerDataHandler implements IndexerDataHandler {
   constructor(
     private logger: Logger,
@@ -48,6 +79,8 @@ export class SvmSpokePoolIndexerDataHandler implements IndexerDataHandler {
 
     const events = await this.fetchEventsByRange(blockRange, isBackfilling);
 
+    await this.updateNewDepositsWithIntegratorId(events.depositEvents);
+
     this.logger.debug({
       at: "Indexer#SpokePoolIndexerDataHandler#processBlockRange",
       message: `Found events for ${this.getDataIdentifier()}`,
@@ -62,7 +95,6 @@ export class SvmSpokePoolIndexerDataHandler implements IndexerDataHandler {
     // - store events
     // - get block times
     // - delete unfinalised events
-    // - update new deposits with integrator id
     // - process events
     // - publish price messages
   }
@@ -126,4 +158,18 @@ export class SvmSpokePoolIndexerDataHandler implements IndexerDataHandler {
       fillEvents,
     };
   }
+
+  private async updateNewDepositsWithIntegratorId(
+    deposits: EventWithData<SvmSpokeClient.FundsDeposited>[],
+  ) {
+    await across.utils.forEachAsync(deposits, async (deposit) => {
+      const integratorId = await utils.getSvmIntegratorId(
+        this.provider,
+        deposit.signature,
+      );
+      if (integratorId) {
+        // TODO: update deposit with integrator id when we are storing them in the database
+      }
+    });
+  }
 }

packages/indexer/src/utils/spokePoolUtils.ts

@@ -1,5 +1,6 @@
 import { interfaces, providers } from "@across-protocol/sdk";
 import { utils as ethersUtils } from "ethers";
+import { SvmProvider } from "../web3/RetryProvidersFactory";
 
 export type V3FundsDepositedWithIntegradorId = interfaces.DepositWithBlock & {
   integratorId?: string | undefined;
@@ -39,6 +40,28 @@ export async function getIntegratorId(
   return integratorId;
 }
 
+export async function getSvmIntegratorId(
+  provider: SvmProvider,
+  txnRef: any, // TODO: fix, should be Signature
+) {
+  const INTEGRATOR_DELIMITER = "1dc0de";
+  const INTEGRATOR_ID_LENGTH = 4; // Integrator ids are 4 characters long
+  const txn = await provider
+    .getTransaction(txnRef, {
+      maxSupportedTransactionVersion: 0,
+    })
+    .send();
+  const txnLogs = txn?.meta?.logMessages;
+  const integratorIdLog = txnLogs?.find((log) =>
+    log.includes(INTEGRATOR_DELIMITER),
+  );
+  const integratorId = integratorIdLog
+    ?.split(INTEGRATOR_DELIMITER)
+    .pop()
+    ?.substring(0, INTEGRATOR_ID_LENGTH);
+  return integratorId;
+}
+
 export function getInternalHash(
   relayData: Omit<interfaces.RelayData, "message">,
   messageHash: string,

packages/indexer/src/web3/constants.ts

@@ -25,6 +25,8 @@ const DEFAULT_NO_TTL_DISTANCE: { [chainId: number]: number } = {
   [CHAIN_IDs.WORLD_CHAIN]: 86400,
   [CHAIN_IDs.ZK_SYNC]: 172800,
   [CHAIN_IDs.ZORA]: 86400,
+  // Testnets:
+  [CHAIN_IDs.SOLANA_DEVNET]: 432000,
 };
 
 export function getNoTtlBlockDistance(chainId: number) {