From 9d2232306e497687de6f90bd7615748005c2b708 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 01:39:55 -0700 Subject: [PATCH] chore: bump tungstenite from 0.16.0 to 0.17.2 (#23268) * chore: bump tungstenite from 0.16.0 to 0.17.2 Bumps [tungstenite](https://github.com/snapview/tungstenite-rs) from 0.16.0 to 0.17.2. - [Release notes](https://github.com/snapview/tungstenite-rs/releases) - [Changelog](https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/snapview/tungstenite-rs/compare/v0.16.0...v0.17.2) --- updated-dependencies: - dependency-name: tungstenite dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump tokio-tungstenite in tandem Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tyera Eulberg --- Cargo.lock | 21 +++++++++++---- client/Cargo.toml | 4 +-- client/src/nonblocking/pubsub_client.rs | 1 + programs/bpf/Cargo.lock | 35 +++++++++---------------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38fd0ee998..302a1a1bb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4349,6 +4349,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.1", +] + [[package]] name = "sha1" version = "0.6.0" @@ -7139,9 +7150,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80b39df6afcc12cdf752398ade96a6b9e99c903dfdc36e53ad10b9c366bca72" +checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" dependencies = [ "futures-util", "log 0.4.14", @@ -7341,9 +7352,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.16.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" +checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" dependencies = [ "base64 0.13.0", "byteorder", @@ -7353,7 +7364,7 @@ dependencies = [ "log 0.4.14", "rand 0.8.4", "rustls 0.20.2", - "sha-1 0.9.8", + "sha-1 0.10.0", "thiserror", "url 2.2.2", "utf-8", diff --git a/client/Cargo.toml b/client/Cargo.toml index ce3937a26c..44dc46c593 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -38,8 +38,8 @@ solana-vote-program = { path = "../programs/vote", version = "=1.10.0" } thiserror = "1.0" tokio = { version = "1", features = ["full"] } tokio-stream = "0.1.8" -tokio-tungstenite = { version = "0.16.0", features = ["rustls-tls-webpki-roots"] } -tungstenite = { version = "0.16.0", features = ["rustls-tls-webpki-roots"] } +tokio-tungstenite = { version = "0.17.1", features = ["rustls-tls-webpki-roots"] } +tungstenite = { version = "0.17.2", features = ["rustls-tls-webpki-roots"] } url = "2.2.2" [dev-dependencies] diff --git a/client/src/nonblocking/pubsub_client.rs b/client/src/nonblocking/pubsub_client.rs index 9a0dcf57b6..56a7817153 100644 --- a/client/src/nonblocking/pubsub_client.rs +++ b/client/src/nonblocking/pubsub_client.rs @@ -238,6 +238,7 @@ impl PubsubClient { }, Message::Pong(_data) => continue, Message::Close(_frame) => break, + Message::Frame(_frame) => continue, }; diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index ad7fbee293..f635d4a683 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -44,7 +44,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.2.1", + "cpufeatures", "opaque-debug", ] @@ -527,15 +527,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "cpufeatures" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8" -dependencies = [ - "libc", -] - [[package]] name = "cpufeatures" version = "0.2.1" @@ -1999,7 +1990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures", "opaque-debug", "universal-hash", ] @@ -2525,15 +2516,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ - "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.1.4", - "digest 0.9.0", - "opaque-debug", + "cpufeatures", + "digest 0.10.1", ] [[package]] @@ -2544,7 +2533,7 @@ checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures", "digest 0.9.0", "opaque-debug", ] @@ -2556,7 +2545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures", "digest 0.10.1", ] @@ -4153,9 +4142,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80b39df6afcc12cdf752398ade96a6b9e99c903dfdc36e53ad10b9c366bca72" +checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" dependencies = [ "futures-util", "log", @@ -4261,9 +4250,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "tungstenite" -version = "0.16.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" +checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" dependencies = [ "base64 0.13.0", "byteorder 1.4.3",