Suggested Fee Recipient : bug fix

validator/client/validator.go

@@ -986,14 +986,19 @@ func (v *validator) feeRecipients(ctx context.Context, pubkeys [][fieldparams.BL
 			validatorIndex = ind
 			v.pubkeyToValidatorIndex[key] = validatorIndex
 		}
+		if v.feeRecipientConfig.DefaultConfig != nil {
+			feeRecipient = v.feeRecipientConfig.DefaultConfig.FeeRecipient
+		}
 		if v.feeRecipientConfig.ProposeConfig != nil {
 			option, ok := v.feeRecipientConfig.ProposeConfig[key]
 			if option != nil && ok {
+				// override the default if a proposeconfig is set
 				feeRecipient = option.FeeRecipient
-			} else {
-				feeRecipient = v.feeRecipientConfig.DefaultConfig.FeeRecipient
 			}
 		}
+		if hexutil.Encode(feeRecipient.Bytes()) == fieldparams.EthBurnAddressHex {
+			log.Warnln("Fee recipient is set to the burn address. You will not be rewarded transaction fees on this setting. Please set a different fee recipient.")
+		}
 		validatorToFeeRecipientArray = append(validatorToFeeRecipientArray, &ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer{
 			ValidatorIndex: validatorIndex,
 			FeeRecipient:   feeRecipient[:],

validator/client/validator_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"math"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -1460,6 +1461,7 @@ func TestValidator_UdpateFeeRecipient(t *testing.T) {
 	tests := []struct {
 		name            string
 		validatorSetter func(t *testing.T) *validator
+		feeRecipientMap map[types.ValidatorIndex]string
 		err             string
 	}{
 		{
@@ -1498,6 +1500,9 @@ func TestValidator_UdpateFeeRecipient(t *testing.T) {
 
 				return &v
 			},
+			feeRecipientMap: map[types.ValidatorIndex]string{
+				1: "0x046Fb65722E7b2455043BFEBf6177F1D2e9738D9",
+			},
 		},
 		{
 			name: " Skip if no config",
@@ -1552,6 +1557,9 @@ func TestValidator_UdpateFeeRecipient(t *testing.T) {
 				}, nil)
 				return &v
 			},
+			feeRecipientMap: map[types.ValidatorIndex]string{
+				1: "0x046Fb65722E7b2455043BFEBf6177F1D2e9738D9",
+			},
 		},
 		{
 			name: " Happy Path proposer config not nil",
@@ -1591,6 +1599,9 @@ func TestValidator_UdpateFeeRecipient(t *testing.T) {
 				}
 				return &v
 			},
+			feeRecipientMap: map[types.ValidatorIndex]string{
+				1: "0x046Fb65722E7b2455043BFEBf6177F1D2e9738D9",
+			},
 		},
 		{
 			name: " proposer config not nil but fee recipient empty ",
@@ -1628,6 +1639,7 @@ func TestValidator_UdpateFeeRecipient(t *testing.T) {
 						FeeRecipient: common.HexToAddress("0x046Fb65722E7b2455043BFEBf6177F1D2e9738D9"),
 					},
 				}
+
 				return &v
 			},
 		},
@@ -1674,9 +1686,20 @@ func TestValidator_UdpateFeeRecipient(t *testing.T) {
 			v := tt.validatorSetter(t)
 			km, err := v.Keymanager()
 			require.NoError(t, err)
+			pubkeys, err := km.FetchValidatingPublicKeys(ctx)
+			require.NoError(t, err)
+			if tt.feeRecipientMap != nil {
+				feeRecipients, err := v.feeRecipients(ctx, pubkeys)
+				require.NoError(t, err)
+				for _, recipient := range feeRecipients {
+					require.Equal(t, strings.ToLower(tt.feeRecipientMap[recipient.ValidatorIndex]), strings.ToLower(hexutil.Encode(recipient.FeeRecipient)))
+				}
+			}
+
 			if err := v.UpdateFeeRecipient(ctx, km); tt.err != "" {
 				assert.ErrorContains(t, tt.err, err)
 			}
+
 		})
 	}
 }