Allow rotating encryptionPublicKey in CapabilitiesRegistry (#14760)

* allow updating key * added changesets * prettier & wrappers * bump --------- Co-authored-by: krehermann <[email protected]>
smartcontractkit · Oct 14, 2024 · 3af39c8 · 3af39c8
1 parent 16499e5
commit 3af39c8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/.changeset/forty-lizards-camp.md b/.changeset/forty-lizards-camp.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Enable rotating encryptionPublicKey in CapabilitiesRegistry contract
diff --git a/contracts/.changeset/silent-houses-join.md b/contracts/.changeset/silent-houses-join.md
@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+Enable rotating encryptionPublicKey in CapabilitiesRegistry contract
diff --git a/contracts/src/v0.8/keystone/CapabilitiesRegistry.sol b/contracts/src/v0.8/keystone/CapabilitiesRegistry.sol
@@ -641,6 +641,8 @@ contract CapabilitiesRegistry is OwnerIsCreator, TypeAndVersionInterface {
         s_nodeSigners.add(node.signer);
       }
 
+      if (node.encryptionPublicKey == bytes32("")) revert InvalidNodeEncryptionPublicKey(node.encryptionPublicKey);
+
       bytes32[] memory supportedHashedCapabilityIds = node.hashedCapabilityIds;
       if (supportedHashedCapabilityIds.length == 0) revert InvalidNodeCapabilities(supportedHashedCapabilityIds);
 
@@ -678,6 +680,7 @@ contract CapabilitiesRegistry is OwnerIsCreator, TypeAndVersionInterface {
 
       storedNode.nodeOperatorId = node.nodeOperatorId;
       storedNode.p2pId = node.p2pId;
+      storedNode.encryptionPublicKey = node.encryptionPublicKey;
 
       emit NodeUpdated(node.p2pId, node.nodeOperatorId, node.signer);
     }

diff --git a/contracts/src/v0.8/keystone/test/CapabilitiesRegistry_UpdateNodesTest.t.sol b/contracts/src/v0.8/keystone/test/CapabilitiesRegistry_UpdateNodesTest.t.sol
@@ -138,6 +138,25 @@ contract CapabilitiesRegistry_UpdateNodesTest is BaseTest {
     s_CapabilitiesRegistry.updateNodes(nodes);
   }
 
+  function test_RevertWhen_EncryptionPublicKeyEmpty() public {
+    changePrank(NODE_OPERATOR_ONE_ADMIN);
+    CapabilitiesRegistry.NodeParams[] memory nodes = new CapabilitiesRegistry.NodeParams[](1);
+
+    bytes32[] memory hashedCapabilityIds = new bytes32[](1);
+    hashedCapabilityIds[0] = s_basicHashedCapabilityId;
+
+    nodes[0] = CapabilitiesRegistry.NodeParams({
+      nodeOperatorId: TEST_NODE_OPERATOR_ONE_ID,
+      p2pId: P2P_ID,
+      signer: NODE_OPERATOR_ONE_SIGNER_ADDRESS,
+      encryptionPublicKey: bytes32(""),
+      hashedCapabilityIds: hashedCapabilityIds
+    });
+
+    vm.expectRevert(abi.encodeWithSelector(CapabilitiesRegistry.InvalidNodeEncryptionPublicKey.selector, bytes32("")));
+    s_CapabilitiesRegistry.updateNodes(nodes);
+  }
+
   function test_RevertWhen_NodeSignerAlreadyAssignedToAnotherNode() public {
     changePrank(NODE_OPERATOR_ONE_ADMIN);
     CapabilitiesRegistry.NodeParams[] memory nodes = new CapabilitiesRegistry.NodeParams[](1);