diff --git a/Cargo.lock b/Cargo.lock index 287f7c6706..82ef090021 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4384,7 +4384,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -8336,6 +8336,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", + "webpki-roots 0.25.4", "winreg", ] @@ -9501,7 +9502,7 @@ dependencies = [ "time", "tokio-stream", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -10164,10 +10165,10 @@ dependencies = [ "futures-util", "log", "rustls 0.21.11", - "rustls-native-certs", "tokio", "tokio-rustls 0.24.1", "tungstenite", + "webpki-roots 0.25.4", ] [[package]] @@ -10602,6 +10603,7 @@ dependencies = [ "thiserror", "url", "utf-8", + "webpki-roots 0.24.0", ] [[package]] @@ -11184,6 +11186,21 @@ dependencies = [ "webpki 0.22.4", ] +[[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + [[package]] name = "webrtc" version = "0.6.0" diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index 2f14a5b02a..49a631e641 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -25,7 +25,6 @@ si-scale = "0.2.2" tap = "1.0.1" thiserror = { workspace = true } url = { workspace = true, features = ["serde"] } -tungstenite = { workspace = true, default-features = false } tokio = { workspace = true, features = ["macros"] } time = { workspace = true } zeroize = { workspace = true } @@ -74,8 +73,17 @@ workspace = true features = ["time"] [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite] -version = "0.20.1" -features = ["rustls-tls-native-roots"] +workspace = true +features = ["rustls-tls-webpki-roots"] + +[target."cfg(not(target_arch = \"wasm32\"))".dependencies.tungstenite] +workspace = true +default-features = true +features = ["rustls-tls-webpki-roots"] + +[target."cfg(target_arch = \"wasm32\")".dependencies.tungstenite] +workspace = true +default-features = false [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures] workspace = true diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index 87902d3d10..b69b8bcea2 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -48,10 +48,7 @@ features = ["net", "sync", "time"] [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite] workspace = true -# the choice of this particular tls feature was arbitrary; -# if you reckon a different one would be more appropriate, feel free to change it -# features = ["native-tls"] -features = ["rustls-tls-native-roots"] +features = ["rustls-tls-webpki-roots"] # wasm-only dependencies [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen] diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml index 158062138a..2613494080 100644 --- a/common/client-libs/validator-client/Cargo.toml +++ b/common/client-libs/validator-client/Cargo.toml @@ -24,7 +24,6 @@ nym-group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contr nym-service-provider-directory-common = { path = "../../cosmwasm-smart-contracts/service-provider-directory" } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -reqwest = { workspace = true, features = ["json"] } nym-http-api-client = { path = "../../../common/http-api-client"} thiserror = { workspace = true } log = { workspace = true } @@ -67,6 +66,14 @@ cosmwasm-std = { workspace = true } workspace = true features = ["tokio"] +[target."cfg(target_arch = \"wasm32\")".dependencies.reqwest] +workspace = true +features = ["json"] + +[target."cfg(not(target_arch = \"wasm32\"))".dependencies.reqwest] +workspace = true +features = ["json", "rustls-tls"] + [dev-dependencies] bip39 = { workspace = true } cosmrs = { workspace = true, features = ["bip32"] }