Merge branch 'master' into lightrpc

parity/account.rs

@@ -18,7 +18,7 @@ use std::path::PathBuf;
 use ethcore::ethstore::{EthStore, SecretStore, import_accounts, read_geth_accounts};
 use ethcore::ethstore::dir::RootDiskDirectory;
 use ethcore::ethstore::SecretVaultRef;
-use ethcore::account_provider::AccountProvider;
+use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
 use helpers::{password_prompt, password_from_file};
 use params::SpecType;
 
@@ -92,7 +92,7 @@ fn new(n: NewAccount) -> Result<String, String> {
 
 	let dir = Box::new(keys_dir(n.path, n.spec)?);
 	let secret_store = Box::new(secret_store(dir, Some(n.iterations))?);
-	let acc_provider = AccountProvider::new(secret_store);
+	let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
 	let new_account = acc_provider.new_account(&password).map_err(|e| format!("Could not create new account: {}", e))?;
 	Ok(format!("{:?}", new_account))
 }
@@ -100,7 +100,7 @@ fn new(n: NewAccount) -> Result<String, String> {
 fn list(list_cmd: ListAccounts) -> Result<String, String> {
 	let dir = Box::new(keys_dir(list_cmd.path, list_cmd.spec)?);
 	let secret_store = Box::new(secret_store(dir, None)?);
-	let acc_provider = AccountProvider::new(secret_store);
+	let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
 	let accounts = acc_provider.accounts();
 	let result = accounts.into_iter()
 		.map(|a| format!("{:?}", a))

parity/cli/mod.rs

@@ -101,6 +101,9 @@ usage! {
 			or |c: &Config| otry!(c.account).password.clone(),
 		flag_keys_iterations: u32 = 10240u32,
 			or |c: &Config| otry!(c.account).keys_iterations.clone(),
+		flag_no_hardware_wallets: bool = false,
+			or |c: &Config| otry!(c.account).disable_hardware.clone(),
+
 
 		flag_force_ui: bool = false,
 			or |c: &Config| otry!(c.ui).force.clone(),
@@ -347,6 +350,7 @@ struct Account {
 	unlock: Option<Vec<String>>,
 	password: Option<Vec<String>>,
 	keys_iterations: Option<u32>,
+	disable_hardware: Option<bool>,
 }
 
 #[derive(Default, Debug, PartialEq, RustcDecodable)]
@@ -583,6 +587,7 @@ mod tests {
 			flag_unlock: Some("0xdeadbeefcafe0000000000000000000000000000".into()),
 			flag_password: vec!["~/.safe/password.file".into()],
 			flag_keys_iterations: 10240u32,
+			flag_no_hardware_wallets: false,
 
 			flag_force_ui: false,
 			flag_no_ui: false,
@@ -769,6 +774,7 @@ mod tests {
 				unlock: Some(vec!["0x1".into(), "0x2".into(), "0x3".into()]),
 				password: Some(vec!["passwdfile path".into()]),
 				keys_iterations: None,
+				disable_hardware: None,
 			}),
 			ui: Some(Ui {
 				force: None,

parity/cli/usage.txt

@@ -78,6 +78,7 @@ Account Options:
   --keys-iterations NUM          Specify the number of iterations to use when
                                  deriving key from the password (bigger is more
                                  secure) (default: {flag_keys_iterations}).
+  --no-hardware-wallets          Disables hardware wallet support. (default: {flag_no_hardware_wallets})
 
 UI Options:
   --force-ui                     Enable Trusted UI WebSocket endpoint,

parity/configuration.rs

@@ -461,6 +461,7 @@ impl Configuration {
 			testnet: self.args.flag_testnet,
 			password_files: self.args.flag_password.clone(),
 			unlocked_accounts: to_addresses(&self.args.flag_unlock)?,
+			enable_hardware_wallets: !self.args.flag_no_hardware_wallets,
 		};
 
 		Ok(cfg)

parity/params.rs

@@ -175,6 +175,7 @@ pub struct AccountsConfig {
 	pub testnet: bool,
 	pub password_files: Vec<String>,
 	pub unlocked_accounts: Vec<Address>,
+	pub enable_hardware_wallets: bool,
 }
 
 impl Default for AccountsConfig {
@@ -184,6 +185,7 @@ impl Default for AccountsConfig {
 			testnet: false,
 			password_files: Vec::new(),
 			unlocked_accounts: Vec::new(),
+			enable_hardware_wallets: true,
 		}
 	}
 }

parity/presale.rs

@@ -16,7 +16,7 @@
 
 use ethcore::ethstore::{PresaleWallet, EthStore};
 use ethcore::ethstore::dir::RootDiskDirectory;
-use ethcore::account_provider::AccountProvider;
+use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
 use helpers::{password_prompt, password_from_file};
 use params::SpecType;
 
@@ -37,7 +37,7 @@ pub fn execute(cmd: ImportWallet) -> Result<String, String> {
 
 	let dir = Box::new(RootDiskDirectory::create(cmd.path).unwrap());
 	let secret_store = Box::new(EthStore::open_with_iterations(dir, cmd.iterations).unwrap());
-	let acc_provider = AccountProvider::new(secret_store);
+	let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
 	let wallet = PresaleWallet::open(cmd.wallet_path).map_err(|_| "Unable to open presale wallet.")?;
 	let kp = wallet.decrypt(&password).map_err(|_| "Invalid password.")?;
 	let address = acc_provider.insert_account(kp.secret().clone(), &password).unwrap();

parity/run.rs

@@ -26,7 +26,7 @@ use ethcore_logger::{Config as LogConfig};
 use ethcore::miner::{StratumOptions, Stratum};
 use ethcore::client::{Mode, DatabaseCompactionProfile, VMType, BlockChainClient};
 use ethcore::service::ClientService;
-use ethcore::account_provider::AccountProvider;
+use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
 use ethcore::miner::{Miner, MinerService, ExternalMiner, MinerOptions};
 use ethcore::snapshot;
 use ethcore::verification::queue::VerifierSettings;
@@ -516,9 +516,13 @@ fn prepare_account_provider(spec: &SpecType, dirs: &Directories, data_dir: &str,
 	let path = dirs.keys_path(data_dir);
 	upgrade_key_location(&dirs.legacy_keys_path(cfg.testnet), &path);
 	let dir = Box::new(RootDiskDirectory::create(&path).map_err(|e| format!("Could not open keys directory: {}", e))?);
-	let account_provider = AccountProvider::new(Box::new(
-		EthStore::open_with_iterations(dir, cfg.iterations).map_err(|e| format!("Could not open keys directory: {}", e))?
-	));
+	let account_settings = AccountProviderSettings {
+		enable_hardware_wallets: cfg.enable_hardware_wallets,
+		hardware_wallet_classic_key: spec == &SpecType::Classic,
+	};
+	let account_provider = AccountProvider::new(
+		Box::new(EthStore::open_with_iterations(dir, cfg.iterations).map_err(|e| format!("Could not open keys directory: {}", e))?),
+		account_settings);
 
 	for a in cfg.unlocked_accounts {
 		// Check if the account exists