Skip to content

chore: fix subdep issue #1537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niklasad1 merged 3 commits into from
Mar 17, 2025
Merged

chore: fix subdep issue #1537

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dc6467
chore: fix subdep issue
prestwich Mar 17, 2025
3adcdde
chore: more verbose dep spec
prestwich Mar 17, 2025
b33b1b7
Update client/transport/Cargo.toml
niklasad1 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ resolver = "2"

[workspace.package]
authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
version = "0.24.8"
version = "0.24.9"
edition = "2021"
rust-version = "1.74.0"
license = "MIT"
Expand All @@ -31,14 +31,14 @@ keywords = ["jsonrpc", "json", "http", "websocket", "WASM"]
readme = "README.md"

[workspace.dependencies]
jsonrpsee-types = { path = "types", version = "0.24.7" }
jsonrpsee-core = { path = "core", version = "0.24.7" }
jsonrpsee-server = { path = "server", version = "0.24.7" }
jsonrpsee-ws-client = { path = "client/ws-client", version = "0.24.7" }
jsonrpsee-http-client = { path = "client/http-client", version = "0.24.7" }
jsonrpsee-wasm-client = { path = "client/wasm-client", version = "0.24.7" }
jsonrpsee-client-transport = { path = "client/transport", version = "0.24.7" }
jsonrpsee-proc-macros = { path = "proc-macros", version = "0.24.7" }
jsonrpsee-types = { path = "types", version = "0.24.9" }
jsonrpsee-core = { path = "core", version = "0.24.9" }
jsonrpsee-server = { path = "server", version = "0.24.9" }
jsonrpsee-ws-client = { path = "client/ws-client", version = "0.24.9" }
jsonrpsee-http-client = { path = "client/http-client", version = "0.24.9" }
jsonrpsee-wasm-client = { path = "client/wasm-client", version = "0.24.9" }
jsonrpsee-client-transport = { path = "client/transport", version = "0.24.9" }
jsonrpsee-proc-macros = { path = "proc-macros", version = "0.24.9" }

tower = "0.4"
tower-http = "0.5"
2 changes: 1 addition & 1 deletion client/http-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ http-body = "1"
jsonrpsee-types = { workspace = true }
jsonrpsee-core = { workspace = true, features = ["client", "http-helpers"] }
rustls = { version = "0.23.7", default-features = false, optional = true, features = ["logging", "std", "tls12", "ring"] }
rustls-platform-verifier = { version = "0.3", optional = true }
rustls-platform-verifier = { version = "0.5", optional = true }
serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = "1"
thiserror = "1"
Expand Down
14 changes: 9 additions & 5 deletions client/http-client/src/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,15 @@ impl<L> HttpTransportClientBuilder<L> {
http_conn.enforce_http(false);

let https_conn = match certificate_store {
CertificateStore::Native => hyper_rustls::HttpsConnectorBuilder::new()
.with_tls_config(rustls_platform_verifier::tls_config())
.https_or_http()
.enable_all_versions()
.wrap_connector(http_conn),
CertificateStore::Native => {
Copy link
Copy Markdown
Author

@prestwich prestwich Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copied from main to address a deprecation issue

use rustls_platform_verifier::ConfigVerifierExt;

hyper_rustls::HttpsConnectorBuilder::new()
.with_tls_config(rustls::ClientConfig::with_platform_verifier())
.https_or_http()
.enable_all_versions()
.wrap_connector(http_conn)
}

CertificateStore::Custom(tls_config) => hyper_rustls::HttpsConnectorBuilder::new()
.with_tls_config(tls_config)
Expand Down
2 changes: 1 addition & 1 deletion client/transport/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ base64 = { version = "0.22", default-features = false, features = ["alloc"], opt
# tls
tokio-rustls = { version = "0.26", default-features = false, optional = true, features = ["logging", "tls12", "ring"] }
rustls-pki-types = { version = "1", optional = true }
rustls-platform-verifier = { version = "0.3.1", optional = true }
rustls-platform-verifier = { version = "0.5", optional = true }
rustls = { version = "0.23", default-features = false, optional = true }

# ws
Expand Down
8 changes: 6 additions & 2 deletions client/transport/src/ws/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,13 +633,17 @@ impl TryFrom<url::Url> for Target {
fn build_tls_config(cert_store: &CertificateStore) -> Result<tokio_rustls::TlsConnector, WsHandshakeError> {
let config = match cert_store {
#[cfg(feature = "tls-rustls-platform-verifier")]
CertificateStore::Native => rustls_platform_verifier::tls_config(),
CertificateStore::Native => {
Copy link
Copy Markdown
Author

@prestwich prestwich Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copied from main to address a deprecation issue

use rustls_platform_verifier::ConfigVerifierExt;

rustls::ClientConfig::with_platform_verifier()
}
#[cfg(not(feature = "tls-rustls-platform-verifier"))]
CertificateStore::Native => {
return Err(WsHandshakeError::CertificateStore(io::Error::new(
io::ErrorKind::Other,
"Native certificate store not supported, either call `Builder::with_custom_cert_store` or enable the `tls-rustls-platform-verifier` feature.",
)))
)));
}
CertificateStore::Custom(cfg) => cfg.clone(),
};
Expand Down