diff --git a/parity/main.rs b/parity/main.rs index f701ff97b..f5f5cfcd4 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -83,7 +83,7 @@ Parity. Ethereum Client. Usage: parity daemon [options] - parity account (new | list) + parity account (new | list) [options] parity [options] Protocol Options: @@ -94,7 +94,7 @@ Protocol Options: -d --db-path PATH Specify the database & configuration directory path [default: $HOME/.parity]. --keys-path PATH Specify the path for JSON key files to be found - [default: $HOME/.web3/keys]. + [default: $HOME/.parity/keys]. --identity NAME Specify your node's name. Account Options: @@ -384,7 +384,7 @@ impl Configuration { } } - fn _keys_path(&self) -> String { + fn keys_path(&self) -> String { self.args.flag_keys_path.replace("$HOME", env::home_dir().unwrap().to_str().unwrap()) } @@ -504,7 +504,7 @@ impl Configuration { fn execute_account_cli(&self) { use util::keys::store::SecretStore; use rpassword::read_password; - let mut secret_store = SecretStore::new(); + let mut secret_store = SecretStore::new_in(Path::new(&self.keys_path())); if self.args.cmd_new { println!("Please note that password is NOT RECOVERABLE."); println!("Type password: "); @@ -538,7 +538,7 @@ impl Configuration { .into_iter() }).collect::>(); - let account_service = AccountService::new(); + let account_service = AccountService::new_in(Path::new(&self.keys_path())); for d in &self.args.flag_unlock { let a = Address::from_str(clean_0x(&d)).unwrap_or_else(|_| { die!("{}: Invalid address for --unlock. Must be 40 hex characters, without the 0x at the beginning.", d) diff --git a/util/src/keys/store.rs b/util/src/keys/store.rs index a4b6f2c7b..5dec27fc3 100644 --- a/util/src/keys/store.rs +++ b/util/src/keys/store.rs @@ -128,7 +128,7 @@ impl Default for AccountService { } impl AccountService { - /// New account service with the default location + /// New account service with the keys store in default location pub fn new() -> Self { let secret_store = RwLock::new(SecretStore::new()); secret_store.write().unwrap().try_import_existing(); @@ -137,6 +137,15 @@ impl AccountService { } } + /// New account service with the keys store in specific location + pub fn new_in(path: &Path) -> Self { + let secret_store = RwLock::new(SecretStore::new_in(path)); + secret_store.write().unwrap().try_import_existing(); + AccountService { + secret_store: secret_store + } + } + #[cfg(test)] fn new_test(temp: &::devtools::RandomTempPath) -> Self { let secret_store = RwLock::new(SecretStore::new_test(temp));