From b15a8ac67e387540edca975814ba2fa21dad1d3f Mon Sep 17 00:00:00 2001 From: JukLee0ira Date: Thu, 26 Jun 2025 10:50:28 +0800 Subject: [PATCH] cmd/geth: accountcmd no need to acquire the datadir lock #27084 (#1154) --- cmd/XDC/accountcmd.go | 59 +++++++++++++++++++++++++++---------------- cmd/XDC/config.go | 19 +++++++++----- node/config.go | 6 ++--- node/node.go | 2 +- 4 files changed, 53 insertions(+), 33 deletions(-) diff --git a/cmd/XDC/accountcmd.go b/cmd/XDC/accountcmd.go index 29134623b0..6805e435ec 100644 --- a/cmd/XDC/accountcmd.go +++ b/cmd/XDC/accountcmd.go @@ -195,10 +195,28 @@ nodes. } ) +// makeAccountManager creates an account manager with backends +func makeAccountManager(ctx *cli.Context) *accounts.Manager { + cfg := loadBaseConfig(ctx) + am := accounts.NewManager(&accounts.Config{InsecureUnlockAllowed: cfg.Node.InsecureUnlockAllowed}) + keydir, isEphemeral, err := cfg.Node.GetKeyStoreDir() + if err != nil { + utils.Fatalf("Failed to get the keystore directory: %v", err) + } + if isEphemeral { + utils.Fatalf("Can't use ephemeral directory as keystore path") + } + + if err := setAccountManagerBackends(&cfg.Node, am, keydir); err != nil { + utils.Fatalf("Failed to set account manager backends: %v", err) + } + return am +} + func accountList(ctx *cli.Context) error { - stack, _ := makeConfigNode(ctx) + am := makeAccountManager(ctx) var index int - for _, wallet := range stack.AccountManager().Wallets() { + for _, wallet := range am.Wallets() { for _, account := range wallet.Accounts() { fmt.Printf("Account #%d: {%x} %s\n", index, account.Address, &account.URL) index++ @@ -294,17 +312,13 @@ 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 := XDCConfig{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 := loadBaseConfig(ctx) + keydir, isEphemeral, err := cfg.Node.GetKeyStoreDir() if err != nil { - utils.Fatalf("Failed to read configuration: %v", err) + utils.Fatalf("Failed to get the keystore directory: %v", err) + } + if isEphemeral { + utils.Fatalf("Can't use ephemeral directory as keystore path") } scryptN := keystore.StandardScryptN scryptP := keystore.StandardScryptP @@ -336,8 +350,8 @@ 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) + am := makeAccountManager(ctx) + backends := am.Backends(keystore.KeyStoreType) if len(backends) == 0 { utils.Fatalf("Keystore is not available") } @@ -363,14 +377,15 @@ func importWallet(ctx *cli.Context) error { utils.Fatalf("Could not read wallet file: %v", err) } - stack, _ := makeConfigNode(ctx) - passphrase := getPassPhrase("", false, 0, utils.MakePasswordList(ctx)) - - backends := stack.AccountManager().Backends(keystore.KeyStoreType) + am := makeAccountManager(ctx) + backends := am.Backends(keystore.KeyStoreType) if len(backends) == 0 { utils.Fatalf("Keystore is not available") + } ks := backends[0].(*keystore.KeyStore) + passphrase := getPassPhrase("", false, 0, utils.MakePasswordList(ctx)) + acct, err := ks.ImportPreSaleKey(keyJson, passphrase) if err != nil { utils.Fatalf("%v", err) @@ -388,14 +403,14 @@ func accountImport(ctx *cli.Context) error { if err != nil { utils.Fatalf("Failed to load the private key: %v", err) } - stack, _ := makeConfigNode(ctx) - passphrase := getPassPhrase("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) + am := makeAccountManager(ctx) + backends := am.Backends(keystore.KeyStoreType) if len(backends) == 0 { utils.Fatalf("Keystore is not available") } ks := backends[0].(*keystore.KeyStore) + passphrase := getPassPhrase("Your new account is locked with a password. Please give a password. Do not forget this password.", true, 0, utils.MakePasswordList(ctx)) + acct, err := ks.ImportECDSA(key, passphrase) if err != nil { utils.Fatalf("Could not create the account: %v", err) diff --git a/cmd/XDC/config.go b/cmd/XDC/config.go index 1391ae4884..ca97ec77aa 100644 --- a/cmd/XDC/config.go +++ b/cmd/XDC/config.go @@ -30,6 +30,7 @@ import ( "unicode" "github.com/XinFinOrg/XDPoSChain/XDCx" + "github.com/XinFinOrg/XDPoSChain/accounts" "github.com/XinFinOrg/XDPoSChain/accounts/keystore" "github.com/XinFinOrg/XDPoSChain/accounts/scwallet" "github.com/XinFinOrg/XDPoSChain/accounts/usbwallet" @@ -130,8 +131,9 @@ func defaultNodeConfig() node.Config { return cfg } -// makeConfigNode loads geth configuration and creates a blank node instance. -func makeConfigNode(ctx *cli.Context) (*node.Node, XDCConfig) { +// loadBaseConfig loads the gethConfig based on the given command line +// parameters and config file. +func loadBaseConfig(ctx *cli.Context) XDCConfig { // Load defaults. cfg := XDCConfig{ Eth: ethconfig.Defaults, @@ -186,12 +188,18 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, XDCConfig) { // Apply flags. utils.SetNodeConfig(ctx, &cfg.Node) + return cfg +} + +// makeConfigNode loads geth configuration and creates a blank node instance. +func makeConfigNode(ctx *cli.Context) (*node.Node, XDCConfig) { + cfg := loadBaseConfig(ctx) stack, err := node.New(&cfg.Node) if err != nil { utils.Fatalf("Failed to create the protocol stack: %v", err) } // Node doesn't by default populate account manager backends - if err := setAccountManagerBackends(stack); err != nil { + if err := setAccountManagerBackends(stack.Config(), stack.AccountManager(), stack.KeyStoreDir()); err != nil { utils.Fatalf("Failed to set account manager backends: %v", err) } @@ -325,10 +333,7 @@ func applyMetricConfig(ctx *cli.Context, cfg *XDCConfig) { } } -func setAccountManagerBackends(stack *node.Node) error { - conf := stack.Config() - am := stack.AccountManager() - keydir := stack.KeyStoreDir() +func setAccountManagerBackends(conf *node.Config, am *accounts.Manager, keydir string) error { scryptN := keystore.StandardScryptN scryptP := keystore.StandardScryptP if conf.UseLightweightKDF { diff --git a/node/config.go b/node/config.go index e3d30a4af6..2e0863a34a 100644 --- a/node/config.go +++ b/node/config.go @@ -436,10 +436,10 @@ func (c *Config) KeyDirConfig() (string, error) { return keydir, err } -// getKeyStoreDir retrieves the key directory and will create +// GetKeyStoreDir retrieves the key directory and will create // and ephemeral one if necessary. -func getKeyStoreDir(conf *Config) (string, bool, error) { - keydir, err := conf.KeyDirConfig() +func (c *Config) GetKeyStoreDir() (string, bool, error) { + keydir, err := c.KeyDirConfig() if err != nil { return "", false, err } diff --git a/node/node.go b/node/node.go index 7321564131..ea9847db47 100644 --- a/node/node.go +++ b/node/node.go @@ -124,7 +124,7 @@ func New(conf *Config) (*Node, error) { return nil, err } - keyDir, isEphem, err := getKeyStoreDir(conf) + keyDir, isEphem, err := conf.GetKeyStoreDir() if err != nil { return nil, err }