Merge branch 'master' into unlock

2017-06-07 17:07:32 +02:00
parent 139ee17d39 b9b5c84417
commit 52f7978d4d
21 changed files with 200 additions and 91 deletions
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -778,6 +778,12 @@ fn prepare_account_provider(spec: &SpecType, dirs: &Directories, data_dir: &str,
 		enable_hardware_wallets: cfg.enable_hardware_wallets,
 		hardware_wallet_classic_key: spec == &SpecType::Classic,
 		fast_unlock: cfg.enable_fast_unlock,
+		blacklisted_accounts: 	match *spec {
+			SpecType::Morden | SpecType::Ropsten | SpecType::Kovan | SpecType::Dev => vec![],
+			_ => vec![
+				"00a329c0648769a73afac7f9381e08fb43dbea72".into()
+			],
+		},
 	};
 	let account_provider = AccountProvider::new(
 		Box::new(EthStore::open_with_iterations(dir, cfg.iterations).map_err(|e| format!("Could not open keys directory: {}", e))?),