Merge branch 'develop' into tt_1326_update_Sol_Foundry

.changeset/ninety-cougars-tease.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal restore common version to head of develop

.changeset/polite-crabs-pretend.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal ensure remote target request hash is deterministic

.changeset/thin-rings-count.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Add evm Chain Reader GetLatestValue support for filtering on indexed topic types that get hashed.

.changeset/young-mice-invent.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added CCIP plugins code from https://github.com/smartcontractkit/ccip/ #added

.mockery.yaml

@@ -457,4 +457,95 @@ packages:
       filename: optimism_dispute_game_factory_interface.go
       outpkg: mock_optimism_dispute_game_factory
     interfaces:
-      OptimismDisputeGameFactoryInterface: 
+      OptimismDisputeGameFactoryInterface:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache:
+    config:
+      filename: chain_health_mock.go
+    interfaces:
+      ChainHealthcheck:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata:
+    interfaces:
+      CommitStoreReader:
+        config:
+          filename: commit_store_reader_mock.go
+      OffRampReader:
+        config:
+          filename: offramp_reader_mock.go
+      OnRampReader:
+        config:
+          filename: onramp_reader_mock.go
+      PriceRegistryReader:
+        config:
+          filename: price_registry_reader_mock.go
+      TokenPoolReader:
+        config:
+          filename: token_pool_reader_mock.go
+      USDCReader:
+        config:
+          filename: usdc_reader_mock.go
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/batchreader:
+    config:
+      filename: token_pool_batched_reader_mock.go
+    interfaces:
+      TokenPoolBatchedReader:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/ccipdataprovider:
+    config:
+      filename: price_registry_mock.go
+    interfaces:
+      PriceRegistry:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdb:
+    config:
+      filename: price_service_mock.go
+    interfaces:
+      PriceService:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/pricegetter:
+    config:
+      filename: mock.go
+      dir: "{{ .InterfaceDir }}/"
+      outpkg: pricegetter
+    interfaces:
+      PriceGetter:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+  github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/statuschecker:
+    interfaces:
+      CCIPTransactionStatusChecker:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib:
+    config:
+      outpkg: rpclibmocks
+    interfaces:
+      BatchCaller:
+        config:
+          filename: batch_caller.go
+          dir: core/services/relay/evm/rpclibmocks
+      EvmBatchCaller:
+        config:
+          filename: evm_mock.go
+          dir: "{{ .InterfaceDir }}/rpclibmocks"
+
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices:
+    config:
+      dir: "{{ .InterfaceDir }}/"
+      outpkg: prices
+    interfaces:
+      GasPriceEstimatorCommit:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+          filename: gas_price_estimator_commit_mock.go
+      GasPriceEstimatorExec:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+          filename: gas_price_estimator_exec_mock.go
+      GasPriceEstimator:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+          filename: gas_price_estimator_mock.go
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/tokendata:
+    config:
+      filename: reader_mock.go
+      dir: "{{ .InterfaceDir }}/"
+      outpkg: tokendata
+    interfaces:
+      Reader:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"

contracts/.changeset/itchy-turtles-agree.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': minor
+---
+
+#internal Add an event with indexed topics that get hashed to Chain Reader Tester contract.

contracts/src/v0.8/shared/test/helpers/ChainReaderTester.sol

@@ -40,6 +40,9 @@ contract ChainReaderTester {
   // First topic is event hash
   event TriggeredWithFourTopics(int32 indexed field1, int32 indexed field2, int32 indexed field3);
 
+  // first topic is event hash, second and third topics get hashed before getting stored
+  event TriggeredWithFourTopicsWithHashed(string indexed field1, uint8[32] indexed field2, bytes32 indexed field3);
+
   TestStruct[] private s_seen;
   uint64[] private s_arr;
   uint64 private s_value;
@@ -125,4 +128,9 @@ contract ChainReaderTester {
   function triggerWithFourTopics(int32 field1, int32 field2, int32 field3) public {
     emit TriggeredWithFourTopics(field1, field2, field3);
   }
+
+  // first topic is event hash, second and third topics get hashed before getting stored
+  function triggerWithFourTopicsWithHashed(string memory field1, uint8[32] memory field2, bytes32 field3) public {
+    emit TriggeredWithFourTopicsWithHashed(field1, field2, field3);
+  }
 }

core/capabilities/integration_tests/keystone_contracts_setup.go

@@ -91,8 +91,8 @@ func peerToNode(nopID uint32, p peer) (kcr.CapabilitiesRegistryNodeParams, error
 	}, nil
 }
 
-func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workflowDonPeers []peer, triggerDonPeers []peer,
-	targetDonPeerIDs []peer,
+func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workflowDon donInfo, triggerDon donInfo,
+	targetDon donInfo,
 	transactOpts *bind.TransactOpts, backend *ethBackend) common.Address {
 	addr, _, reg, err := kcr.DeployCapabilitiesRegistry(transactOpts, backend)
 	require.NoError(t, err)
@@ -157,23 +157,23 @@ func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workfl
 
 	nopID := recLog.NodeOperatorId
 	nodes := []kcr.CapabilitiesRegistryNodeParams{}
-	for _, wfPeer := range workflowDonPeers {
+	for _, wfPeer := range workflowDon.peerIDs {
 		n, innerErr := peerToNode(nopID, wfPeer)
 		require.NoError(t, innerErr)
 
 		n.HashedCapabilityIds = [][32]byte{ocrid}
 		nodes = append(nodes, n)
 	}
 
-	for _, triggerPeer := range triggerDonPeers {
+	for _, triggerPeer := range triggerDon.peerIDs {
 		n, innerErr := peerToNode(nopID, triggerPeer)
 		require.NoError(t, innerErr)
 
 		n.HashedCapabilityIds = [][32]byte{sid}
 		nodes = append(nodes, n)
 	}
 
-	for _, targetPeer := range targetDonPeerIDs {
+	for _, targetPeer := range targetDon.peerIDs {
 		n, innerErr := peerToNode(nopID, targetPeer)
 		require.NoError(t, innerErr)
 
@@ -185,7 +185,7 @@ func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workfl
 	require.NoError(t, err)
 
 	// workflow DON
-	ps, err := peers(workflowDonPeers)
+	ps, err := peers(workflowDon.peerIDs)
 	require.NoError(t, err)
 
 	cc := newCapabilityConfig()
@@ -199,22 +199,24 @@ func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workfl
 		},
 	}
 
-	workflowDonF := uint8(2)
-	_, err = reg.AddDON(transactOpts, ps, cfgs, false, true, workflowDonF)
+	_, err = reg.AddDON(transactOpts, ps, cfgs, false, true, workflowDon.F)
 	require.NoError(t, err)
 
 	// trigger DON
-	ps, err = peers(triggerDonPeers)
+	ps, err = peers(triggerDon.peerIDs)
 	require.NoError(t, err)
 
-	triggerDonF := 1
-	config := &pb.RemoteTriggerConfig{
-		RegistrationRefresh: durationpb.New(20000 * time.Millisecond),
-		RegistrationExpiry:  durationpb.New(60000 * time.Millisecond),
-		// F + 1
-		MinResponsesToAggregate: uint32(triggerDonF) + 1,
+	triggerCapabilityConfig := newCapabilityConfig()
+	triggerCapabilityConfig.RemoteConfig = &pb.CapabilityConfig_RemoteTriggerConfig{
+		RemoteTriggerConfig: &pb.RemoteTriggerConfig{
+			RegistrationRefresh: durationpb.New(60000 * time.Millisecond),
+			RegistrationExpiry:  durationpb.New(60000 * time.Millisecond),
+			// F + 1
+			MinResponsesToAggregate: uint32(triggerDon.F) + 1,
+		},
 	}
-	configb, err := proto.Marshal(config)
+
+	configb, err := proto.Marshal(triggerCapabilityConfig)
 	require.NoError(t, err)
 
 	cfgs = []kcr.CapabilitiesRegistryCapabilityConfiguration{
@@ -224,22 +226,31 @@ func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workfl
 		},
 	}
 
-	_, err = reg.AddDON(transactOpts, ps, cfgs, true, false, uint8(triggerDonF))
+	_, err = reg.AddDON(transactOpts, ps, cfgs, true, false, triggerDon.F)
 	require.NoError(t, err)
 
 	// target DON
-	ps, err = peers(targetDonPeerIDs)
+	ps, err = peers(targetDon.peerIDs)
+	require.NoError(t, err)
+
+	targetCapabilityConfig := newCapabilityConfig()
+	targetCapabilityConfig.RemoteConfig = &pb.CapabilityConfig_RemoteTargetConfig{
+		RemoteTargetConfig: &pb.RemoteTargetConfig{
+			RequestHashExcludedAttributes: []string{"signed_report.Signatures"},
+		},
+	}
+
+	remoteTargetConfigBytes, err := proto.Marshal(targetCapabilityConfig)
 	require.NoError(t, err)
 
 	cfgs = []kcr.CapabilitiesRegistryCapabilityConfiguration{
 		{
 			CapabilityId: wid,
-			Config:       ccb,
+			Config:       remoteTargetConfigBytes,
 		},
 	}
 
-	targetDonF := uint8(1)
-	_, err = reg.AddDON(transactOpts, ps, cfgs, true, false, targetDonF)
+	_, err = reg.AddDON(transactOpts, ps, cfgs, true, false, targetDon.F)
 	require.NoError(t, err)
 
 	backend.Commit()
@@ -253,19 +264,18 @@ func newCapabilityConfig() *pb.CapabilityConfig {
 	}
 }
 
-func setupForwarderContract(t *testing.T, workflowDonPeers []peer, workflowDonId uint32,
-	configVersion uint32, f uint8,
+func setupForwarderContract(t *testing.T, workflowDon donInfo,
 	transactOpts *bind.TransactOpts, backend *ethBackend) (common.Address, *forwarder.KeystoneForwarder) {
 	addr, _, fwd, err := forwarder.DeployKeystoneForwarder(transactOpts, backend)
 	require.NoError(t, err)
 	backend.Commit()
 
 	var signers []common.Address
-	for _, p := range workflowDonPeers {
+	for _, p := range workflowDon.peerIDs {
 		signers = append(signers, common.HexToAddress(p.Signer))
 	}
 
-	_, err = fwd.SetConfig(transactOpts, workflowDonId, configVersion, f, signers)
+	_, err = fwd.SetConfig(transactOpts, workflowDon.ID, workflowDon.ConfigVersion, workflowDon.F, signers)
 	require.NoError(t, err)
 	backend.Commit()
 

core/capabilities/integration_tests/mock_libocr.go

@@ -157,10 +157,6 @@ func (m *mockLibOCR) simulateProtocolRound(ctx context.Context) error {
 				Signer:    commontypes.OracleID(i),
 				Signature: sig,
 			})
-
-			if uint8(len(signatures)) == m.f+1 {
-				break
-			}
 		}
 
 		for _, node := range m.nodes {
@@ -181,7 +177,16 @@ func (m *mockLibOCR) simulateProtocolRound(ctx context.Context) error {
 				continue
 			}
 
-			err = node.Transmit(ctx, types.ConfigDigest{}, 0, report, signatures)
+			// For each node select a random set of f+1 signatures to mimic libocr behaviour
+			s := rand.NewSource(time.Now().UnixNano())
+			r := rand.New(s)
+			indices := r.Perm(len(signatures))
+			selectedSignatures := make([]types.AttributedOnchainSignature, m.f+1)
+			for i := 0; i < int(m.f+1); i++ {
+				selectedSignatures[i] = signatures[indices[i]]
+			}
+
+			err = node.Transmit(ctx, types.ConfigDigest{}, 0, report, selectedSignatures)
 			if err != nil {
 				return fmt.Errorf("failed to transmit report: %w", err)
 			}

core/capabilities/integration_tests/setup.go

@@ -68,8 +68,8 @@ func setupStreamDonsWithTransmissionSchedule(ctx context.Context, t *testing.T,
 	lggr.SetLogLevel(TestLogLevel)
 
 	ethBlockchain, transactor := setupBlockchain(t, 1000, 1*time.Second)
-	capabilitiesRegistryAddr := setupCapabilitiesRegistryContract(ctx, t, workflowDonInfo.peerIDs, triggerDonInfo.peerIDs, targetDonInfo.peerIDs, transactor, ethBlockchain)
-	forwarderAddr, _ := setupForwarderContract(t, workflowDonInfo.peerIDs, workflowDonInfo.ID, 1, workflowDonInfo.F, transactor, ethBlockchain)
+	capabilitiesRegistryAddr := setupCapabilitiesRegistryContract(ctx, t, workflowDonInfo, triggerDonInfo, targetDonInfo, transactor, ethBlockchain)
+	forwarderAddr, _ := setupForwarderContract(t, workflowDonInfo, transactor, ethBlockchain)
 	consumerAddr, consumer := setupConsumerContract(t, transactor, ethBlockchain, forwarderAddr, workflowOwnerID, workflowName)
 
 	var feedIDs []string
@@ -259,9 +259,10 @@ func createDonInfo(t *testing.T, don don) donInfo {
 
 	triggerDonInfo := donInfo{
 		DON: commoncap.DON{
-			ID:      don.id,
-			Members: donPeers,
-			F:       don.f,
+			ID:            don.id,
+			Members:       donPeers,
+			F:             don.f,
+			ConfigVersion: 1,
 		},
 		peerIDs:    peerIDs,
 		keys:       donKeys,

core/capabilities/integration_tests/streams_test.go

@@ -22,9 +22,9 @@ func Test_AllAtOnceTransmissionSchedule(t *testing.T) {
 
 	// The don IDs set in the below calls are inferred from the order in which the dons are added to the capabilities registry
 	// in the setupCapabilitiesRegistryContract function, should this order change the don IDs will need updating.
-	workflowDonInfo := createDonInfo(t, don{id: 1, numNodes: 5, f: 1})
-	triggerDonInfo := createDonInfo(t, don{id: 2, numNodes: 7, f: 1})
-	targetDonInfo := createDonInfo(t, don{id: 3, numNodes: 4, f: 1})
+	workflowDonInfo := createDonInfo(t, don{id: 1, numNodes: 7, f: 2})
+	triggerDonInfo := createDonInfo(t, don{id: 2, numNodes: 7, f: 2})
+	targetDonInfo := createDonInfo(t, don{id: 3, numNodes: 4, f: 2})
 
 	consumer, feedIDs, triggerSink := setupStreamDonsWithTransmissionSchedule(ctx, t, workflowDonInfo, triggerDonInfo, targetDonInfo, 3,
 		"2s", "allAtOnce")

core/capabilities/launcher.go

@@ -216,6 +216,7 @@ func (w *launcher) addRemoteCapabilities(ctx context.Context, myDON registrysync
 					int(remoteDON.F+1),
 					w.lggr,
 				)
+
 				// TODO: We need to implement a custom, Mercury-specific
 				// aggregator here, because there is no guarantee that
 				// all trigger events in the workflow will have the same
@@ -358,6 +359,7 @@ func (w *launcher) exposeCapabilities(ctx context.Context, myPeerID p2ptypes.Pee
 		case capabilities.CapabilityTypeTarget:
 			newTargetServer := func(capability capabilities.BaseCapability, info capabilities.CapabilityInfo) (receiverService, error) {
 				return target.NewServer(
+					c.RemoteTargetConfig,
 					myPeerID,
 					capability.(capabilities.TargetCapability),
 					info,

core/capabilities/launcher_test.go

@@ -323,7 +323,7 @@ func TestLauncher_WiresUpClientsForPublicWorkflowDON(t *testing.T) {
 	// The below state describes a Workflow DON (AcceptsWorkflows = true),
 	// which exposes the streams-trigger and write_chain capabilities.
 	// We expect receivers to be wired up and both capabilities to be added to the registry.
-	var rtc capabilities.RemoteTriggerConfig
+	rtc := &capabilities.RemoteTriggerConfig{}
 	rtc.ApplyDefaults()
 
 	state := &registrysyncer.LocalRegistry{

core/capabilities/remote/target/endtoend_test.go

@@ -226,7 +226,7 @@ func testRemoteTarget(ctx context.Context, t *testing.T, underlying commoncap.Ta
 	for i := 0; i < numCapabilityPeers; i++ {
 		capabilityPeer := capabilityPeers[i]
 		capabilityDispatcher := broker.NewDispatcherForNode(capabilityPeer)
-		capabilityNode := target.NewServer(capabilityPeer, underlying, capInfo, capDonInfo, workflowDONs, capabilityDispatcher,
+		capabilityNode := target.NewServer(&commoncap.RemoteTargetConfig{RequestHashExcludedAttributes: []string{}}, capabilityPeer, underlying, capInfo, capDonInfo, workflowDONs, capabilityDispatcher,
 			capabilityNodeResponseTimeout, lggr)
 		servicetest.Run(t, capabilityNode)
 		broker.RegisterReceiverNode(capabilityPeer, capabilityNode)