update jsonrpsee (#88)

Cargo.toml

@@ -19,12 +19,16 @@ path = "src/main.rs"
 anyhow = "1.0.68"
 async-trait = "0.1.63"
 blake2 = "0.10.6"
+chrono = "0.4.24"
 clap = { version = "4.1.1", features = ["derive"] }
 enumflags2 = "0.7.7"
 futures = "0.3.25"
 hyper = "0.14.23"
 log = "0.4.17"
 moka = { version = "0.11.0", features = ["future"] }
+opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
+opentelemetry-datadog = { version = "0.8.0", features = ["reqwest-client"] }
+opentelemetry-jaeger = { version = "0.19.0", features = ["rt-tokio"] }
 rand = "0.8.5"
 serde = "1.0.152"
 serde_json = "1.0.92"
@@ -33,15 +37,11 @@ tokio = { version = "1.24.2", features = ["full"] }
 tower = { version = "0.4.13", features = ["full"] }
 tower-http = { version = "0.4.0", features = ["full"] }
 tracing = "0.1.37"
+tracing-serde = "0.1.3"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] }
-opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
-opentelemetry-datadog = { version = "0.8.0", features = ["reqwest-client"] }
-opentelemetry-jaeger = { version = "0.19.0", features = ["rt-tokio"] }
 
-jsonrpsee = { version = "0.19.0", path = "./vendor/jsonrpsee/jsonrpsee", features = ["full"] }
+jsonrpsee = { version = "0.20.0", path = "./vendor/jsonrpsee/jsonrpsee", features = ["full"] }
 governor = { version = "0.5.1", path = "./vendor/governor/governor" }
-chrono = "0.4.24"
-tracing-serde = "0.1.3"
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["async_tokio", "html_reports"] }

benches/bench/helpers.rs

@@ -127,7 +127,7 @@ fn gen_rpc_module() -> jsonrpsee::RpcModule<()> {
 }
 
 pub mod client {
-    use jsonrpsee::client_transport::ws::{Uri, WsTransportClientBuilder};
+    use jsonrpsee::client_transport::ws::{Url, WsTransportClientBuilder};
     use jsonrpsee::ws_client::{WsClient, WsClientBuilder};
 
     pub use jsonrpsee::core::client::{ClientT, SubscriptionClientT};
@@ -144,11 +144,11 @@ pub mod client {
     }
 
     pub async fn ws_handshake(url: &str, headers: HeaderMap) {
-        let uri: Uri = url.parse().unwrap();
+        let url: Url = url.parse().unwrap();
         WsTransportClientBuilder::default()
             .max_request_size(u32::MAX)
             .set_headers(headers)
-            .build(uri)
+            .build(url)
             .await
             .unwrap();
     }

config.yml

@@ -1,8 +1,8 @@
 extensions:  
   client:
     endpoints:
-      - wss://acala-rpc.dwellir.com:443
-      - wss://acala-rpc-0.aca-api.network:443
+      - wss://acala-rpc.dwellir.com
+      - wss://acala-rpc-0.aca-api.network
   event_bus:
   substrate_api:
     stale_timeout_seconds: 180 # rotate endpoint if no new blocks for 3 minutes

eth_config.yml

@@ -1,7 +1,7 @@
 extensions:  
   client:
     endpoints:
-      - wss://eth-rpc-karura-testnet.aca-staging.network:443
+      - wss://eth-rpc-karura-testnet.aca-staging.network
   event_bus:
   eth_api:
     stale_timeout_seconds: 180 # rotate endpoint if no new blocks for 3 minutes

src/extensions/server.rs

@@ -2,7 +2,7 @@ use std::{future::Future, net::SocketAddr};
 
 use async_trait::async_trait;
 use jsonrpsee::server::{
-    middleware::proxy_get_request::ProxyGetRequestLayer,
+    middleware::ProxyGetRequestLayer,
     {RandomStringIdProvider, RpcModule, ServerBuilder, ServerHandle},
 };
 use serde::Deserialize;