Validator Registration- proposer settings renaming

cmd/validator/flags/flags.go

@@ -345,10 +345,10 @@ var (
 		Value: params.BeaconConfig().EthBurnAddressHex,
 	}
 
-	// EnableValidatorRegistrationFlag enables the periodic validator registration API calls that will update the custom builder with validator settings.
-	EnableValidatorRegistrationFlag = &cli.BoolFlag{
-		Name:  "enable-validator-registration",
-		Usage: "Enables validator registration APIs (MEV Builder APIs) for the validator client to update settings such as fee recipient and gas limit",
+	// EnableBuilderFlag enables the periodic validator registration API calls that will update the custom builder with validator settings.
+	EnableBuilderFlag = &cli.BoolFlag{
+		Name:  "enable-builder",
+		Usage: "Enables MEV Builder validator registration APIs for the validator client to update settings such as fee recipient and gas limit. Note* this flag is not required if using proposer settings config file",
 		Value: false,
 	}
 )

cmd/validator/main.go

@@ -78,7 +78,7 @@ var appFlags = []cli.Flag{
 	flags.SuggestedFeeRecipientFlag,
 	flags.ProposerSettingsURLFlag,
 	flags.ProposerSettingsFlag,
-	flags.EnableValidatorRegistrationFlag,
+	flags.EnableBuilderFlag,
 	////////////////////
 	cmd.DisableMonitoringFlag,
 	cmd.MonitoringHostFlag,

cmd/validator/usage.go

@@ -112,7 +112,7 @@ var appHelpFlagGroups = []flagGroup{
 			flags.ProposerSettingsFlag,
 			flags.ProposerSettingsURLFlag,
 			flags.SuggestedFeeRecipientFlag,
-			flags.EnableValidatorRegistrationFlag,
+			flags.EnableBuilderFlag,
 		},
 	},
 	{

config/validator/service/proposer-settings.go

@@ -17,15 +17,16 @@ type ProposerSettingsPayload struct {
 // ProposerOptionPayload is the struct representation of the JSON config file set in the validator through the CLI.
 // FeeRecipient is set to an eth address in hex string format with 0x prefix.
 type ProposerOptionPayload struct {
-	FeeRecipient          string                 `json:"fee_recipient" yaml:"fee_recipient"`
-	ValidatorRegistration *ValidatorRegistration `json:"validator_registration" yaml:"validator_registration"`
+	FeeRecipient  string         `json:"fee_recipient" yaml:"fee_recipient"`
+	BuilderConfig *BuilderConfig `json:"builder" yaml:"builder"`
 }
 
-// ValidatorRegistration is the struct representation of the JSON config file set in the validator through the CLI.
+// BuilderConfig is the struct representation of the JSON config file set in the validator through the CLI.
 // GasLimit is a number set to help the network decide on the maximum gas in each block.
-type ValidatorRegistration struct {
-	Enable   bool   `json:"enable" yaml:"enable"`
-	GasLimit uint64 `json:"gas_limit,omitempty" yaml:"gas_limit,omitempty"`
+type BuilderConfig struct {
+	Enabled  bool     `json:"enabled" yaml:"enabled"`
+	GasLimit uint64   `json:"gas_limit,omitempty" yaml:"gas_limit,omitempty"`
+	Relays   []string `json:"relays" yaml:"relays"`
 }
 
 // ProposerSettings is a Prysm internal representation of the fee recipient config on the validator client.
@@ -37,14 +38,14 @@ type ProposerSettings struct {
 
 // ProposerOption is a Prysm internal representation of the ProposerOptionPayload on the validator client in bytes format instead of hex.
 type ProposerOption struct {
-	FeeRecipient          common.Address
-	ValidatorRegistration *ValidatorRegistration
+	FeeRecipient  common.Address
+	BuilderConfig *BuilderConfig
 }
 
 // DefaultProposerOption returns a Proposer Option with defaults filled
 func DefaultProposerOption() ProposerOption {
 	return ProposerOption{
-		FeeRecipient:          params.BeaconConfig().DefaultFeeRecipient,
-		ValidatorRegistration: nil,
+		FeeRecipient:  params.BeaconConfig().DefaultFeeRecipient,
+		BuilderConfig: nil,
 	}
 }

validator/client/validator.go

@@ -980,22 +980,13 @@ func (v *validator) PushProposerSettings(ctx context.Context, km keymanager.IKey
 		log.Warnf("No valid validator indices were found, prepare beacon proposer request fee recipients array is empty")
 		return nil
 	}
-	if len(feeRecipients) != len(pubkeys) {
-		log.WithFields(logrus.Fields{
-			"activePubkeys": len(pubkeys) - len(feeRecipients),
-		}).Warnln("will not prepare beacon proposer and update fee recipient until a validator index is assigned")
-	}
 	if _, err := v.validatorClient.PrepareBeaconProposer(ctx, &ethpb.PrepareBeaconProposerRequest{
 		Recipients: feeRecipients,
 	}); err != nil {
 		return err
 	}
 	log.Infoln("Prepared beacon proposer with fee recipient to validator index mapping")
-	if len(signedRegisterValidatorRequests) != len(pubkeys) {
-		log.WithFields(logrus.Fields{
-			"activePubkeys": len(pubkeys) - len(signedRegisterValidatorRequests),
-		}).Warnln("will not be included in validator registration until a validator index is assigned")
-	}
+
 	if err := SubmitValidatorRegistration(ctx, v.validatorClient, signedRegisterValidatorRequests); err != nil {
 		return err
 	}
@@ -1004,8 +995,9 @@ func (v *validator) PushProposerSettings(ctx context.Context, km keymanager.IKey
 }
 
 func (v *validator) buildProposerSettingsRequests(ctx context.Context, pubkeys [][fieldparams.BLSPubkeyLength]byte, signer iface.SigningFunc) ([]*ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer, []*ethpb.SignedValidatorRegistrationV1, error) {
-	var validatorToFeeRecipients []*ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer
+	var proposerFeeRecipientRequests []*ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer
 	var signedRegisterValidatorRequests []*ethpb.SignedValidatorRegistrationV1
+	anyValidatorRegistrationEnabled := false
 	// need to check for pubkey to validator index mappings
 	for i, key := range pubkeys {
 		var enableValidatorRegistration bool
@@ -1028,8 +1020,8 @@ func (v *validator) buildProposerSettingsRequests(ctx context.Context, pubkeys [
 		}
 		if v.ProposerSettings.DefaultConfig != nil {
 			feeRecipient = v.ProposerSettings.DefaultConfig.FeeRecipient
-			vr := v.ProposerSettings.DefaultConfig.ValidatorRegistration
-			if vr != nil && vr.Enable {
+			vr := v.ProposerSettings.DefaultConfig.BuilderConfig
+			if vr != nil && vr.Enabled {
 				gasLimit = vr.GasLimit
 				enableValidatorRegistration = true
 			}
@@ -1040,8 +1032,8 @@ func (v *validator) buildProposerSettingsRequests(ctx context.Context, pubkeys [
 			if ok && option != nil {
 				// override the default if a proposeconfig is set
 				feeRecipient = option.FeeRecipient
-				vr := option.ValidatorRegistration
-				if vr != nil && vr.Enable {
+				vr := option.BuilderConfig
+				if vr != nil && vr.Enabled {
 					gasLimit = vr.GasLimit
 					enableValidatorRegistration = true
 				} else {
@@ -1055,12 +1047,13 @@ func (v *validator) buildProposerSettingsRequests(ctx context.Context, pubkeys [
 
 		// Only include requests with assigned validator index
 		if !skipAppendToFeeRecipientArray {
-			validatorToFeeRecipients = append(validatorToFeeRecipients, &ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer{
+			proposerFeeRecipientRequests = append(proposerFeeRecipientRequests, &ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer{
 				ValidatorIndex: validatorIndex,
 				FeeRecipient:   feeRecipient[:],
 			})
 		}
 		if !skipAppendToFeeRecipientArray && enableValidatorRegistration {
+			anyValidatorRegistrationEnabled = true
 			unsignedRequest := &ethpb.ValidatorRegistrationV1{
 				FeeRecipient: feeRecipient[:],
 				GasLimit:     gasLimit,
@@ -1075,7 +1068,20 @@ func (v *validator) buildProposerSettingsRequests(ctx context.Context, pubkeys [
 			signedRegisterValidatorRequests = append(signedRegisterValidatorRequests, request)
 		}
 	}
-	return validatorToFeeRecipients, signedRegisterValidatorRequests, nil
+
+	if len(proposerFeeRecipientRequests) != len(pubkeys) {
+		log.WithFields(logrus.Fields{
+			"totalNonActivePubkeys": len(pubkeys) - len(proposerFeeRecipientRequests),
+		}).Warnln("will not prepare beacon proposer and update fee recipient until a validator index is assigned")
+	}
+
+	if len(signedRegisterValidatorRequests) != len(pubkeys) && anyValidatorRegistrationEnabled {
+		log.WithFields(logrus.Fields{
+			"totalNonActivePubkeys": len(pubkeys) - len(signedRegisterValidatorRequests),
+		}).Warnln("will not be included in MEV builder validator registration until a validator index is assigned")
+	}
+
+	return proposerFeeRecipientRequests, signedRegisterValidatorRequests, nil
 }
 
 func (v *validator) cacheValidatorPubkeyHexToValidatorIndex(ctx context.Context, pubkey [fieldparams.BLSPubkeyLength]byte) (types.ValidatorIndex, bool, error) {

validator/client/validator_test.go

@@ -1461,6 +1461,7 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 		mockExpectedRequests []ExpectedValidatorRegistration
 		err                  string
 		logMessages          []string
+		doesntContainLogs    bool
 	}{
 		{
 			name: " Happy Path proposer config not nil",
@@ -1505,17 +1506,17 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 				}).Return(nil, nil)
 				config[keys[0]] = &validatorserviceconfig.ProposerOption{
 					FeeRecipient: common.HexToAddress("0x055Fb65722E7b2455043BFEBf6177F1D2e9738D9"),
-					ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-						Enable:   true,
+					BuilderConfig: &validatorserviceconfig.BuilderConfig{
+						Enabled:  true,
 						GasLimit: uint64(40000000),
 					},
 				}
 				v.ProposerSettings = &validatorserviceconfig.ProposerSettings{
 					ProposeConfig: config,
 					DefaultConfig: &validatorserviceconfig.ProposerOption{
 						FeeRecipient: common.HexToAddress(defaultFeeHex),
-						ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-							Enable:   true,
+						BuilderConfig: &validatorserviceconfig.BuilderConfig{
+							Enabled:  true,
 							GasLimit: uint64(35000000),
 						},
 					},
@@ -1585,17 +1586,17 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 				}).Return(nil, nil)
 				config[keys[0]] = &validatorserviceconfig.ProposerOption{
 					FeeRecipient: common.HexToAddress("0x055Fb65722E7b2455043BFEBf6177F1D2e9738D9"),
-					ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-						Enable:   true,
+					BuilderConfig: &validatorserviceconfig.BuilderConfig{
+						Enabled:  true,
 						GasLimit: uint64(40000000),
 					},
 				}
 				v.ProposerSettings = &validatorserviceconfig.ProposerSettings{
 					ProposeConfig: config,
 					DefaultConfig: &validatorserviceconfig.ProposerOption{
 						FeeRecipient: common.HexToAddress(defaultFeeHex),
-						ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-							Enable:   false,
+						BuilderConfig: &validatorserviceconfig.BuilderConfig{
+							Enabled:  false,
 							GasLimit: uint64(35000000),
 						},
 					},
@@ -1617,6 +1618,66 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 					GasLimit:     uint64(40000000),
 				},
 			},
+			logMessages: []string{"will not be included in MEV builder validator registration"},
+		},
+		{
+			name: " Happy Path default doesn't send any validator registrations",
+			validatorSetter: func(t *testing.T) *validator {
+
+				v := validator{
+					validatorClient:              client,
+					node:                         nodeClient,
+					db:                           db,
+					pubkeyToValidatorIndex:       make(map[[fieldparams.BLSPubkeyLength]byte]types.ValidatorIndex),
+					signedValidatorRegistrations: make(map[[fieldparams.BLSPubkeyLength]byte]*ethpb.SignedValidatorRegistrationV1),
+					useWeb:                       false,
+					interopKeysConfig: &local.InteropKeymanagerConfig{
+						NumValidatorKeys: 2,
+						Offset:           1,
+					},
+				}
+				err := v.WaitForKeymanagerInitialization(ctx)
+				require.NoError(t, err)
+				config := make(map[[fieldparams.BLSPubkeyLength]byte]*validatorserviceconfig.ProposerOption)
+				km, err := v.Keymanager()
+				require.NoError(t, err)
+				keys, err := km.FetchValidatingPublicKeys(ctx)
+				require.NoError(t, err)
+				client.EXPECT().ValidatorIndex(
+					ctx, // ctx
+					&ethpb.ValidatorIndexRequest{PublicKey: keys[0][:]},
+				).Return(&ethpb.ValidatorIndexResponse{
+					Index: 1,
+				}, nil)
+				client.EXPECT().ValidatorIndex(
+					ctx, // ctx
+					&ethpb.ValidatorIndexRequest{PublicKey: keys[1][:]},
+				).Return(&ethpb.ValidatorIndexResponse{
+					Index: 2,
+				}, nil)
+				client.EXPECT().PrepareBeaconProposer(gomock.Any(), &ethpb.PrepareBeaconProposerRequest{
+					Recipients: []*ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer{
+						{FeeRecipient: common.HexToAddress("0x055Fb65722E7b2455043BFEBf6177F1D2e9738D9").Bytes(), ValidatorIndex: 1},
+						{FeeRecipient: common.HexToAddress(defaultFeeHex).Bytes(), ValidatorIndex: 2},
+					},
+				}).Return(nil, nil)
+				config[keys[0]] = &validatorserviceconfig.ProposerOption{
+					FeeRecipient: common.HexToAddress("0x055Fb65722E7b2455043BFEBf6177F1D2e9738D9"),
+				}
+				v.ProposerSettings = &validatorserviceconfig.ProposerSettings{
+					ProposeConfig: config,
+					DefaultConfig: &validatorserviceconfig.ProposerOption{
+						FeeRecipient: common.HexToAddress(defaultFeeHex),
+					},
+				}
+				return &v
+			},
+			feeRecipientMap: map[types.ValidatorIndex]string{
+				1: "0x055Fb65722E7b2455043BFEBf6177F1D2e9738D9",
+				2: defaultFeeHex,
+			},
+			logMessages:       []string{"will not be included in MEV builder validator registration"},
+			doesntContainLogs: true,
 		},
 		{
 			name: " Happy Path",
@@ -1647,8 +1708,8 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 					ProposeConfig: nil,
 					DefaultConfig: &validatorserviceconfig.ProposerOption{
 						FeeRecipient: common.HexToAddress(defaultFeeHex),
-						ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-							Enable:   true,
+						BuilderConfig: &validatorserviceconfig.BuilderConfig{
+							Enabled:  true,
 							GasLimit: params.BeaconConfig().DefaultBuilderGasLimit,
 						},
 					},
@@ -1703,8 +1764,8 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 					ProposeConfig: nil,
 					DefaultConfig: &validatorserviceconfig.ProposerOption{
 						FeeRecipient: common.HexToAddress(defaultFeeHex),
-						ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-							Enable:   true,
+						BuilderConfig: &validatorserviceconfig.BuilderConfig{
+							Enabled:  true,
 							GasLimit: uint64(40000000),
 						},
 					},
@@ -1895,17 +1956,17 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 
 				config[keys[0]] = &validatorserviceconfig.ProposerOption{
 					FeeRecipient: common.Address{},
-					ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-						Enable:   true,
+					BuilderConfig: &validatorserviceconfig.BuilderConfig{
+						Enabled:  true,
 						GasLimit: uint64(40000000),
 					},
 				}
 				v.ProposerSettings = &validatorserviceconfig.ProposerSettings{
 					ProposeConfig: config,
 					DefaultConfig: &validatorserviceconfig.ProposerOption{
 						FeeRecipient: common.HexToAddress(defaultFeeHex),
-						ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-							Enable:   true,
+						BuilderConfig: &validatorserviceconfig.BuilderConfig{
+							Enabled:  true,
 							GasLimit: uint64(40000000),
 						},
 					},
@@ -1952,8 +2013,8 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 					ProposeConfig: nil,
 					DefaultConfig: &validatorserviceconfig.ProposerOption{
 						FeeRecipient: common.HexToAddress(defaultFeeHex),
-						ValidatorRegistration: &validatorserviceconfig.ValidatorRegistration{
-							Enable:   true,
+						BuilderConfig: &validatorserviceconfig.BuilderConfig{
+							Enabled:  true,
 							GasLimit: params.BeaconConfig().DefaultBuilderGasLimit,
 						},
 					},
@@ -1992,7 +2053,7 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 			},
 			logMessages: []string{
 				"prepare beacon proposer and update fee recipient until a validator index is assigned",
-				"not be included in validator registration until a validator index is assigned",
+				"will not be included in MEV builder validator registration until a validator index is assigned",
 			},
 		},
 	}
@@ -2029,7 +2090,11 @@ func TestValidator_PushProposerSettings(t *testing.T) {
 			}
 			if len(tt.logMessages) > 0 {
 				for _, message := range tt.logMessages {
-					assert.LogsContain(t, hook, message)
+					if tt.doesntContainLogs {
+						assert.LogsDoNotContain(t, hook, message)
+					} else {
+						assert.LogsContain(t, hook, message)
+					}
 				}
 
 			}