bump some of our core dependencies (#7563)

* updated ethereum-types and tiny-keccak

* Updated several deps

* Updated several more dependencies

* Modify dummy file to trigger ci

* fixed update of memmap to 0.6 in ethash crate

* Fixed fetch after update to latest reqwest

* Updated jsonrpc-core with fixes for serde

* add expects in util/version/build.rs

Cargo.toml

@@ -17,7 +17,7 @@ num_cpus = "1.2"
 number_prefix = "0.2"
 rpassword = "1.0"
 semver = "0.6"
-ansi_term = "0.9"
+ansi_term = "0.10"
 parking_lot = "0.4"
 regex = "0.2"
 isatty = "0.1"

dapps/ui/Cargo.toml

@@ -7,7 +7,7 @@ version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [build-dependencies]
-rustc_version = "0.1"
+rustc_version = "0.2"
 
 [dependencies]
 parity-ui-dev = { path = "../../js", optional = true }

ethash/Cargo.toml

@@ -11,7 +11,7 @@ keccak-hash = { path = "../util/hash" }
 primal = "0.2.3"
 parking_lot = "0.4"
 crunchy = "0.1.0"
-memmap = "0.5.2"
+memmap = "0.6"
 either = "1.0.0"
 
 [features]

ethash/src/cache.rs

@@ -17,7 +17,7 @@
 use compute::Light;
 use either::Either;
 use keccak::{H256, keccak_512};
-use memmap::{Mmap, Protection};
+use memmap::MmapMut;
 use parking_lot::Mutex;
 use seed_compute::SeedHashCompute;
 
@@ -30,7 +30,7 @@ use std::path::{Path, PathBuf};
 use std::slice;
 use std::sync::Arc;
 
-type Cache = Either<Vec<Node>, Mmap>;
+type Cache = Either<Vec<Node>, MmapMut>;
 
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
 pub enum OptimizeFor {
@@ -181,7 +181,7 @@ impl NodeCache {
 	}
 }
 
-fn make_memmapped_cache(path: &Path, num_nodes: usize, ident: &H256) -> io::Result<Mmap> {
+fn make_memmapped_cache(path: &Path, num_nodes: usize, ident: &H256) -> io::Result<MmapMut> {
 	use std::fs::OpenOptions;
 
 	let file = OpenOptions::new()
@@ -191,9 +191,9 @@ fn make_memmapped_cache(path: &Path, num_nodes: usize, ident: &H256) -> io::Resu
 		.open(&path)?;
 	file.set_len((num_nodes * NODE_BYTES) as _)?;
 
-	let mut memmap = Mmap::open(&file, Protection::ReadWrite)?;
+	let mut memmap = unsafe { MmapMut::map_mut(&file)? };
 
-	unsafe { initialize_memory(memmap.mut_ptr() as *mut Node, num_nodes, ident) };
+	unsafe { initialize_memory(memmap.as_mut_ptr() as *mut Node, num_nodes, ident) };
 
 	Ok(memmap)
 }
@@ -241,7 +241,10 @@ fn consume_cache(cache: &mut Cache, path: &Path) -> io::Result<()> {
 fn cache_from_path(path: &Path, optimize_for: OptimizeFor) -> io::Result<Cache> {
 	let memmap = match optimize_for {
 		OptimizeFor::Cpu => None,
-		OptimizeFor::Memory => Mmap::open_path(path, Protection::ReadWrite).ok(),
+		OptimizeFor::Memory => {
+			let file = fs::OpenOptions::new().read(true).write(true).create(true).open(path)?;
+			unsafe { MmapMut::map_mut(&file).ok() }
+		},
 	};
 
 	memmap.map(Either::Right).ok_or(()).or_else(|_| {
@@ -287,7 +290,7 @@ impl AsRef<[Node]> for NodeCache {
 		match self.cache {
 			Either::Left(ref vec) => vec,
 			Either::Right(ref mmap) => unsafe {
-				let bytes = mmap.ptr();
+				let bytes = mmap.as_ptr();
 				// This isn't a safety issue, so we can keep this a debug lint. We don't care about
 				// people manually messing with the files unless it can cause unsafety, but if we're
 				// generating incorrect files then we want to catch that in CI.

ethcore/Cargo.toml

@@ -7,7 +7,7 @@ version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-ansi_term = "0.9"
+ansi_term = "0.10"
 bloomchain = { path = "../util/bloomchain" }
 bn = { git = "https://github.com/paritytech/bn" }
 byteorder = "1.0"
@@ -35,7 +35,7 @@ futures = "0.1"
 hardware-wallet = { path = "../hw" }
 heapsize = "0.4"
 itertools = "0.5"
-lazy_static = "0.2"
+lazy_static = "1.0"
 log = "0.3"
 lru-cache = "0.1"
 native-contracts = { path = "native_contracts" }

ethcore/evm/Cargo.toml

@@ -8,7 +8,7 @@ bit-set = "0.4"
 ethereum-types = "0.1"
 evmjit = { path = "../../evmjit", optional = true }
 heapsize = "0.4"
-lazy_static = "0.2"
+lazy_static = "1.0"
 log = "0.3"
 vm = { path = "../vm" }
 keccak-hash = { path = "../../util/hash" }

ethcore/native_contracts/generator/Cargo.toml

@@ -6,4 +6,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ethabi = "4.0"
-heck = "0.2"
+heck = "0.3"

ethcore/src/verification/verification.rs

@@ -23,6 +23,15 @@
 
 use std::collections::HashSet;
 
+use bytes::Bytes;
+use ethereum_types::{H256, U256};
+use hash::keccak;
+use heapsize::HeapSizeOf;
+use rlp::UntrustedRlp;
+use time::get_time;
+use triehash::ordered_trie_root;
+use unexpected::{Mismatch, OutOfBounds};
+
 use blockchain::*;
 use client::BlockChainClient;
 use engines::EthEngine;
@@ -31,15 +40,6 @@ use header::{BlockNumber, Header};
 use transaction::SignedTransaction;
 use views::BlockView;
 
-use ethereum_types::{H256, U256};
-use bytes::Bytes;
-use hash::keccak;
-use heapsize::HeapSizeOf;
-use rlp::UntrustedRlp;
-use time::get_time;
-use triehash::ordered_trie_root;
-use unexpected::{Mismatch, OutOfBounds};
-
 /// Preprocessed block data gathered in `verify_block_unordered` call
 pub struct PreverifiedBlock {
 	/// Populated block header

ethkey/Cargo.toml

@@ -8,7 +8,7 @@ byteorder = "1.0"
 edit-distance = "2.0"
 eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
 ethereum-types = "0.1"
-lazy_static = "0.2"
+lazy_static = "1.0"
 log = "0.3"
 parity-wordlist = "1.2"
 rand = "0.3.14"

ipfs/Cargo.toml

@@ -13,5 +13,5 @@ jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "pa
 jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 rlp = { path = "../util/rlp" }
 cid = "0.2"
-multihash = "0.6"
+multihash = "0.7"
 unicase = "2.0"

logger/Cargo.toml

@@ -9,9 +9,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 log = "0.3"
 env_logger = "0.4"
 isatty = "0.1"
-lazy_static = "0.2"
+lazy_static = "1.0"
 regex = "0.2"
 time = "0.1"
 parking_lot = "0.4"
 arrayvec = "0.4"
-ansi_term = "0.9"
+ansi_term = "0.10"

rpc/Cargo.toml

@@ -8,12 +8,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [lib]
 
 [dependencies]
-ansi_term = "0.9"
+ansi_term = "0.10"
 cid = "0.2"
 futures = "0.1.6"
 futures-cpupool = "0.1"
 log = "0.3"
-multihash ="0.6"
+multihash ="0.7"
 order-stat = "0.1"
 parking_lot = "0.4"
 rand = "0.3"

secret_store/Cargo.toml

@@ -33,7 +33,7 @@ ethcore-logger = { path = "../logger" }
 ethcrypto = { path = "../ethcrypto" }
 ethkey = { path = "../ethkey" }
 native-contracts = { path = "../ethcore/native_contracts" }
-lazy_static = "0.2"
+lazy_static = "1.0"
 
 [dev-dependencies]
 tempdir = "0.3"

util/fetch/Cargo.toml

@@ -11,7 +11,7 @@ futures = "0.1"
 futures-cpupool = "0.1"
 parking_lot = "0.4"
 log = "0.3"
-reqwest = "0.7"
+reqwest = "0.8"
 
 [features]
 default = []

util/fetch/src/client.rs

@@ -114,7 +114,7 @@ impl Clone for Client {
 
 impl Client {
 	fn new_client() -> Result<Arc<reqwest::Client>, Error> {
-		let mut client = reqwest::ClientBuilder::new()?;
+		let mut client = reqwest::ClientBuilder::new();
 		client.redirect(reqwest::RedirectPolicy::limited(5));
 		Ok(Arc::new(client.build()?))
 	}
@@ -208,7 +208,7 @@ impl Future for FetchTask {
 		}
 
 		trace!(target: "fetch", "Starting fetch task: {:?}", self.url);
-		let result = self.client.get(&self.url)?
+		let result = self.client.get(&self.url)
 						  .header(reqwest::header::UserAgent::new("Parity Fetch"))
 						  .send()?;
 

util/network/Cargo.toml

@@ -18,7 +18,7 @@ slab = "0.2"
 igd = "0.6"
 libc = "0.2.7"
 parking_lot = "0.4"
-ansi_term = "0.9"
+ansi_term = "0.10"
 rustc-hex = "1.0"
 ethcore-io = { path = "../io" }
 ethcore-bytes = { path = "../bytes" }

util/rlp/Cargo.toml

@@ -9,6 +9,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 elastic-array = "0.9"
 ethereum-types = "0.1"
-lazy_static = "0.2"
+lazy_static = "1.0"
 rustc-hex = "1.0"
 byteorder = "1.0"

util/version/Cargo.toml

@@ -12,7 +12,7 @@ target_info = "0.1"
 
 [build-dependencies]
 vergen = "0.1"
-rustc_version = "0.1.0"
+rustc_version = "0.2.0"
 
 [features]
 final = []

util/version/build.rs

@@ -23,15 +23,17 @@ use std::io::Write;
 use std::path::Path;
 use vergen::{vergen, OutputFns};
 
+const ERROR_MSG: &'static str = "Failed to generate rustc_version file";
+
 fn main() {
-	vergen(OutputFns::all()).unwrap();
-	let out_dir = env::var("OUT_DIR").unwrap();
+	vergen(OutputFns::all()).expect(ERROR_MSG);
+	let out_dir = env::var("OUT_DIR").expect(ERROR_MSG);
 	let dest_path = Path::new(&out_dir).join("rustc_version.rs");
-	let mut f = File::create(&dest_path).unwrap();
+	let mut f = File::create(&dest_path).expect(ERROR_MSG);
 	f.write_all(format!("
 		/// Returns compiler version.
 		pub fn rustc_version() -> &'static str {{
 			\"{}\"
 		}}
-	", rustc_version::version()).as_bytes()).unwrap();
+	", rustc_version::version().expect(ERROR_MSG)).as_bytes()).expect(ERROR_MSG);
 }

whisper/Cargo.toml

@@ -16,7 +16,7 @@ log = "0.3"
 ordered-float = "0.5"
 parking_lot = "0.4"
 rand = "0.3"
-ring = "0.9.5"
+ring = "0.12"
 rlp = { path = "../util/rlp" }
 serde = "1.0"
 serde_derive = "1.0"