E2E: fee-recipient evaluator

config/validator/service/proposer-settings.go

@@ -7,11 +7,11 @@ import (
 )
 
 // ProposerSettingsPayload is the struct representation of the JSON or YAML payload set in the validator through the CLI.
-// ProposeConfig is the map of validator address to fee recipient options all in hex format.
+// ProposerConfig is the map of validator address to fee recipient options all in hex format.
 // DefaultConfig is the default fee recipient address for all validators unless otherwise specified in the propose config.required.
 type ProposerSettingsPayload struct {
-	ProposeConfig map[string]*ProposerOptionPayload `json:"proposer_config" yaml:"proposer_config"`
-	DefaultConfig *ProposerOptionPayload            `json:"default_config" yaml:"default_config"`
+	ProposerConfig map[string]*ProposerOptionPayload `json:"proposer_config" yaml:"proposer_config"`
+	DefaultConfig  *ProposerOptionPayload            `json:"default_config" yaml:"default_config"`
 }
 
 // ProposerOptionPayload is the struct representation of the JSON config file set in the validator through the CLI.

testing/endtoend/components/BUILD.bazel

@@ -25,6 +25,7 @@ go_library(
         "//cmd/validator/flags:go_default_library",
         "//config/features:go_default_library",
         "//config/params:go_default_library",
+        "//config/validator/service:go_default_library",
         "//contracts/deposit:go_default_library",
         "//crypto/bls:go_default_library",
         "//encoding/bytesutil:go_default_library",
@@ -39,6 +40,7 @@ go_library(
         "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library",
         "@com_github_ethereum_go_ethereum//accounts/keystore:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
+        "@com_github_ethereum_go_ethereum//crypto:go_default_library",
         "@com_github_ethereum_go_ethereum//ethclient:go_default_library",
         "@com_github_ethereum_go_ethereum//rpc:go_default_library",
         "@com_github_google_uuid//:go_default_library",

testing/endtoend/components/eth1/miner.go

@@ -27,6 +27,10 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+const (
+	EthAddress = "0x878705ba3f8bc32fcf7f4caa1a35e72af65cf766"
+)
+
 // Miner represents an ETH1 node which mines blocks.
 type Miner struct {
 	e2etypes.ComponentRunner
@@ -127,9 +131,9 @@ func (m *Miner) Start(ctx context.Context) error {
 		"--ipcdisable",
 		"--verbosity=4",
 		"--mine",
-		"--unlock=0x878705ba3f8bc32fcf7f4caa1a35e72af65cf766",
+		fmt.Sprintf("--unlock=%s", EthAddress),
 		"--allow-insecure-unlock",
-		"--txpool.locals=0x878705ba3f8bc32fcf7f4caa1a35e72af65cf766",
+		fmt.Sprintf("--txpool.locals=%s", EthAddress),
 		fmt.Sprintf("--password=%s", eth1Path+"/keystore/"+minerPasswordFile),
 	}
 

testing/endtoend/components/eth1/node.go

@@ -90,7 +90,7 @@ func (node *Node) Start(ctx context.Context) error {
 		"--ws.origins=\"*\"",
 		"--ipcdisable",
 		"--verbosity=4",
-		"--txpool.locals=0x878705ba3f8bc32fcf7f4caa1a35e72af65cf766",
+		fmt.Sprintf("--txpool.locals=%s", EthAddress),
 	}
 	// If we are testing sync, geth needs to be run via full sync as snap sync does not
 	// work in our setup.

testing/endtoend/components/validator.go

@@ -3,27 +3,32 @@ package components
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"math/big"
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
 	"strings"
 	"syscall"
 
 	"github.com/bazelbuild/rules_go/go/tools/bazel"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
 	cmdshared "github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	"github.com/prysmaticlabs/prysm/config/params"
+	validator_service_config "github.com/prysmaticlabs/prysm/config/validator/service"
 	contracts "github.com/prysmaticlabs/prysm/contracts/deposit"
 	"github.com/prysmaticlabs/prysm/encoding/bytesutil"
+	"github.com/prysmaticlabs/prysm/io/file"
 	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/testing/endtoend/components/eth1"
 	"github.com/prysmaticlabs/prysm/testing/endtoend/helpers"
@@ -33,6 +38,7 @@ import (
 )
 
 const depositGasLimit = 4000000
+const DefaultFeeRecipientAddress = "0x099FB65722e7b2455043bfebF6177f1D2E9738d9"
 
 var _ e2etypes.ComponentRunner = (*ValidatorNode)(nil)
 var _ e2etypes.ComponentRunner = (*ValidatorNodeSet)(nil)
@@ -170,6 +176,7 @@ func NewValidatorNode(config *e2etypes.E2EConfig, validatorNum, index, offset in
 
 // Start starts a validator client.
 func (v *ValidatorNode) Start(ctx context.Context) error {
+	validatorHexPubKeys := make([]string, 0)
 	var pkg, target string
 	if v.config.UsePrysmShValidator {
 		pkg = ""
@@ -198,6 +205,15 @@ func (v *ValidatorNode) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+
+	_, pubs, err := interop.DeterministicallyGenerateKeys(uint64(offset), uint64(validatorNum))
+	if err != nil {
+		return err
+	}
+	for _, pub := range pubs {
+		validatorHexPubKeys = append(validatorHexPubKeys, hexutil.Encode(pub.Marshal()))
+	}
+
 	args := []string{
 		fmt.Sprintf("--%s=%s/eth2-val-%d", cmdshared.DataDirFlag.Name, e2e.TestParams.TestPath, index),
 		fmt.Sprintf("--%s=%s", cmdshared.LogFileName.Name, file.Name()),
@@ -219,20 +235,22 @@ func (v *ValidatorNode) Start(ctx context.Context) error {
 		args = append(args, fmt.Sprintf("--%s=http://localhost:%d", flags.Web3SignerURLFlag.Name, Web3RemoteSignerPort))
 		// Write the pubkeys as comma seperated hex strings with 0x prefix.
 		// See: https://docs.teku.consensys.net/en/latest/HowTo/External-Signer/Use-External-Signer/
-		_, pubs, err := interop.DeterministicallyGenerateKeys(uint64(offset), uint64(validatorNum))
-		if err != nil {
-			return err
-		}
-		var hexPubs []string
-		for _, pub := range pubs {
-			hexPubs = append(hexPubs, hexutil.Encode(pub.Marshal()))
-		}
-		args = append(args, fmt.Sprintf("--%s=%s", flags.Web3SignerPublicValidatorKeysFlag.Name, strings.Join(hexPubs, ",")))
+		args = append(args, fmt.Sprintf("--%s=%s", flags.Web3SignerPublicValidatorKeysFlag.Name, strings.Join(validatorHexPubKeys, ",")))
 	} else {
 		// When not using remote key signer, use interop keys.
 		args = append(args,
 			fmt.Sprintf("--%s=%d", flags.InteropNumValidators.Name, validatorNum),
-			fmt.Sprintf("--%s=%d", flags.InteropStartIndex.Name, offset))
+			fmt.Sprintf("--%s=%d", flags.InteropStartIndex.Name, offset),
+		)
+	}
+	//TODO: web3signer does not support validator registration signing currently, move this when support is there.
+	//TODO: current version of prysmsh still uses wrong flag name.
+	if !v.config.UsePrysmShValidator && !v.config.UseWeb3RemoteSigner {
+		proposerSettingsPathPath, err := createProposerSettingsPath(validatorHexPubKeys, index)
+		if err != nil {
+			return err
+		}
+		args = append(args, fmt.Sprintf("--%s=%s", flags.ProposerSettingsFlag.Name, proposerSettingsPathPath))
 	}
 	args = append(args, config.ValidatorFlags...)
 
@@ -378,3 +396,49 @@ func sendDeposits(web3 *ethclient.Client, keystoreBytes []byte, num, offset int,
 	}
 	return nil
 }
+
+func createProposerSettingsPath(pubkeys []string, validatorIndex int) (string, error) {
+	testNetDir := e2e.TestParams.TestPath + fmt.Sprintf("/proposer-settings/validator_%d", validatorIndex)
+	configPath := filepath.Join(testNetDir, "config.json")
+	if len(pubkeys) == 0 {
+		return "", errors.New("number of validators must be greater than 0")
+	}
+	var proposerSettingsPayload validator_service_config.ProposerSettingsPayload
+	if len(pubkeys) == 1 {
+		proposerSettingsPayload = validator_service_config.ProposerSettingsPayload{
+			DefaultConfig: &validator_service_config.ProposerOptionPayload{
+				FeeRecipient: DefaultFeeRecipientAddress,
+			},
+		}
+	} else {
+		config := make(map[string]*validator_service_config.ProposerOptionPayload)
+
+		for _, pubkey := range pubkeys {
+			// Create an account
+			key, err := crypto.GenerateKey()
+			if err != nil {
+				return "", err
+			}
+			config[pubkey] = &validator_service_config.ProposerOptionPayload{
+				FeeRecipient: crypto.PubkeyToAddress(key.PublicKey).Hex(),
+			}
+		}
+		proposerSettingsPayload = validator_service_config.ProposerSettingsPayload{
+			ProposerConfig: config,
+			DefaultConfig: &validator_service_config.ProposerOptionPayload{
+				FeeRecipient: DefaultFeeRecipientAddress,
+			},
+		}
+	}
+	jsonBytes, err := json.Marshal(proposerSettingsPayload)
+	if err != nil {
+		return "", err
+	}
+	if err := file.MkdirAll(testNetDir); err != nil {
+		return "", err
+	}
+	if err := file.WriteFile(configPath, jsonBytes); err != nil {
+		return "", err
+	}
+	return configPath, nil
+}

testing/endtoend/endtoend_setup_test.go

@@ -82,6 +82,10 @@ func e2eMinimal(t *testing.T, cfgo ...types.E2EConfigOpt) *testRunner {
 	for _, o := range cfgo {
 		o(testConfig)
 	}
+	//TODO: web3signer does not currently support validator registration signing so evaluator will break code
+	if !testConfig.UseWeb3RemoteSigner {
+		testConfig.Evaluators = append(testConfig.Evaluators, ev.FeeRecipientIsPresent)
+	}
 
 	return newTestRunner(t, testConfig)
 }
@@ -158,7 +162,10 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfgo ...types.E2E
 	for _, o := range cfgo {
 		o(testConfig)
 	}
-
+	//TODO: web3signer does not currently support validator registration signing so evaluator will break code
+	if !testConfig.UseWeb3RemoteSigner {
+		testConfig.Evaluators = append(testConfig.Evaluators, ev.FeeRecipientIsPresent)
+	}
 	return newTestRunner(t, testConfig)
 }
 

testing/endtoend/evaluators/BUILD.bazel

@@ -8,6 +8,7 @@ go_library(
         "api_middleware.go",
         "data.go",
         "execution_engine.go",
+        "fee_recipient.go",
         "finality.go",
         "fork.go",
         "metrics.go",
@@ -26,6 +27,7 @@ go_library(
         "//beacon-chain/p2p:go_default_library",
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
+        "//config/validator/service:go_default_library",
         "//consensus-types/interfaces:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//consensus-types/wrapper:go_default_library",
@@ -43,9 +45,13 @@ go_library(
         "//testing/endtoend/types:go_default_library",
         "//testing/util:go_default_library",
         "//time/slots:go_default_library",
+        "@com_github_ethereum_go_ethereum//common:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
+        "@com_github_ethereum_go_ethereum//ethclient:go_default_library",
+        "@com_github_ethereum_go_ethereum//rpc:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_prysmaticlabs_go_bitfield//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
         "@io_bazel_rules_go//proto/wkt:empty_go_proto",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_protobuf//types/known/emptypb:go_default_library",