fix ccip config api (#2966)

Author: aelmanaa

src/pages/api/ccip/types/index.ts

@@ -39,6 +39,7 @@ export interface ChainDetails {
   tokenPoolFactory?: string
   feeQuoter?: string
   rmnPermeable?: boolean
+  mcms?: string
 }
 
 export type ChainApiResponse = {

src/pages/api/ccip/utils.ts

@@ -4,7 +4,7 @@ import { ChainsConfig, Environment, loadReferenceData, Version } from "@config/d
 import { SupportedChain } from "@config/index.ts"
 import { directoryToSupportedChain } from "@features/utils/index.ts"
 import { v4 as uuidv4 } from "uuid"
-import type { TokenMetadata } from "./types/index.ts"
+import type { TokenMetadata, ChainType, OutputKeyType } from "./types/index.ts"
 
 export const prerender = false
 
@@ -264,6 +264,16 @@ export const validateOutputKey = (outputKey?: string): "chainId" | "selector" |
   return outputKey as "chainId" | "selector" | "internalId"
 }
 
+export const generateChainKey = (chainId: number | string, chainType: ChainType, outputKey: OutputKeyType): string => {
+  const chainIdStr = chainId.toString()
+
+  if (outputKey === "chainId" && chainType !== "evm" && chainType !== "solana") {
+    return `${chainType}-${chainIdStr}`
+  }
+
+  return chainIdStr
+}
+
 /**
  * Handles API errors and converts them to standardized responses
  * @param error - Error to handle

src/pages/api/ccip/v1/chains.ts

@@ -3,6 +3,7 @@ import {
   validateEnvironment,
   validateFilters,
   validateOutputKey,
+  generateChainKey,
   createMetadata,
   handleApiError,
   successHeaders,
@@ -90,7 +91,12 @@ export const GET: APIRoute = async ({ request }) => {
       (acc, [family, chainList]) => {
         acc[family] = chainList.reduce(
           (familyAcc, chain) => {
-            const key = outputKey ? chain[outputKey].toString() : chain.internalId
+            const key =
+              outputKey === "chainId"
+                ? generateChainKey(chain.chainId, chain.chainType, outputKey)
+                : outputKey
+                  ? chain[outputKey].toString()
+                  : chain.internalId
             familyAcc[key] = chain
             return familyAcc
           },

src/pages/api/services/chain-data.ts

@@ -305,17 +305,84 @@ class SolanaChainStrategy extends BaseChainStrategy {
   }
 }
 
-// Strategy Factory
+class AptosChainStrategy extends BaseChainStrategy {
+  private static readonly REQUIRED_FIELDS = {
+    tokenAdminRegistry: (config: ChainsConfig[string]) => !config.tokenAdminRegistry?.address,
+    mcms: (config: ChainsConfig[string]) => !config.mcms?.address,
+  } as const
+
+  validateChainData(
+    chainId: number | string | undefined,
+    networkId: string,
+    chainConfig: ChainsConfig[string],
+    selectorEntry?: { selector: string; name: string },
+    supportedChain?: SupportedChain
+  ): {
+    isValid: boolean
+    missingFields: string[]
+    validatedData?: ChainDetails
+  } {
+    const baseValidation = this.validateBaseFields(chainId, networkId, chainConfig, selectorEntry, supportedChain)
+
+    if (!baseValidation.isValid || !baseValidation.baseData) {
+      return {
+        isValid: false,
+        missingFields: baseValidation.missingFields,
+      }
+    }
+
+    const missingFields = this.validateAptosRequirements(chainConfig)
+
+    if (missingFields.length > 0) {
+      logger.warn({
+        message: "Aptos chain configuration incomplete",
+        requestId: this.requestId,
+        networkId,
+        missingFields,
+      })
+
+      return {
+        isValid: false,
+        missingFields,
+      }
+    }
+
+    const validatedData: ChainDetails = {
+      ...(baseValidation.baseData as ChainDetails),
+      tokenAdminRegistry: chainConfig.tokenAdminRegistry?.address ?? "",
+      mcms: chainConfig.mcms?.address ?? "",
+    }
+
+    return {
+      isValid: true,
+      missingFields: [],
+      validatedData,
+    }
+  }
+
+  private validateAptosRequirements(chainConfig: ChainsConfig[string]): string[] {
+    return Object.entries(AptosChainStrategy.REQUIRED_FIELDS)
+      .filter(([_, validator]) => validator(chainConfig))
+      .map(([field]) => field)
+  }
+}
+
 class ChainStrategyFactory {
+  private static readonly strategies = new Map<ChainType, new (requestId: string) => IChainProcessingStrategy>([
+    ["evm", EvmChainStrategy],
+    ["solana", SolanaChainStrategy],
+    ["aptos", AptosChainStrategy],
+  ])
+
   static getStrategy(chainType: ChainType, requestId: string): IChainProcessingStrategy {
-    switch (chainType) {
-      case "evm":
-        return new EvmChainStrategy(requestId)
-      case "solana":
-        return new SolanaChainStrategy(requestId)
-      default:
-        throw new Error(`Unsupported chain type: ${chainType}`)
+    const StrategyClass = this.strategies.get(chainType)
+
+    if (!StrategyClass) {
+      const supportedTypes = Array.from(this.strategies.keys()).join(", ")
+      throw new Error(`Chain type "${chainType}" not supported. Available strategies: ${supportedTypes}`)
     }
+
+    return new StrategyClass(requestId)
   }
 }
 

src/pages/api/services/token-data.ts

@@ -10,7 +10,7 @@ import {
 import { Version } from "@config/data/ccip/types.ts"
 import { SupportedChain } from "@config/index.ts"
 import { getAllSupportedTokens, getAllTokenLanes, getTokenData } from "@config/data/ccip/data.ts"
-import { resolveChainOrThrow } from "@api/ccip/utils.ts"
+import { resolveChainOrThrow, generateChainKey } from "@api/ccip/utils.ts"
 import { logger } from "@lib/logging/index.js"
 import { getChainId, getChainTypeAndFamily, getTitle } from "../../../features/utils/index.ts"
 import { getSelectorEntry } from "@config/data/ccip/selectors.ts"
@@ -134,17 +134,17 @@ export class TokenDataService {
             .map((destChainId) => {
               const destSupportedChain = resolveChainOrThrow(destChainId)
               const destNumericChainId = getChainId(destSupportedChain)
-              const { chainType } = getChainTypeAndFamily(destSupportedChain)
+              const { chainType: destChainType } = getChainTypeAndFamily(destSupportedChain)
 
               if (!destNumericChainId) return destChainId
 
               if (outputKey === "chainId") {
-                return destNumericChainId.toString()
+                return generateChainKey(destNumericChainId, destChainType, outputKey)
               } else if (outputKey === "selector") {
-                const selectorEntry = getSelectorEntry(destNumericChainId, chainType)
+                const selectorEntry = getSelectorEntry(destNumericChainId, destChainType)
                 return selectorEntry?.selector || destChainId
               } else if (outputKey === "internalId") {
-                const selectorEntry = getSelectorEntry(destNumericChainId, chainType)
+                const selectorEntry = getSelectorEntry(destNumericChainId, destChainType)
                 return selectorEntry?.name || destChainId
               }
               return destChainId
@@ -154,7 +154,7 @@ export class TokenDataService {
           // Get the appropriate key based on outputKey parameter
           let chainKey = chainId
           if (outputKey === "chainId") {
-            chainKey = numericChainId.toString()
+            chainKey = generateChainKey(numericChainId, chainType, outputKey)
           } else if (outputKey === "selector") {
             const selectorEntry = getSelectorEntry(numericChainId, chainType)
             if (selectorEntry) {