Merge branch 'nikolas/remove-default-mapping' into nikolas/track-FallbackHyperEVMFlowCompleted

Author: NikolasHaimerl

packages/indexer/src/data-indexing/adapter/oft/service.ts

@@ -1,14 +1,9 @@
 import { CHAIN_IDs } from "@across-protocol/constants";
-import { createMapWithDefault } from "../../../utils/map";
 
 // Taken from sample tx: https://layerzeroscan.com/tx/0x2bc0a3844389de155fac8a91cae44a01379ab9b13aa135cb69f368985b0ae85a
-export const SPONSORED_OFT_SRC_PERIPHERY_ADDRESS: { [key: number]: string } =
-  createMapWithDefault(
-    {
-      [CHAIN_IDs.ARBITRUM]: "0x1235Ac1010FeeC8ae22744f323416cBBE37feDbE",
-    },
-    "0x1235Ac1010FeeC8ae22744f323416cBBE37feDbE",
-  );
+export const SPONSORED_OFT_SRC_PERIPHERY_ADDRESS: { [key: number]: string } = {
+  [CHAIN_IDs.ARBITRUM]: "0x1235Ac1010FeeC8ae22744f323416cBBE37feDbE",
+};
 
 export type OftTokenKey = "usdt0";
 

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

@@ -2,7 +2,7 @@ import { Logger } from "winston";
 import { ethers, providers, Transaction } from "ethers";
 import * as across from "@across-protocol/sdk";
 import { CHAIN_IDs } from "@across-protocol/constants";
-import { formatFromAddressToChainFormat } from "../../utils";
+import { formatFromAddressToChainFormat, isTestnet } from "../../utils";
 import {
   BlockRange,
   HYPERCORE_FLOW_EXECUTOR_ADDRESS,
@@ -40,7 +40,6 @@ import {
   getCctpDestinationChainFromDomain,
   isHypercoreWithdraw,
 } from "../adapter/cctp-v2/service";
-import { createMapWithDefault } from "../../utils/map";
 import { entities, SaveQueryResult } from "@repo/indexer-database";
 
 export type EvmBurnEventsPair = {
@@ -78,35 +77,21 @@ export type StoreEventsResult = {
 };
 
 // Taken from https://developers.circle.com/cctp/evm-smart-contracts
-const TOKEN_MESSENGER_ADDRESS: { [key: number]: string } = createMapWithDefault(
-  {
-    [CHAIN_IDs.ARBITRUM_SEPOLIA]: "0x8FE6B999Dc680CcFDD5Bf7EB0974218be2542DAA",
-    [CHAIN_IDs.HYPEREVM_TESTNET]: "0x8FE6B999Dc680CcFDD5Bf7EB0974218be2542DAA",
-  },
-  "0x28b5a0e9C621a5BadaA536219b3a228C8168cf5d",
-);
+const TOKEN_MESSENGER_ADDRESS_MAINNET: string =
+  "0x28b5a0e9C621a5BadaA536219b3a228C8168cf5d";
+const TOKEN_MESSENGER_ADDRESS_TESTNET: string =
+  "0x8FE6B999Dc680CcFDD5Bf7EB0974218be2542DAA";
 
 // Taken from https://developers.circle.com/cctp/evm-smart-contracts
-const MESSAGE_TRANSMITTER_ADDRESS: { [key: number]: string } =
-  createMapWithDefault(
-    {
-      [CHAIN_IDs.ARBITRUM_SEPOLIA]:
-        "0xE737e5cEBEEBa77EFE34D4aa090756590b1CE275",
-      [CHAIN_IDs.HYPEREVM_TESTNET]:
-        "0xE737e5cEBEEBa77EFE34D4aa090756590b1CE275",
-    },
-    "0x81D40F21F12A8F0E3252Bccb954D722d4c464B64",
-  );
+const MESSAGE_TRANSMITTER_ADDRESS_MAINNET: string =
+  "0x81D40F21F12A8F0E3252Bccb954D722d4c464B64";
+const MESSAGE_TRANSMITTER_ADDRESS_TESTNET: string =
+  "0xE737e5cEBEEBa77EFE34D4aa090756590b1CE275";
 
 // TODO: Update this address once the contract is deployed
-const SPONSORED_CCTP_SRC_PERIPHERY_ADDRESS: { [key: number]: string } =
-  createMapWithDefault(
-    {
-      [CHAIN_IDs.ARBITRUM_SEPOLIA]:
-        "0x79176E2E91c77b57AC11c6fe2d2Ab2203D87AF85",
-    },
-    "0x79176E2E91c77b57AC11c6fe2d2Ab2203D87AF85",
-  );
+const SPONSORED_CCTP_SRC_PERIPHERY_ADDRESS: { [key: number]: string } = {
+  [CHAIN_IDs.ARBITRUM_SEPOLIA]: "0x79176E2E91c77b57AC11c6fe2d2Ab2203D87AF85",
+};
 
 const SWAP_API_CALLDATA_MARKER = "73c0de";
 const WHITELISTED_FINALIZERS = ["0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D"];
@@ -177,23 +162,19 @@ export class CCTPIndexerDataHandler implements IndexerDataHandler {
   private async fetchEventsByRange(
     blockRange: BlockRange,
   ): Promise<FetchEventsResult> {
-    const tokenMessengerAddress = TOKEN_MESSENGER_ADDRESS[this.chainId];
-    const messageTransmitterAddress = MESSAGE_TRANSMITTER_ADDRESS[this.chainId];
     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];
 
-    if (!tokenMessengerAddress || !messageTransmitterAddress) {
-      const errorMessage = `CCTP contracts addresses not configured for chain ${this.chainId}`;
-      this.logger.error({
-        at: "CCTPIndexerDataHandler#fetchEventsByRange",
-        message: errorMessage,
-      });
-      throw new Error(errorMessage);
-    }
+    const tokenMessengerAddress = isTestnet(this.chainId)
+      ? TOKEN_MESSENGER_ADDRESS_TESTNET
+      : TOKEN_MESSENGER_ADDRESS_MAINNET;
+    const messageTransmitterAddress = isTestnet(this.chainId)
+      ? MESSAGE_TRANSMITTER_ADDRESS_TESTNET
+      : MESSAGE_TRANSMITTER_ADDRESS_MAINNET;
 
     const tokenMessengerContract = new ethers.Contract(
       tokenMessengerAddress,

packages/indexer/src/utils/adressUtils.ts

@@ -1,4 +1,5 @@
 import { utils, arch } from "@across-protocol/sdk";
+import { CHAIN_IDs } from "@across-protocol/constants";
 
 const { chainIsEvm, chainIsSvm } = utils;
 
@@ -24,3 +25,18 @@ export function formatFromAddressToChainFormat(
   // Fallback to bytes32 when address is malformed for the chain
   return address.toBytes32();
 }
+
+export const isTestnet = (chainId: number): boolean => {
+  return (
+    chainId === CHAIN_IDs.ARBITRUM_SEPOLIA ||
+    chainId === CHAIN_IDs.HYPEREVM_TESTNET ||
+    chainId === CHAIN_IDs.BASE_SEPOLIA ||
+    chainId === CHAIN_IDs.BLAST_SEPOLIA ||
+    chainId === CHAIN_IDs.LISK_SEPOLIA ||
+    chainId === CHAIN_IDs.MODE_SEPOLIA ||
+    chainId === CHAIN_IDs.OPTIMISM_SEPOLIA ||
+    chainId === CHAIN_IDs.POLYGON_AMOY ||
+    chainId === CHAIN_IDs.SEPOLIA ||
+    chainId === CHAIN_IDs.SOLANA_DEVNET
+  );
+};

packages/indexer/src/utils/index.ts

@@ -4,4 +4,3 @@ export * from "./contractFactoryUtils";
 export * from "./bundleBuilderUtils";
 export * from "./spokePoolUtils";
 export * from "./currencyUtils";
-export * from "./map";