Refactor CCTP indexer to use unified sponsored periphery address for all flow events

Author: NikolasHaimerl

packages/indexer/src/data-indexing/model/hyperEvmExecutor.ts

@@ -32,12 +32,3 @@ export interface FallbackHyperEVMFlowCompletedLog extends providers.Log {
     evmAmountSponsored: BigNumber;
   };
 }
-// Taken from https://testnet.purrsec.com/tx/0x1bf0dc091249341d0e91380b1c1d7dca683ab1b6773f7fb011b71a3d017a8fc9
-export const HYPERCORE_FLOW_EXECUTOR_ADDRESS: { [key: number]: string } = {
-  [CHAIN_IDs.HYPEREVM_TESTNET]: "0x06C61D54958a0772Ee8aF41789466d39FfeaeB13",
-};
-
-// Taken from https://hyperevmscan.io/tx/0x869d1df5f1e7b6b91a824d8e2b455ac48d1f26f0b5f2823c96df391eb75dff34#eventlog#8
-export const ARBITRARY_EVM_FLOW_EXECUTOR_ADDRESS: { [key: number]: string } = {
-  [CHAIN_IDs.HYPEREVM]: "0x7B164050BBC8e7ef3253e7db0D74b713Ba3F1c95",
-};

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

@@ -5,11 +5,9 @@ import { CHAIN_IDs } from "@across-protocol/constants";
 import { formatFromAddressToChainFormat } from "../../utils";
 import {
   BlockRange,
-  HYPERCORE_FLOW_EXECUTOR_ADDRESS,
   SimpleTransferFlowCompletedLog,
   ArbitraryActionsExecutedLog,
   FallbackHyperEVMFlowCompletedLog,
-  ARBITRARY_EVM_FLOW_EXECUTOR_ADDRESS,
 } from "../model";
 import { IndexerDataHandler } from "./IndexerDataHandler";
 import { EventDecoder } from "../../web3/EventDecoder";
@@ -84,6 +82,12 @@ const TOKEN_MESSENGER_ADDRESS: string =
 const MESSAGE_TRANSMITTER_ADDRESS: string =
   "0xE737e5cEBEEBa77EFE34D4aa090756590b1CE275";
 
+// TODO: Update this address once the contract is deployed
+const SPONSORED_CCTP_DST_PERIPHERY_ADDRESS: { [key: number]: string } = {
+  // Taken from https://hyperevmscan.io/address/0x7B164050BBC8e7ef3253e7db0D74b713Ba3F1c95#code
+  [CHAIN_IDs.HYPEREVM]: "0x7B164050BBC8e7ef3253e7db0D74b713Ba3F1c95",
+};
+
 // TODO: Update this address once the contract is deployed
 const SPONSORED_CCTP_SRC_PERIPHERY_ADDRESS: { [key: number]: string } = {
   [CHAIN_IDs.ARBITRUM_SEPOLIA]: "0x79176E2E91c77b57AC11c6fe2d2Ab2203D87AF85",
@@ -160,10 +164,8 @@ export class CCTPIndexerDataHandler implements IndexerDataHandler {
   ): Promise<FetchEventsResult> {
     const sponsoredCCTPSrcPeripheryAddress =
       SPONSORED_CCTP_SRC_PERIPHERY_ADDRESS[this.chainId];
-    const hyperEvmExecutorAddress =
-      HYPERCORE_FLOW_EXECUTOR_ADDRESS[this.chainId];
-    const arbitraryEvmFlowExecutorAddress =
-      ARBITRARY_EVM_FLOW_EXECUTOR_ADDRESS[this.chainId];
+    const sponsoredCCTPDstPeripheryAddress =
+      SPONSORED_CCTP_DST_PERIPHERY_ADDRESS[this.chainId];
 
     const tokenMessengerContract = new ethers.Contract(
       TOKEN_MESSENGER_ADDRESS,
@@ -268,30 +270,26 @@ export class CCTPIndexerDataHandler implements IndexerDataHandler {
 
     let simpleTransferFlowCompletedEvents: SimpleTransferFlowCompletedLog[] =
       [];
-    if (hyperEvmExecutorAddress) {
+    let arbitraryActionsExecutedEvents: ArbitraryActionsExecutedLog[] = [];
+    let fallbackHyperEVMFlowCompletedEvents: FallbackHyperEVMFlowCompletedLog[] =
+      [];
+    if (sponsoredCCTPDstPeripheryAddress) {
       simpleTransferFlowCompletedEvents =
         this.getSimpleTransferFlowCompletedEventsFromTransactionReceipts(
           filteredMessageReceivedTxReceipts,
-          hyperEvmExecutorAddress,
+          sponsoredCCTPDstPeripheryAddress,
         );
-    }
 
-    let arbitraryActionsExecutedEvents: ArbitraryActionsExecutedLog[] = [];
-    if (arbitraryEvmFlowExecutorAddress) {
       arbitraryActionsExecutedEvents =
         this.getArbitraryActionsExecutedEventsFromTransactionReceipts(
           filteredMessageReceivedTxReceipts,
-          arbitraryEvmFlowExecutorAddress,
+          sponsoredCCTPDstPeripheryAddress,
         );
-    }
 
-    let fallbackHyperEVMFlowCompletedEvents: FallbackHyperEVMFlowCompletedLog[] =
-      [];
-    if (arbitraryEvmFlowExecutorAddress) {
       fallbackHyperEVMFlowCompletedEvents =
         this.getFallbackHyperEVMFlowCompletedEventsFromTransactionReceipts(
           filteredMessageReceivedTxReceipts,
-          arbitraryEvmFlowExecutorAddress,
+          sponsoredCCTPDstPeripheryAddress,
         );
     }
 

packages/indexer/src/data-indexing/tests/CCTPIndexerDataHandler.integration.test.ts

@@ -116,9 +116,9 @@ describe("CCTPIndexerDataHandler", () => {
 
   it("should fetch and store SimpleTransferFlowCompleted event in the database", async () => {
     const transactionHash =
-      "0x1bf0dc091249341d0e91380b1c1d7dca683ab1b6773f7fb011b71a3d017a8fc9";
-    const blockNumber = 36200188;
-    setupTestForChainId(CHAIN_IDs.HYPEREVM_TESTNET);
+      "0x0e07cf92929a5e3c9d18ba28c71bf50b678d357eb9f433ed305ac6ab958f0abb";
+    const blockNumber = 18541961;
+    setupTestForChainId(CHAIN_IDs.HYPEREVM);
 
     const blockRange: BlockRange = {
       from: blockNumber,