fix compilation issues

ssvlabs · Feb 8, 2025 · 4c2e1e8 · 4c2e1e8
1 parent ad9e861
commit 4c2e1e8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/cli/operator/node.go b/cli/operator/node.go
@@ -143,9 +143,9 @@ var StartNodeCmd = &cobra.Command{
 		var operatorPrivKey keys.OperatorPrivateKey
 		var operatorPrivKeyText string
 		var operatorPubKey keys.OperatorPublicKey
-		var ssvSignerClient *ssvsignerclient.Client
+		var ssvSignerClient *ssvsignerclient.SSVSignerClient
 		if cfg.SSVSignerEndpoint != "" {
-			ssvSignerClient = ssvsignerclient.NewClient(cfg.SSVSignerEndpoint)
+			ssvSignerClient = ssvsignerclient.New(cfg.SSVSignerEndpoint)
 			operatorPubKeyString, err := ssvSignerClient.GetOperatorIdentity()
 			if err != nil {
 				logger.Fatal("ssv-signer unavailable", zap.Error(err))
@@ -209,21 +209,6 @@ var StartNodeCmd = &cobra.Command{
 			logger.Fatal("failed to validate config", zap.Error(err))
 		}
 
-		var keyManager ekm.KeyManager
-		if cfg.SSVSignerEndpoint != "" { // TODO: try to remove repetitive check
-			keyManager = ekm.NewSSVSignerKeyManagerAdapter(ssvSignerClient)
-		} else {
-			ekmHashedKey, err := operatorPrivKey.EKMHash()
-			if err != nil {
-				logger.Fatal("could not get operator private key hash", zap.Error(err))
-			}
-
-			keyManager, err = ekm.NewETHKeyManagerSigner(logger, db, networkConfig, ekmHashedKey)
-			if err != nil {
-				logger.Fatal("could not create new eth-key-manager signer", zap.Error(err))
-			}
-		}
-
 		cfg.P2pNetworkConfig.Ctx = cmd.Context()
 
 		slotTickerProvider := func() slotticker.SlotTicker {
@@ -283,6 +268,21 @@ var StartNodeCmd = &cobra.Command{
 			executionClient = ec
 		}
 
+		var keyManager ekm.KeyManager
+		if cfg.SSVSignerEndpoint != "" { // TODO: try to remove repetitive check
+			keyManager = ekm.NewSSVSignerKeyManagerAdapter(ssvSignerClient, consensusClient)
+		} else {
+			ekmHashedKey, err := operatorPrivKey.EKMHash()
+			if err != nil {
+				logger.Fatal("could not get operator private key hash", zap.Error(err))
+			}
+
+			keyManager, err = ekm.NewETHKeyManagerSigner(logger, db, networkConfig, ekmHashedKey)
+			if err != nil {
+				logger.Fatal("could not create new eth-key-manager signer", zap.Error(err))
+			}
+		}
+
 		cfg.P2pNetworkConfig.NodeStorage = nodeStorage
 		cfg.P2pNetworkConfig.OperatorPubKeyHash = format.OperatorID(operatorData.PublicKey)
 		cfg.P2pNetworkConfig.OperatorDataStore = operatorDataStore

diff --git a/ekm/ssv_signer.go b/ekm/ssv_signer.go
@@ -11,17 +11,19 @@ import (
 	"github.com/ssvlabs/ssv-signer/web3signer"
 	spectypes "github.com/ssvlabs/ssv-spec/types"
 
+	"github.com/ssvlabs/ssv/beacon/goclient"
 	"github.com/ssvlabs/ssv/operator/keys"
 )
 
 // TODO: move to another package?
 
 type SSVSignerKeyManagerAdapter struct {
-	client *ssvsignerclient.SSVSignerClient
+	client          *ssvsignerclient.SSVSignerClient
+	consensusClient *goclient.GoClient
 }
 
-func NewSSVSignerKeyManagerAdapter(client *ssvsignerclient.SSVSignerClient) *SSVSignerKeyManagerAdapter {
-	return &SSVSignerKeyManagerAdapter{client: client}
+func NewSSVSignerKeyManagerAdapter(client *ssvsignerclient.SSVSignerClient, consensusClient *goclient.GoClient) *SSVSignerKeyManagerAdapter {
+	return &SSVSignerKeyManagerAdapter{client: client, consensusClient: consensusClient}
 }
 
 func (s *SSVSignerKeyManagerAdapter) SignBeaconObject(obj ssz.HashRoot, domain phase0.Domain, sharePubkey []byte, domainType phase0.DomainType) (spectypes.Signature, [32]byte, error) {