forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd: rename pendingBlockProducer to miner.pending.feeRecipient flag

Browse source
This commit is contained in:
Marius van der Wijden 2024-03-06 12:04:23 +01:00
parent 6b21155432
commit 2bd5c5fcc9
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/geth/main.go
View file

@ -121,7 +121,7 @@ var (
utils.MinerEtherbaseFlag, // deprecated utils.MinerEtherbaseFlag, // deprecated
utils.MinerExtraDataFlag, utils.MinerExtraDataFlag,
utils.MinerRecommitIntervalFlag, utils.MinerRecommitIntervalFlag,
utils.MinerPendingBlockProducerFlag, utils.MinerPendingFeeRecipientFlag,
utils.MinerNewPayloadTimeoutFlag, // deprecated utils.MinerNewPayloadTimeoutFlag, // deprecated
utils.NATFlag, utils.NATFlag,
utils.NoDiscoverFlag, utils.NoDiscoverFlag,

10
cmd/utils/flags.go
View file

@ -448,8 +448,8 @@ var (
Value: ethconfig.Defaults.Miner.Recommit, Value: ethconfig.Defaults.Miner.Recommit,
Category: flags.MinerCategory, Category: flags.MinerCategory,
} }
MinerPendingBlockProducerFlag = &cli.StringFlag{ MinerPendingFeeRecipientFlag = &cli.StringFlag{
Name: "miner.pendingBlockProducer", Name: "miner.pending.feeRecipient",
Usage: "0x prefixed public address for the pending block producer (not used for actual block production)", Usage: "0x prefixed public address for the pending block producer (not used for actual block production)",
Category: flags.MinerCategory, 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") log.Warn("Option --miner.etherbase is deprecated as the etherbase is set by the consensus client post-merge")
return return
} }
if !ctx.IsSet(MinerPendingBlockProducerFlag.Name) { if !ctx.IsSet(MinerPendingFeeRecipientFlag.Name) {
return return
} }
addr := ctx.String(MinerPendingBlockProducerFlag.Name) addr := ctx.String(MinerPendingFeeRecipientFlag.Name)
if strings.HasPrefix(addr, "0x") || strings.HasPrefix(addr, "0X") { if strings.HasPrefix(addr, "0x") || strings.HasPrefix(addr, "0X") {
addr = addr[2:] addr = addr[2:]
} }
b, err := hex.DecodeString(addr) b, err := hex.DecodeString(addr)
if err != nil || len(b) != common.AddressLength { 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 return
} }
cfg.Miner.Etherbase = common.BytesToAddress(b) cfg.Miner.Etherbase = common.BytesToAddress(b)