Refactor

shared/services/config/stadernode-config.go

@@ -325,7 +325,7 @@ func (cfg *StaderNodeConfig) GetMerkleProofApi() string {
 }
 
 func (cfg *StaderNodeConfig) GetNodeDiversityApi() string {
-	return cfg.baseStaderBackendUrl[cfg.Network.Value.(config.Network)] + "/nodeDiversity"
+	return cfg.baseStaderBackendUrl[cfg.Network.Value.(config.Network)] + "/saveNodeDiversity"
 }
 
 func (cfg *StaderNodeConfig) GetTxWatchUrl() string {

shared/services/ec-manager.go

@@ -26,7 +26,6 @@ import (
 	"io"
 	"math"
 	"math/big"
-	"net/http"
 	"strings"
 	"time"
 
@@ -39,6 +38,7 @@ import (
 	"github.com/stader-labs/stader-node/shared/types/api"
 	cfgtypes "github.com/stader-labs/stader-node/shared/types/config"
 	"github.com/stader-labs/stader-node/shared/utils/log"
+	"github.com/stader-labs/stader-node/shared/utils/net"
 )
 
 // This is a proxy for multiple ETH clients, providing natural fallback support if one of them fails.
@@ -537,19 +537,19 @@ func (p *ExecutionClientManager) Version() (string, error) {
 		url = p.primaryEcUrl
 	}
 
-	method := "POST"
-
-	payload := strings.NewReader(`{"jsonrpc":"2.0","method":"web3_clientVersion","params":[],"id":1}`)
-
-	client := &http.Client{}
-	req, err := http.NewRequest(method, url, payload)
-
-	if err != nil {
-		return "", err
+	payload := struct {
+		Jsonrpc string   `json:"jsonrpc"`
+		Method  string   `json:"method"`
+		Params  []string `json:"params"`
+		Id      int64    `json:"id"`
+	}{
+		Jsonrpc: "2.0",
+		Method:  "web3_clientVersion",
+		Params:  []string{},
+		Id:      1,
 	}
-	req.Header.Add("Content-Type", "application/json")
 
-	res, err := client.Do(req)
+	res, err := net.MakePostRequest(url, payload)
 	if err != nil {
 		return "", err
 	}

shared/types/stader-backend/node-diversity.go

@@ -6,11 +6,13 @@ type NodeDiversityRequest struct {
 }
 
 type NodeDiversity struct {
-	ExecutionClient string `json:"executionClient"`
-	ConsensusClient string `json:"consensusClient"`
-	NodeAddress     string `json:"nodeAddress"`
-	NodePublicKey   string `json:"nodePublicKey"`
-	Relays          string `json:"relays"`
+	ExecutionClient      string `json:"executionClient"`
+	ConsensusClient      string `json:"consensusClient"`
+	ValidatorClient      string `json:"validatorClient"`
+	TotalNonTerminalKeys uint64 `json:"totalNonTerminalKeys"`
+	NodeAddress          string `json:"nodeAddress"`
+	NodePublicKey        string `json:"nodePublicKey"`
+	Relays               string `json:"relays"`
 }
 
 type NodeDiversityResponseType struct {

stader/node/node.go

@@ -45,6 +45,7 @@ import (
 	"github.com/stader-labs/stader-node/shared/utils/stdr"
 	"github.com/stader-labs/stader-node/shared/utils/validator"
 	"github.com/stader-labs/stader-node/stader-lib/node"
+	stader_lib "github.com/stader-labs/stader-node/stader-lib/stader"
 	eth2types "github.com/wealdtech/go-eth2-types/v2"
 
 	"github.com/fatih/color"
@@ -413,7 +414,7 @@ func run(c *cli.Context) error {
 		for {
 			infoLog.Printlnf("Running the node diversity tracker daemon")
 
-			message, err := makesNodeDiversityMessage(ec, bc, w, cfg)
+			message, err := makesNodeDiversityMessage(ec, bc, pnr, w, cfg)
 			if err != nil {
 				errorLog.Printlnf("Error makesNodeDiversityMessage %+v", err)
 				continue
@@ -451,6 +452,7 @@ func run(c *cli.Context) error {
 func makesNodeDiversityMessage(
 	ec *services.ExecutionClientManager,
 	bc *services.BeaconClientManager,
+	pnr *stader_lib.PermissionlessNodeRegistryContractManager,
 	w *wallet.Wallet,
 	cfg *config.StaderConfig,
 ) (*stader_backend.NodeDiversity, error) {
@@ -491,18 +493,43 @@ func makesNodeDiversityMessage(
 		relayString = strings.Join(relayNames, ",")
 	}
 
+	operatorId, err := node.GetOperatorId(pnr, nodeAccount.Address, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	totalValidatorKeys, err := node.GetTotalValidatorKeys(pnr, operatorId, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	//fmt.Printf("Get total non terminal validator keys\n")
+	totalNonTerminalValidatorKeys, err := node.GetTotalNonTerminalValidatorKeys(pnr, nodeAccount.Address, totalValidatorKeys, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get the new validator client according to the settings file
+	selectedConsensusClientConfig, err := cfg.GetSelectedConsensusClientConfig()
+	if err != nil {
+		return nil, err
+	}
+
 	message := stader_backend.NodeDiversity{
-		ExecutionClient: ecVersion,
-		ConsensusClient: bcNodeVersion.Version,
-		NodeAddress:     nodeAccount.Address.String(),
-		NodePublicKey:   nodePublicKey,
-		Relays:          relayString,
+		ExecutionClient:      ecVersion,
+		ConsensusClient:      bcNodeVersion.Version,
+		ValidatorClient:      selectedConsensusClientConfig.GetName(),
+		NodeAddress:          nodeAccount.Address.String(),
+		TotalNonTerminalKeys: totalNonTerminalValidatorKeys,
+		NodePublicKey:        nodePublicKey,
+		Relays:               relayString,
 	}
 
 	return &message, nil
 }
 
 func makesNodeDiversityRequest(msg *stader_backend.NodeDiversity, privateKey *ecdsa.PrivateKey) (*stader_backend.NodeDiversityRequest, error) {
+	msg.TotalNonTerminalKeys = 1
 	msgBytes, err := json.Marshal(msg)
 	if err != nil {
 		return nil, err

stader/node/node_test.go

@@ -5,6 +5,7 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"encoding/json"
+	"fmt"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/accounts"
@@ -14,8 +15,9 @@ import (
 )
 
 var (
-	ExecutionClient = "Nethermind/v1.25.2+78c7bf5f/linux-x64/dotnet8.0.1"
-	ConsensusClient = "Lighthouse/v4.6.0-rc.0-2e8e160/x86_64-linux"
+	ExecutionClient = "besu/v1.25.2+78c7bf5f/linux-x64/dotnet8.0.1"
+	ConsensusClient = "teku/v4.6.0-rc.0-2e8e160/x86_64-linux"
+	ValidatorClient = "prysm"
 
 	PrvFake = "f7d400ec4062274059f531413e03a938fd837e3a07692338ab78dfd93d1e21e1"
 )
@@ -35,11 +37,13 @@ func TestVerifySignature(t *testing.T) {
 
 	pubkeyBytes := crypto.FromECDSAPub(publicKeyECDSA)
 	req, err := makesNodeDiversityRequest(&stader_backend.NodeDiversity{
-		ExecutionClient: ExecutionClient,
-		ConsensusClient: ConsensusClient,
-		NodeAddress:     crypto.PubkeyToAddress(*publicKeyECDSA).String(),
-		NodePublicKey:   hex.EncodeToString(pubkeyBytes),
-		Relays:          "ultrasound,aestus",
+		ExecutionClient:      ExecutionClient,
+		ConsensusClient:      ConsensusClient,
+		ValidatorClient:      ValidatorClient,
+		TotalNonTerminalKeys: 1,
+		NodeAddress:          crypto.PubkeyToAddress(*publicKeyECDSA).String(),
+		NodePublicKey:        hex.EncodeToString(pubkeyBytes),
+		Relays:               "ultrasound,aestus",
 	}, privateKey)
 	if err != nil {
 		t.Error(err)
@@ -73,10 +77,13 @@ func TestVerifySignatureFailed(t *testing.T) {
 	}
 
 	msg := stader_backend.NodeDiversity{
-		ExecutionClient: ExecutionClient,
-		ConsensusClient: ConsensusClient,
-		NodeAddress:     crypto.PubkeyToAddress(*publicKeyECDSA).String(),
-		NodePublicKey:   hex.EncodeToString(publickeyBytes),
+		ExecutionClient:      ExecutionClient,
+		ConsensusClient:      ConsensusClient,
+		ValidatorClient:      ValidatorClient,
+		TotalNonTerminalKeys: 10,
+		Relays:               "ultrasound,aestus",
+		NodeAddress:          crypto.PubkeyToAddress(*publicKeyECDSA).String(),
+		NodePublicKey:        hex.EncodeToString(publickeyBytes),
 	}
 	req, err := makesNodeDiversityRequest(&msg, privateKeyFake)
 	if err != nil {
@@ -104,11 +111,21 @@ func verifySignature(t *testing.T, msg *stader_backend.NodeDiversity, signEncode
 		t.Error(err)
 	}
 
+	if msg.ValidatorClient != ValidatorClient {
+		t.Error(err)
+	}
+
+	if msg.TotalNonTerminalKeys != 10 {
+		t.Error(err)
+	}
+
 	msgBytes, err := json.Marshal(msg)
 	if err != nil {
 		t.Error(err)
 	}
 
+	fmt.Printf("[%s]", msgBytes)
+	fmt.Printf("[%s]", signEncoded)
 	msgHashed := accounts.TextHash(msgBytes)
 
 	decodePubkey, err := hex.DecodeString(msg.NodePublicKey)