From 77f577a388c3e9a4ae5e33155654c1410c6b4c1f Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Wed, 19 Feb 2025 20:55:32 +0800 Subject: [PATCH] cmd/utils: not set Etherbase when flag `--unlock` is set --- cmd/utils/flags.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 2b4ecf63bd..c57b9e1e63 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1095,7 +1095,10 @@ func setEtherbase(ctx *cli.Context, ks *keystore.KeyStore, cfg *ethconfig.Config } cfg.Etherbase = account.Address } else { - cfg.Etherbase = common.HexToAddress(ctx.String(MinerEtherbaseFlag.Name)) + if !ctx.IsSet(UnlockedAccountFlag.Name) { + cfg.Etherbase = common.HexToAddress(ctx.String(MinerEtherbaseFlag.Name)) + log.Info("Set etherbase", "address", cfg.Etherbase.Hex()) + } } }