From 118c84af5719e5b52c002da1c681dab5df460233 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Mon, 23 Sep 2024 15:17:18 +0800
Subject: [PATCH] cmd/utils: fix `setEtherbase` (#30488)

Make `setEtherbase` fall thorugh and handle `miner.pending.feeRecipient` after showing deprecation-warning for `miner.etherbase`-flag.
---
 cmd/utils/flags.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index ff0b3a4031..da2814855a 100644
--- 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