Skip to content

Commit

Permalink
cmd/utils: fix setEtherbase (#30488)
Browse files Browse the repository at this point in the history 
Make `setEtherbase` fall thorugh and handle `miner.pending.feeRecipient` after showing deprecation-warning for `miner.etherbase`-flag.
  • Loading branch information
@zhiqiangxu
zhiqiangxu authored Sep 23, 2024
1 parent f4c6c03 commit 118c84a
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion cmd/utils/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

This comment has been minimized.

Sign in to view

Copy link
@Khalilheyrani6367

Khalilheyrani6367 Sep 27, 2024

cmd/utils/flags.go
log.Warn("Option --miner.etherbase is deprecated as the etherbase is set by the consensus client post-merge")

This comment has been minimized.

Sign in to view

Copy link
@Khalilheyrani6367

Khalilheyrani6367 Sep 27, 2024

cmd/utils/flags.go
return
}
if !ctx.IsSet(MinerPendingFeeRecipientFlag.Name) {
return
Expand Down

2 comments on commit 118c84a

@Khalilheyrani6367
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

118c84a

@Khalilheyrani6367
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cmd/utils/flags.go

Please sign in to comment.