diff --git a/Cargo.lock b/Cargo.lock index 78d52e59ca..5ee1ba4c07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6881,9 +6881,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "tungstenite" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" +checksum = "983d40747bce878d2fb67d910dcb8bd3eca2b2358540c3cc1b98c027407a3ae3" dependencies = [ "base64 0.13.0", "byteorder", diff --git a/client/Cargo.toml b/client/Cargo.toml index bed0dab715..9fdef9be21 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -34,7 +34,7 @@ solana-version = { path = "../version", version = "=1.8.0" } solana-vote-program = { path = "../programs/vote", version = "=1.8.0" } thiserror = "1.0" tokio = { version = "1", features = ["full"] } -tungstenite = "0.14.0" +tungstenite = "0.15.0" url = "2.2.2" [dev-dependencies] diff --git a/client/src/pubsub_client.rs b/client/src/pubsub_client.rs index d3dd63bcc3..696d8e30ca 100644 --- a/client/src/pubsub_client.rs +++ b/client/src/pubsub_client.rs @@ -17,6 +17,7 @@ use { solana_sdk::signature::Signature, std::{ marker::PhantomData, + net::TcpStream, sync::{ atomic::{AtomicBool, Ordering}, mpsc::{channel, Receiver}, @@ -25,7 +26,7 @@ use { thread::JoinHandle, }, thiserror::Error, - tungstenite::{client::AutoStream, connect, Message, WebSocket}, + tungstenite::{connect, stream::MaybeTlsStream, Message, WebSocket}, url::{ParseError, Url}, }; @@ -50,7 +51,7 @@ where { message_type: PhantomData, operation: &'static str, - socket: Arc>>, + socket: Arc>>>, subscription_id: u64, t_cleanup: Option>, exit: Arc, @@ -76,7 +77,7 @@ where T: DeserializeOwned, { fn send_subscribe( - writable_socket: &Arc>>, + writable_socket: &Arc>>>, body: String, ) -> Result { writable_socket @@ -118,7 +119,7 @@ where } fn read_message( - writable_socket: &Arc>>, + writable_socket: &Arc>>>, ) -> Result { let message = writable_socket.write().unwrap().read_message()?; let message_text = &message.into_text().unwrap(); diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index fdbe8f9d92..0c64d4b7ef 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -3806,9 +3806,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "tungstenite" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" +checksum = "983d40747bce878d2fb67d910dcb8bd3eca2b2358540c3cc1b98c027407a3ae3" dependencies = [ "base64 0.13.0", "byteorder 1.4.3",