diff --git a/Cargo.lock b/Cargo.lock index 83e6527545..06145df3e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2920,7 +2920,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite 0.18.0", + "tokio-tungstenite", "tokio-util", "toml 0.7.6", "unsigned-varint", @@ -4175,15 +4175,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "input_buffer" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" -dependencies = [ - "bytes", -] - [[package]] name = "instant" version = "0.1.12" @@ -6243,7 +6234,7 @@ dependencies = [ "tap", "thiserror", "tokio", - "tokio-tungstenite 0.14.0", + "tokio-tungstenite", "url", ] @@ -6286,8 +6277,8 @@ dependencies = [ "time 0.3.25", "tokio", "tokio-stream", - "tokio-tungstenite 0.14.0", - "tungstenite 0.13.0", + "tokio-tungstenite", + "tungstenite", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -6587,7 +6578,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite 0.14.0", + "tokio-tungstenite", "tokio-util", "url", "zeroize", @@ -6616,8 +6607,8 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite 0.14.0", - "tungstenite 0.13.0", + "tokio-tungstenite", + "tungstenite", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -6642,7 +6633,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tungstenite 0.13.0", + "tungstenite", "zeroize", ] @@ -6875,7 +6866,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "tokio-tungstenite 0.17.2", + "tokio-tungstenite", "url", ] @@ -9722,17 +9713,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha1" version = "0.10.5" @@ -9969,7 +9949,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "sha-1 0.9.8", + "sha-1", ] [[package]] @@ -10829,46 +10809,21 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.14.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e96bb520beab540ab664bd5a9cfeaa1fcd846fa68c830b42e2c8963071251d2" -dependencies = [ - "futures-util", - "log", - "pin-project", - "tokio", - "tungstenite 0.13.0", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.17.3", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.18.0", + "tungstenite", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -11255,52 +11210,13 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.13.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "input_buffer", - "log", - "rand 0.8.5", - "sha-1 0.9.8", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.10.1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" -dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", @@ -11856,7 +11772,7 @@ dependencies = [ "gloo-net", "gloo-utils", "js-sys", - "tungstenite 0.13.0", + "tungstenite", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -12114,7 +12030,7 @@ dependencies = [ "log", "rtcp", "rtp", - "sha-1 0.9.8", + "sha-1", "subtle 2.4.1", "thiserror", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 886b9a70f3..96014d8f6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -164,6 +164,8 @@ tap = "1.0.1" tendermint-rpc = "0.32" # same version as used by cosmrs thiserror = "1.0.38" tokio = "1.24.1" +tokio-tungstenite = "0.20.1" +tungstenite = { version = "0.20.1", default-features = false } ts-rs = "7.0.0" url = "2.4" zeroize = "1.6.0" diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 8e025c7e09..57df3570b3 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -30,8 +30,8 @@ serde = { workspace = true, features = ["derive"] } # for config serialization/d serde_json = { workspace = true } thiserror = { workspace = true } tap = "1.0.1" -tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] } # async runtime -tokio-tungstenite = "0.14" # websocket +tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } # async runtime +tokio-tungstenite = { workspace = true } ## internal nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index a98eb783ab..cd17b7e979 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -24,7 +24,7 @@ sha2 = "0.10.6" tap = "1.0.1" thiserror = { workspace = true } url = { workspace = true, features = ["serde"] } -tungstenite = { version = "0.13.0", default-features = false } +tungstenite = { workspace = true, default-features = false } tokio = { workspace = true, features = ["macros"]} time = "0.3.17" zeroize = { workspace = true } @@ -54,7 +54,7 @@ workspace = true features = ["time"] [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite] -version = "0.14" +version = "0.20.1" [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx] version = "0.6.2" diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index f859b648d2..0840d5882f 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -31,7 +31,7 @@ serde = { workspace = true, features = ["derive"] } [dependencies.tungstenite] -version = "0.13" +workspace = true default-features = false # non-wasm-only dependencies @@ -44,7 +44,7 @@ version = "0.1.11" features = ["net", "sync", "time"] [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite] -version = "0.14" +workspace = true # wasm-only dependencies [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen] diff --git a/common/wasm/utils/Cargo.toml b/common/wasm/utils/Cargo.toml index ac4d1da56a..5d95fe8082 100644 --- a/common/wasm/utils/Cargo.toml +++ b/common/wasm/utils/Cargo.toml @@ -18,7 +18,7 @@ gloo-net = { version = "0.3.1", features = ["websocket"], optional = true } # we don't want entire tokio-tungstenite, tungstenite itself is just fine - we just want message and error enums [dependencies.tungstenite] -version = "0.13" +workspace = true default-features = false optional = true diff --git a/ephemera/Cargo.toml b/ephemera/Cargo.toml index 50743df2fe..95cd7daab2 100644 --- a/ephemera/Cargo.toml +++ b/ephemera/Cargo.toml @@ -44,7 +44,7 @@ serde_derive = "1.0.149" serde_json = "1.0.91" thiserror = "1.0.37" tokio = { version = "1", features = ["macros", "net","rt-multi-thread"] } -tokio-tungstenite = "0.18.0" +tokio-tungstenite = { workspace = true } tokio-util = { version = "0.7.4", features = ["full"] } toml = "0.7.0" unsigned-varint = "0.7.1" diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 1dd1531099..d4f0930d3d 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -39,7 +39,7 @@ subtle-encoding = { version = "0.5", features = ["bech32-preview"] } thiserror = "1" tokio = { workspace = true, features = [ "rt-multi-thread", "net", "signal", "fs", "time" ] } tokio-stream = { version = "0.1.11", features = ["fs"] } -tokio-tungstenite = "0.14" +tokio-tungstenite = { version = "0.20.1" } tokio-util = { version = "0.7.4", features = ["codec"] } url = { version = "2.2", features = ["serde"] } zeroize = { workspace = true } diff --git a/gateway/gateway-requests/Cargo.toml b/gateway/gateway-requests/Cargo.toml index dcd8ad3743..df6c59414a 100644 --- a/gateway/gateway-requests/Cargo.toml +++ b/gateway/gateway-requests/Cargo.toml @@ -28,6 +28,6 @@ nym-coconut-interface = { path = "../../common/coconut-interface" } nym-credentials = { path = "../../common/credentials" } [dependencies.tungstenite] -version = "0.13.0" +workspace = true default-features = false diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 7e63ac74c1..0cd084f931 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -34,8 +34,8 @@ serde_json = { workspace = true } sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "chrono"]} tap = { workspace = true } thiserror = "1.0" -tokio = { version = "1.24.1", features = [ "net", "rt-multi-thread", "macros" ] } -tokio-tungstenite = "0.17.2" +tokio = { workspace = true, features = [ "net", "rt-multi-thread", "macros" ] } +tokio-tungstenite = { workspace = true } url = { workspace = true } # internal