Merge branch 'master' into refactor/hashdb-generic

* master:
  Refactor evm Instruction to be a c-like enum (#8914)
  Fix deadlock in blockchain. (#8977)
  snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 (#8984)
  Use local parity-dapps-glue instead of crate published at crates.io (#8983)
  parity: omit redundant last imported block number in light sync informant (#8962)
  Disable hardware-wallets on platforms that don't support `libusb` (#8464)
  Bump error-chain and quick_error versions (#8972)

Author: dvdplm

Cargo.lock

@@ -115,12 +115,9 @@ path = "parity/main.rs"
 name = "parity"
 
 [profile.dev]
-panic = "abort"
 
 [profile.release]
 debug = false
-lto = false
-panic = "abort"
 
 [workspace]
 members = [

Cargo.toml

@@ -13,7 +13,6 @@ futures = "0.1"
 futures-cpupool = "0.1"
 linked-hash-map = "0.5"
 log = "0.3"
-parity-dapps-glue = "1.9"
 parking_lot = "0.5"
 mime_guess = "2.0.0-alpha.2"
 rand = "0.4"
@@ -32,6 +31,7 @@ ethcore-bytes = { path = "../util/bytes" }
 ethereum-types = "0.3"
 fetch = { path = "../util/fetch" }
 node-health = { path = "./node-health" }
+parity-dapps-glue = { path = "./js-glue" }
 parity-hash-fetch = { path = "../hash-fetch" }
 parity-reactor = { path = "../util/reactor" }
 keccak-hash = { path = "../util/hash" }

dapps/Cargo.toml

@@ -22,7 +22,7 @@ memorydb = { path = "../util/memorydb" }
 patricia-trie = { path = "../util/patricia_trie" }
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 ethcore-crypto = { path = "crypto" }
-error-chain = { version = "0.11", default-features = false }
+error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
@@ -37,7 +37,6 @@ ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
 evm = { path = "evm" }
-hardware-wallet = { path = "../hw" }
 heapsize = "0.4"
 itertools = "0.5"
 lazy_static = "1.0"
@@ -72,6 +71,12 @@ keccak-hasher = { path = "../util/keccak-hasher" }
 kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
 tempdir = {version="0.3", optional = true}
 
+[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
+hardware-wallet = { path = "../hw" }
+
+[target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android")))'.dependencies]
+fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }
+
 [dev-dependencies]
 tempdir = "0.3"
 trie-standardmap = { path = "../util/trie-standardmap" }

ethcore/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 ethereum-types = "0.3"
-quick-error = "1.2"
+quick-error = "1.2.2"
 ring = "0.12"
 rust-crypto = "0.2.36"
 tiny-keccak = "1.4"