Merge branch 'capability-registry-internal-review' into KS-264/capabi…

…lity-registry-internal-review-informational-findings
smartcontractkit · Jun 5, 2024 · 9affacc · 9affacc
2 parents 045a940 + f57ca21
commit 9affacc
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 164 deletions.
diff --git a/.changeset/cuddly-lions-sneeze.md b/.changeset/cuddly-lions-sneeze.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal remove update capabilities from capability registry
diff --git a/contracts/.changeset/silent-ravens-lay.md b/contracts/.changeset/silent-ravens-lay.md
@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+remove update capabilities from capability registry
diff --git a/contracts/src/v0.8/keystone/CapabilityRegistry.sol b/contracts/src/v0.8/keystone/CapabilityRegistry.sol
@@ -549,6 +549,9 @@ contract CapabilityRegistry is OwnerIsCreator, TypeAndVersionInterface {
 
   /// @notice Adds a new capability to the capability registry
   /// @param capabilities The capabilities being added
+  /// @dev There is no function to update capabilities as this would require
+  /// nodes to trust that the capabilities they support are not updated by the
+  /// admin
   function addCapabilities(Capability[] calldata capabilities) external onlyOwner {
     for (uint256 i; i < capabilities.length; ++i) {
       Capability memory capability = capabilities[i];
@@ -558,17 +561,6 @@ contract CapabilityRegistry is OwnerIsCreator, TypeAndVersionInterface {
     }
   }
 
-  /// @notice Updates capabilities
-  /// @param capabilities The updated capability params
-  function updateCapabilities(Capability[] calldata capabilities) external onlyOwner {
-    for (uint256 i; i < capabilities.length; ++i) {
-      Capability memory capability = capabilities[i];
-      bytes32 hashedCapabilityId = getHashedCapabilityId(capability.labelledName, capability.version);
-      if (!s_hashedCapabilityIds.contains(hashedCapabilityId)) revert CapabilityDoesNotExist(hashedCapabilityId);
-      _setCapability(hashedCapabilityId, capability);
-    }
-  }
-
   /// @notice Deprecates a capability
   /// @param hashedCapabilityIds[] The IDs of the capabilities to deprecate
   function deprecateCapabilities(bytes32[] calldata hashedCapabilityIds) external onlyOwner {

diff --git a/contracts/src/v0.8/keystone/test/CapabilityRegistry_UpdateCapabilitiesTest.t.sol b/contracts/src/v0.8/keystone/test/CapabilityRegistry_UpdateCapabilitiesTest.t.sol