cmd/utils: fix setEtherbase (ethereum#30488)

zhiqiangxu · web-flow · commit 118c84af5719 · 2024-09-23T09:17:18.000+02:00
Make `setEtherbase` fall thorugh and handle `miner.pending.feeRecipient` after showing deprecation-warning for `miner.etherbase`-flag.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1307,7 +1307,6 @@ func MakeAddress(ks *keystore.KeyStore, account string) (accounts.Account, error
 func setEtherbase(ctx *cli.Context, cfg *ethconfig.Config) {
 	if ctx.IsSet(MinerEtherbaseFlag.Name) {
 		log.Warn("Option --miner.etherbase is deprecated as the etherbase is set by the consensus client post-merge")
-		return
 	}
 	if !ctx.IsSet(MinerPendingFeeRecipientFlag.Name) {
 		return

Original file line number	Diff line number	Diff line change
`@@ -1307,7 +1307,6 @@ func MakeAddress(ks *keystore.KeyStore, account string) (accounts.Account, error`
`1307`	`1307`	`func setEtherbase(ctx cli.Context, cfg ethconfig.Config) {`
`1308`	`1308`	`if ctx.IsSet(MinerEtherbaseFlag.Name) {`
`1309`	`1309`	`log.Warn("Option --miner.etherbase is deprecated as the etherbase is set by the consensus client post-merge")`
`1310`		`- return`
`1311`	`1310`	`}`
`1312`	`1311`	`if !ctx.IsSet(MinerPendingFeeRecipientFlag.Name) {`
`1313`	`1312`	`return`