implement finality config in BaseVerifier

Author: RensR

chains/evm/contracts/ccvs/components/BaseVerifier.sol

@@ -8,6 +8,7 @@ import {ITypeAndVersion} from "@chainlink/contracts/src/v0.8/shared/interfaces/I
 
 import {Client} from "../../libraries/Client.sol";
 
+import {FinalityCodec} from "../../libraries/FinalityCodec.sol";
 import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";
 import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";
 
@@ -33,7 +34,8 @@ abstract contract BaseVerifier is ICrossChainVerifierV1, ITypeAndVersion {
     IRouter router; // ──────────╮ Local router to use for messages to/fom this chain.
     uint16 feeUSDCents; //       │ The fee in US dollar cents for messages to this remote chain. [0, $655.35]
     uint32 gasForVerification; //│ The gas to reserve for verification of messages on the remote chain.
-    uint32 payloadSizeBytes; //  │ The size of the verification payload on the remote chain.
+    uint16 payloadSizeBytes; //  │ The size of the verification payload on the remote chain.
+    bytes2 finalityConfig; //    │ The finality configuration for the local chain for messages to the remote chain.
     bool allowlistEnabled; // ───╯ True if the allowlist is enabled.
     EnumerableSet.AddressSet allowedSendersList; // The list of addresses allowed to send messages.
   }
@@ -44,7 +46,8 @@ abstract contract BaseVerifier is ICrossChainVerifierV1, ITypeAndVersion {
     bool allowlistEnabled; //      │ True if the allowlist is enabled.
     uint16 feeUSDCents; // ────────╯ The fee in US dollar cents for messages to this remote chain.
     uint32 gasForVerification; // ─╮ The gas to reserve for verification of messages on the remote chain.
-    uint32 payloadSizeBytes; // ───╯ The size of the verification payload on the remote chain.
+    uint16 payloadSizeBytes; //    │ The size of the verification payload on the remote chain.
+    bytes2 finalityConfig; // ─────╯ The finality configuration for the local chain for messages to the remote chain.
   }
 
   /// @dev Struct to hold the allowlist configuration args per dest chain.
@@ -108,17 +111,29 @@ abstract contract BaseVerifier is ICrossChainVerifierV1, ITypeAndVersion {
 
   /// @notice get ChainConfig configured for the remoteChainSelector.
   /// @param remoteChainSelector The remote chain selector.
-  /// @return allowlistEnabled boolean indicator to specify if allowlist check is enabled.
-  /// @return router address of the local router.
+  /// @return remoteChainConfig The struct containing the remote chain settings.
   /// @return allowedSendersList list of addresses that are allowed to send messages to the remote chain.
   function getRemoteChainConfig(
     uint64 remoteChainSelector
-  ) external view virtual returns (bool allowlistEnabled, address router, address[] memory allowedSendersList) {
+  )
+    external
+    view
+    virtual
+    returns (RemoteChainConfigArgs memory remoteChainConfig, address[] memory allowedSendersList)
+  {
     RemoteChainConfig storage config = _getRemoteChainConfig(remoteChainSelector);
-    allowlistEnabled = config.allowlistEnabled;
-    router = address(config.router);
-    allowedSendersList = config.allowedSendersList.values();
-    return (allowlistEnabled, router, allowedSendersList);
+    return (
+      RemoteChainConfigArgs({
+        router: config.router,
+        remoteChainSelector: remoteChainSelector,
+        allowlistEnabled: config.allowlistEnabled,
+        feeUSDCents: config.feeUSDCents,
+        gasForVerification: config.gasForVerification,
+        payloadSizeBytes: config.payloadSizeBytes,
+        finalityConfig: config.finalityConfig
+      }),
+      config.allowedSendersList.values()
+    );
   }
 
   function _getRemoteChainConfig(
@@ -152,6 +167,7 @@ abstract contract BaseVerifier is ICrossChainVerifierV1, ITypeAndVersion {
       remoteChainConfig.gasForVerification = remoteChainConfigArg.gasForVerification;
       // The payload could be zero bytes if no offchain data is required.
       remoteChainConfig.payloadSizeBytes = remoteChainConfigArg.payloadSizeBytes;
+      remoteChainConfig.finalityConfig = remoteChainConfigArg.finalityConfig;
 
       emit RemoteChainConfigSet(
         remoteChainSelector, address(remoteChainConfigArg.router), remoteChainConfig.allowlistEnabled
@@ -241,16 +257,16 @@ abstract contract BaseVerifier is ICrossChainVerifierV1, ITypeAndVersion {
     uint64 destChainSelector,
     Client.EVM2AnyMessage memory, // message
     bytes memory, // extraArgs
-    bytes2 // finalityConfig
+    bytes2 requestedFinality
   ) external view virtual returns (uint16 feeUSDCents, uint32 gasForVerification, uint32 payloadSizeBytes) {
-    if (s_remoteChainConfigs[destChainSelector].router == IRouter(address(0))) {
+    RemoteChainConfig storage config = _getRemoteChainConfig(destChainSelector);
+
+    if (config.router == IRouter(address(0))) {
       revert RemoteChainNotSupported(destChainSelector);
     }
-    return (
-      s_remoteChainConfigs[destChainSelector].feeUSDCents,
-      s_remoteChainConfigs[destChainSelector].gasForVerification,
-      s_remoteChainConfigs[destChainSelector].payloadSizeBytes
-    );
+    FinalityCodec._ensureRequestedFinalityAllowed(requestedFinality, config.finalityConfig);
+
+    return (config.feeUSDCents, config.gasForVerification, config.payloadSizeBytes);
   }
 
   function _assertNotCursedByRMN(

chains/evm/contracts/libraries/FinalityCodec.sol

@@ -122,7 +122,7 @@ library FinalityCodec {
     // Otherwise, it must be block-depth based.
     uint16 requestedBlockDepth = uint16(requestedFinality & BLOCK_DEPTH_MASK);
     uint16 allowedBlockDepth = uint16(allowedFinality & BLOCK_DEPTH_MASK);
-    if (allowedBlockDepth == 0 || requestedBlockDepth > allowedBlockDepth) {
+    if (allowedBlockDepth == 0 || requestedBlockDepth < allowedBlockDepth) {
       revert InvalidBlockDepth(requestedBlockDepth, allowedBlockDepth);
     }
   }