diff --git a/Cargo.lock b/Cargo.lock index 964bcc2857..af7121baa3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3566,34 +3566,16 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quinn" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7542006acd6e057ff632307d219954c44048f818898da03113d6c0086bfddd9" +checksum = "21afdc492bf2a8688cb386be6605d1163b6ace89afa5e3b529037d2b4334b860" dependencies = [ "bytes", "futures-channel", "futures-util", "fxhash", - "quinn-proto 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quinn-udp 0.1.0", - "rustls 0.20.6", - "thiserror", - "tokio", - "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn" -version = "0.8.3" -source = "git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd#37c19743cc881cf71369946d572849d5d2ffc3fd" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", - "quinn-udp 0.1.3", + "quinn-proto", + "quinn-udp", "rustls 0.20.6", "thiserror", "tokio", @@ -3603,28 +3585,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a13a5c0a674c1ce7150c9df7bc4a1e46c2fbbe7c710f56c0dc78b1a810e779e" -dependencies = [ - "bytes", - "fxhash", - "rand 0.8.5", - "ring", - "rustls 0.20.6", - "rustls-native-certs", - "rustls-pemfile 0.2.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn-proto" -version = "0.8.3" -source = "git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd#37c19743cc881cf71369946d572849d5d2ffc3fd" +checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" dependencies = [ "bytes", "fxhash", @@ -3649,20 +3612,7 @@ dependencies = [ "futures-util", "libc", "mio", - "quinn-proto 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "socket2", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.1.3" -source = "git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd#37c19743cc881cf71369946d572849d5d2ffc3fd" -dependencies = [ - "futures-util", - "libc", - "quinn-proto 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", + "quinn-proto", "socket2", "tokio", "tracing", @@ -4997,8 +4947,8 @@ dependencies = [ "jsonrpc-http-server", "lazy_static", "log", - "quinn 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quinn-proto 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", + "quinn", + "quinn-proto", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", @@ -6349,8 +6299,8 @@ dependencies = [ "pem", "percentage", "pkcs8", - "quinn 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", - "quinn-proto 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", + "quinn", + "quinn-proto", "rand 0.7.3", "rcgen", "rustls 0.20.6", diff --git a/client/Cargo.toml b/client/Cargo.toml index 29138707e3..85a0b0fd21 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -27,8 +27,8 @@ itertools = "0.10.2" jsonrpc-core = "18.0.0" lazy_static = "1.4.0" log = "0.4.17" -quinn = "0.8.3" -quinn-proto = "0.8.3" +quinn = "0.8.4" +quinn-proto = "0.8.4" rand = "0.7.0" rand_chacha = "0.2.2" rayon = "1.5.3" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index a33b7c4c0a..0226a14463 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -3289,34 +3289,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7542006acd6e057ff632307d219954c44048f818898da03113d6c0086bfddd9" +checksum = "21afdc492bf2a8688cb386be6605d1163b6ace89afa5e3b529037d2b4334b860" dependencies = [ "bytes", "futures-channel", "futures-util", "fxhash", - "quinn-proto 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quinn-udp 0.1.1", - "rustls 0.20.6", - "thiserror", - "tokio", - "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn" -version = "0.8.3" -source = "git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd#37c19743cc881cf71369946d572849d5d2ffc3fd" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", - "quinn-udp 0.1.3", + "quinn-proto", + "quinn-udp", "rustls 0.20.6", "thiserror", "tokio", @@ -3326,28 +3308,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a13a5c0a674c1ce7150c9df7bc4a1e46c2fbbe7c710f56c0dc78b1a810e779e" -dependencies = [ - "bytes", - "fxhash", - "rand 0.8.5", - "ring", - "rustls 0.20.6", - "rustls-native-certs", - "rustls-pemfile 0.2.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn-proto" -version = "0.8.3" -source = "git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd#37c19743cc881cf71369946d572849d5d2ffc3fd" +checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" dependencies = [ "bytes", "fxhash", @@ -3372,20 +3335,7 @@ dependencies = [ "futures-util", "libc", "mio", - "quinn-proto 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "socket2", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.1.3" -source = "git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd#37c19743cc881cf71369946d572849d5d2ffc3fd" -dependencies = [ - "futures-util", - "libc", - "quinn-proto 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", + "quinn-proto", "socket2", "tokio", "tracing", @@ -4724,8 +4674,8 @@ dependencies = [ "jsonrpc-core", "lazy_static", "log", - "quinn 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quinn-proto 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", + "quinn", + "quinn-proto", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", @@ -5704,8 +5654,8 @@ dependencies = [ "pem", "percentage", "pkcs8", - "quinn 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", - "quinn-proto 0.8.3 (git+https://github.com/quinn-rs/quinn.git?rev=37c19743cc881cf71369946d572849d5d2ffc3fd)", + "quinn", + "quinn-proto", "rand 0.7.3", "rcgen", "rustls 0.20.6", diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml index a3f72ab414..8bc2909620 100644 --- a/streamer/Cargo.toml +++ b/streamer/Cargo.toml @@ -21,8 +21,8 @@ nix = "0.24.2" pem = "1.0.2" percentage = "0.1.0" pkcs8 = { version = "0.8.0", features = ["alloc"] } -quinn = {git = "https://github.com/quinn-rs/quinn.git", rev = "37c19743cc881cf71369946d572849d5d2ffc3fd"} -quinn-proto = {git = "https://github.com/quinn-rs/quinn.git", rev = "37c19743cc881cf71369946d572849d5d2ffc3fd"} +quinn = "0.8.4" +quinn-proto = "0.8.4" rand = "0.7.0" rcgen = "0.9.2"