Backporting to beta (#5791)

* v1.6.8

* Update expanse json with fork at block 600000 (#5351)

* Update expanse json with fork at block 600000

* update exp chainID to 2

* Bumped mio

* Fixed default UI port for mac installer (#5782)

* Blacklist empty phrase account.

* Update Cid/multihash/ring/tinykeccak (#5785)

* Updating ring,multihash,tiny-keccak

* Updating CID in ipfs.

* Disable compression for RLP strings
This commit is contained in:
Arkadiy Paronyan
2017-06-07 22:09:16 +02:00
committed by GitHub
parent fb82c6c415
commit b8b5a23b12
34 changed files with 333 additions and 215 deletions

View File

@@ -589,6 +589,12 @@ fn prepare_account_provider(spec: &SpecType, dirs: &Directories, data_dir: &str,
let account_settings = AccountProviderSettings {
enable_hardware_wallets: cfg.enable_hardware_wallets,
hardware_wallet_classic_key: spec == &SpecType::Classic,
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))?),