From d8a3cf1703a930ea8026a26ed13624c0f279b24b Mon Sep 17 00:00:00 2001
From: Gregory Hill <gregorydhill@outlook.com>
Date: Mon, 2 Aug 2021 12:04:13 +0100
Subject: [PATCH 1/2] chore: update to jsonrpsee 0.3.0

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
---
 Cargo.lock           | 162 ++++++++++++++++++++++++++++---------------
 runtime/Cargo.toml   |  12 ++--
 runtime/src/conn.rs  |   6 +-
 runtime/src/error.rs |  23 ++----
 runtime/src/rpc.rs   |   4 +-
 runtime/src/tests.rs |   2 +-
 6 files changed, 125 insertions(+), 84 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ee3f21ae..33f573e27 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -316,19 +316,6 @@ version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
-[[package]]
-name = "async-tls"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls 0.19.1",
- "webpki 0.21.4",
- "webpki-roots",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.50"
@@ -432,6 +419,19 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "bae"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf"
+dependencies = [
+ "heck",
+ "proc-macro-error 0.4.12",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "base-x"
 version = "0.2.8"
@@ -477,6 +477,9 @@ name = "beef"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bincode"
@@ -1006,7 +1009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
 dependencies = [
  "heck",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -2289,7 +2292,7 @@ checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
 dependencies = [
  "futures-io",
  "rustls 0.19.1",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -2870,7 +2873,7 @@ dependencies = [
  "rustls-native-certs 0.4.0",
  "tokio 0.2.25",
  "tokio-rustls 0.14.1",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -2887,7 +2890,7 @@ dependencies = [
  "rustls-native-certs 0.5.0",
  "tokio 1.8.1",
  "tokio-rustls 0.22.0",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -3546,12 +3549,13 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.2.0-alpha.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2737440f37efa10e5ef7beeec43d059d29dc92640978be21fcdcef481a2edb0d"
+checksum = "52819604ca75933e88f51a31ef2e963fc5e3b0e67c5e4e7cd1bcf866e28b6af2"
 dependencies = [
  "async-trait",
  "fnv",
+ "futures 0.3.15",
  "hyper 0.14.9",
  "hyper-rustls 0.22.1",
  "jsonrpsee-types",
@@ -3560,16 +3564,18 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
+ "tokio 1.8.1",
  "url 2.2.2",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5784ee8bb31988fa2c7a755fe31b0e21aa51894a67e5c99b6d4470f0253bf31a"
+checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300"
 dependencies = [
  "Inflector",
+ "bae",
  "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
@@ -3578,25 +3584,27 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51"
+checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788"
 dependencies = [
  "async-trait",
  "beef",
  "futures-channel",
  "futures-util",
+ "hyper 0.14.9",
  "log 0.4.14",
  "serde",
  "serde_json",
+ "soketto 0.6.0",
  "thiserror",
 ]
 
 [[package]]
 name = "jsonrpsee-utils"
-version = "0.2.0-alpha.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922"
+checksum = "0df2c313adda0418a281cea99d1b9e3c22714d2b9139e9adb1543b4a40ee0458"
 dependencies = [
  "futures-util",
  "hyper 0.14.9",
@@ -3605,24 +3613,26 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.2.0-alpha.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6fdb4390bd25358c62e8b778652a564a1723ba07dca0feb3da439c2253fe59f"
+checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198"
 dependencies = [
- "async-std",
- "async-tls",
  "async-trait",
  "fnv",
  "futures 0.3.15",
  "jsonrpsee-types",
  "log 0.4.14",
  "pin-project 1.0.7",
+ "rustls 0.19.1",
+ "rustls-native-certs 0.5.0",
  "serde",
  "serde_json",
- "soketto",
+ "soketto 0.6.0",
  "thiserror",
+ "tokio 1.8.1",
+ "tokio-rustls 0.22.0",
+ "tokio-util 0.6.7",
  "url 2.2.2",
- "webpki 0.22.0",
 ]
 
 [[package]]
@@ -4174,7 +4184,7 @@ dependencies = [
  "log 0.4.14",
  "quicksink",
  "rw-stream-sink",
- "soketto",
+ "soketto 0.4.2",
  "url 2.2.2",
  "webpki-roots",
 ]
@@ -4858,7 +4868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
 dependencies = [
  "proc-macro-crate 1.0.0",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -6037,16 +6047,42 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
+dependencies = [
+ "proc-macro-error-attr 0.4.12",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check 0.9.3",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
- "proc-macro-error-attr",
+ "proc-macro-error-attr 1.0.4",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check 0.9.3",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
+dependencies = [
  "proc-macro2",
  "quote",
  "syn",
+ "syn-mid",
  "version_check 0.9.3",
 ]
 
@@ -6881,7 +6917,7 @@ dependencies = [
  "log 0.4.14",
  "ring",
  "sct",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -6894,7 +6930,7 @@ dependencies = [
  "log 0.4.14",
  "ring",
  "sct",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -8362,6 +8398,21 @@ dependencies = [
  "sha-1 0.9.6",
 ]
 
+[[package]]
+name = "soketto"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f"
+dependencies = [
+ "base64 0.13.0",
+ "bytes 1.0.1",
+ "futures 0.3.15",
+ "httparse",
+ "log 0.4.14",
+ "rand 0.8.4",
+ "sha-1 0.9.6",
+]
+
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
@@ -9158,7 +9209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10"
 dependencies = [
  "heck",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -9246,7 +9297,7 @@ dependencies = [
 [[package]]
 name = "substrate-subxt"
 version = "0.15.0"
-source = "git+https://github.com/interlay/substrate-subxt?rev=3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33#3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33"
+source = "git+https://github.com/interlay/substrate-subxt?rev=8bfaa511d34169b55888c5ad4288c8bafd203f24#8bfaa511d34169b55888c5ad4288c8bafd203f24"
 dependencies = [
  "async-trait",
  "dyn-clone",
@@ -9256,6 +9307,7 @@ dependencies = [
  "hex 0.4.3",
  "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
+ "jsonrpsee-types",
  "jsonrpsee-ws-client",
  "log 0.4.14",
  "num-traits",
@@ -9279,7 +9331,7 @@ dependencies = [
 [[package]]
 name = "substrate-subxt-client"
 version = "0.7.0"
-source = "git+https://github.com/interlay/substrate-subxt?rev=3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33#3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33"
+source = "git+https://github.com/interlay/substrate-subxt?rev=8bfaa511d34169b55888c5ad4288c8bafd203f24#8bfaa511d34169b55888c5ad4288c8bafd203f24"
 dependencies = [
  "async-std",
  "futures 0.1.31",
@@ -9297,12 +9349,12 @@ dependencies = [
 [[package]]
 name = "substrate-subxt-proc-macro"
 version = "0.15.0"
-source = "git+https://github.com/interlay/substrate-subxt?rev=3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33#3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33"
+source = "git+https://github.com/interlay/substrate-subxt?rev=8bfaa511d34169b55888c5ad4288c8bafd203f24#8bfaa511d34169b55888c5ad4288c8bafd203f24"
 dependencies = [
  "async-trait",
  "heck",
  "proc-macro-crate 0.1.5",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -9348,6 +9400,17 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "syn-mid"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.12.4"
@@ -9712,7 +9775,7 @@ dependencies = [
  "futures-core",
  "rustls 0.18.1",
  "tokio 0.2.25",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -9723,7 +9786,7 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
  "rustls 0.19.1",
  "tokio 1.8.1",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -9864,6 +9927,7 @@ checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
  "bytes 1.0.1",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "log 0.4.14",
  "pin-project-lite 0.2.7",
@@ -10732,23 +10796,13 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 3c8fc858b..7ad39652f 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -36,18 +36,18 @@ sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkad
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
 
 # Subxt dependencies
-substrate-subxt-proc-macro = { git = "https://github.com/interlay/substrate-subxt", rev = "3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33" }
-substrate-subxt = { git = "https://github.com/interlay/substrate-subxt", rev = "3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33" }
+substrate-subxt-proc-macro = { git = "https://github.com/interlay/substrate-subxt", rev = "8bfaa511d34169b55888c5ad4288c8bafd203f24" }
+substrate-subxt = { git = "https://github.com/interlay/substrate-subxt", rev = "8bfaa511d34169b55888c5ad4288c8bafd203f24" }
 
-jsonrpsee-types = "=0.2.0-alpha.6"
-jsonrpsee-ws-client = "=0.2.0-alpha.6"
+jsonrpsee-types = "0.3.0"
+jsonrpsee-ws-client = "0.3.0"
 
 # Polkadot dependencies
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
 parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
 
 # Dependencies for the testing utils for integration tests
-substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33", optional = true }
+substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "8bfaa511d34169b55888c5ad4288c8bafd203f24", optional = true }
 tempdir = {version = "0.3.7", optional = true }
 interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb", optional = true }
 bitcoin = { path = "../bitcoin", optional = true }
@@ -109,7 +109,7 @@ rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "exchange-rate-oracle"
 
 [dev-dependencies]
-substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33" }
+substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "8bfaa511d34169b55888c5ad4288c8bafd203f24" }
 interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb" }
 tempdir = "0.3.7"
 env_logger = "0.8.3"
\ No newline at end of file
diff --git a/runtime/src/conn.rs b/runtime/src/conn.rs
index 66e178be6..1f9f2a838 100644
--- a/runtime/src/conn.rs
+++ b/runtime/src/conn.rs
@@ -11,11 +11,7 @@ pub(crate) async fn new_websocket_client(
     max_concurrent_requests: Option<usize>,
     max_notifs_per_subscription: Option<usize>,
 ) -> Result<WsClient, Error> {
-    let parsed_url = url::Url::parse(&url)?;
-    let path = parsed_url.path().to_string();
-
     let ws_client = WsClientBuilder::default()
-        .handshake_url(path.into())
         .connection_timeout(CONNECTION_TIMEOUT)
         .max_concurrent_requests(max_concurrent_requests.unwrap_or(1024))
         .max_notifs_per_subscription(max_notifs_per_subscription.unwrap_or(256))
@@ -34,7 +30,7 @@ pub(crate) async fn new_websocket_client_with_retry(
     timeout(connection_timeout, async move {
         loop {
             match new_websocket_client(url, max_concurrent_requests, max_notifs_per_subscription).await {
-                Err(Error::JsonRpseeError(JsonRpseeError::TransportError(err))) => {
+                Err(Error::JsonRpseeError(JsonRpseeError::Transport(err))) => {
                     log::trace!("could not connect to parachain: {}", err);
                     sleep(RETRY_TIMEOUT).await;
                     continue;
diff --git a/runtime/src/error.rs b/runtime/src/error.rs
index 62f6e916d..6ce647250 100644
--- a/runtime/src/error.rs
+++ b/runtime/src/error.rs
@@ -6,12 +6,8 @@ use crate::{
     ISSUE_COMPLETED_ERROR, ISSUE_MODULE, REDEEM_MODULE,
 };
 use codec::Error as CodecError;
-use jsonrpsee_types::{
-    error::Error as RequestError,
-    v2::error::{JsonRpcErrorAlloc as JsonRpcError, JsonRpcErrorCode},
-};
-use jsonrpsee_ws_client::transport::WsConnectError;
-use serde_json::{value::Value as JsonValue, Error as SerdeJsonError};
+use jsonrpsee_types::{error::Error as RequestError, CallError};
+use serde_json::Error as SerdeJsonError;
 use sp_core::crypto::SecretStringError;
 use std::{array::TryFromSliceError, io::Error as IoError, num::TryFromIntError};
 use substrate_subxt::{ModuleError as SubxtModuleError, RuntimeError as SubxtRuntimeError};
@@ -60,9 +56,6 @@ pub enum Error {
     SerdeJsonError(#[from] SerdeJsonError),
     #[error("Error getting json-rpsee data: {0}")]
     JsonRpseeError(#[from] JsonRpseeError),
-    /// Occurs during websocket handshake
-    #[error("Rpc error: {0}")]
-    WsConnectError(#[from] WsConnectError),
     #[error("Timeout: {0}")]
     TimeElapsed(#[from] Elapsed),
     #[error("UrlParseError: {0}")]
@@ -97,12 +90,11 @@ impl Error {
         )
     }
 
-    pub fn is_outdated_nonce(&self) -> bool {
+    pub fn is_invalid_transaction(&self) -> bool {
         matches!(self,
-            Error::SubxtError(SubxtError::Rpc(RequestError::Request(JsonRpcError { error, .. })))
-                if error.code == JsonRpcErrorCode::ServerError(POOL_INVALID_TX) &&
-                error.message == OUTDATED_NONCE_MESSAGE &&
-                error.data == Some(JsonValue::String(OUTDATED_NONCE_DATA_STR.to_string()))
+            Error::SubxtError(SubxtError::Rpc(RequestError::Call(CallError::Custom { code, message, .. })))
+                if *code == POOL_INVALID_TX &&
+                message == INVALID_TX_MESSAGE
         )
     }
 
@@ -142,5 +134,4 @@ pub enum KeyLoadingError {
 // https://github.com/paritytech/substrate/blob/e60597dff0aa7ffad623be2cc6edd94c7dc51edd/client/rpc-api/src/author/error.rs#L80
 const BASE_ERROR: i32 = 1000;
 const POOL_INVALID_TX: i32 = BASE_ERROR + 10;
-const OUTDATED_NONCE_MESSAGE: &str = "Invalid Transaction";
-const OUTDATED_NONCE_DATA_STR: &str = "Transaction is outdated";
+const INVALID_TX_MESSAGE: &str = "Invalid Transaction";
diff --git a/runtime/src/rpc.rs b/runtime/src/rpc.rs
index b830d8363..3ead1bea2 100644
--- a/runtime/src/rpc.rs
+++ b/runtime/src/rpc.rs
@@ -116,7 +116,7 @@ impl InterBtcParachain {
             |result| async {
                 match result.map_err(Into::<Error>::into) {
                     Ok(ok) => Ok(ok),
-                    Err(err) if err.is_outdated_nonce() => {
+                    Err(err) if err.is_invalid_transaction() => {
                         self.refresh_nonce().await;
                         Err(RetryPolicy::Skip(Error::InvalidTransaction))
                     }
@@ -144,7 +144,7 @@ impl InterBtcParachain {
     {
         let mut sub = self.ext_client.subscribe_finalized_blocks().await?;
         loop {
-            on_block(sub.next().await.ok_or(Error::ChannelClosed)?).await?;
+            on_block(sub.next().await?.ok_or(Error::ChannelClosed)?).await?;
         }
     }
 
diff --git a/runtime/src/tests.rs b/runtime/src/tests.rs
index 7896b008d..4cb1aed41 100644
--- a/runtime/src/tests.rs
+++ b/runtime/src/tests.rs
@@ -62,7 +62,7 @@ async fn test_outdated_nonce_matching() {
         .unwrap();
     let err = parachain_rpc.get_outdated_nonce_error().await;
     log::error!("Error: {:?}", err);
-    assert!(err.is_outdated_nonce())
+    assert!(err.is_invalid_transaction())
 }
 
 #[tokio::test]

From 7ba4edf54742a3ee1a192a88052baf85e574358d Mon Sep 17 00:00:00 2001
From: Gregory Hill <gregorydhill@outlook.com>
Date: Mon, 2 Aug 2021 12:18:00 +0100
Subject: [PATCH 2/2] chore: update to hyper to 0.14.11

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
---
 Cargo.lock         | 51 +++++++++++++---------------------------------
 service/Cargo.toml |  4 ++--
 2 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 33f573e27..7e70aefc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2836,9 +2836,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.9"
+version = "0.14.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83"
+checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
 dependencies = [
  "bytes 1.0.1",
  "futures-channel",
@@ -2884,7 +2884,7 @@ checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
 dependencies = [
  "ct-logs 0.8.0",
  "futures-util",
- "hyper 0.14.9",
+ "hyper 0.14.11",
  "log 0.4.14",
  "rustls 0.19.1",
  "rustls-native-certs 0.5.0",
@@ -2893,19 +2893,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
-dependencies = [
- "bytes 0.5.6",
- "hyper 0.13.10",
- "native-tls",
- "tokio 0.2.25",
- "tokio-tls",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -2913,7 +2900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes 1.0.1",
- "hyper 0.14.9",
+ "hyper 0.14.11",
  "native-tls",
  "tokio 1.8.1",
  "tokio-native-tls",
@@ -3356,8 +3343,8 @@ checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a"
 dependencies = [
  "derive_more",
  "futures 0.3.15",
- "hyper 0.14.9",
- "hyper-tls 0.5.0",
+ "hyper 0.14.11",
+ "hyper-tls",
  "jsonrpc-core 18.0.0",
  "jsonrpc-pubsub 18.0.0",
  "log 0.4.14",
@@ -3448,7 +3435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff"
 dependencies = [
  "futures 0.3.15",
- "hyper 0.14.9",
+ "hyper 0.14.11",
  "jsonrpc-core 18.0.0",
  "jsonrpc-server-utils 18.0.0",
  "log 0.4.14",
@@ -3556,7 +3543,7 @@ dependencies = [
  "async-trait",
  "fnv",
  "futures 0.3.15",
- "hyper 0.14.9",
+ "hyper 0.14.11",
  "hyper-rustls 0.22.1",
  "jsonrpsee-types",
  "jsonrpsee-utils",
@@ -3592,7 +3579,7 @@ dependencies = [
  "beef",
  "futures-channel",
  "futures-util",
- "hyper 0.14.9",
+ "hyper 0.14.11",
  "log 0.4.14",
  "serde",
  "serde_json",
@@ -3607,7 +3594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0df2c313adda0418a281cea99d1b9e3c22714d2b9139e9adb1543b4a40ee0458"
 dependencies = [
  "futures-util",
- "hyper 0.14.9",
+ "hyper 0.14.11",
  "jsonrpsee-types",
 ]
 
@@ -6735,8 +6722,8 @@ dependencies = [
  "futures-util",
  "http 0.2.4",
  "http-body 0.4.2",
- "hyper 0.14.9",
- "hyper-tls 0.5.0",
+ "hyper 0.14.11",
+ "hyper-tls",
  "ipnet",
  "js-sys",
  "lazy_static",
@@ -8151,8 +8138,8 @@ dependencies = [
  "bitcoin 0.7.0",
  "clap 3.0.0-beta.2",
  "futures 0.3.15",
- "hyper 0.13.10",
- "hyper-tls 0.4.3",
+ "hyper 0.14.11",
+ "hyper-tls",
  "interbtc-telemetry-types",
  "runtime",
  "serde",
@@ -9862,16 +9849,6 @@ dependencies = [
  "tokio-executor",
 ]
 
-[[package]]
-name = "tokio-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
-dependencies = [
- "native-tls",
- "tokio 0.2.25",
-]
-
 [[package]]
 name = "tokio-udp"
 version = "0.1.6"
diff --git a/service/Cargo.toml b/service/Cargo.toml
index 01e33ae4e..37c062c08 100644
--- a/service/Cargo.toml
+++ b/service/Cargo.toml
@@ -11,8 +11,8 @@ clap = "3.0.0-beta.2"
 thiserror = "1.0"
 
 tokio = { version = "1.0", features = ["full"] }
-hyper = { version = "0.13" }
-hyper-tls = "0.4.3"
+hyper = { version = "0.14.11" }
+hyper-tls = "0.5.0"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"