cmd/geth: accountcmd no need to acquire the datadir lock

cmd/geth/accountcmd.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/node"
 	"github.com/urfave/cli/v2"
 )
 
@@ -188,14 +189,45 @@ nodes.
 	}
 )
 
+// getAccountConfig gets accountcmd related config options
+func getAccountConfig(ctx *cli.Context) node.Config {
+	cfg := node.DefaultConfig
+
+	// Apply flags.
+	utils.SetDataDir(ctx, &cfg)
+	if ctx.IsSet(utils.KeyStoreDirFlag.Name) {
+		cfg.KeyStoreDir = ctx.String(utils.KeyStoreDirFlag.Name)
+	}
+	if ctx.IsSet(utils.LightKDFFlag.Name) {
+		cfg.UseLightweightKDF = ctx.Bool(utils.LightKDFFlag.Name)
+	}
+
+	return cfg
+}
+
+// makeKeyStore creates a keystore with given datadir and keystore dir
+func makeKeyStore(ctx *cli.Context) *keystore.KeyStore {
+	cfg := getAccountConfig(ctx)
+	keydir, err := cfg.KeyDirConfig()
+	if err != nil {
+		utils.Fatalf("Failed to get the keystore directory: %v", err)
+	}
+
+	scryptN := keystore.StandardScryptN
+	scryptP := keystore.StandardScryptP
+	if cfg.UseLightweightKDF {
+		scryptN = keystore.LightScryptN
+		scryptP = keystore.LightScryptP
+	}
+	ks := keystore.NewKeyStore(keydir, scryptN, scryptP)
+
+	return ks
+}
+
 func accountList(ctx *cli.Context) error {
-	stack, _ := makeConfigNode(ctx)
-	var index int
-	for _, wallet := range stack.AccountManager().Wallets() {
-		for _, account := range wallet.Accounts() {
-			fmt.Printf("Account #%d: {%x} %s\n", index, account.Address, &account.URL)
-			index++
-		}
+	ks := makeKeyStore(ctx)
+	for index, account := range ks.Accounts() {
+		fmt.Printf("Account #%d: {%x} %s\n", index, account.Address, &account.URL)
 	}
 	return nil
 }
@@ -258,21 +290,14 @@ func ambiguousAddrRecovery(ks *keystore.KeyStore, err *keystore.AmbiguousAddrErr
 
 // accountCreate creates a new account into the keystore defined by the CLI flags.
 func accountCreate(ctx *cli.Context) error {
-	cfg := gethConfig{Node: defaultNodeConfig()}
-	// Load config file.
-	if file := ctx.String(configFileFlag.Name); file != "" {
-		if err := loadConfig(file, &cfg); err != nil {
-			utils.Fatalf("%v", err)
-		}
-	}
-	utils.SetNodeConfig(ctx, &cfg.Node)
-	keydir, err := cfg.Node.KeyDirConfig()
+	cfg := getAccountConfig(ctx)
+	keydir, err := cfg.KeyDirConfig()
 	if err != nil {
-		utils.Fatalf("Failed to read configuration: %v", err)
+		utils.Fatalf("Failed to get the keystore directory: %v", err)
 	}
 	scryptN := keystore.StandardScryptN
 	scryptP := keystore.StandardScryptP
-	if cfg.Node.UseLightweightKDF {
+	if cfg.UseLightweightKDF {
 		scryptN = keystore.LightScryptN
 		scryptP = keystore.LightScryptP
 	}
@@ -300,12 +325,7 @@ func accountUpdate(ctx *cli.Context) error {
 	if ctx.Args().Len() == 0 {
 		utils.Fatalf("No accounts specified to update")
 	}
-	stack, _ := makeConfigNode(ctx)
-	backends := stack.AccountManager().Backends(keystore.KeyStoreType)
-	if len(backends) == 0 {
-		utils.Fatalf("Keystore is not available")
-	}
-	ks := backends[0].(*keystore.KeyStore)
+	ks := makeKeyStore(ctx)
 
 	for _, addr := range ctx.Args().Slice() {
 		account, oldPassword := unlockAccount(ks, addr, 0, nil)
@@ -327,14 +347,9 @@ func importWallet(ctx *cli.Context) error {
 		utils.Fatalf("Could not read wallet file: %v", err)
 	}
 
-	stack, _ := makeConfigNode(ctx)
+	ks := makeKeyStore(ctx)
 	passphrase := utils.GetPassPhraseWithList("", false, 0, utils.MakePasswordList(ctx))
 
-	backends := stack.AccountManager().Backends(keystore.KeyStoreType)
-	if len(backends) == 0 {
-		utils.Fatalf("Keystore is not available")
-	}
-	ks := backends[0].(*keystore.KeyStore)
 	acct, err := ks.ImportPreSaleKey(keyJSON, passphrase)
 	if err != nil {
 		utils.Fatalf("%v", err)
@@ -352,14 +367,9 @@ func accountImport(ctx *cli.Context) error {
 	if err != nil {
 		utils.Fatalf("Failed to load the private key: %v", err)
 	}
-	stack, _ := makeConfigNode(ctx)
+	ks := makeKeyStore(ctx)
 	passphrase := utils.GetPassPhraseWithList("Your new account is locked with a password. Please give a password. Do not forget this password.", true, 0, utils.MakePasswordList(ctx))
 
-	backends := stack.AccountManager().Backends(keystore.KeyStoreType)
-	if len(backends) == 0 {
-		utils.Fatalf("Keystore is not available")
-	}
-	ks := backends[0].(*keystore.KeyStore)
 	acct, err := ks.ImportECDSA(key, passphrase)
 	if err != nil {
 		utils.Fatalf("Could not create the account: %v", err)