Upgrade to jsonrpc v14 (#11151)

* Upgrade to jsonrpc v14

Contains paritytech/jsonrpc#495 with good bugfixes to resource usage.

* Bump tokio & futures.

* Bump even further.

* Upgrade tokio to 0.1.22

* Partially revert "Bump tokio & futures."

This reverts commit 100907e.

Author: dvdplm

Cargo.lock

@@ -29,7 +29,7 @@ serde_derive = "1.0"
 futures = "0.1"
 fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = "10.0.1"
+jsonrpc-core = "14.0.0"
 parity-bytes = "0.1"
 common-types = { path = "ethcore/types" }
 ethcore = { path = "ethcore", features = ["parity"] }

Cargo.toml

@@ -12,10 +12,10 @@ futures = "0.1"
 log = "0.4"
 serde = "1.0"
 serde_json = "1.0"
-url = "1.2.0"
+url = "2"
 matches = "0.1"
-parking_lot = "0.7"
-jsonrpc-core = "10.0.1"
-jsonrpc-ws-server = "10.0.1"
+parking_lot = "0.9"
+jsonrpc-core = "14.0.0"
+jsonrpc-ws-server = "14.0.0"
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.1"

cli-signer/rpc-client/Cargo.toml

@@ -37,7 +37,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 tiny-keccak = "1.4"
 transaction-pool = "2.0.1"
-url = "1"
+url = "2"
 
 [dev-dependencies]
 env_logger = "0.5"

ethcore/private-tx/Cargo.toml

@@ -272,7 +272,7 @@ impl Provider {
 		let mut state_buf = [0u8; 64];
 		state_buf[..32].clone_from_slice(&state_hash);
 		state_buf[32..].clone_from_slice(&H256::from(nonce));
-		keccak(&state_buf.as_ref())
+		keccak(AsRef::<[u8]>::as_ref(&state_buf[..]))
 	}
 
 	fn pool_client<'a>(&'a self, nonce_cache: &'a NonceCache, local_accounts: &'a HashSet<Address>) -> miner::pool_client::PoolClient<'a, Client> {

ethcore/private-tx/src/lib.rs

@@ -9,8 +9,8 @@ authors = ["Parity Technologies <[email protected]>"]
 ethcore = { path = "../ethcore" }
 parity-bytes = "0.1"
 ethereum-types = "0.4"
-jsonrpc-core = "10.0.1"
-jsonrpc-http-server = "10.0.1"
+jsonrpc-core = "14.0.0"
+jsonrpc-http-server = "14.0.0"
 rlp = { version = "0.3.0", features = ["ethereum"] }
 cid = "0.3"
 multihash = "0.8"

ipfs/Cargo.toml

@@ -11,7 +11,7 @@ authors = ["Parity Technologies <[email protected]>"]
 ethash = { path = "../ethash", optional = true }
 fetch = { path = "../util/fetch", optional = true }
 hyper = { version = "0.12", optional = true }
-url = { version = "1", optional = true }
+url = { version = "2", optional = true }
 
 # Miner
 ansi_term = "0.10"

miner/Cargo.toml

@@ -8,8 +8,8 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 ethereum-types = "0.4"
 keccak-hash = "0.1"
-jsonrpc-core = "10.0.1"
-jsonrpc-tcp-server = "10.0.1"
+jsonrpc-core = "14.0.0"
+jsonrpc-tcp-server = "14.0.0"
 log = "0.4"
 parking_lot = "0.7"
 

miner/stratum/Cargo.toml

@@ -497,4 +497,11 @@ mod tests {
 			"{ \"id\": 17, \"method\": \"mining.notify\", \"params\": { \"00040008\", \"100500\" } }\n",
 			response);
 	}
+
+	#[test]
+	fn jsonprc_server_is_send_and_sync() {
+		fn is_send_and_sync<T: Send + Sync>() {}
+
+		is_send_and_sync::<JsonRpcServer>();
+	}
 }

miner/stratum/src/lib.rs

@@ -14,7 +14,7 @@ futures = "0.1.6"
 jni = { version = "0.11", optional = true }
 panic_hook = { path = "../util/panic-hook" }
 parity-ethereum = { path = "../", default-features = false }
-tokio = "0.1.11"
+tokio = "0.1.22"
 tokio-current-thread = "0.1.3"
 
 [features]