Add keystore service to standardcapabilities delegate (#18274)

* Add keystore service to standardcapabilities delegate

* Update chainlink-common version, fix trigger initialise func

* fix nil pointer

* fix lint

* update gomodtidies

* add p2p key use

* undo removal of function

* Update core/capabilities/integration_tests/keystone/contracts_setup.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* lowercase getSignerStringFromOCRKeyBundle

* add error for no p2p key

* fix merge conflict

* lint

* add changeset

* add error check

* lint

* lint

* lint

* lint

* Update chainlink-common, use single account signer.

* resolve merge conflict

* resolve merge conflict 2

* resolve merge conflict 2

* Fixes chainlink version in CI

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Adam Hamrick <adam.hamrick@smartcontract.com>

Author: 3 people

.changeset/cyan-ears-fix.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#change Add keystore service to standardcapabilities, refactor integration_tests/framework to use a p2p key in the test node

core/capabilities/fakes/consensus_nodag.go

@@ -103,6 +103,7 @@ func (fc *fakeConsensusNoDAG) Initialise(
 	_ core.PipelineRunnerService,
 	_ core.RelayerSet,
 	_ core.OracleFactory,
-	_ core.GatewayConnector) error {
+	_ core.GatewayConnector,
+	_ core.Keystore) error {
 	return nil
 }

core/capabilities/fakes/evm_chain.go

@@ -65,7 +65,8 @@ func (fc *FakeEVMChain) Initialise(ctx context.Context, config string, _ core.Te
 	_ core.PipelineRunnerService,
 	_ core.RelayerSet,
 	_ core.OracleFactory,
-	_ core.GatewayConnector) error {
+	_ core.GatewayConnector,
+	_ core.Keystore) error {
 	// TODO: do validation of config here
 
 	err := fc.Start(ctx)

core/capabilities/fakes/http_action.go

@@ -135,7 +135,8 @@ func (fh *DirectHTTPAction) Initialise(ctx context.Context, config string, _ cor
 	_ core.PipelineRunnerService,
 	_ core.RelayerSet,
 	_ core.OracleFactory,
-	_ core.GatewayConnector) error {
+	_ core.GatewayConnector,
+	_ core.Keystore) error {
 	// TODO: do validation of config here
 
 	err := fh.Start(ctx)

core/capabilities/fakes/manual_cron_trigger.go

@@ -59,7 +59,8 @@ func (f *ManualCronTriggerService) Initialise(ctx context.Context, config string
 	_ core.PipelineRunnerService,
 	_ core.RelayerSet,
 	_ core.OracleFactory,
-	_ core.GatewayConnector) error {
+	_ core.GatewayConnector,
+	_ core.Keystore) error {
 	f.lggr.Debugf("Initialising %s", ServiceName)
 
 	var cronConfig ManualCronConfig

core/capabilities/fakes/manual_http_trigger.go

@@ -55,7 +55,8 @@ func (f *ManualHTTPTriggerService) Initialise(ctx context.Context, config string
 	_ core.PipelineRunnerService,
 	_ core.RelayerSet,
 	_ core.OracleFactory,
-	_ core.GatewayConnector) error {
+	_ core.GatewayConnector,
+	_ core.Keystore) error {
 	f.lggr.Debugf("Initialising %s", HTTPTriggerServiceName)
 	return f.Start(ctx)
 }

core/capabilities/fakes/standard_capabilities_mocks.go

@@ -23,6 +23,15 @@ func (k *KVStoreMock) Get(ctx context.Context, key string) ([]byte, error) {
 	return nil, nil
 }
 
+type KeystoreMock struct{}
+
+func (k *KeystoreMock) Accounts(ctx context.Context) (accounts []string, err error) {
+	return nil, nil
+}
+func (k *KeystoreMock) Sign(ctx context.Context, account string, data []byte) (signed []byte, err error) {
+	return nil, nil
+}
+
 type ErrorLogMock struct{}
 
 func (e *ErrorLogMock) SaveError(ctx context.Context, msg string) error {

core/capabilities/integration_tests/framework/capabilities_registry.go

@@ -12,6 +12,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb"
 	"github.com/smartcontractkit/chainlink-common/pkg/values"
 	kcr "github.com/smartcontractkit/chainlink-evm/gethwrappers/keystone/generated/capabilities_registry_1_1_0"
+	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
 
 	"github.com/stretchr/testify/require"
 )
@@ -88,9 +89,14 @@ func (r *CapabilitiesRegistry) setupDON(donInfo DonConfiguration, capabilities [
 
 	r.backend.Commit()
 
+	peerIDs := make([][32]byte, 0, len(donInfo.p2pKeys))
 	nodes := []kcr.CapabilitiesRegistryNodeParams{}
-	for _, peerID := range donInfo.peerIDs {
-		n, innerErr := peerToNode(r.nodeOperatorID, peerID)
+	for i, p2pkey := range donInfo.p2pKeys {
+		signer, innerErr := getSignerStringFromOCRKeyBundle(donInfo.KeyBundles[i])
+		require.NoError(r.t, innerErr)
+		peer := peerIDAndOCRSigner{PeerID: p2ptypes.PeerID(p2pkey.PeerID()), Signer: signer}
+		peerIDs = append(peerIDs, p2pkey.PeerID())
+		n, innerErr := peerToNode(r.nodeOperatorID, peer)
 		require.NoError(r.t, innerErr)
 
 		n.HashedCapabilityIds = hashedCapabilityIDs
@@ -101,9 +107,6 @@ func (r *CapabilitiesRegistry) setupDON(donInfo DonConfiguration, capabilities [
 	require.NoError(r.t, err)
 	r.backend.Commit()
 
-	ps, err := peers(donInfo.peerIDs)
-	require.NoError(r.t, err)
-
 	var capabilityConfigurations []kcr.CapabilitiesRegistryCapabilityConfiguration
 	for i, c := range capabilities {
 		configBinary, err2 := proto.Marshal(c.donCapabilityConfig)
@@ -115,7 +118,7 @@ func (r *CapabilitiesRegistry) setupDON(donInfo DonConfiguration, capabilities [
 		})
 	}
 
-	_, err = r.contract.AddDON(r.backend.transactionOpts, ps, capabilityConfigurations, true, donInfo.AcceptsWorkflows, donInfo.F)
+	_, err = r.contract.AddDON(r.backend.transactionOpts, peerIDs, capabilityConfigurations, true, donInfo.AcceptsWorkflows, donInfo.F)
 	require.NoError(r.t, err)
 	r.backend.Commit()
 

core/capabilities/integration_tests/framework/don.go

@@ -114,7 +114,7 @@ type capabilityNode struct {
 	registry  *capabilities.Registry
 	key       ethkey.KeyV2
 	KeyBundle ocr2key.KeyBundle
-	peerID    peer
+	peer      peerIDAndOCRSigner
 	start     func()
 }
 
@@ -164,11 +164,13 @@ func NewDON(ctx context.Context, t *testing.T, lggr logger.Logger, donConfig Don
 			CapabilityDONs: dependentDONs,
 		}
 
+		signer, err := getSignerStringFromOCRKeyBundle(donConfig.KeyBundles[i])
+		require.NoError(t, err)
 		cn := &capabilityNode{
 			registry:  capabilityRegistry,
 			key:       donConfig.keys[i],
 			KeyBundle: donConfig.KeyBundles[i],
-			peerID:    donConfig.peerIDs[i],
+			peer:      peerIDAndOCRSigner{PeerID: member, Signer: signer},
 		}
 		don.nodes = append(don.nodes, cn)
 
@@ -187,7 +189,7 @@ func NewDON(ctx context.Context, t *testing.T, lggr logger.Logger, donConfig Don
 						modifier(c, cn)
 					}
 				}, donContext.syncerFetcherFunc, donContext.computeFetcherFactory)
-
+			require.NoError(t, node.KeyStore.P2P().Add(ctx, donConfig.p2pKeys[i]))
 			require.NoError(t, node.Start(testutils.Context(t)))
 			cn.TestApplication = node
 		}
@@ -231,12 +233,8 @@ func (d *DON) GetExternalCapabilities() (map[CapabilityRegistration]bool, error)
 		}
 
 		for _, node := range d.nodes {
-			peerIDBytes, err := peerIDToBytes(node.peerID.PeerID)
-			if err != nil {
-				return nil, fmt.Errorf("failed to convert peer ID to bytes: %w", err)
-			}
 			result[CapabilityRegistration{
-				nodePeerID:      hex.EncodeToString(peerIDBytes[:]),
+				nodePeerID:      hex.EncodeToString(node.peer.PeerID[:]),
 				capabilityID:    publishedCapability.registryConfig.LabelledName + "@" + publishedCapability.registryConfig.Version,
 				capabilityDonID: d.GetID(),
 			}] = true
@@ -254,8 +252,12 @@ func (d *DON) GetF() uint8 {
 	return d.config.F
 }
 
-func (d *DON) GetPeerIDs() []peer {
-	return d.config.peerIDs
+func (d *DON) GetPeerIDsAndOCRSigners() []peerIDAndOCRSigner {
+	peers := make([]peerIDAndOCRSigner, 0, len(d.nodes))
+	for _, node := range d.nodes {
+		peers = append(peers, node.peer)
+	}
+	return peers
 }
 
 func (d *DON) Start(ctx context.Context) error {

core/capabilities/integration_tests/framework/don_configuration.go

@@ -7,6 +7,7 @@ import (
 	commoncap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
 	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
 )
 
@@ -15,7 +16,7 @@ type DonConfiguration struct {
 	name       string
 	keys       []ethkey.KeyV2
 	KeyBundles []ocr2key.KeyBundle
-	peerIDs    []peer
+	p2pKeys    []p2pkey.KeyV2
 }
 
 // NewDonConfigurationParams exists purely to make it obvious in the test code what DON configuration is being used
@@ -31,20 +32,15 @@ func NewDonConfiguration(don NewDonConfigurationParams) (DonConfiguration, error
 		return DonConfiguration{}, errors.New("invalid configuration, number of nodes must be at least 3*F+1")
 	}
 
-	keyBundles, peerIDs, err := getKeyBundlesAndPeerIDs(don.Name, don.NumNodes)
+	keyBundles, p2pKeys, err := getKeyBundlesAndP2PKeys(don.Name, don.NumNodes)
 	if err != nil {
-		return DonConfiguration{}, fmt.Errorf("failed to get key bundles and peer IDs: %w", err)
+		return DonConfiguration{}, fmt.Errorf("failed to get key bundles and p2p keys: %w", err)
 	}
 
-	donPeers := make([]p2ptypes.PeerID, len(peerIDs))
+	donPeers := make([]p2ptypes.PeerID, len(p2pKeys))
 	var donKeys []ethkey.KeyV2
-	for i := 0; i < len(peerIDs); i++ {
-		peerID := p2ptypes.PeerID{}
-		err = peerID.UnmarshalText([]byte(peerIDs[i].PeerID))
-		if err != nil {
-			return DonConfiguration{}, fmt.Errorf("failed to unmarshal peer ID: %w", err)
-		}
-		donPeers[i] = peerID
+	for i := 0; i < len(p2pKeys); i++ {
+		donPeers[i] = p2ptypes.PeerID(p2pKeys[i].PeerID())
 		newKey, err := ethkey.NewV2()
 		if err != nil {
 			return DonConfiguration{}, fmt.Errorf("failed to create key: %w", err)
@@ -60,7 +56,7 @@ func NewDonConfiguration(don NewDonConfigurationParams) (DonConfiguration, error
 			AcceptsWorkflows: don.AcceptsWorkflows,
 		},
 		name:       don.Name,
-		peerIDs:    peerIDs,
+		p2pKeys:    p2pKeys,
 		keys:       donKeys,
 		KeyBundles: keyBundles,
 	}