Merge pull request #1997 from mintlayer/remove_rustls_pemfile_dep

Fix CI: update crates that depend on the now deprecated crate `rustls-pemfile`

Author: ImplOfAnImpl

Cargo.lock

@@ -183,14 +183,16 @@ hex-literal = "0.4"
 hickory-client = "0.24"
 hickory-server = "0.24"
 hmac = "0.12"
+http = "1.3"
+hyper = "1.7"
 iced = "0.13"
 # Note: we need this fix - https://github.com/iced-rs/iced_aw/pull/329
 # TODO: switch back to a released version of iced_aw once the fix is released (need version > 0.12)
 iced_aw = { git = "https://github.com/iced-rs/iced_aw", rev = "def1db9aac1e58a47e0c3127d4d4e95d724ca8ad" }
 iced_fonts = "0.1"
 indoc = "2.0"
 itertools = "0.14"
-jsonrpsee = { version = "0.22", default-features = false }
+jsonrpsee = { version = "0.26", default-features = false }
 lazy_static = "1.4"
 libtest-mimic = "0.8"
 log = "0.4"
@@ -221,6 +223,7 @@ reedline = "0.38"
 ref-cast = "1.0"
 regex = "1.10"
 replace_with = "0.1"
+reqwest = "0.12"
 rfd = { version = "0.15", default-features = false }
 ripemd = "0.1"
 rlimit = "0.10"
@@ -258,8 +261,8 @@ tokio-socks = "0.5"
 tokio-stream = "0.1"
 tokio-util = { version = "0.7", default-features = false }
 toml = "0.8"
-tower = "0.4"
-tower-http-axum = { package = "tower-http", version = "0.5" }
+tower = "0.5"
+tower-http = "0.5"
 x25519-dalek = "2.0"
 zeroize = "1.5"
 

Cargo.toml

@@ -27,7 +27,7 @@ axum.workspace = true
 ctor.workspace = true
 hex.workspace = true
 libtest-mimic.workspace = true
-reqwest = "0.11"
+reqwest.workspace = true
 rstest.workspace = true
 serde.workspace = true
 serde_json.workspace = true

api-server/stack-test-suite/Cargo.toml

@@ -29,4 +29,4 @@ serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true }
-tower-http-axum = { workspace = true, features = ["cors"] }
+tower-http = { workspace = true, features = ["cors"] }

api-server/web-server/Cargo.toml

@@ -16,19 +16,21 @@
 pub mod json_helpers;
 pub mod v2;
 
+use std::sync::Arc;
+
+use axum::{http::Method, response::IntoResponse, routing::get, Json, Router};
+use serde_json::json;
+use tokio::net::TcpListener;
+use tower_http::cors::{AllowMethods, Any, CorsLayer};
+
+use api_server_common::storage::storage_api::ApiServerStorage;
+
 use crate::{
     api,
     error::{ApiServerWebServerClientError, ApiServerWebServerError},
     ApiServerWebServerState, TxSubmitClient,
 };
 
-use api_server_common::storage::storage_api::ApiServerStorage;
-use axum::{http::Method, response::IntoResponse, routing::get, Json, Router};
-use serde_json::json;
-use std::sync::Arc;
-use tokio::net::TcpListener;
-use tower_http_axum::cors::{AllowMethods, Any, CorsLayer};
-
 #[allow(clippy::unused_async)]
 async fn bad_request() -> Result<(), ApiServerWebServerError> {
     Err(ApiServerWebServerClientError::BadRequest)?

api-server/web-server/src/api/mod.rs

@@ -18,6 +18,7 @@ allow = [
     "BSD-3-Clause",
     "BSL-1.0",
     "CC0-1.0",
+    "CDLA-Permissive-2.0",
     "ISC",
     "MIT",
     "MPL-2.0",

deny.toml

@@ -22,16 +22,14 @@ utils-networking = { path = "../utils/networking" }
 anyhow.workspace = true
 async-trait.workspace = true
 base64.workspace = true
+http.workspace = true
+hyper.workspace = true
 jsonrpsee = { workspace = true, features = ["server", "server-core", "http-client", "ws-client", "macros"] }
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 tower = { workspace = true, features = ["util"] }
-
-# This we keep here, and not in the workspace, because it comes from jsonrpsee and requires an older version
-tower-http = { version = "0.4", features = ["auth", "set-header"] }
-http = "0.2"
-hyper = "0.14"
+tower-http = { workspace = true, features = ["auth", "set-header"] }
 
 [dev-dependencies]
 test-utils = { path = "../test-utils" }

rpc/Cargo.toml

@@ -31,7 +31,8 @@ use std::{net::SocketAddr, path::PathBuf};
 use base64::Engine;
 use http::{header, HeaderValue};
 use jsonrpsee::{
-    http_client::{transport::HttpBackend, HttpClient, HttpClientBuilder},
+    core::middleware::RpcServiceBuilder,
+    http_client::{transport::HttpBackend, HttpClient, HttpClientBuilder, RpcService},
     server::{ServerBuilder, ServerHandle},
 };
 
@@ -109,7 +110,9 @@ impl Builder {
         };
 
         let mut module = jsonrpsee::RpcModule::new(());
-        module.register_method(method_list_name, move |_params, &()| method_names.clone())?;
+        module.register_method(method_list_name, move |_params, &(), _extensions| {
+            method_names.clone()
+        })?;
         Ok(module)
     }
 }
@@ -223,7 +226,7 @@ impl<T> MakeHeaderValue<T> for RpcAuthData {
     }
 }
 
-pub type RpcHttpClient = HttpClient<SetRequestHeader<HttpBackend, RpcAuthData>>;
+pub type RpcHttpClient = HttpClient<RpcService<SetRequestHeader<HttpBackend, RpcAuthData>>>;
 
 pub fn new_http_client(
     host: impl AsRef<str>,
@@ -234,7 +237,12 @@ pub fn new_http_client(
         rpc_auth,
     ));
 
-    HttpClientBuilder::default().set_http_middleware(middleware).build(host)
+    HttpClientBuilder::default()
+        // Note: by default (i.e. without calling `set_rpc_middleware`) `HttpClientBuilder` wraps
+        // the produced `RpcService` into `RpcLogger`, which we don't need.
+        .set_rpc_middleware(RpcServiceBuilder::default())
+        .set_http_middleware(middleware)
+        .build(host)
 }
 
 pub type RpcWsClient = jsonrpsee::ws_client::WsClient;

rpc/src/lib.rs

@@ -18,7 +18,8 @@ use crypto::{
     kdf::{argon2::Argon2Config, hash_password, verify_password, KdfConfig, KdfResult},
     util::eq::SliceEqualityCheckMethod,
 };
-use hyper::{Body, Request, Response};
+use hyper::{Request, Response};
+use jsonrpsee::server::HttpBody;
 use logging::log;
 use randomness::make_true_rng;
 use tower_http::validate_request::ValidateRequest;
@@ -102,7 +103,7 @@ impl RpcAuth {
 }
 
 impl<B> ValidateRequest<B> for RpcAuth {
-    type ResponseBody = Body;
+    type ResponseBody = HttpBody;
 
     fn validate(&mut self, request: &mut Request<B>) -> Result<(), Response<Self::ResponseBody>> {
         use jsonrpsee::types;

rpc/src/rpc_auth/mod.rs

@@ -121,4 +121,4 @@ pub enum Error {
 }
 
 /// Subscription method reply type
-pub type Reply = Result<(), jsonrpsee::core::StringError>;
+pub type Reply = Result<(), jsonrpsee::core::SubscriptionError>;