feat: add operator table updater to CCR

src/contracts/interfaces/ICrossChainRegistry.sol

@@ -43,6 +43,9 @@ interface ICrossChainRegistryErrors {
 
     /// @notice Thrown when the storage is not cleared
     error NeedToDelete();
+
+    /// @notice Thrown when the lengths between two arrays are not the same
+    error ArrayLengthMismatch();
 }
 
 interface ICrossChainRegistryTypes {
@@ -77,7 +80,7 @@ interface ICrossChainRegistryEvents is ICrossChainRegistryTypes {
     event TransportDestinationRemoved(OperatorSet operatorSet, uint256 chainID);
 
     /// @notice Emitted when a chainID is added to the whitelist
-    event ChainIDAddedToWhitelist(uint256 chainID);
+    event ChainIDAddedToWhitelist(uint256 chainID, address operatorTableUpdater);
 
     /// @notice Emitted when a chainID is removed from the whitelist
     event ChainIDRemovedFromWhitelist(uint256 chainID);
@@ -150,11 +153,10 @@ interface ICrossChainRegistry is ICrossChainRegistryErrors, ICrossChainRegistryE
     /**
      * @notice Adds chainIDs to the whitelist of chainIDs that can be transported to
      * @param chainIDs the chainIDs to add to the whitelist
+     * @param operatorTableUpdaters the operatorTableUpdaters for each whitelisted chainID
      * @dev msg.sender must be the owner of the CrossChainRegistry
      */
-    function addChainIDsToWhitelist(
-        uint256[] calldata chainIDs
-    ) external;
+    function addChainIDsToWhitelist(uint256[] calldata chainIDs, address[] calldata operatorTableUpdaters) external;
 
     /**
      * @notice Removes chainIDs from the whitelist of chainIDs that can be transported to
@@ -228,6 +230,7 @@ interface ICrossChainRegistry is ICrossChainRegistryErrors, ICrossChainRegistryE
     /**
      * @notice Gets the list of chains that are supported by the CrossChainRegistry
      * @return An array of chainIDs that are supported by the CrossChainRegistry
+     * @return An array of operatorTableUpdaters corresponding to each chainID
      */
-    function getSupportedChains() external view returns (uint256[] memory);
+    function getSupportedChains() external view returns (uint256[] memory, address[] memory);
 }

src/contracts/interfaces/IOperatorTableUpdater.sol

@@ -98,15 +98,15 @@ interface IOperatorTableUpdater is
      * @param globalTableRoot the new globalTableRoot
      * @param operatorSetIndex the index of the given operatorSet being updated
      * @param proof the proof of the leaf at index against the globalTableRoot
-     * @param tableInfo the tableInfo of the operator table
-     * @dev Depending on the decoded KeyType, the tableInfo will be decoded to a
+     * @param operatorTableBytes the bytes of the operator table
+     * @dev Depending on the decoded KeyType, the tableInfo will be decoded
      */
     function updateOperatorTable(
         uint32 referenceTimestamp,
         bytes32 globalTableRoot,
         uint32 operatorSetIndex,
         bytes calldata proof,
-        bytes calldata tableInfo
+        bytes calldata operatorTableBytes
     ) external;
 
     /**

src/contracts/multichain/CrossChainRegistry.sol

@@ -23,6 +23,7 @@ contract CrossChainRegistry is
     PermissionControllerMixin,
     SemVerMixin
 {
+    using EnumerableMap for EnumerableMap.UintToAddressMap;
     using EnumerableSet for EnumerableSet.Bytes32Set;
     using EnumerableSet for EnumerableSet.UintSet;
     using OperatorSetLib for OperatorSet;
@@ -205,18 +206,21 @@ contract CrossChainRegistry is
 
     /// @inheritdoc ICrossChainRegistry
     function addChainIDsToWhitelist(
-        uint256[] calldata chainIDs
+        uint256[] calldata chainIDs,
+        address[] calldata operatorTableUpdaters
     ) external onlyOwner onlyWhenNotPaused(PAUSED_CHAIN_WHITELIST) {
+        require(chainIDs.length == operatorTableUpdaters.length, ArrayLengthMismatch());
+
         for (uint256 i = 0; i < chainIDs.length; i++) {
             uint256 chainID = chainIDs[i];
 
             // Validate chainID
             require(chainID != 0, InvalidChainId());
 
             // Add to whitelist
-            require(_whitelistedChainIDs.add(chainID), ChainIDAlreadyWhitelisted());
+            require(_whitelistedChainIDs.set(chainID, operatorTableUpdaters[i]), ChainIDAlreadyWhitelisted());
 
-            emit ChainIDAddedToWhitelist(chainID);
+            emit ChainIDAddedToWhitelist(chainID, operatorTableUpdaters[i]);
         }
     }
 
@@ -438,7 +442,17 @@ contract CrossChainRegistry is
     }
 
     /// @inheritdoc ICrossChainRegistry
-    function getSupportedChains() external view returns (uint256[] memory) {
-        return _whitelistedChainIDs.values();
+    function getSupportedChains() external view returns (uint256[] memory, address[] memory) {
+        uint256 length = _whitelistedChainIDs.length();
+        uint256[] memory chainIDs = new uint256[](length);
+        address[] memory operatorTableUpdaters = new address[](length);
+
+        for (uint256 i = 0; i < length; i++) {
+            (uint256 chainID, address operatorTableUpdater) = _whitelistedChainIDs.at(i);
+            chainIDs[i] = chainID;
+            operatorTableUpdaters[i] = operatorTableUpdater;
+        }
+
+        return (chainIDs, operatorTableUpdaters);
     }
 }

src/contracts/multichain/CrossChainRegistryStorage.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.27;
 
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 import "../interfaces/ICrossChainRegistry.sol";
 import "../interfaces/IOperatorTableCalculator.sol";
 import "../interfaces/IAllocationManager.sol";
@@ -15,6 +16,7 @@ import "../libraries/OperatorSetLib.sol";
  * @dev This abstract contract is designed to be inherited by the CrossChainRegistry implementation
  */
 abstract contract CrossChainRegistryStorage is ICrossChainRegistry {
+    using EnumerableMap for EnumerableMap.UintToAddressMap;
     using EnumerableSet for EnumerableSet.Bytes32Set;
     using EnumerableSet for EnumerableSet.UintSet;
     using OperatorSetLib for OperatorSet;
@@ -62,8 +64,8 @@ abstract contract CrossChainRegistryStorage is ICrossChainRegistry {
 
     /// CHAIN WHITELISTING
 
-    /// @dev Set of whitelisted chain IDs that can be used as transport destinations
-    EnumerableSet.UintSet internal _whitelistedChainIDs;
+    /// @dev Map of whitelisted chain IDs to operator table updaters
+    EnumerableMap.UintToAddressMap internal _whitelistedChainIDs;
 
     // Construction
 
@@ -77,5 +79,5 @@ abstract contract CrossChainRegistryStorage is ICrossChainRegistry {
      * variables without shifting down storage in the inheritance chain.
      * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps
      */
-    uint256[43] private __gap;
+    uint256[42] private __gap;
 }

src/contracts/multichain/OperatorTableUpdater.sol

@@ -89,10 +89,10 @@ contract OperatorTableUpdater is Initializable, OwnableUpgradeable, OperatorTabl
         bytes32 globalTableRoot,
         uint32 operatorSetIndex,
         bytes calldata proof,
-        bytes calldata tableInfo
+        bytes calldata operatorTableBytes
     ) external {
         (OperatorSet memory operatorSet, CurveType curveType, OperatorSetConfig memory operatorSetConfig) =
-            _getOperatorTableInfo(tableInfo);
+            _getOperatorTableInfo(operatorTableBytes);
 
         // Check that the `referenceTimestamp` is greater than the latest reference timestamp
         require(
@@ -107,17 +107,17 @@ contract OperatorTableUpdater is Initializable, OwnableUpgradeable, OperatorTabl
             globalTableRoot: globalTableRoot,
             operatorSetIndex: operatorSetIndex,
             proof: proof,
-            operatorSetLeafHash: keccak256(tableInfo)
+            operatorSetLeafHash: keccak256(operatorTableBytes)
         });
 
         // Update the operator table
         if (curveType == CurveType.BN254) {
             bn254CertificateVerifier.updateOperatorTable(
-                operatorSet, referenceTimestamp, _getBN254OperatorSetInfo(tableInfo), operatorSetConfig
+                operatorSet, referenceTimestamp, _getBN254OperatorSetInfo(operatorTableBytes), operatorSetConfig
             );
         } else if (curveType == CurveType.ECDSA) {
             ecdsaCertificateVerifier.updateOperatorTable(
-                operatorSet, referenceTimestamp, _getECDSAOperatorSetInfo(tableInfo), operatorSetConfig
+                operatorSet, referenceTimestamp, _getECDSAOperatorSetInfo(operatorTableBytes), operatorSetConfig
             );
         } else {
             revert InvalidCurveType();