Merge branch 'develop' into tt_922_automation_seth

.changeset/funny-tips-promise.md

@@ -0,0 +1,6 @@
+---
+"chainlink": patch
+---
+
+#added
+compare user-defined max gas price with current gas price in automation simulation pipeline

.changeset/mighty-flies-breathe.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added ORM and corresponding tables for CCIP gas prices and token prices

.changeset/modern-trainers-hear.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Generate gethwrappers for capability registry changes

.changeset/neat-pianos-argue.md

@@ -0,0 +1,6 @@
+---
+"chainlink": patch
+---
+
+#added
+pass a gas estimator to registry 2.1 pipeline

.changeset/ten-dodos-run.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Normalize keystone workflow ref regex property to match id regex

.changeset/witty-weeks-kneel.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added an integration test for max gas price check

.github/workflows/ci-core.yml

@@ -170,7 +170,7 @@ jobs:
         env:
           OUTPUT_FILE: ./output.txt
           USE_TEE: false
-          CL_DATABASE_URL: ${{ env.DB_URL }}
+          CL_DATABASE_URL: ${{ env.DB_URL }}  
         run: ./tools/bin/${{ matrix.type.cmd }} ./...
       - name: Print Filtered Test Results
         if: ${{ failure() && matrix.type.cmd == 'go_core_tests' && needs.filter.outputs.changes == 'true' }}
@@ -203,7 +203,7 @@ jobs:
             ./coverage.txt
             ./postgres_logs.txt
       - name: Notify Slack
-        if: ${{ failure() && steps.print-races.outputs.post_to_slack == 'true' && matrix.type.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.base_ref == 'develop') && needs.filter.outputs.changes == 'true' }}
+        if: ${{ failure() && steps.print-races.outputs.post_to_slack == 'true' && matrix.type.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') &&  needs.filter.outputs.changes == 'true' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}

common/client/poller.go

@@ -27,10 +27,11 @@ type Poller[T any] struct {
 	wg     sync.WaitGroup
 }
 
-// NewPoller creates a new Poller instance
+// NewPoller creates a new Poller instance and returns a channel to receive the polled data
 func NewPoller[
 	T any,
-](pollingInterval time.Duration, pollingFunc func(ctx context.Context) (T, error), pollingTimeout time.Duration, channel chan<- T, logger logger.Logger) Poller[T] {
+](pollingInterval time.Duration, pollingFunc func(ctx context.Context) (T, error), pollingTimeout time.Duration, logger logger.Logger) (Poller[T], <-chan T) {
+	channel := make(chan T)
 	return Poller[T]{
 		pollingInterval: pollingInterval,
 		pollingFunc:     pollingFunc,
@@ -39,7 +40,7 @@ func NewPoller[
 		logger:          logger,
 		errCh:           make(chan error),
 		stopCh:          make(chan struct{}),
-	}
+	}, channel
 }
 
 var _ types.Subscription = &Poller[any]{}
@@ -58,6 +59,7 @@ func (p *Poller[T]) Unsubscribe() {
 		close(p.stopCh)
 		p.wg.Wait()
 		close(p.errCh)
+		close(p.channel)
 		return nil
 	})
 }

common/client/poller_test.go

@@ -23,10 +23,7 @@ func Test_Poller(t *testing.T) {
 			return nil, nil
 		}
 
-		channel := make(chan Head, 1)
-		defer close(channel)
-
-		poller := NewPoller[Head](time.Millisecond, pollFunc, time.Second, channel, lggr)
+		poller, _ := NewPoller[Head](time.Millisecond, pollFunc, time.Second, lggr)
 		err := poller.Start()
 		require.NoError(t, err)
 
@@ -50,12 +47,8 @@ func Test_Poller(t *testing.T) {
 			return h.ToMockHead(t), nil
 		}
 
-		// data channel to receive updates from the poller
-		channel := make(chan Head, 1)
-		defer close(channel)
-
 		// Create poller and start to receive data
-		poller := NewPoller[Head](time.Millisecond, pollFunc, time.Second, channel, lggr)
+		poller, channel := NewPoller[Head](time.Millisecond, pollFunc, time.Second, lggr)
 		require.NoError(t, poller.Start())
 		defer poller.Unsubscribe()
 
@@ -79,14 +72,10 @@ func Test_Poller(t *testing.T) {
 			return nil, fmt.Errorf("polling error %d", pollNumber)
 		}
 
-		// data channel to receive updates from the poller
-		channel := make(chan Head, 1)
-		defer close(channel)
-
 		olggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 
 		// Create poller and subscribe to receive data
-		poller := NewPoller[Head](time.Millisecond, pollFunc, time.Second, channel, olggr)
+		poller, _ := NewPoller[Head](time.Millisecond, pollFunc, time.Second, olggr)
 		require.NoError(t, poller.Start())
 		defer poller.Unsubscribe()
 
@@ -114,14 +103,10 @@ func Test_Poller(t *testing.T) {
 		// Set instant timeout
 		pollingTimeout := time.Duration(0)
 
-		// data channel to receive updates from the poller
-		channel := make(chan Head, 1)
-		defer close(channel)
-
 		olggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 
 		// Create poller and subscribe to receive data
-		poller := NewPoller[Head](time.Millisecond, pollFunc, pollingTimeout, channel, olggr)
+		poller, _ := NewPoller[Head](time.Millisecond, pollFunc, pollingTimeout, olggr)
 		require.NoError(t, poller.Start())
 		defer poller.Unsubscribe()
 
@@ -146,14 +131,10 @@ func Test_Poller(t *testing.T) {
 		// Set long timeout
 		pollingTimeout := time.Minute
 
-		// data channel to receive updates from the poller
-		channel := make(chan Head, 1)
-		defer close(channel)
-
 		olggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 
 		// Create poller and subscribe to receive data
-		poller := NewPoller[Head](time.Millisecond, pollFunc, pollingTimeout, channel, olggr)
+		poller, _ := NewPoller[Head](time.Millisecond, pollFunc, pollingTimeout, olggr)
 		require.NoError(t, poller.Start())
 
 		// Unsubscribe while blocked in polling function
@@ -184,8 +165,7 @@ func Test_Poller_Unsubscribe(t *testing.T) {
 	}
 
 	t.Run("Test multiple unsubscribe", func(t *testing.T) {
-		channel := make(chan Head, 1)
-		poller := NewPoller[Head](time.Millisecond, pollFunc, time.Second, channel, lggr)
+		poller, channel := NewPoller[Head](time.Millisecond, pollFunc, time.Second, lggr)
 		err := poller.Start()
 		require.NoError(t, err)
 
@@ -194,14 +174,12 @@ func Test_Poller_Unsubscribe(t *testing.T) {
 		poller.Unsubscribe()
 	})
 
-	t.Run("Test unsubscribe with closed channel", func(t *testing.T) {
-		channel := make(chan Head, 1)
-		poller := NewPoller[Head](time.Millisecond, pollFunc, time.Second, channel, lggr)
+	t.Run("Read channel after unsubscribe", func(t *testing.T) {
+		poller, channel := NewPoller[Head](time.Millisecond, pollFunc, time.Second, lggr)
 		err := poller.Start()
 		require.NoError(t, err)
 
-		<-channel
-		close(channel)
 		poller.Unsubscribe()
+		require.Equal(t, <-channel, nil)
 	})
 }

contracts/.changeset/three-hotels-agree.md

@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+Add function to update nodes in capability registry

contracts/src/v0.8/keystone/CapabilityRegistry.sol

@@ -106,6 +106,16 @@ contract CapabilityRegistry is OwnerIsCreator, TypeAndVersionInterface {
   /// @param nodeOperatorId The ID of the node operator that manages this node
   event NodeAdded(bytes32 p2pId, uint256 nodeOperatorId);
 
+  /// @notice This event is emitted when a node is updated
+  /// @param p2pId The P2P ID of the node
+  /// @param nodeOperatorId The ID of the node operator that manages this node
+  /// @param signer The node's signer address
+  event NodeUpdated(bytes32 p2pId, uint256 nodeOperatorId, address signer);
+
+  /// @notice This error is thrown when trying to set the node's
+  /// signer address to zero
+  error InvalidNodeSigner();
+
   /// @notice This error is thrown when trying add a capability that already
   /// exists.
   error CapabilityAlreadyExists();
@@ -236,12 +246,16 @@ contract CapabilityRegistry is OwnerIsCreator, TypeAndVersionInterface {
     for (uint256 i; i < nodes.length; ++i) {
       Node memory node = nodes[i];
 
+      bool isOwner = msg.sender == owner();
+
       NodeOperator memory nodeOperator = s_nodeOperators[node.nodeOperatorId];
-      if (msg.sender != nodeOperator.admin) revert AccessForbidden();
+      if (!isOwner && msg.sender != nodeOperator.admin) revert AccessForbidden();
 
       bool nodeExists = s_nodes[node.p2pId].supportedHashedCapabilityIds.length > 0;
       if (nodeExists || bytes32(node.p2pId) == bytes32("")) revert InvalidNodeP2PId(node.p2pId);
 
+      if (node.signer == address(0)) revert InvalidNodeSigner();
+
       if (node.supportedHashedCapabilityIds.length == 0)
         revert InvalidNodeCapabilities(node.supportedHashedCapabilityIds);
 
@@ -255,6 +269,36 @@ contract CapabilityRegistry is OwnerIsCreator, TypeAndVersionInterface {
     }
   }
 
+  /// @notice Updates nodes.  The node admin can update the node's signer address
+  /// and reconfigure its supported capabilities
+  /// @param nodes The nodes to update
+  function updateNodes(Node[] calldata nodes) external {
+    for (uint256 i; i < nodes.length; ++i) {
+      Node memory node = nodes[i];
+
+      bool isOwner = msg.sender == owner();
+
+      NodeOperator memory nodeOperator = s_nodeOperators[node.nodeOperatorId];
+      if (!isOwner && msg.sender != nodeOperator.admin) revert AccessForbidden();
+
+      bool nodeExists = s_nodes[node.p2pId].supportedHashedCapabilityIds.length > 0;
+      if (!nodeExists) revert InvalidNodeP2PId(node.p2pId);
+
+      if (node.signer == address(0)) revert InvalidNodeSigner();
+
+      if (node.supportedHashedCapabilityIds.length == 0)
+        revert InvalidNodeCapabilities(node.supportedHashedCapabilityIds);
+
+      for (uint256 j; j < node.supportedHashedCapabilityIds.length; ++j) {
+        if (!s_hashedCapabilityIds.contains(node.supportedHashedCapabilityIds[j]))
+          revert InvalidNodeCapabilities(node.supportedHashedCapabilityIds);
+      }
+
+      s_nodes[node.p2pId] = node;
+      emit NodeUpdated(node.p2pId, node.nodeOperatorId, node.signer);
+    }
+  }
+
   /// @notice Gets a node's data
   /// @param p2pId The P2P ID of the node to query for
   /// @return Node The node data

contracts/src/v0.8/keystone/test/CapabilityRegistry_AddNodesTest.t.sol

@@ -18,7 +18,7 @@ contract CapabilityRegistry_AddNodesTest is BaseTest {
     s_capabilityRegistry.addCapability(s_capabilityWithConfigurationContract);
   }
 
-  function test_RevertWhen_CalledByNonNodeOperatorAdmin() public {
+  function test_RevertWhen_CalledByNonNodeOperatorAdminAndNonOwner() public {
     changePrank(STRANGER);
     CapabilityRegistry.Node[] memory nodes = new CapabilityRegistry.Node[](1);
 
@@ -36,6 +36,24 @@ contract CapabilityRegistry_AddNodesTest is BaseTest {
     s_capabilityRegistry.addNodes(nodes);
   }
 
+  function test_RevertWhen_SignerAddressEmpty() public {
+    changePrank(NODE_OPERATOR_ONE_ADMIN);
+    CapabilityRegistry.Node[] memory nodes = new CapabilityRegistry.Node[](1);
+
+    bytes32[] memory hashedCapabilityIds = new bytes32[](1);
+    hashedCapabilityIds[0] = s_basicHashedCapabilityId;
+
+    nodes[0] = CapabilityRegistry.Node({
+      nodeOperatorId: TEST_NODE_OPERATOR_ONE_ID,
+      p2pId: P2P_ID,
+      signer: address(0),
+      supportedHashedCapabilityIds: hashedCapabilityIds
+    });
+
+    vm.expectRevert(abi.encodeWithSelector(CapabilityRegistry.InvalidNodeSigner.selector));
+    s_capabilityRegistry.addNodes(nodes);
+  }
+
   function test_RevertWhen_AddingDuplicateP2PId() public {
     changePrank(NODE_OPERATOR_ONE_ADMIN);
     CapabilityRegistry.Node[] memory nodes = new CapabilityRegistry.Node[](1);
@@ -133,4 +151,31 @@ contract CapabilityRegistry_AddNodesTest is BaseTest {
     assertEq(node.supportedHashedCapabilityIds[0], s_basicHashedCapabilityId);
     assertEq(node.supportedHashedCapabilityIds[1], s_capabilityWithConfigurationContractId);
   }
+
+  function test_OwnerCanAddNodes() public {
+    changePrank(ADMIN);
+
+    CapabilityRegistry.Node[] memory nodes = new CapabilityRegistry.Node[](1);
+    bytes32[] memory hashedCapabilityIds = new bytes32[](2);
+    hashedCapabilityIds[0] = s_basicHashedCapabilityId;
+    hashedCapabilityIds[1] = s_capabilityWithConfigurationContractId;
+
+    nodes[0] = CapabilityRegistry.Node({
+      nodeOperatorId: TEST_NODE_OPERATOR_ONE_ID,
+      p2pId: P2P_ID,
+      signer: NODE_OPERATOR_ONE_SIGNER_ADDRESS,
+      supportedHashedCapabilityIds: hashedCapabilityIds
+    });
+
+    vm.expectEmit(address(s_capabilityRegistry));
+    emit NodeAdded(P2P_ID, TEST_NODE_OPERATOR_ONE_ID);
+    s_capabilityRegistry.addNodes(nodes);
+
+    CapabilityRegistry.Node memory node = s_capabilityRegistry.getNode(P2P_ID);
+    assertEq(node.nodeOperatorId, TEST_NODE_OPERATOR_ONE_ID);
+    assertEq(node.p2pId, P2P_ID);
+    assertEq(node.supportedHashedCapabilityIds.length, 2);
+    assertEq(node.supportedHashedCapabilityIds[0], s_basicHashedCapabilityId);
+    assertEq(node.supportedHashedCapabilityIds[1], s_capabilityWithConfigurationContractId);
+  }
 }