upgrade some of the dependencies (#11467)

* bump parity-util-mem and related deps * upgrade some of the dependencies * deduplicate static_assertions
2020-02-07 17:23:45 +01:00 · 2020-02-07 17:23:45 +01:00 · 654632264b
parent cb7df2053d
commit 654632264b
68 changed files with 314 additions and 493 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -41,8 +41,8 @@ futures = "0.1"
 journaldb = { path = "util/journaldb" }
 jsonrpc-core = "14.0.3"
 keccak-hash = "0.4.0"
-kvdb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
+kvdb = "0.4.0"
+kvdb-rocksdb = "0.5.0"
 log = "0.4"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 node-filter = { path = "ethcore/node-filter" }
@ -59,9 +59,9 @@ parity-path = "0.1"
 parity-rpc = { path = "rpc" }
 parity-runtime = { path = "util/runtime" }
 parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.3.0", features = ["jemalloc-global"] }
+parity-util-mem = { version = "0.5.1", features = ["jemalloc-global"] }
 parity-version = { path = "util/version" }
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 regex = "1.0"
 registrar = { path = "util/registrar" }
 rlp = "0.4.0"
@ -75,7 +75,7 @@ snapshot = { path = "ethcore/snapshot" }
 spec = { path = "ethcore/spec" }
 term_size = "0.3"
 textwrap = "0.9"
-toml = "0.4"
+toml = "0.5.6"
 verification = { path = "ethcore/verification" }

 [build-dependencies]
--- a/accounts/Cargo.toml
+++ b/accounts/Cargo.toml
@ -12,7 +12,7 @@ ethkey = { path = "ethkey" }
 ethstore = { path = "ethstore" }
 log = "0.4"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
--- a/accounts/ethkey/Cargo.toml
+++ b/accounts/ethkey/Cargo.toml
@ -10,4 +10,4 @@ log = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-wordlist = "1.3"
+parity-wordlist = "1.3.1"
--- a/accounts/ethkey/cli/Cargo.toml
+++ b/accounts/ethkey/cli/Cargo.toml
@ -10,7 +10,7 @@ env_logger = "0.5"
 ethkey = { path = "../" }
 panic_hook = { path = "../../../util/panic-hook" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-wordlist="1.2"
+parity-wordlist= "1.3.1"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
--- a/accounts/ethstore/Cargo.toml
+++ b/accounts/ethstore/Cargo.toml
@ -15,13 +15,12 @@ serde_derive = "1.0"
 rustc-hex = "1.0"
 tiny-keccak = "1.4"
 time = "0.1.34"
-itertools = "0.5"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 ethereum-types = "0.8.0"
 dir = { path = "../../util/dir" }
-smallvec = "0.6"
-parity-wordlist = "1.0"
+smallvec = "1.2.0"
+parity-wordlist = "1.3.1"
 tempdir = "0.3"

 [dev-dependencies]
--- a/accounts/ethstore/cli/Cargo.toml
+++ b/accounts/ethstore/cli/Cargo.toml
@ -11,7 +11,7 @@ num_cpus = "1.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 ethstore = { path = "../" }
 ethkey = { path = "../../ethkey" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
--- a/accounts/ethstore/src/accounts_dir/memory.rs
+++ b/accounts/ethstore/src/accounts_dir/memory.rs
@ -16,7 +16,6 @@

 use std::collections::HashMap;
 use parking_lot::RwLock;
-use itertools;
 use crypto::publickey::Address;

 use {SafeAccount, Error};
@ -30,7 +29,7 @@ pub struct MemoryDirectory {

 impl KeyDirectory for MemoryDirectory {
 	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		Ok(itertools::Itertools::flatten(self.accounts.read().values().cloned()).collect())
+		Ok(self.accounts.read().values().cloned().flatten().collect())
 	}

 	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
--- a/accounts/ethstore/src/lib.rs
+++ b/accounts/ethstore/src/lib.rs
@ -19,7 +19,6 @@
 #![warn(missing_docs)]

 extern crate dir;
-extern crate itertools;
 extern crate libc;
 extern crate parking_lot;
 extern crate rand;
@ -97,4 +96,3 @@ impl<'a> From<&'a json::H160> for Address {
 		From::from(a)
 	}
 }
-
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@ -14,7 +14,7 @@ serde = "1.0"
 serde_json = "1.0"
 url = "2.1.0"
 matches = "0.1"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 jsonrpc-core = "14.0.3"
 jsonrpc-ws-server = "14.0.3"
 parity-rpc = { path = "../../rpc" }
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@ -11,9 +11,9 @@ ethereum-types = "0.8.0"
 keccak-hash = "0.4.0"
 log = "0.4"
 memmap = "0.6"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 primal = "0.2.3"
-static_assertions = "0.3.3"
+static_assertions = "1.1.0"

 [dev-dependencies]
 criterion = "0.3"
--- a/ethash/src/shared.rs
+++ b/ethash/src/shared.rs
@ -69,7 +69,7 @@ pub type NodeBytes = [u8; NODE_BYTES];
 pub type NodeWords = [u32; NODE_WORDS];
 pub type NodeDwords = [u64; NODE_DWORDS];

-assert_eq_size!(node; Node, NodeBytes, NodeWords, NodeDwords);
+assert_eq_size!(Node, NodeBytes, NodeWords, NodeDwords);

 #[repr(C)]
 pub union Node {
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@ -28,21 +28,21 @@ evm = { path = "evm" }
 executive-state = { path = "executive-state" }
 futures = "0.1"
 hash-db = "0.15.0"
-itertools = "0.5"
+itertools = "0.8.2"
 journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.4.0"
-kvdb = "0.3.1"
-kvdb-memorydb = { version = "0.3.1", optional = true }
-kvdb-rocksdb = { version = "0.4.1", optional = true }
+kvdb = "0.4.0"
+kvdb-memorydb = { version = "0.4.0", optional = true }
+kvdb-rocksdb = { version = "0.5.0", optional = true }
 lazy_static = { version = "1.3", optional = true }
 log = "0.4"
 macros = { path = "../util/macros", optional = true }
 machine = { path = "./machine" }
 memory-cache = { path = "../util/memory-cache" }
 parity-bytes = "0.1"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 pod = { path = "pod", optional = true }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"], optional = true }
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 rand = "0.7"
@ -50,7 +50,7 @@ rand_xorshift = "0.2"
 rayon = "1.1"
 registrar = { path = "../util/registrar" }
 rlp = "0.4.0"
-rustc-hex = "2"
+rustc-hex = "2.1.0"
 scopeguard = "1.0.0"
 serde = "1.0"
 serde_derive = "1.0"
@ -78,8 +78,8 @@ ethcore-builtin = { path = "./builtin" }
 ethjson = { path = "../json", features = ["test-helpers"] }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 fetch = { path = "../util/fetch" }
-kvdb-memorydb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
+kvdb-memorydb = "0.4.0"
+kvdb-rocksdb = "0.5.0"
 lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
 macros = { path = "../util/macros" }
--- a/ethcore/account-db/Cargo.toml
+++ b/ethcore/account-db/Cargo.toml
@ -11,5 +11,5 @@ ethereum-types = "0.8.0"
 hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 rlp = "0.4"
--- a/ethcore/account-state/Cargo.toml
+++ b/ethcore/account-state/Cargo.toml
@ -16,17 +16,17 @@ hash-db = "0.15.0"
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4"
 lru-cache = "0.1.2"
-memory-db = "0.18.0"
+memory-db = "0.19.0"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.3.0"
-parking_lot = "0.9"
+parity-util-mem = "0.5.1"
+parking_lot = "0.10.0"
 pod = { path = "../pod" }
 rlp = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
-trie-db = "0.18.0"
+trie-db = "0.20.0"

 [dev-dependencies]
 account-db = { path = "../account-db" }
--- a/ethcore/blockchain/Cargo.toml
+++ b/ethcore/blockchain/Cargo.toml
@ -14,13 +14,13 @@ common-types = { path = "../types" }
 ethcore-db = { path = "../db" }
 ethereum-types = "0.8.0"
 keccak-hash = "0.4.0"
-parity-util-mem = "0.3.0"
-itertools = "0.5"
-kvdb = "0.3.1"
+parity-util-mem = "0.5.1"
+itertools = "0.8.2"
+kvdb = "0.4.0"
 log = "0.4"
 parity-bytes = "0.1"
 rand = "0.7"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 rayon = "1.0"
 rlp = "0.4.0"
 rlp_compress = { path = "../../util/rlp-compress" }
@ -32,4 +32,4 @@ env_logger = "0.5"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 rustc-hex = "1.0"
 tempdir = "0.3"
-kvdb-memorydb = "0.3.1"
+kvdb-memorydb = "0.4.0"
--- a/ethcore/client-traits/Cargo.toml
+++ b/ethcore/client-traits/Cargo.toml
@ -15,7 +15,7 @@ common-types = { path = "../types" }
 ethcore-db = { path = "../db" }
 ethcore-miner = { path = "../../miner" }
 ethereum-types = "0.8.0"
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 registrar = { path = "../../util/registrar" }
 stats = { path = "../../util/stats" }
 trace = { path = "../trace" }
--- a/ethcore/db/Cargo.toml
+++ b/ethcore/db/Cargo.toml
@ -10,8 +10,8 @@ edition = "2018"
 [dependencies]
 common-types = { path = "../types" }
 ethereum-types = "0.8.0"
-kvdb = "0.3.1"
-parity-util-mem = "0.3.0"
-parking_lot = "0.9"
+kvdb = "0.4.0"
+parity-util-mem = "0.5.1"
+parking_lot = "0.10.0"
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }
--- a/ethcore/engines/authority-round/Cargo.toml
+++ b/ethcore/engines/authority-round/Cargo.toml
@ -20,7 +20,7 @@ ethjson = { path = "../../../json" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 engine = { path = "../../engine" }
 io = { package = "ethcore-io", path = "../../../util/io" }
-itertools = "0.5"
+itertools = "0.8.2"
 keccak-hash = "0.4.0"
 lazy_static = "1.3.0"
 log = "0.4"
@ -28,7 +28,7 @@ lru-cache = "0.1"
 machine = { path = "../../machine" }
 macros = { path = "../../../util/macros" }
 parity-bytes = "0.1"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 rand = "0.7"
 rlp = "0.4.0"
 time-utils = { path = "../../../util/time-utils" }
--- a/ethcore/engines/basic-authority/Cargo.toml
+++ b/ethcore/engines/basic-authority/Cargo.toml
@ -15,7 +15,7 @@ ethjson = { path = "../../../json" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 log = "0.4.8"
 machine = { path = "../../machine" }
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 rlp = "0.4.2"
 validator-set = { path = "../validator-set" }

--- a/ethcore/engines/clique/Cargo.toml
+++ b/ethcore/engines/clique/Cargo.toml
@ -20,7 +20,7 @@ lru-cache = "0.1"
 machine = { path = "../../machine" }
 macros = { path = "../../../util/macros" }
 rand = "0.7"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 rlp = "0.4.0"
 time-utils = { path = "../../../util/time-utils" }
 unexpected = { path = "../../../util/unexpected" }
--- a/ethcore/engines/validator-set/Cargo.toml
+++ b/ethcore/engines/validator-set/Cargo.toml
@ -17,14 +17,14 @@ ethereum-types = "0.8.0"
 ethjson = { path = "../../../json" }
 executive-state = { path = "../../executive-state" }
 keccak-hash = "0.4.0"
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 lazy_static = "1.3.0"
 log = "0.4.8"
 machine = { path = "../../machine" }
 memory-cache = { path = "../../../util/memory-cache" }
 parity-bytes = "0.1.0"
-parity-util-mem = "0.3.0"
-parking_lot = "0.9"
+parity-util-mem = "0.5.1"
+parking_lot = "0.10.0"
 rlp = "0.4.2"
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../../util/triehash-ethereum" }
 unexpected = { path = "../../../util/unexpected" }
--- a/ethcore/engines/validator-set/src/lib.rs
+++ b/ethcore/engines/validator-set/src/lib.rs
@ -37,8 +37,6 @@ use engine::SystemCall;
 use ethereum_types::{H256, Address};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use machine::Machine;
-// The MallocSizeOf derive looks for this in the root
-use parity_util_mem as malloc_size_of;
 use parity_bytes::Bytes;

 #[cfg(any(test, feature = "test-helpers"))]
--- a/ethcore/evm/Cargo.toml
+++ b/ethcore/evm/Cargo.toml
@ -8,12 +8,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
 bit-set = "0.4"
 parity-bytes = "0.1"
 ethereum-types = "0.8.0"
-parity-util-mem = "0.3.0"
+parity-util-mem = "0.5.1"
 lazy_static = "1.0"
 log = "0.4"
 vm = { path = "../vm" }
 keccak-hash = "0.4.0"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 memory-cache = { path = "../../util/memory-cache" }

 [dev-dependencies]
--- a/ethcore/executive-state/Cargo.toml
+++ b/ethcore/executive-state/Cargo.toml
@ -14,7 +14,7 @@ common-types = { path = "../types" }
 ethereum-types = "0.8.0"
 hash-db = "0.15.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4.8"
 machine = { path = "../machine" }
 trace = { path = "../trace" }
@ -30,5 +30,5 @@ keccak-hash = "0.4.0"
 pod = { path = "../pod" }
 rustc-hex = "1.0"
 spec = { path = "../spec" }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@ -18,39 +18,39 @@ ethcore-blockchain = { path = "../blockchain" }
 ethereum-types = "0.8.0"
 executive-state = { path = "../executive-state" }
 machine = { path = "../machine" }
-memory-db = "0.18.0"
-trie-db = "0.18.0"
+memory-db = "0.19.0"
+trie-db = "0.20.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-miner = { path = "../../miner" }
 ethcore-io = { path = "../../util/io" }
 hash-db = "0.15.0"
-parity-util-mem = "0.3.0"
+parity-util-mem = "0.5.1"
 vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
 failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] }
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }
-smallvec = "0.6"
+smallvec = "1.2.0"
 futures = "0.1"
 rand = "0.7"
 bincode = "1.1"
 serde = "1.0"
 serde_derive = "1.0"
 spec = { path = "../spec" }
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 stats = { path = "../../util/stats" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 memory-cache = { path = "../../util/memory-cache" }
 journaldb = { path = "../../util/journaldb" }
 verification = { path = "../verification" }

 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = "0.3.1"
+kvdb-memorydb = "0.4.0"
 tempdir = "0.3"

 [features]
--- a/ethcore/machine/Cargo.toml
+++ b/ethcore/machine/Cargo.toml
@ -30,7 +30,7 @@ keccak-hash = "0.4.0"
 log = "0.4"
 lru-cache = "0.1.2"
 parity-bytes = "0.1.0"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 rlp = "0.4.2"
 state-db = { path = "../state-db" }
 trace = { path = "../trace" }
--- a/ethcore/node-filter/Cargo.toml
+++ b/ethcore/node-filter/Cargo.toml
@ -14,7 +14,7 @@ ethcore-network = { path = "../../util/network" }
 ethcore-network-devp2p = { path = "../../util/network-devp2p" }
 ethereum-types = "0.8.0"
 log = "0.4"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 ethabi = "9.0.1"
 ethabi-derive = "9.0.1"
 ethabi-contract = "9.0.0"
@ -22,7 +22,7 @@ lru-cache = "0.1"

 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = "0.3.1"
+kvdb-memorydb = "0.4.0"
 ethcore-io = { path = "../../util/io" }
 spec = { path = "../spec" }
 tempdir = "0.3"
--- a/ethcore/pod/Cargo.toml
+++ b/ethcore/pod/Cargo.toml
@ -12,16 +12,16 @@ ethereum-types = "0.8.0"
 ethjson = { path = "../../json" }
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 hash-db = "0.15.0"
-itertools = "0.8"
+itertools = "0.8.2"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4"
 parity-bytes = "0.1.0"
 rlp = "0.4"
-rustc-hex = "1"
+rustc-hex = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../util/triehash-ethereum" }

 [dev-dependencies]
--- a/ethcore/private-tx/Cargo.toml
+++ b/ethcore/private-tx/Cargo.toml
@ -22,18 +22,18 @@ ethereum-types = "0.8.0"
 ethjson = { path = "../../json" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
-parity-util-mem = "0.3.0"
+parity-util-mem = "0.5.1"
 hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4"
 machine = { path = "../machine" }
 journaldb = { path = "../../util/journaldb" }
 parity-bytes = "0.1"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parking_lot = "0.9"
-trie-db = "0.18.0"
+parking_lot = "0.10.0"
+trie-db = "0.20.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 registrar = { path = "../../util/registrar" }
 rlp = "0.4.0"
--- a/ethcore/service/Cargo.toml
+++ b/ethcore/service/Cargo.toml
@ -14,7 +14,7 @@ ethcore-io = { path = "../../util/io" }
 ethcore-private-tx = { path = "../private-tx" }
 ethcore-sync = { path = "../sync" }
 ethereum-types = "0.8.0"
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4"
 snapshot = { path = "../snapshot" }
 spec = { path = "../spec" }
@ -23,5 +23,5 @@ trace-time = "0.1"
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
 ethcore-db = { path = "../db" }
-kvdb-rocksdb = "0.4.1"
+kvdb-rocksdb = "0.5.0"
 tempdir = "0.3"
--- a/ethcore/snapshot/Cargo.toml
+++ b/ethcore/snapshot/Cargo.toml
@ -25,22 +25,22 @@ ethcore-io = { path = "../../util/io" }
 ethereum-types = "0.8.0"
 ethtrie  = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 hash-db = "0.15.0"
-itertools = "0.5"
+itertools = "0.8.2"
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4.8"
 num_cpus = "1.10.1"
 rand = "0.7"
 rand_xorshift = "0.2"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 rlp = "0.4.2"
 rlp_derive = { path = "../../util/rlp-derive" }
 scopeguard = "1.0.0"
 snappy = { package = "parity-snappy", version ="0.1.0" }
 state-db = { path = "../state-db" }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../util/triehash-ethereum" }

 [dev-dependencies]
@ -53,7 +53,7 @@ ethabi-contract = "9.0.0"
 ethabi-derive = "9.0.1"
 ethcore = { path = "..", features = ["test-helpers"] }
 ethkey = { path = "../../accounts/ethkey" }
-kvdb-rocksdb = "0.4.1"
+kvdb-rocksdb = "0.5.0"
 lazy_static = { version = "1.3" }
 spec = { path = "../spec" }
 tempdir = "0.3"
--- a/ethcore/snapshot/snapshot-tests/Cargo.toml
+++ b/ethcore/snapshot/snapshot-tests/Cargo.toml
@ -23,10 +23,10 @@ hash-db = "0.15.0"
 journaldb = { path = "../../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../../util/keccak-hasher" }
-kvdb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
+kvdb = "0.4.0"
+kvdb-rocksdb = "0.5.0"
 log = "0.4.8"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 rand = "0.7"
 rand_xorshift = "0.2"
@ -35,7 +35,7 @@ snappy = { package = "parity-snappy", version ="0.1.0" }
 snapshot = { path = "../../snapshot", features = ["test-helpers"] }
 spec = { path = "../../spec" }
 tempdir = "0.3"
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 trie-standardmap = "0.15.0"
 ethabi = "9.0.1"
 ethabi-contract = "9.0.0"
--- a/ethcore/spec/Cargo.toml
+++ b/ethcore/spec/Cargo.toml
@ -25,7 +25,7 @@ hash-db = "0.15.0"
 instant-seal = { path = "../engines/instant-seal" }
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
-kvdb-memorydb = "0.3.1"
+kvdb-memorydb = "0.4.0"
 log = "0.4.8"
 machine = { path = "../machine" }
 null-engine = { path = "../engines/null-engine" }
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@ -29,7 +29,6 @@ use bytes::ToPretty;
 use ethereum_types::{Address, H256, H264, U256};
 use hash::keccak;
 use hash_db::EMPTY_PREFIX;
-use itertools::Itertools;
 use kvdb::{DBTransaction, DBValue, KeyValueDB};
 use parking_lot::{Mutex, RwLock};
 use rand::rngs::OsRng;
@ -2355,7 +2354,7 @@ impl PrepareOpenBlock for Client {
 			.unwrap_or_else(Vec::new)
 			.into_iter()
 			.take(engine.maximum_uncle_count(open_block.header.number()))
-			.foreach(|h| {
+			.for_each(|h| {
 				open_block.push_uncle(h.decode().expect("decoding failure")).expect("pushing maximum_uncle_count;
 												open_block was just created;
 												push_uncle is not ok only if more than maximum_uncle_count is pushed;
--- a/ethcore/state-db/Cargo.toml
+++ b/ethcore/state-db/Cargo.toml
@ -16,11 +16,11 @@ hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 journaldb = { path = "../../util/journaldb" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4.6"
 lru-cache = "0.1.2"
 memory-cache = { path = "../../util/memory-cache" }
-parking_lot = "0.9"
+parking_lot = "0.10.0"

 [dev-dependencies]
 env_logger = "0.5"
--- a/ethcore/sync/Cargo.toml
+++ b/ethcore/sync/Cargo.toml
@ -27,9 +27,9 @@ macros = { path = "../../util/macros" }
 network = { package = "ethcore-network", path = "../../util/network" }
 parity-runtime = { path = "../../util/runtime" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-util-mem = "0.3.0"
+parity-util-mem = "0.5.1"
 rand = "0.7"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 rlp = "0.4.0"
 snapshot = { path = "../snapshot" }
 trace-time = "0.1"
@ -40,7 +40,7 @@ env_logger = "0.5"
 engine = { path = "../engine" }
 ethcore = { path = "..", features = ["test-helpers"] }
 ethcore-io = { path = "../../util/io", features = ["mio"] }
-kvdb-memorydb = "0.3.1"
+kvdb-memorydb = "0.4.0"
 machine = { path = "../machine" }
 rand_xorshift = "0.2"
 rustc-hex = "1.0"
--- a/ethcore/trace/Cargo.toml
+++ b/ethcore/trace/Cargo.toml
@ -11,11 +11,11 @@ ethcore-blockchain = { path = "../blockchain" }
 ethcore-db = { path = "../db" }
 ethereum-types = "0.8.0"
 evm = { path = "../evm" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.3.0"
-parking_lot = "0.9"
+parity-util-mem = "0.5.1"
+parking_lot = "0.10.0"
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }
 vm = { path = "../vm" }
--- a/ethcore/trace/src/lib.rs
+++ b/ethcore/trace/src/lib.rs
@ -19,8 +19,6 @@
 use ethereum_types::{U256, Address};
 use kvdb::DBTransaction;
 use vm::{Error as VmError, ActionParams};
-// The MallocSizeOf derive looks for this in the root
-use parity_util_mem as malloc_size_of;

 mod config;
 mod db;
--- a/ethcore/trie-vm-factories/Cargo.toml
+++ b/ethcore/trie-vm-factories/Cargo.toml
@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"

 [dependencies]
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 account-db = { path = "../account-db" }
 evm = { path = "../evm" }
--- a/ethcore/types/Cargo.toml
+++ b/ethcore/types/Cargo.toml
@ -13,7 +13,7 @@ ethjson = { path = "../../json" }
 keccak-hash = "0.4.0"
 parity-bytes = "0.1"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-util-mem = "0.3.0"
+parity-util-mem = "0.5.1"
 parity-snappy = "0.1"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rlp = "0.4.0"
@ -22,7 +22,7 @@ unexpected = { path = "../../util/unexpected" }
 vm = { path = "../vm"}

 [dev-dependencies]
-rustc-hex = "2.0"
+rustc-hex = "2.1.0"

 [features]
 test-helpers = []
--- a/ethcore/verification/Cargo.toml
+++ b/ethcore/verification/Cargo.toml
@ -24,8 +24,8 @@ len-caching-lock = { path = "../../util/len-caching-lock" }
 log = "0.4"
 num_cpus = "1.2"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.3.0"
-parking_lot = "0.9"
+parity-util-mem = "0.5.1"
+parking_lot = "0.10.0"
 rlp = "0.4.2"
 time-utils = { path = "../../util/time-utils" }
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../util/triehash-ethereum" }
--- a/ethcore/verification/src/lib.rs
+++ b/ethcore/verification/src/lib.rs
@ -16,9 +16,6 @@

 //! Block verification utilities.

-// The MallocSizeOf derive looks for this in the root
-use parity_util_mem as malloc_size_of;
-
 #[cfg(feature = "bench" )]
 pub mod verification;
 #[cfg(not(feature = "bench" ))]
--- a/ethcore/wasm/run/Cargo.toml
+++ b/ethcore/wasm/run/Cargo.toml
@ -14,7 +14,7 @@ vm = { path = "../../vm" }
 wasm = { path = "../" }
 clap = "2.24"
 env_logger = "0.5"
-rustc-hex = "1"
+rustc-hex = "1.0"

 [features]
 default = ["ethereum-types/std"]
--- a/miner/Cargo.toml
+++ b/miner/Cargo.toml
@ -22,12 +22,12 @@ ethabi-contract = "9.0.0"
 ethcore-call-contract = { path = "../ethcore/call-contract" }
 ethereum-types = "0.8.0"
 futures = "0.1"
-parity-util-mem = "0.3.0"
+parity-util-mem = "0.5.1"
 keccak-hash = "0.4.0"
 linked-hash-map = "0.5"
 log = "0.4"
 parity-runtime = { path = "../util/runtime" }
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 price-info = { path = "./price-info", optional = true }
 registrar = { path = "../util/registrar" }
 rlp = "0.4.0"
--- a/miner/local-store/Cargo.toml
+++ b/miner/local-store/Cargo.toml
@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 common-types = { path = "../../ethcore/types" }
 ethcore-io = { path = "../../util/io" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4"
 rlp = "0.4.0"
 serde = "1.0"
@ -18,4 +18,4 @@ serde_json = "1.0"
 [dev-dependencies]
 ethkey = { path = "../../accounts/ethkey" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-kvdb-memorydb = "0.3.1"
+kvdb-memorydb = "0.4.0"
--- a/miner/stratum/Cargo.toml
+++ b/miner/stratum/Cargo.toml
@ -11,7 +11,7 @@ keccak-hash = "0.4.0"
 jsonrpc-core = "14.0.3"
 jsonrpc-tcp-server = "14.0.3"
 log = "0.4"
-parking_lot = "0.9"
+parking_lot = "0.10.0"

 [dev-dependencies]
 env_logger = "0.5"
--- a/parity/logger/Cargo.toml
+++ b/parity/logger/Cargo.toml
@ -12,6 +12,6 @@ atty = "0.2"
 lazy_static = "1.0"
 regex = "1.0"
 time = "0.1"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 arrayvec = "0.4"
 ansi_term = "0.11"
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@ -21,12 +21,12 @@ semver = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 tempdir = "0.3"
 tiny-keccak = "1.4"
 tokio-timer = "0.1"
 transient-hashmap = "0.4"
-itertools = "0.5"
+itertools = "0.8.2"

 jsonrpc-core = "14.0.5"
 jsonrpc-derive = "14.0.5"
--- a/secret-store/Cargo.toml
+++ b/secret-store/Cargo.toml
@ -15,14 +15,14 @@ ethkey = { path = "../accounts/ethkey", optional = true }
 futures = "0.1"
 hyper = { version = "0.12", default-features = false }
 keccak-hash = "0.4.0"
-kvdb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
+kvdb = "0.4.0"
+kvdb-rocksdb = "0.5.0"
 lazy_static = "1.0"
 log = "0.4"
 parity-bytes = "0.1"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 parity-runtime = { path = "../util/runtime" }
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 percent-encoding = "2.1.0"
 rustc-hex = "1.0"
 serde = "1.0"
@ -38,4 +38,4 @@ jsonrpc-server-utils = "14.0.3"
 [dev-dependencies]
 env_logger = "0.5"
 tempdir = "0.3"
-kvdb-rocksdb = "0.4.1"
+kvdb-rocksdb = "0.5.0"
--- a/updater/Cargo.toml
+++ b/updater/Cargo.toml
@ -22,7 +22,7 @@ parity-hash-fetch = { path = "hash-fetch" }
 parity-path = "0.1"
 parity-version = { path = "../util/version" }
 rand = "0.7"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 semver = "0.9"
 target_info = "0.1"

--- a/updater/hash-fetch/Cargo.toml
+++ b/updater/hash-fetch/Cargo.toml
@ -11,7 +11,7 @@ call-contract = { package = "ethcore-call-contract", path = "../../ethcore/call-
 futures = "0.1"
 log = "0.4"
 mime = "0.3"
-mime_guess = "2.0.0-alpha.2"
+mime_guess = "2.0.1"
 rand = "0.7"
 rustc-hex = "1.0"
 fetch = { path = "../../util/fetch" }
@ -27,5 +27,5 @@ ethabi-derive = "9.0.1"
 ethabi-contract = "9.0.0"

 [dev-dependencies]
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 fake-fetch = { path = "../../util/fake-fetch" }
--- a/updater/hash-fetch/src/urlhint.rs
+++ b/updater/hash-fetch/src/urlhint.rs
@ -200,7 +200,7 @@ fn guess_mime_type(url: &str) -> Option<Mime> {
 	url.and_then(|url| {
 		url.split('.').last()
 	}).and_then(|extension| {
-		mime_guess::get_mime_type_opt(extension)
+		mime_guess::from_ext(extension).first()
 	})
 }

--- a/util/EIP-152/Cargo.toml
+++ b/util/EIP-152/Cargo.toml
@ -15,7 +15,7 @@ arrayref = "0.3.5"

 [dev-dependencies]
 criterion = "0.3"
-rustc-hex = "2.0.1"
+rustc-hex = "2.1.0"

 [[bench]]
 name = "bench"
--- a/util/EIP-712/Cargo.toml
+++ b/util/EIP-712/Cargo.toml
@ -18,11 +18,11 @@ ethabi = "9.0.1"
 keccak-hash = "0.4.0"
 ethereum-types = "0.8.0"
 failure = "0.1"
-itertools = "0.7"
+itertools = "0.8.2"
 lazy_static = "1.1"
 regex = "1.0"
 validator = "0.8"
 validator_derive = "0.8"
 lunarity-lexer = "0.2"
-rustc-hex = "2.0"
+rustc-hex = "2.1.0"
 indexmap = "1.0.2"
--- a/util/blooms-db/Cargo.toml
+++ b/util/blooms-db/Cargo.toml
@ -7,7 +7,7 @@ edition = "2018"

 [dependencies]
 ethbloom = "0.8.0"
-parking_lot = "0.9"
+parking_lot = "0.10.0"

 [dev-dependencies]
 criterion = "0.3"
--- a/util/io/Cargo.toml
+++ b/util/io/Cargo.toml
@ -11,7 +11,7 @@ edition = "2018"
 fnv = "1.0"
 mio = { version = "0.6.19", optional = true }
 crossbeam-deque = "0.6"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 log = "0.4"
 slab = "0.4"
 num_cpus = "1.8"
--- a/util/journaldb/Cargo.toml
+++ b/util/journaldb/Cargo.toml
@ -10,16 +10,16 @@ edition = "2018"
 parity-bytes = "0.1"
 ethereum-types = "0.8.0"
 hash-db = "0.15.0"
-malloc_size_of = { version = "0.3.0", package = "parity-util-mem" }
+parity-util-mem = "0.5.1"
 keccak-hasher = { path = "../keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.4.0"
 log = "0.4"
-memory-db = "0.18.0"
-parking_lot = "0.9"
+memory-db = "0.19.0"
+parking_lot = "0.10.0"
 fastmap = { path = "../../util/fastmap" }
 rlp = "0.4.0"

 [dev-dependencies]
 env_logger = "0.5"
 keccak-hash = "0.4.0"
-kvdb-memorydb = "0.3.1"
+kvdb-memorydb = "0.4.0"
--- a/util/journaldb/src/archivedb.rs
+++ b/util/journaldb/src/archivedb.rs
@ -26,7 +26,7 @@ use ethereum_types::H256;
 use hash_db::{HashDB, Prefix};
 use keccak_hasher::KeccakHasher;
 use kvdb::{KeyValueDB, DBTransaction, DBValue};
-use malloc_size_of::MallocSizeOfExt;
+use parity_util_mem::MallocSizeOfExt;
 use parity_bytes::Bytes;
 use rlp::{encode, decode};

--- a/util/journaldb/src/earlymergedb.rs
+++ b/util/journaldb/src/earlymergedb.rs
@ -27,7 +27,7 @@ use hash_db::{HashDB, Prefix};
 use keccak_hasher::KeccakHasher;
 use kvdb::{KeyValueDB, DBTransaction, DBValue};
 use log::{trace, warn};
-use malloc_size_of::{MallocSizeOf, allocators::new_malloc_size_ops};
+use parity_util_mem::{MallocSizeOf, allocators::new_malloc_size_ops};
 use parity_bytes::Bytes;
 use parking_lot::RwLock;
 use rlp::{encode, decode};
--- a/util/journaldb/src/overlayrecentdb.rs
+++ b/util/journaldb/src/overlayrecentdb.rs
@ -28,7 +28,7 @@ use hash_db::{HashDB, Prefix, EMPTY_PREFIX};
 use keccak_hasher::KeccakHasher;
 use kvdb::{KeyValueDB, DBTransaction, DBValue};
 use log::trace;
-use malloc_size_of::{MallocSizeOf, allocators::new_malloc_size_ops};
+use parity_util_mem::{MallocSizeOf, allocators::new_malloc_size_ops};
 use parity_bytes::Bytes;
 use parking_lot::RwLock;
 use rlp::{Rlp, RlpStream, encode, decode, DecoderError, Decodable, Encodable};
--- a/util/journaldb/src/refcounteddb.rs
+++ b/util/journaldb/src/refcounteddb.rs
@ -27,7 +27,7 @@ use hash_db::{HashDB, Prefix, EMPTY_PREFIX};
 use keccak_hasher::KeccakHasher;
 use kvdb::{KeyValueDB, DBTransaction, DBValue};
 use log::trace;
-use malloc_size_of::{MallocSizeOf, allocators::new_malloc_size_ops};
+use parity_util_mem::{MallocSizeOf, allocators::new_malloc_size_ops};
 use parity_bytes::Bytes;
 use rlp::{encode, decode};

--- a/util/len-caching-lock/Cargo.toml
+++ b/util/len-caching-lock/Cargo.toml
@ -7,4 +7,4 @@ version = "0.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-parking_lot = "0.9"
+parking_lot = "0.10.0"
--- a/util/memory-cache/Cargo.toml
+++ b/util/memory-cache/Cargo.toml
@ -6,5 +6,5 @@ description = "An LRU-cache which operates on memory used"
 license = "GPL3"

 [dependencies]
-parity-util-mem = "0.3.0"
+parity-util-mem = "0.5.1"
 lru-cache = "0.1"
--- a/util/migration-rocksdb/Cargo.toml
+++ b/util/migration-rocksdb/Cargo.toml
@ -6,8 +6,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 log = "0.4"
 macros = { path = "../macros" }
-kvdb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
+kvdb = "0.4.0"
+kvdb-rocksdb = "0.5.0"

 [dev-dependencies]
 tempdir = "0.3"
--- a/util/network-devp2p/Cargo.toml
+++ b/util/network-devp2p/Cargo.toml
@ -14,9 +14,9 @@ bytes = "0.4"
 rand = "0.7"
 tiny-keccak = "1.4"
 slab = "0.2"
-igd = "0.9"
+igd = "0.10.0"
 libc = "0.2.7"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 ansi_term = "0.11"
 rustc-hex = "1.0"
 ethcore-io = { path = "../io", features = ["mio"] }
--- a/util/patricia-trie-ethereum/Cargo.toml
+++ b/util/patricia-trie-ethereum/Cargo.toml
@ -6,7 +6,7 @@ description = "Merkle-Patricia Trie (Ethereum Style)"
 license = "GPL-3.0"

 [dependencies]
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 keccak-hasher = { version = "0.1.1", path = "../keccak-hasher" }
 hash-db = "0.15.0"
 rlp = "0.4.4"
@ -15,7 +15,7 @@ ethereum-types = "0.8.0"
 elastic-array = "0.10"

 [dev-dependencies]
-memory-db = "0.18.0"
+memory-db = "0.19.0"
 keccak-hash = "0.4.0"
 journaldb = { path = "../journaldb" }
 criterion = "0.3"
--- a/util/version/Cargo.toml
+++ b/util/version/Cargo.toml
@ -29,7 +29,7 @@ target_info = "0.1"
 [build-dependencies]
 vergen = "3.0.4"
 rustc_version = "0.2"
-toml = "0.4"
+toml = "0.5.6"

 [features]
 final = []