Merge branch 'main' into ds/v7-exchange-rate-release

Author: dev-dist

src/components/CCIP/Drawer/LaneDrawer.tsx

@@ -96,7 +96,7 @@ function LaneDrawer({
                   Rate limit capacity
                   <Tooltip
                     label=""
-                    tip="Rate limit data is currently unavailable. You can find this Token Pool rate limit by reading the Token Pool contract directly on the relevant blockchain."
+                    tip="Maximum amount per transaction"
                     labelStyle={{
                       marginRight: "5px",
                     }}

src/components/CCIP/Drawer/TokenDrawer.tsx

@@ -163,7 +163,7 @@ function TokenDrawer({
                   Rate limit capacity
                   <Tooltip
                     label=""
-                    tip="Rate limit data is currently unavailable. You can find this Token Pool rate limit by reading the Token Pool contract directly on the relevant blockchain."
+                    tip="Maximum amount per transaction"
                     labelStyle={{
                       marginRight: "5px",
                     }}

src/content/chainlink-nodes/v1/node-config.mdx

@@ -1534,7 +1534,7 @@ PeerID = '12D3KooWMoejJznyDuEk5aX6GvbjaG12UzeornPCBNzMRqdwrFJw' # Example
 TraceLogging = false # Default
 ```
 
-P2P has a versioned networking stack. Currenly only `[P2P.V2]` is supported.
+P2P has a versioned networking stack. Currently only `[P2P.V2]` is supported.
 All nodes in the OCR network should share the same networking stack.
 
 ### IncomingMessageBufferSize
@@ -17026,7 +17026,7 @@ SenderAddress is optional and can be set to a specific sender address for gas li
 If you are using gas limit estimation:
 
 - Setting SenderAddress is optional for most products. If it is set, the from address for the transaction for gas estimation will be set to the inputted SenderAddress. If it is not set, the actual address the transaction is sent from is used if available.
-- Setting SenderAddress is neccessary for gas limit estimation to function correctly for CCIP. Gas limit estimation works only in CCIP 1.6 and above if SenderAddress is set to the given example value (0x00c11c11c11C11c11C11c11c11C11C11c11C11c1). This value is hardcoded in the CCIP 1.6 contracts and is not needed for other products.
+- Setting SenderAddress is necessary for gas limit estimation to function correctly for CCIP. Gas limit estimation works only in CCIP 1.6 and above if SenderAddress is set to the given example value (0x00c11c11c11C11c11C11c11c11C11C11c11C11c1). This value is hardcoded in the CCIP 1.6 contracts and is not needed for other products.
 
 ### BumpMin
 
@@ -17110,7 +17110,7 @@ In EIP-1559 mode, the following changes occur to how configuration works:
 - All new transactions will be sent as type 0x2 transactions specifying a TipCap and FeeCap. Be aware that existing pending legacy transactions will continue to be gas bumped in legacy mode.
 - `BlockHistoryEstimator` will apply its calculations (gas percentile etc) to the TipCap and this value will be used for new transactions (GasPrice will be ignored)
 - `FixedPriceEstimator` will use `GasTipCapDefault` instead of `GasPriceDefault` for the tip cap
-- `FixedPriceEstimator` will use `GasFeeCapDefault` instaed of `GasPriceDefault` for the fee cap
+- `FixedPriceEstimator` will use `GasFeeCapDefault` instead of `GasPriceDefault` for the fee cap
 - `PriceMin` is ignored for new transactions and `GasTipCapMinimum` is used instead (default 0)
 - `PriceMax` still represents that absolute upper limit that Chainlink will ever spend (total) on a single tx
 - `Keeper.GasTipCapBufferPercent` is ignored in EIP-1559 mode and `Keeper.GasTipCapBufferPercent` is used instead

src/content/data-streams/reference/report-schema-v10.mdx

@@ -19,21 +19,21 @@ Chainlink Backed xStock Data Streams adhere to the report schema outlined below.
 
 ### Schema Fields
 
-| Field                   | Type      | Description                                                                                                          |
-| ----------------------- | --------- | -------------------------------------------------------------------------------------------------------------------- |
-| `feedId`                | `bytes32` | Unique identifier for the Data Streams feed                                                                          |
-| `validFromTimestamp`    | `uint32`  | Earliest timestamp when the price is valid (seconds)                                                                 |
-| `observationsTimestamp` | `uint32`  | Latest timestamp when the price is valid (seconds)                                                                   |
-| `nativeFee`             | `uint192` | Cost to verify report onchain (native token)                                                                         |
-| `linkFee`               | `uint192` | Cost to verify report onchain (LINK)                                                                                 |
-| `expiresAt`             | `uint32`  | Expiration date of the report (seconds)                                                                              |
-| `lastUpdateTimestamp`   | `uint64`  | Timestamp of the last valid price update (nanoseconds)                                                               |
-| `price`                 | `int192`  | Last traded price from the real-world equity market                                                                  |
-| `marketStatus`          | `uint32`  | Status of the real-world equity market. <br/> Possible values: `0` (Unknown), `1` (Closed), `2` (Open), `3` (Halted) |
-| `currentMultiplier`     | `int192`  | Currently applied multiplier accounting for past corporate actions                                                   |
-| `newMultiplier`         | `int192`  | Multiplier to be applied at the activationDateTime <br/> (set to `0` if none is scheduled)                           |
-| `activationDateTime`    | `uint32`  | When the next corporate action takes effect <br/> (set to `0` if none is scheduled) (seconds)                        |
-| `tokenizedPrice`        | `int192`  | 24/7 tokenized equity price as traded on supported exchanges <br/> (In development; currently returns `0`).          |
+| Field                   | Type      | Description                                                                                                 |
+| ----------------------- | --------- | ----------------------------------------------------------------------------------------------------------- |
+| `feedId`                | `bytes32` | Unique identifier for the Data Streams feed                                                                 |
+| `validFromTimestamp`    | `uint32`  | Earliest timestamp when the price is valid (seconds)                                                        |
+| `observationsTimestamp` | `uint32`  | Latest timestamp when the price is valid (seconds)                                                          |
+| `nativeFee`             | `uint192` | Cost to verify report onchain (native token)                                                                |
+| `linkFee`               | `uint192` | Cost to verify report onchain (LINK)                                                                        |
+| `expiresAt`             | `uint32`  | Expiration date of the report (seconds)                                                                     |
+| `lastUpdateTimestamp`   | `uint64`  | Timestamp of the last valid price update (nanoseconds)                                                      |
+| `price`                 | `int192`  | Last traded price from the real-world equity market                                                         |
+| `marketStatus`          | `uint32`  | Status of the real-world equity market. <br/> Possible values: `0` (Unknown), `1` (Closed), `2` (Open)      |
+| `currentMultiplier`     | `int192`  | Currently applied multiplier accounting for past corporate actions                                          |
+| `newMultiplier`         | `int192`  | Multiplier to be applied at the activationDateTime <br/> (set to `0` if none is scheduled)                  |
+| `activationDateTime`    | `uint32`  | When the next corporate action takes effect <br/> (set to `0` if none is scheduled) (seconds)               |
+| `tokenizedPrice`        | `int192`  | 24/7 tokenized equity price as traded on supported exchanges <br/> (In development; currently returns `0`). |
 
 **Notes:**
 

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) {