From 2bd5c5fcc93caaf6924fc19cf4c0be490ae49b50 Mon Sep 17 00:00:00 2001
From: Marius van der Wijden <m.vanderwijden@live.de>
Date: Wed, 6 Mar 2024 12:04:23 +0100
Subject: [PATCH] cmd: rename pendingBlockProducer to
 miner.pending.feeRecipient flag

---
 cmd/geth/main.go   |  2 +-
 cmd/utils/flags.go | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index f27a20f4cf..9a88e9f2e8 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -121,7 +121,7 @@ var (
 		utils.MinerEtherbaseFlag, // deprecated
 		utils.MinerExtraDataFlag,
 		utils.MinerRecommitIntervalFlag,
-		utils.MinerPendingBlockProducerFlag,
+		utils.MinerPendingFeeRecipientFlag,
 		utils.MinerNewPayloadTimeoutFlag, // deprecated
 		utils.NATFlag,
 		utils.NoDiscoverFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 12f03ef530..9148bdbe8d 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -448,8 +448,8 @@ var (
 		Value:    ethconfig.Defaults.Miner.Recommit,
 		Category: flags.MinerCategory,
 	}
-	MinerPendingBlockProducerFlag = &cli.StringFlag{
-		Name:     "miner.pendingBlockProducer",
+	MinerPendingFeeRecipientFlag = &cli.StringFlag{
+		Name:     "miner.pending.feeRecipient",
 		Usage:    "0x prefixed public address for the pending block producer (not used for actual block production)",
 		Category: flags.MinerCategory,
 	}
@@ -1261,16 +1261,16 @@ func setEtherbase(ctx *cli.Context, cfg *ethconfig.Config) {
 		log.Warn("Option --miner.etherbase is deprecated as the etherbase is set by the consensus client post-merge")
 		return
 	}
-	if !ctx.IsSet(MinerPendingBlockProducerFlag.Name) {
+	if !ctx.IsSet(MinerPendingFeeRecipientFlag.Name) {
 		return
 	}
-	addr := ctx.String(MinerPendingBlockProducerFlag.Name)
+	addr := ctx.String(MinerPendingFeeRecipientFlag.Name)
 	if strings.HasPrefix(addr, "0x") || strings.HasPrefix(addr, "0X") {
 		addr = addr[2:]
 	}
 	b, err := hex.DecodeString(addr)
 	if err != nil || len(b) != common.AddressLength {
-		Fatalf("-%s: invalid pending block producer address %q", MinerPendingBlockProducerFlag.Name, addr)
+		Fatalf("-%s: invalid pending block producer address %q", MinerPendingFeeRecipientFlag.Name, addr)
 		return
 	}
 	cfg.Miner.Etherbase = common.BytesToAddress(b)