adding builder boost factor to proposer settings

config/validator/service/BUILD.bazel

@@ -13,6 +13,7 @@ go_library(
         "@com_github_ethereum_go_ethereum//common:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
+        "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library",
     ],
 )
 

config/validator/service/proposer_settings.go

@@ -10,6 +10,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/consensus-types/validator"
 	"github.com/prysmaticlabs/prysm/v4/encoding/bytesutil"
 	validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 // ToSettings converts struct to ProposerSettings
@@ -54,19 +55,25 @@ func ToSettings(ps *validatorpb.ProposerSettingsPayload) (*ProposerSettings, err
 // 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 BuilderConfig struct {
-	Enabled  bool             `json:"enabled" yaml:"enabled"`
-	GasLimit validator.Uint64 `json:"gas_limit,omitempty" yaml:"gas_limit,omitempty"`
-	Relays   []string         `json:"relays,omitempty" yaml:"relays,omitempty"`
+	Enabled            bool             `json:"enabled" yaml:"enabled"`
+	GasLimit           validator.Uint64 `json:"gas_limit,omitempty" yaml:"gas_limit,omitempty"`
+	Relays             []string         `json:"relays,omitempty" yaml:"relays,omitempty"`
+	BuilderBoostFactor *uint64          `json:"builder_boost_factor,omitempty" yaml:"builder_boost_factor,omitempty"`
 }
 
 // ToBuilderConfig converts protobuf to a builder config used in inmemory storage
 func ToBuilderConfig(from *validatorpb.BuilderConfig) *BuilderConfig {
 	if from == nil {
 		return nil
 	}
+	var bbf *uint64
+	if from.BuilderBoostFactor != nil {
+		bbf = &from.BuilderBoostFactor.Value
+	}
 	config := &BuilderConfig{
-		Enabled:  from.Enabled,
-		GasLimit: from.GasLimit,
+		Enabled:            from.Enabled,
+		GasLimit:           from.GasLimit,
+		BuilderBoostFactor: bbf,
 	}
 	if from.Relays != nil {
 		relays := make([]string, len(from.Relays))
@@ -173,6 +180,7 @@ func (bc *BuilderConfig) Clone() *BuilderConfig {
 	config := &BuilderConfig{}
 	config.Enabled = bc.Enabled
 	config.GasLimit = bc.GasLimit
+	config.BuilderBoostFactor = bc.BuilderBoostFactor
 	var relays []string
 	if bc.Relays != nil {
 		relays = make([]string, len(bc.Relays))
@@ -196,6 +204,10 @@ func (bc *BuilderConfig) ToPayload() *validatorpb.BuilderConfig {
 		config.Relays = relays
 	}
 	config.GasLimit = bc.GasLimit
+	if bc.BuilderBoostFactor != nil {
+		config.BuilderBoostFactor = &wrapperspb.UInt64Value{Value: *bc.BuilderBoostFactor}
+	}
+
 	return config
 }
 

proto/prysm/v1alpha1/validator-client/BUILD.bazel

@@ -29,6 +29,7 @@ proto_library(
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:descriptor_proto",
         "@com_google_protobuf//:empty_proto",
+        "@com_google_protobuf//:wrappers_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@googleapis//google/api:annotations_proto",
     ],
@@ -53,6 +54,7 @@ go_proto_library(
         "@googleapis//google/api:annotations_go_proto",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
         "@io_bazel_rules_go//proto/wkt:empty_go_proto",
+        "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library",
         "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
         "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
         "@org_golang_google_protobuf//runtime/protoimpl:go_default_library",
@@ -78,6 +80,7 @@ go_proto_library(
         "@googleapis//google/api:annotations_go_proto",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
         "@io_bazel_rules_go//proto/wkt:empty_go_proto",
+        "@io_bazel_rules_go//proto/wkt:wrappers_go_proto",
         "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
     ],
 )

proto/prysm/v1alpha1/validator-client/keymanager.proto

@@ -6,6 +6,7 @@ import "proto/prysm/v1alpha1/attestation.proto";
 import "proto/prysm/v1alpha1/beacon_block.proto";
 import "proto/prysm/v1alpha1/beacon_state.proto";
 import "proto/prysm/v1alpha1/sync_committee.proto";
+import "google/protobuf/wrappers.proto";
 
 option csharp_namespace = "Ethereum.Validator.Accounts.V2";
 option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client;validatorpb";
@@ -94,6 +95,7 @@ message BuilderConfig {
   bool enabled = 1;
   uint64 gas_limit = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/validator.Uint64"];
   repeated string relays = 3;
+  google.protobuf.UInt64Value builder_boost_factor = 4;
 }
 
 // ProposerSettingsPayload is used to unmarshal files sent from the validator flag as well as safe to bolt db bucket

validator/client/BUILD.bazel

@@ -93,6 +93,7 @@ go_library(
         "@org_golang_google_grpc//status:go_default_library",
         "@org_golang_google_protobuf//proto:go_default_library",
         "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
+        "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library",
     ],
 )
 
@@ -176,5 +177,6 @@ go_test(
         "@org_golang_google_grpc//metadata:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
         "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
+        "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library",
     ],
 )

validator/client/propose.go

@@ -12,6 +12,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing"
 	fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/v4/config/params"
+	validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service"
 	"github.com/prysmaticlabs/prysm/v4/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives"
@@ -26,6 +27,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/validator/client/iface"
 	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const domainDataErr = "could not get domain data"
@@ -74,9 +76,10 @@ func (v *validator) ProposeBlock(ctx context.Context, slot primitives.Slot, pubK
 
 	// Request block from beacon node
 	b, err := v.validatorClient.GetBeaconBlock(ctx, &ethpb.BlockRequest{
-		Slot:         slot,
-		RandaoReveal: randaoReveal,
-		Graffiti:     g,
+		Slot:               slot,
+		RandaoReveal:       randaoReveal,
+		Graffiti:           g,
+		BuilderBoostFactor: findBuilderBoost(pubKey, v.proposerSettings),
 	})
 	if err != nil {
 		log.WithField("blockSlot", slot).WithError(err).Error("Failed to request block from beacon node")
@@ -220,6 +223,27 @@ func (v *validator) ProposeBlock(ctx context.Context, slot primitives.Slot, pubK
 	}
 }
 
+func findBuilderBoost(pubKey [fieldparams.BLSPubkeyLength]byte, proposerSettings *validatorserviceconfig.ProposerSettings) *wrapperspb.UInt64Value {
+	if proposerSettings != nil {
+		if proposerSettings.ProposeConfig != nil {
+			option, ok := proposerSettings.ProposeConfig[pubKey]
+			if ok && option.BuilderConfig != nil && option.BuilderConfig.BuilderBoostFactor != nil {
+				return &wrapperspb.UInt64Value{
+					Value: *option.BuilderConfig.BuilderBoostFactor,
+				}
+			}
+		}
+		if proposerSettings.DefaultConfig != nil &&
+			proposerSettings.DefaultConfig.BuilderConfig != nil &&
+			proposerSettings.DefaultConfig.BuilderConfig.BuilderBoostFactor != nil {
+			return &wrapperspb.UInt64Value{
+				Value: *proposerSettings.DefaultConfig.BuilderConfig.BuilderBoostFactor,
+			}
+		}
+	}
+	return nil
+}
+
 // ProposeExit performs a voluntary exit on a validator.
 // The exit is signed by the validator before being sent to the beacon node for broadcasting.
 func ProposeExit(