Productionize RMN remote contract

contracts/.solhintignore

@@ -42,5 +42,8 @@
 ./src/v0.8/vendor
 ./node_modules/
 
-# Ignore RMN contracts temporarily
-./src/v0.8/ccip/rmn
+# Ignore RMNHome contract temporarily
+./src/v0.8/ccip/rmn/RMNHome.sol
+
+# Ignore tweaked vendored contracts
+./src/v0.8/shared/enumerable/EnumerableSetWithBytes16.sol

contracts/src/v0.8/ccip/interfaces/IRMNV2.sol

@@ -11,12 +11,29 @@ interface IRMNV2 {
     bytes32 s;
   }
 
-  function verify(Internal.MerkleRoot[] memory merkleRoots, Signature[] memory signatures) external view;
+  /// @notice Verifies signatures of RMN nodes, on dest lane updates as provided in the CommitReport
+  /// @param offRampAddress is not inferred by msg.sender, in case the call is made through ARMProxy
+  /// @param merkleRoots must be well formed, and is a representation of the CommitReport received from the oracles
+  /// @param signatures rmnNodes ECDSA sigs, only r & s, must be sorted in ascending order by signer address
+  /// @param rawVs rmnNodes ECDSA sigs, part v bitmap
+  /// @dev Will revert if verification fails
+  function verify(
+    address offRampAddress,
+    Internal.MerkleRoot[] memory merkleRoots,
+    Signature[] memory signatures,
+    uint256 rawVs
+  ) external view;
+
+  /// @notice gets the current set of cursed subjects
+  /// @return subjects the list of cursed subjects
+  function getCursedSubjects() external view returns (bytes16[] memory subjects);
 
   /// @notice If there is an active global or legacy curse, this function returns true.
+  /// @return bool true if there is an active global curse
   function isCursed() external view returns (bool);
 
   /// @notice If there is an active global curse, or an active curse for `subject`, this function returns true.
   /// @param subject To check whether a particular chain is cursed, set to bytes16(uint128(chainSelector)).
+  /// @return bool true if the provided subject is cured *or* if there is an active global curse
   function isCursed(bytes16 subject) external view returns (bool);
 }

contracts/src/v0.8/ccip/offRamp/OffRamp.sol

@@ -131,6 +131,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     Internal.PriceUpdates priceUpdates; // Collection of gas and price updates to commit
     Internal.MerkleRoot[] merkleRoots; // Collection of merkle roots per source chain to commit
     IRMNV2.Signature[] rmnSignatures; // RMN signatures on the merkle roots
+    uint256 rmnRawVs; // Raw v values of the RMN signatures
   }
 
   struct GasLimitOverride {
@@ -778,13 +779,13 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     bytes calldata report,
     bytes32[] calldata rs,
     bytes32[] calldata ss,
-    bytes32 rawVs // signatures
+    bytes32 rawVs
   ) external {
     CommitReport memory commitReport = abi.decode(report, (CommitReport));
 
     // Verify RMN signatures
     if (commitReport.merkleRoots.length > 0) {
-      i_rmn.verify(commitReport.merkleRoots, commitReport.rmnSignatures);
+      i_rmn.verify(address(this), commitReport.merkleRoots, commitReport.rmnSignatures, commitReport.rmnRawVs);
     }
 
     // Check if the report contains price updates

contracts/src/v0.8/ccip/rmn/RMNHome.sol

@@ -1,18 +1,22 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.24;
-
-import "@openzeppelin/contracts/access/Ownable2Step.sol";
+pragma solidity 0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 
+import {OwnerIsCreator} from "../../shared/access/OwnerIsCreator.sol";
+
 /// @notice Stores the home configuration for RMN, that is referenced by CCIP oracles, RMN nodes, and the RMNRemote
 /// contracts.
-contract RMNHome is Ownable2Step, ITypeAndVersion {
-  /// @dev temp placeholder to exclude this contract from coverage
-  function test() public {}
+contract RMNHome is OwnerIsCreator, ITypeAndVersion {
+  error DuplicatePeerId();
+  error DuplicateOffchainPublicKey();
+  error OutOfOrderSourceChains();
+  error OutOfOrderObserverNodeIndices();
+  error OutOfBoundsObserverNodeIndex();
+  error MinObserversTooHigh();
 
-  string public constant override typeAndVersion = "RMNHome 1.6.0-dev";
-  uint256 public constant CONFIG_RING_BUFFER_SIZE = 2;
+  event ConfigSet(bytes32 configDigest, VersionedConfig versionedConfig);
+  event ConfigRevoked(bytes32 configDigest);
 
   struct Node {
     string peerId; // used for p2p communication, base58 encoded
@@ -38,6 +42,9 @@ contract RMNHome is Ownable2Step, ITypeAndVersion {
     Config config;
   }
 
+  string public constant override typeAndVersion = "RMNHome 1.6.0-dev";
+  uint256 public constant CONFIG_RING_BUFFER_SIZE = 2;
+
   function _configDigest(VersionedConfig memory versionedConfig) internal pure returns (bytes32) {
     uint256 h = uint256(keccak256(abi.encode(versionedConfig)));
     uint256 prefixMask = type(uint256).max << (256 - 16); // 0xFFFF00..00
@@ -143,22 +150,4 @@ contract RMNHome is Ownable2Step, ITypeAndVersion {
       }
     }
   }
-
-  ///
-  /// Events
-  ///
-
-  event ConfigSet(bytes32 configDigest, VersionedConfig versionedConfig);
-  event ConfigRevoked(bytes32 configDigest);
-
-  ///
-  /// Errors
-  ///
-
-  error DuplicatePeerId();
-  error DuplicateOffchainPublicKey();
-  error OutOfOrderSourceChains();
-  error OutOfOrderObserverNodeIndices();
-  error OutOfBoundsObserverNodeIndex();
-  error MinObserversTooHigh();
 }