fix: update data files and types for camelCase consistency after rebase

- Convert lanes.json supportedTokens from object to array format
- Convert tokens.json poolAddress/poolType to nested pool object
- Fix OutputKeyType and LaneInputKeyType to use camelCase values
- Update service files for camelCase chain identifier resolution
- Sync mainnet/testnet data with latest from origin/main

Author: aelmanaa

src/config/data/ccip/v1_2_0/mainnet/lanes.json

@@ -258,26 +258,26 @@ export class LaneDataService {
     filters: LaneFilterType
   ): boolean {
     // Check source chain filters
-    if (filters.sourceChainId && !this.matchesChainFilter(sourceChain, filters.sourceChainId, "chain_id")) {
+    if (filters.sourceChainId && !this.matchesChainFilter(sourceChain, filters.sourceChainId, "chainId")) {
       return false
     }
     if (filters.sourceSelector && !this.matchesChainFilter(sourceChain, filters.sourceSelector, "selector")) {
       return false
     }
-    if (filters.sourceInternalId && !this.matchesChainFilter(sourceChain, filters.sourceInternalId, "internal_id")) {
+    if (filters.sourceInternalId && !this.matchesChainFilter(sourceChain, filters.sourceInternalId, "internalId")) {
       return false
     }
 
     // Check destination chain filters
-    if (filters.destinationChainId && !this.matchesChainFilter(destChain, filters.destinationChainId, "chain_id")) {
+    if (filters.destinationChainId && !this.matchesChainFilter(destChain, filters.destinationChainId, "chainId")) {
       return false
     }
     if (filters.destinationSelector && !this.matchesChainFilter(destChain, filters.destinationSelector, "selector")) {
       return false
     }
     if (
       filters.destinationInternalId &&
-      !this.matchesChainFilter(destChain, filters.destinationInternalId, "internal_id")
+      !this.matchesChainFilter(destChain, filters.destinationInternalId, "internalId")
     ) {
       return false
     }
@@ -291,7 +291,7 @@ export class LaneDataService {
   private matchesChainFilter(
     chain: ChainInfoInternal,
     filterValue: string,
-    filterType: "chain_id" | "selector" | "internal_id"
+    filterType: "chainId" | "selector" | "internalId"
   ): boolean {
     const filterValues = filterValue.split(",").map((v) => v.trim())
     // Map snake_case filter types to camelCase property names
@@ -304,8 +304,8 @@ export class LaneDataService {
     const chainValue = chain[propertyName].toString()
 
     // For chain_id, also check generated chain key format
-    if (filterType === "chain_id") {
-      const generatedKey = generateChainKey(chain.chainId, chain.chainType, "chain_id")
+    if (filterType === "chainId") {
+      const generatedKey = generateChainKey(chain.chainId, chain.chainType, "chainId")
       return filterValues.includes(chainValue) || filterValues.includes(generatedKey)
     }
 
@@ -329,12 +329,12 @@ export class LaneDataService {
     const propertyName = propertyMap[outputKey]
 
     const sourceKey =
-      outputKey === "chain_id"
+      outputKey === "chainId"
         ? generateChainKey(sourceChain.chainId, sourceChain.chainType, outputKey)
         : sourceChain[propertyName].toString()
 
     const destKey =
-      outputKey === "chain_id"
+      outputKey === "chainId"
         ? generateChainKey(destChain.chainId, destChain.chainType, outputKey)
         : destChain[propertyName].toString()
 
@@ -537,13 +537,13 @@ export class LaneDataService {
     chainsReferenceData: Record<string, ChainConfig>
   ): string | null {
     // If already an internal_id, return it directly
-    if (inputKeyType === "internal_id") {
+    if (inputKeyType === "internalId") {
       return chainsReferenceData[identifier] ? identifier : null
     }
 
     // Search through chains to find matching chain_id or selector
     for (const [internalId, chainConfig] of Object.entries(chainsReferenceData)) {
-      if (inputKeyType === "chain_id") {
+      if (inputKeyType === "chainId") {
         // Try to match by numeric chain ID
         try {
           const supportedChain = directoryToSupportedChain(internalId)

src/config/data/ccip/v1_2_0/mainnet/tokens.json

@@ -149,12 +149,12 @@ export class TokenDataService {
 
               if (!destNumericChainId) return destChainId
 
-              if (outputKey === "chain_id") {
+              if (outputKey === "chainId") {
                 return generateChainKey(destNumericChainId, destChainType, outputKey)
               } else if (outputKey === "selector") {
                 const selectorEntry = getSelectorEntry(destNumericChainId, destChainType)
                 return selectorEntry?.selector || destChainId
-              } else if (outputKey === "internal_id") {
+              } else if (outputKey === "internalId") {
                 const selectorEntry = getSelectorEntry(destNumericChainId, destChainType)
                 return selectorEntry?.name || destChainId
               }
@@ -164,14 +164,14 @@ export class TokenDataService {
 
           // Get the appropriate key based on outputKey parameter
           let chainKey = chainId
-          if (outputKey === "chain_id") {
+          if (outputKey === "chainId") {
             chainKey = generateChainKey(numericChainId, chainType, outputKey)
           } else if (outputKey === "selector") {
             const selectorEntry = getSelectorEntry(numericChainId, chainType)
             if (selectorEntry) {
               chainKey = selectorEntry.selector
             }
-          } else if (outputKey === "internal_id") {
+          } else if (outputKey === "internalId") {
             const selectorEntry = getSelectorEntry(numericChainId, chainType)
             if (selectorEntry) {
               chainKey = selectorEntry.name
@@ -276,7 +276,7 @@ export class TokenDataService {
   public async getFilteredTokens(
     environment: Environment,
     filters: TokenFilterType,
-    outputKey: OutputKeyType = "chain_id"
+    outputKey: OutputKeyType = "chainId"
   ): Promise<TokenServiceResponse> {
     logger.info({
       message: "Starting token filtering process",
@@ -388,7 +388,7 @@ export class TokenDataService {
   public async getTokenWithFinality(
     environment: Environment,
     tokenCanonicalSymbol: string,
-    outputKey: OutputKeyType = "chain_id"
+    outputKey: OutputKeyType = "chainId"
   ): Promise<TokenDetailServiceResponse | null> {
     logger.info({
       message: "Getting token with finality data",
@@ -523,7 +523,7 @@ export class TokenDataService {
   public async getTokenFinality(
     environment: Environment,
     tokenCanonicalSymbol: string,
-    outputKey: OutputKeyType = "chain_id"
+    outputKey: OutputKeyType = "chainId"
   ): Promise<TokenFinalityServiceResponse | null> {
     logger.info({
       message: "Getting token finality data",

src/config/data/ccip/v1_2_0/testnet/lanes.json

@@ -74,7 +74,7 @@ export type ChainApiResponse = {
   }[]
 }
 
-export type OutputKeyType = "chain_id" | "selector" | "internal_id"
+export type OutputKeyType = "chainId" | "selector" | "internalId"
 
 export type ChainApiError = {
   error: string
@@ -323,7 +323,7 @@ export interface LaneFilterType {
 /**
  * Input key type for lane path parameters
  */
-export type LaneInputKeyType = "chain_id" | "selector" | "internal_id"
+export type LaneInputKeyType = "chainId" | "selector" | "internalId"
 
 /**
  * Metadata for single lane detail API responses

src/config/data/ccip/v1_2_0/testnet/tokens.json

@@ -57,7 +57,7 @@ export const GET: APIRoute = async ({ request }) => {
 
     // Validate legacy filters
     const filters: FilterType = {
-      chainId: params.get("chain_id") || undefined,
+      chainId: params.get("chainId") || undefined,
       selector: params.get("selector") || undefined,
       internalId: params.get("internalId") || undefined,
     }
@@ -200,7 +200,7 @@ export const GET: APIRoute = async ({ request }) => {
         acc[familyKey] = chainList.reduce(
           (familyAcc, chain) => {
             const key =
-              outputKey === "chain_id"
+              outputKey === "chainId"
                 ? generateChainKey(chain.chainId, chain.chainType, outputKey)
                 : outputKey
                   ? chain[outputKey].toString()

src/lib/ccip/services/lane-data.ts

@@ -42,7 +42,7 @@ export const GET: APIRoute = async ({ params, request }) => {
     })
 
     const laneDataService = new LaneDataService()
-    const result = await laneDataService.getLaneDetails(environment, source, destination, "chain_id")
+    const result = await laneDataService.getLaneDetails(environment, source, destination, "chainId")
 
     if (!result.data) {
       throw new CCIPError(404, `Lane from chain '${source}' to chain '${destination}' not found`)

src/lib/ccip/services/token-data.ts

@@ -42,7 +42,7 @@ export const GET: APIRoute = async ({ params, request }) => {
     })
 
     const laneDataService = new LaneDataService()
-    const result = await laneDataService.getSupportedTokensWithRateLimits(environment, source, destination, "chain_id")
+    const result = await laneDataService.getSupportedTokensWithRateLimits(environment, source, destination, "chainId")
 
     if (!result.data) {
       throw new CCIPError(404, `Lane from chain '${source}' to chain '${destination}' not found`)