diff --git a/beacon-chain/node/config.go b/beacon-chain/node/config.go index 065f94436abb..09b9a5acbd5a 100644 --- a/beacon-chain/node/config.go +++ b/beacon-chain/node/config.go @@ -108,12 +108,12 @@ func configureInteropConfig(cliCtx *cli.Context) { } func configureExecutionSetting(cliCtx *cli.Context) error { - if !cliCtx.IsSet(flags.FeeRecipient.Name) { + if !cliCtx.IsSet(flags.SuggestedFeeRecipient.Name) { return nil } c := params.BeaconConfig() - ha := cliCtx.String(flags.FeeRecipient.Name) + ha := cliCtx.String(flags.SuggestedFeeRecipient.Name) if !common.IsHexAddress(ha) { return fmt.Errorf("%s is not a valid fee recipient address", ha) } diff --git a/beacon-chain/node/config_test.go b/beacon-chain/node/config_test.go index 89f42a1620bc..b70c9e50c7ef 100644 --- a/beacon-chain/node/config_test.go +++ b/beacon-chain/node/config_test.go @@ -90,19 +90,19 @@ func TestConfigureExecutionSetting(t *testing.T) { app := cli.App{} set := flag.NewFlagSet("test", 0) - set.String(flags.FeeRecipient.Name, "", "") - require.NoError(t, set.Set(flags.FeeRecipient.Name, "0xB")) + set.String(flags.SuggestedFeeRecipient.Name, "", "") + require.NoError(t, set.Set(flags.SuggestedFeeRecipient.Name, "0xB")) cliCtx := cli.NewContext(&app, set, nil) err := configureExecutionSetting(cliCtx) require.ErrorContains(t, "0xB is not a valid fee recipient address", err) - require.NoError(t, set.Set(flags.FeeRecipient.Name, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")) + require.NoError(t, set.Set(flags.SuggestedFeeRecipient.Name, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")) cliCtx = cli.NewContext(&app, set, nil) err = configureExecutionSetting(cliCtx) require.NoError(t, err) assert.Equal(t, common.HexToAddress("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), params.BeaconConfig().DefaultFeeRecipient) - require.NoError(t, set.Set(flags.FeeRecipient.Name, "0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")) + require.NoError(t, set.Set(flags.SuggestedFeeRecipient.Name, "0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")) cliCtx = cli.NewContext(&app, set, nil) err = configureExecutionSetting(cliCtx) require.NoError(t, err) diff --git a/cmd/beacon-chain/flags/BUILD.bazel b/cmd/beacon-chain/flags/BUILD.bazel index 82cbee64f538..e19df4a5e883 100644 --- a/cmd/beacon-chain/flags/BUILD.bazel +++ b/cmd/beacon-chain/flags/BUILD.bazel @@ -18,6 +18,7 @@ go_library( ], deps = [ "//cmd:go_default_library", + "//config/fieldparams:go_default_library", "//config/params:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", diff --git a/cmd/beacon-chain/flags/base.go b/cmd/beacon-chain/flags/base.go index cc562f2ea20a..94d984d33e66 100644 --- a/cmd/beacon-chain/flags/base.go +++ b/cmd/beacon-chain/flags/base.go @@ -3,9 +3,9 @@ package flags import ( - "encoding/hex" "strings" + fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams" "github.com/prysmaticlabs/prysm/config/params" "github.com/urfave/cli/v2" ) @@ -216,10 +216,10 @@ var ( Usage: "Sets the minimum number of peers that a node will attempt to peer with that are subscribed to a subnet.", Value: 6, } - // FeeRecipient specifies the fee recipient for the transaction fees. - FeeRecipient = &cli.StringFlag{ - Name: "fee-recipient", - Usage: "Post bellatrix, this address will receive the transaction fees produced by any blocks from this node. Default to junk whilst bellatrix is in development state.", - Value: hex.EncodeToString([]byte("0x0000000000000000000000000000000000000001")), + // SuggestedFeeRecipient specifies the fee recipient for the transaction fees. + SuggestedFeeRecipient = &cli.StringFlag{ + Name: "suggested-fee-recipient", + Usage: "Post bellatrix, this address will receive the transaction fees produced by any blocks from this node. Default to junk whilst bellatrix is in development state. Validator client can override this value through the preparebeaconproposer api.", + Value: fieldparams.EthBurnAddressHex, } ) diff --git a/cmd/beacon-chain/main.go b/cmd/beacon-chain/main.go index 01622255fb0e..b5152f407c13 100644 --- a/cmd/beacon-chain/main.go +++ b/cmd/beacon-chain/main.go @@ -67,7 +67,7 @@ var appFlags = []cli.Flag{ flags.Eth1HeaderReqLimit, flags.GenesisStatePath, flags.MinPeersPerSubnet, - flags.FeeRecipient, + flags.SuggestedFeeRecipient, cmd.EnableBackupWebhookFlag, cmd.BackupWebhookOutputDir, cmd.MinimalConfigFlag, diff --git a/cmd/beacon-chain/usage.go b/cmd/beacon-chain/usage.go index 77c15ae4edaa..69bc1578fe16 100644 --- a/cmd/beacon-chain/usage.go +++ b/cmd/beacon-chain/usage.go @@ -131,7 +131,7 @@ var appHelpFlagGroups = []flagGroup{ { Name: "merge", Flags: []cli.Flag{ - flags.FeeRecipient, + flags.SuggestedFeeRecipient, }, }, {