tests

RensR · RensR · commit c80ea0165f78 · 2026-03-24T13:49:41.000+01:00
diff --git a/chains/evm/contracts/libraries/FinalityCodec.sol b/chains/evm/contracts/libraries/FinalityCodec.sol
@@ -26,9 +26,10 @@ pragma solidity ^0.8.4;
 ///    0x0001..0x03FF                  — wait for N confirmation blocks (depth only, no flags).
 library FinalityCodec {
   error InvalidBlockDepth(uint16 requestedDepth, uint16 maxDepth);
+  error InvalidRequestedFinality(bytes2 requestedFinality, bytes2 allowedFinality);
   /// @notice Requested finality must be exactly one mode: any of the flag bits or a block depth with no upper flag bits.
   /// It cannot combine a flag with a block depth.
-  error InvalidRequestedFinality(bytes2 encodedFinality);
+  error RequestedFinalityCanOnlyHaveOneMode(bytes2 encodedFinality);
 
   /// @notice The block depth is stored in the lower 10 bits, leaving the upper 6 bits for flags. This allows for a
   /// maximum block depth of 1023, which should be sufficient for most use cases. For more security, users should wait
@@ -95,7 +96,7 @@ library FinalityCodec {
     // There must be exactly one active mode: either a block depth or a single flag. Selecting multiple modes is only
     // allowed for `allowedFinality` set by Pools, CCVs, etc., but not for `requestedFinality` set by senders.
     if (activeModes != 1) {
-      revert InvalidRequestedFinality(encodedFinality);
+      revert RequestedFinalityCanOnlyHaveOneMode(encodedFinality);
     }
   }
 
@@ -115,15 +116,15 @@ library FinalityCodec {
     // If any of the flags match, the request is allowed only when it has no depth field (flag-only request).
     if (requestedFinality >> BLOCK_DEPTH_BITS & allowedFinality >> BLOCK_DEPTH_BITS != 0) {
       if (uint16(requestedFinality & BLOCK_DEPTH_MASK) != 0) {
-        revert InvalidRequestedFinality(requestedFinality);
+        revert InvalidRequestedFinality(requestedFinality, allowedFinality);
       }
       return;
     }
     // 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) {
-      revert InvalidBlockDepth(requestedBlockDepth, allowedBlockDepth);
+      revert InvalidRequestedFinality(requestedFinality, allowedFinality);
     }
   }
 }
diff --git a/chains/evm/contracts/test/ccvs/CCTPVerifier/CCTPVerifier.applyAllowlistUpdates.t.sol b/chains/evm/contracts/test/ccvs/CCTPVerifier/CCTPVerifier.applyAllowlistUpdates.t.sol
@@ -32,9 +32,9 @@ contract CCTPVerifier_applyAllowlistUpdates is CCTPVerifierSetup {
 
     s_cctpVerifier.applyAllowlistUpdates(allowlistConfigs);
 
-    (bool allowlistEnabled,, address[] memory allowlistSender) =
+    (BaseVerifier.RemoteChainConfigArgs memory config, address[] memory allowlistSender) =
       s_cctpVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
-    assertEq(allowlistEnabled, allowlistConfigs[0].allowlistEnabled);
+    assertEq(config.allowlistEnabled, allowlistConfigs[0].allowlistEnabled);
     assertEq(allowlistSender.length, allowlistConfigs[0].addedAllowlistedSenders.length);
     assertEq(allowlistSender[0], allowlistConfigs[0].addedAllowlistedSenders[0]);
   }
diff --git a/chains/evm/contracts/test/ccvs/CCTPVerifier/CCTPVerifier.applyDestChainConfigUpdates.t.sol b/chains/evm/contracts/test/ccvs/CCTPVerifier/CCTPVerifier.applyDestChainConfigUpdates.t.sol
@@ -19,19 +19,20 @@ contract CCTPVerifier_applyRemoteChainConfigUpdates is CCTPVerifierSetup {
       allowlistEnabled: true,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
 
     vm.expectEmit();
     emit BaseVerifier.RemoteChainConfigSet(newChainSelector, router, true);
 
     s_cctpVerifier.applyRemoteChainConfigUpdates(args);
 
-    (bool allowlistEnabled, address newRouter, address[] memory allowedSenders) =
+    (BaseVerifier.RemoteChainConfigArgs memory config, address[] memory allowedSenders) =
       s_cctpVerifier.getRemoteChainConfig(newChainSelector);
 
-    assertEq(allowlistEnabled, true);
-    assertEq(newRouter, router);
+    assertEq(config.allowlistEnabled, true);
+    assertEq(address(config.router), router);
     assertEq(allowedSenders.length, 0);
   }
 
diff --git a/chains/evm/contracts/test/ccvs/CCTPVerifier/CCTPVerifierSetup.t.sol b/chains/evm/contracts/test/ccvs/CCTPVerifier/CCTPVerifierSetup.t.sol
@@ -71,7 +71,8 @@ contract CCTPVerifierSetup is BaseVerifierSetup {
       allowlistEnabled: false,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
     s_cctpVerifier.applyRemoteChainConfigUpdates(remoteChainConfigArgs);
 
diff --git a/chains/evm/contracts/test/ccvs/CommitteeVerifier/CommitteeVerifier.applyAllowlistUpdates.t.sol b/chains/evm/contracts/test/ccvs/CommitteeVerifier/CommitteeVerifier.applyAllowlistUpdates.t.sol
@@ -32,9 +32,9 @@ contract CommitteeVerifier_applyAllowlistUpdates is CommitteeVerifierSetup {
 
     s_committeeVerifier.applyAllowlistUpdates(allowlistConfigs);
 
-    (bool allowlistEnabled,, address[] memory allowlistSender) =
+    (BaseVerifier.RemoteChainConfigArgs memory config, address[] memory allowlistSender) =
       s_committeeVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
-    assertEq(allowlistEnabled, allowlistConfigs[0].allowlistEnabled);
+    assertEq(config.allowlistEnabled, allowlistConfigs[0].allowlistEnabled);
     assertEq(allowlistSender.length, allowlistConfigs[0].addedAllowlistedSenders.length);
     assertEq(allowlistSender[0], allowlistConfigs[0].addedAllowlistedSenders[0]);
   }
diff --git a/chains/evm/contracts/test/ccvs/CommitteeVerifier/CommitteeVerifier.applyDestChainConfigUpdates.t.sol b/chains/evm/contracts/test/ccvs/CommitteeVerifier/CommitteeVerifier.applyDestChainConfigUpdates.t.sol
@@ -19,19 +19,20 @@ contract CommitteeVerifier_applyRemoteChainConfigUpdates is CommitteeVerifierSet
       allowlistEnabled: true,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
 
     vm.expectEmit();
     emit BaseVerifier.RemoteChainConfigSet(NEW_DEST_SELECTOR, router, true);
 
     s_committeeVerifier.applyRemoteChainConfigUpdates(args);
 
-    (bool allowlistEnabled, address newRouter, address[] memory allowedSenders) =
+    (BaseVerifier.RemoteChainConfigArgs memory config, address[] memory allowedSenders) =
       s_committeeVerifier.getRemoteChainConfig(NEW_DEST_SELECTOR);
 
-    assertEq(allowlistEnabled, true);
-    assertEq(newRouter, router);
+    assertEq(config.allowlistEnabled, true);
+    assertEq(address(config.router), router);
     assertEq(allowedSenders.length, 0);
   }
 
diff --git a/chains/evm/contracts/test/ccvs/CommitteeVerifier/CommitteeVerifierSetup.t.sol b/chains/evm/contracts/test/ccvs/CommitteeVerifier/CommitteeVerifierSetup.t.sol
@@ -38,7 +38,8 @@ contract CommitteeVerifierSetup is BaseVerifierSetup {
       allowlistEnabled: false,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
 
     s_committeeVerifier.applyRemoteChainConfigUpdates(remoteChainConfigs);
diff --git a/chains/evm/contracts/test/ccvs/LombardVerifier/LombardVerifier.applyAllowlistUpdates.t.sol b/chains/evm/contracts/test/ccvs/LombardVerifier/LombardVerifier.applyAllowlistUpdates.t.sol
@@ -21,7 +21,8 @@ contract LombardVerifier_applyAllowlistUpdates is LombardVerifierSetup {
       allowlistEnabled: true,
       feeUSDCents: 100,
       gasForVerification: 50_000,
-      payloadSizeBytes: 100
+      payloadSizeBytes: 100,
+      finalityConfig: bytes2(0)
     });
     s_lombardVerifier.applyRemoteChainConfigUpdates(remoteChainConfigArgs);
   }
@@ -46,13 +47,13 @@ contract LombardVerifier_applyAllowlistUpdates is LombardVerifierSetup {
 
     s_lombardVerifier.applyAllowlistUpdates(allowlistConfigArgs);
 
-    (bool allowlistEnabled,, address[] memory allowedSenders) =
+    (BaseVerifier.RemoteChainConfigArgs memory config1, address[] memory allowedSenders1) =
       s_lombardVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
 
-    assertTrue(allowlistEnabled);
-    assertEq(allowedSenders.length, 2);
-    assertEq(allowedSenders[0], SENDER1);
-    assertEq(allowedSenders[1], SENDER2);
+    assertTrue(config1.allowlistEnabled);
+    assertEq(allowedSenders1.length, 2);
+    assertEq(allowedSenders1[0], SENDER1);
+    assertEq(allowedSenders1[1], SENDER2);
   }
 
   function test_applyAllowlistUpdates_RemoveSenders() public {
@@ -88,7 +89,7 @@ contract LombardVerifier_applyAllowlistUpdates is LombardVerifierSetup {
 
     s_lombardVerifier.applyAllowlistUpdates(allowlistConfigArgs);
 
-    (,, address[] memory allowedSenders) = s_lombardVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
+    (, address[] memory allowedSenders) = s_lombardVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
 
     assertEq(allowedSenders.length, 2);
     // Verify SENDER2 is not in the list
@@ -125,9 +126,9 @@ contract LombardVerifier_applyAllowlistUpdates is LombardVerifierSetup {
 
     s_lombardVerifier.applyAllowlistUpdates(allowlistConfigArgs);
 
-    (bool allowlistEnabled,,) = s_lombardVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
+    (BaseVerifier.RemoteChainConfigArgs memory config2,) = s_lombardVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
 
-    assertFalse(allowlistEnabled);
+    assertFalse(config2.allowlistEnabled);
   }
 
   function test_applyAllowlistUpdates_RevertWhen_NotOwner() public {
diff --git a/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.applyAllowlistUpdates.t.sol b/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.applyAllowlistUpdates.t.sol
@@ -27,7 +27,7 @@ contract BaseVerifier_applyAllowlistUpdates is BaseVerifierSetup {
     s_baseVerifier.applyAllowlistUpdates(allowlistConfigs);
 
     // Verify sender was added.
-    (,, address[] memory allowedSenders) = s_baseVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
+    (, address[] memory allowedSenders) = s_baseVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
     assertEq(allowedSenders.length, 1);
     assertEq(allowedSenders[0], senders[0]);
   }
@@ -59,7 +59,7 @@ contract BaseVerifier_applyAllowlistUpdates is BaseVerifierSetup {
 
     s_baseVerifier.applyAllowlistUpdates(updateConfigs);
 
-    (,, address[] memory allowedSenders) = s_baseVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
+    (, address[] memory allowedSenders) = s_baseVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
     assertEq(allowedSenders[0], newSendersToAdd[0]);
   }
 
@@ -82,8 +82,8 @@ contract BaseVerifier_applyAllowlistUpdates is BaseVerifierSetup {
 
     s_baseVerifier.applyAllowlistUpdates(disableConfigs);
 
-    (bool allowlistEnabled,,) = s_baseVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
-    assertFalse(allowlistEnabled);
+    (BaseVerifier.RemoteChainConfigArgs memory config,) = s_baseVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
+    assertFalse(config.allowlistEnabled);
 
     // Enabling it again will emit AllowListStateChanged.
     vm.expectEmit();
diff --git a/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.applyDestChainConfigUpdates.t.sol b/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.applyDestChainConfigUpdates.t.sol
@@ -20,10 +20,10 @@ contract BaseVerifier_applyRemoteChainConfigUpdates is BaseVerifierSetup {
     s_baseVerifier.applyRemoteChainConfigUpdates(remoteChainConfigs);
 
     // Verify config was set.
-    (bool allowlistEnabled, address router,) =
+    (BaseVerifier.RemoteChainConfigArgs memory config,) =
       s_baseVerifier.getRemoteChainConfig(remoteChainConfigs[0].remoteChainSelector);
-    assertEq(router, address(remoteChainConfigs[0].router));
-    assertEq(allowlistEnabled, remoteChainConfigs[0].allowlistEnabled);
+    assertEq(address(config.router), address(remoteChainConfigs[0].router));
+    assertEq(config.allowlistEnabled, remoteChainConfigs[0].allowlistEnabled);
   }
 
   // Reverts
@@ -45,7 +45,8 @@ contract BaseVerifier_applyRemoteChainConfigUpdates is BaseVerifierSetup {
       allowlistEnabled: false,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: 0, // Zero gas should revert.
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
 
     vm.expectRevert(abi.encodeWithSelector(BaseVerifier.DestGasCannotBeZero.selector, remoteChainSelector));
diff --git a/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.getDestChainConfig.t.sol b/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.getDestChainConfig.t.sol
@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.24;
 
+import {BaseVerifier} from "../../../../ccvs/components/BaseVerifier.sol";
 import {BaseVerifierSetup} from "./BaseVerifierSetup.t.sol";
 
 contract BaseVerifier_getRemoteChainConfig is BaseVerifierSetup {
   function test_getRemoteChainConfig() public view {
     // Get config for the default destination chain set in setup.
-    (bool allowlistEnabled, address router, address[] memory allowedSenders) =
+    (BaseVerifier.RemoteChainConfigArgs memory config, address[] memory allowedSenders) =
       s_baseVerifier.getRemoteChainConfig(DEST_CHAIN_SELECTOR);
 
-    assertEq(router, address(s_router));
-    assertFalse(allowlistEnabled);
+    assertEq(address(config.router), address(s_router));
+    assertFalse(config.allowlistEnabled);
     assertEq(allowedSenders.length, 0);
   }
 }
diff --git a/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.getFee.t.sol b/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.getFee.t.sol
@@ -3,24 +3,84 @@ pragma solidity ^0.8.24;
 
 import {BaseVerifier} from "../../../../ccvs/components/BaseVerifier.sol";
 import {Client} from "../../../../libraries/Client.sol";
+import {FinalityCodec} from "../../../../libraries/FinalityCodec.sol";
 import {BaseVerifierSetup} from "./BaseVerifierSetup.t.sol";
 
 contract BaseVerifier_getFee is BaseVerifierSetup {
   function test_getFee() public view {
     Client.EVM2AnyMessage memory message;
     (uint256 feeUSDCents, uint32 gasForVerification, uint32 payloadSizeBytes) =
-      s_baseVerifier.getFee(DEST_CHAIN_SELECTOR, message, "", 0);
+      s_baseVerifier.getFee(DEST_CHAIN_SELECTOR, message, "", bytes2(0));
 
     assertEq(feeUSDCents, DEFAULT_CCV_FEE_USD_CENTS);
     assertEq(gasForVerification, DEFAULT_CCV_GAS_LIMIT);
     assertEq(payloadSizeBytes, DEFAULT_CCV_PAYLOAD_SIZE);
   }
 
+  function test_getFee_WithWaitForSafeFlag() public {
+    // Configure chain to allow the WAIT_FOR_SAFE flag.
+    BaseVerifier.RemoteChainConfigArgs[] memory configs = new BaseVerifier.RemoteChainConfigArgs[](1);
+    configs[0] = _getRemoteChainConfig(s_router, DEST_CHAIN_SELECTOR, false);
+    configs[0].finalityConfig = FinalityCodec.WAIT_FOR_SAFE_FLAG;
+    s_baseVerifier.applyRemoteChainConfigUpdates(configs);
+
+    Client.EVM2AnyMessage memory message;
+    (uint256 feeUSDCents,,) = s_baseVerifier.getFee(DEST_CHAIN_SELECTOR, message, "", FinalityCodec.WAIT_FOR_SAFE_FLAG);
+    assertEq(feeUSDCents, DEFAULT_CCV_FEE_USD_CENTS);
+  }
+
+  function test_getFee_WithAllowedBlockDepth() public {
+    // Configure chain to allow up to 10 block confirmations.
+    BaseVerifier.RemoteChainConfigArgs[] memory configs = new BaseVerifier.RemoteChainConfigArgs[](1);
+    configs[0] = _getRemoteChainConfig(s_router, DEST_CHAIN_SELECTOR, false);
+    configs[0].finalityConfig = FinalityCodec._encodeBlockDepth(10);
+    s_baseVerifier.applyRemoteChainConfigUpdates(configs);
+
+    Client.EVM2AnyMessage memory message;
+    // Request 10 blocks — meets the minimum of 5 (request more security than required is fine).
+    (uint256 feeUSDCents,,) =
+      s_baseVerifier.getFee(DEST_CHAIN_SELECTOR, message, "", FinalityCodec._encodeBlockDepth(10));
+    assertEq(feeUSDCents, DEFAULT_CCV_FEE_USD_CENTS);
+  }
+
+  function test_getFee_RevertWhen_BlockDepthBelowMinimum() public {
+    // Configure chain to require at least 10 block confirmations.
+    BaseVerifier.RemoteChainConfigArgs[] memory configs = new BaseVerifier.RemoteChainConfigArgs[](1);
+    configs[0] = _getRemoteChainConfig(s_router, DEST_CHAIN_SELECTOR, false);
+    configs[0].finalityConfig = FinalityCodec._encodeBlockDepth(10);
+    s_baseVerifier.applyRemoteChainConfigUpdates(configs);
+
+    Client.EVM2AnyMessage memory message;
+    // Request 5 blocks — below the minimum of 10.
+    vm.expectRevert(
+      abi.encodeWithSelector(
+        FinalityCodec.InvalidRequestedFinality.selector,
+        FinalityCodec._encodeBlockDepth(5),
+        FinalityCodec._encodeBlockDepth(10)
+      )
+    );
+    s_baseVerifier.getFee(DEST_CHAIN_SELECTOR, message, "", FinalityCodec._encodeBlockDepth(5));
+  }
+
+  function test_getFee_RevertWhen_BlockDepthRequestedButOnlyFinalityAllowed() public {
+    // Default setup has finalityConfig = bytes2(0) → only WAIT_FOR_FINALITY accepted.
+    Client.EVM2AnyMessage memory message;
+    vm.expectRevert(abi.encodeWithSelector(FinalityCodec.InvalidRequestedFinality.selector, FinalityCodec._encodeBlockDepth(1), bytes2(0)));
+    s_baseVerifier.getFee(DEST_CHAIN_SELECTOR, message, "", FinalityCodec._encodeBlockDepth(1));
+  }
+
+  function test_getFee_RevertWhen_SafeFlagNotAllowed() public {
+    // Default setup only allows finality (bytes2(0)) — WAIT_FOR_SAFE is not in allowed flags.
+    Client.EVM2AnyMessage memory message;
+    vm.expectRevert(abi.encodeWithSelector(FinalityCodec.InvalidRequestedFinality.selector, FinalityCodec.WAIT_FOR_SAFE_FLAG, bytes2(0)));
+    s_baseVerifier.getFee(DEST_CHAIN_SELECTOR, message, "", FinalityCodec.WAIT_FOR_SAFE_FLAG);
+  }
+
   function test_getFee_RevertWhen_DestinationNotSupported() public {
     uint64 wrongDestChainSelector = DEST_CHAIN_SELECTOR + 1;
     Client.EVM2AnyMessage memory message;
 
     vm.expectRevert(abi.encodeWithSelector(BaseVerifier.RemoteChainNotSupported.selector, wrongDestChainSelector));
-    s_baseVerifier.getFee(wrongDestChainSelector, message, "", 0);
+    s_baseVerifier.getFee(wrongDestChainSelector, message, "", bytes2(0));
   }
 }
diff --git a/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifierSetup.t.sol b/chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifierSetup.t.sol
@@ -44,7 +44,8 @@ contract BaseVerifierSetup is FeeQuoterSetup {
       allowlistEnabled: false,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
 
     s_baseVerifier.applyRemoteChainConfigUpdates(remoteChainConfigs);
@@ -63,7 +64,8 @@ contract BaseVerifierSetup is FeeQuoterSetup {
       allowlistEnabled: allowlistEnabled,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
   }
 
diff --git a/chains/evm/contracts/test/e2e/e2e.cctp.t.sol b/chains/evm/contracts/test/e2e/e2e.cctp.t.sol
@@ -338,7 +338,8 @@ contract cctp_e2e is OnRampSetup {
       allowlistEnabled: false,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
     s_sourceCCTPSetup.verifier.applyRemoteChainConfigUpdates(remoteChainConfigArgs);
 
@@ -349,7 +350,8 @@ contract cctp_e2e is OnRampSetup {
       allowlistEnabled: false,
       feeUSDCents: DEFAULT_CCV_FEE_USD_CENTS,
       gasForVerification: DEFAULT_CCV_GAS_LIMIT,
-      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE
+      payloadSizeBytes: DEFAULT_CCV_PAYLOAD_SIZE,
+      finalityConfig: bytes2(0)
     });
     s_destCCTPSetup.verifier.applyRemoteChainConfigUpdates(remoteChainConfigArgs);
 
diff --git a/chains/evm/contracts/test/e2e/e2e.feeWithdraw.t.sol b/chains/evm/contracts/test/e2e/e2e.feeWithdraw.t.sol
@@ -115,7 +115,8 @@ contract e2e_feeWithdrawal is OnRampSetup {
       allowlistEnabled: false,
       feeUSDCents: uint16(VERIFIER_FEE_USD_CENTS), // $2.00 fee for verifier
       gasForVerification: VERIFIER_GAS,
-      payloadSizeBytes: VERIFIER_BYTES
+      payloadSizeBytes: uint16(VERIFIER_BYTES),
+      finalityConfig: bytes2(0)
     });
     s_verifierImpl.applyRemoteChainConfigUpdates(destChainConfigs);
 
diff --git a/chains/evm/contracts/test/e2e/e2e.lombard.t.sol b/chains/evm/contracts/test/e2e/e2e.lombard.t.sol
diff --git a/chains/evm/contracts/test/e2e/e2e.t.sol b/chains/evm/contracts/test/e2e/e2e.t.sol
diff --git a/chains/evm/contracts/test/feeQuoter/FeeQuoterSetup.t.sol b/chains/evm/contracts/test/feeQuoter/FeeQuoterSetup.t.sol
diff --git a/chains/evm/contracts/test/libraries/FinalityCodec/FinalityCodec._ensureRequestedFinalityAllowed.t.sol b/chains/evm/contracts/test/libraries/FinalityCodec/FinalityCodec._ensureRequestedFinalityAllowed.t.sol
diff --git a/chains/evm/contracts/test/libraries/FinalityCodec/FinalityCodec._validateRequestedFinality.t.sol b/chains/evm/contracts/test/libraries/FinalityCodec/FinalityCodec._validateRequestedFinality.t.sol
diff --git a/chains/evm/contracts/test/onRamp/OnRamp/OnRamp.forwardFromRouter.t.sol b/chains/evm/contracts/test/onRamp/OnRamp/OnRamp.forwardFromRouter.t.sol
diff --git a/chains/evm/contracts/test/onRamp/OnRamp/OnRamp.getFee.t.sol b/chains/evm/contracts/test/onRamp/OnRamp/OnRamp.getFee.t.sol

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,10 @@ pragma solidity ^0.8.4;`
`26`	`26`	`/// 0x0001..0x03FF — wait for N confirmation blocks (depth only, no flags).`
`27`	`27`	`library FinalityCodec {`
`28`	`28`	`error InvalidBlockDepth(uint16 requestedDepth, uint16 maxDepth);`
	`29`	`+ error InvalidRequestedFinality(bytes2 requestedFinality, bytes2 allowedFinality);`
`29`	`30`	`/// @notice Requested finality must be exactly one mode: any of the flag bits or a block depth with no upper flag bits.`
`30`	`31`	`/// It cannot combine a flag with a block depth.`
`31`		`- error InvalidRequestedFinality(bytes2 encodedFinality);`
	`32`	`+ error RequestedFinalityCanOnlyHaveOneMode(bytes2 encodedFinality);`
`32`	`33`
`33`	`34`	`/// @notice The block depth is stored in the lower 10 bits, leaving the upper 6 bits for flags. This allows for a`
`34`	`35`	`/// maximum block depth of 1023, which should be sufficient for most use cases. For more security, users should wait`
`@@ -95,7 +96,7 @@ library FinalityCodec {`
`95`	`96`	`// There must be exactly one active mode: either a block depth or a single flag. Selecting multiple modes is only`
`96`	`97`	// allowed for `allowedFinality` set by Pools, CCVs, etc., but not for `requestedFinality` set by senders.
`97`	`98`	`if (activeModes != 1) {`
`98`		`- revert InvalidRequestedFinality(encodedFinality);`
	`99`	`+ revert RequestedFinalityCanOnlyHaveOneMode(encodedFinality);`
`99`	`100`	`}`
`100`	`101`	`}`
`101`	`102`
`@@ -115,15 +116,15 @@ library FinalityCodec {`
`115`	`116`	`// If any of the flags match, the request is allowed only when it has no depth field (flag-only request).`
`116`	`117`	`if (requestedFinality >> BLOCK_DEPTH_BITS & allowedFinality >> BLOCK_DEPTH_BITS != 0) {`
`117`	`118`	`if (uint16(requestedFinality & BLOCK_DEPTH_MASK) != 0) {`
`118`		`- revert InvalidRequestedFinality(requestedFinality);`
	`119`	`+ revert InvalidRequestedFinality(requestedFinality, allowedFinality);`
`119`	`120`	`}`
`120`	`121`	`return;`
`121`	`122`	`}`
`122`	`123`	`// Otherwise, it must be block-depth based.`
`123`	`124`	`uint16 requestedBlockDepth = uint16(requestedFinality & BLOCK_DEPTH_MASK);`
`124`	`125`	`uint16 allowedBlockDepth = uint16(allowedFinality & BLOCK_DEPTH_MASK);`
`125`	`126`	`if (allowedBlockDepth == 0 \|\| requestedBlockDepth < allowedBlockDepth) {`
`126`		`- revert InvalidBlockDepth(requestedBlockDepth, allowedBlockDepth);`
	`127`	`+ revert InvalidRequestedFinality(requestedFinality, allowedFinality);`
`127`	`128`	`}`
`128`	`129`	`}`
`129`	`130`	`}`