mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-19 21:31:37 +00:00
Merge pull request #872 from gzliudan/fix_etherbase
cmd/utils: not set Etherbase when flag `--unlock` is set
This commit is contained in:
commit
86e3dbb04d
1 changed files with 4 additions and 1 deletions
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue