forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

cmd/utils: simplify developer account selection and unlocking logic

Browse source
This commit is contained in:
islishude 2025-03-12 20:20:39 +08:00
parent 5abf406387
commit f931c12150
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/utils/flags.go
View file

@ -1726,12 +1726,11 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
Fatalf("Keystore is not available")
}
isKeystoreNonEmpty := len(ks.Accounts()) > 0
// Figure out the dev account address.
// setEtherbase has been called above, configuring the miner address from command line flags.
if cfg.Miner.PendingFeeRecipient != (common.Address{}) {
developer = accounts.Account{Address: cfg.Miner.PendingFeeRecipient}
} else if isKeystoreNonEmpty {
} else if accs := ks.Accounts(); len(accs) > 0 {
developer = ks.Accounts()[0]
} else {
developer, err = ks.NewAccount(passphrase)
@ -1744,7 +1743,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
cfg.Miner.PendingFeeRecipient = developer.Address
// try to unlock the first keystore account
if isKeystoreNonEmpty {
if len(ks.Accounts()) > 0 {
if err := ks.Unlock(developer, passphrase); err != nil {
Fatalf("Failed to unlock developer account: %v", err)
}