geyser: update deps, tokio=1.32.0 (#191)

CHANGELOG.md

@@ -12,8 +12,21 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 ### Features
 
+### Fixes
+
+### Breaking
+
+## 2023-10-03
+
+- yellowstone-grpc-client-1.11.0+solana.1.16.14
+- yellowstone-grpc-geyser-1.9.0+solana.1.16.14
+- yellowstone-grpc-proto-1.10.0+solana.1.16.14
+
+### Features
+
 - proto: add mod `convert_to`, `convert_from` ([#190](https://github.com/rpcpool/yellowstone-grpc/pull/190)).
 - client: add tx pretty print to rust ([#189](https://github.com/rpcpool/yellowstone-grpc/pull/189)).
+- geyser: update deps, tokio=1.32.0 ([#191](https://github.com/rpcpool/yellowstone-grpc/pull/191)).
 
 ### Fixes
 

examples/rust/Cargo.toml

@@ -23,6 +23,6 @@ maplit = "1.0.2"
 serde_json = "1.0.86"
 solana-sdk = "=1.16.14"
 solana-transaction-status = "=1.16.14"
-tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "time"] }
 yellowstone-grpc-client = { path = "../../yellowstone-grpc-client" }
 yellowstone-grpc-proto = { path = "../../yellowstone-grpc-proto" }

examples/rust/src/bin/tx-blocktime.rs

@@ -126,7 +126,7 @@ async fn main() -> anyhow::Result<()> {
                     Some(UpdateOneof::BlockMeta(block)) => {
                         let entry = messages.entry(block.slot).or_default();
                         entry.0 = block.block_time.map(|obj| {
-                            DateTime::from_utc(
+                            DateTime::from_naive_utc_and_offset(
                                 NaiveDateTime::from_timestamp_opt(obj.timestamp, 0).unwrap(),
                                 Utc,
                             )

yellowstone-grpc-client/Cargo.toml

@@ -14,9 +14,9 @@ bytes = "1.3.0"
 futures = "0.3.24"
 http = "0.2.8"
 thiserror = "1.0"
-tonic = { version = "0.9.2", features = ["gzip", "tls", "tls-roots"] }
+tonic = { version = "0.10.2", features = ["gzip", "tls", "tls-roots"] }
-tonic-health = "0.9.2"
+tonic-health = "0.10.2"
 yellowstone-grpc-proto = { path = "../yellowstone-grpc-proto", version = "1.10.0+solana.1.16.14" }
 
 [dev-dependencies]
-tokio = { version = "1.21.2", features = ["macros"] }
+tokio = { version = "1.32.0", features = ["macros"] }

yellowstone-grpc-geyser/Cargo.toml

@@ -17,7 +17,7 @@ anyhow = "1.0.62"
 base64 = "0.21.0"
 bincode = "1.3.3"
 bs58 = "0.4.0"
-clap = { version = "4.3.0", features = ["cargo", "derive"] }
+clap = { version = "4.3.24", features = ["cargo", "derive"] }
 futures = "0.3.24"
 hyper = { version = "0.14.20", features = ["server"] }
 lazy_static = "1.4.0"
@@ -29,11 +29,11 @@ solana-geyser-plugin-interface = "=1.16.14"
 solana-logger = "=1.16.14"
 solana-sdk = "=1.16.14"
 solana-transaction-status = "=1.16.14"
-spl-token-2022 = "0.7.0"
+spl-token-2022 = "0.9.0"
-tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros", "time", "fs"] }
+tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "time", "fs"] }
 tokio-stream = "0.1.11"
-tonic = { version = "0.9.2", features = ["gzip", "tls", "tls-roots"] }
+tonic = { version = "0.10.2", features = ["gzip", "tls", "tls-roots"] }
-tonic-health = "0.9.2"
+tonic-health = "0.10.2"
 yellowstone-grpc-proto = { path = "../yellowstone-grpc-proto" }
 
 [build-dependencies]

yellowstone-grpc-geyser/src/filters.rs

@@ -57,8 +57,9 @@ impl Filter {
 
     fn decode_commitment(commitment: Option<i32>) -> anyhow::Result<CommitmentLevel> {
         let commitment = commitment.unwrap_or(CommitmentLevel::Processed as i32);
-        CommitmentLevel::from_i32(commitment)
+        CommitmentLevel::try_from(commitment).map_err(|_error| {
-            .ok_or_else(|| anyhow::anyhow!("failed to create CommitmentLevel from {commitment:?}"))
+            anyhow::anyhow!("failed to create CommitmentLevel from {commitment:?}")
+        })
     }
 
     fn decode_pubkeys<T: FromIterator<Pubkey>>(

yellowstone-grpc-geyser/src/grpc.rs

@@ -559,7 +559,7 @@ impl BlockMetaStorage {
 
     fn parse_commitment(commitment: Option<i32>) -> Result<CommitmentLevel, Status> {
         let commitment = commitment.unwrap_or(CommitmentLevel::Processed as i32);
-        CommitmentLevel::from_i32(commitment).ok_or_else(|| {
+        CommitmentLevel::try_from(commitment).map_err(|_error| {
             let msg = format!("failed to create CommitmentLevel from {commitment:?}");
             Status::unknown(msg)
         })

yellowstone-grpc-kafka/Cargo.toml

@@ -22,7 +22,7 @@ serde_json = "1.0.86"
 sha2 = "0.10.7"
 tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros", "time", "fs", "signal"] }
 tokio-stream = "0.1.11"
-tonic = { version = "0.9.2", features = ["gzip", "tls", "tls-roots"] }
+tonic = { version = "0.10.2", features = ["gzip", "tls", "tls-roots"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 yellowstone-grpc-proto = { path = "../yellowstone-grpc-proto" }

yellowstone-grpc-proto/Cargo.toml

@@ -11,13 +11,13 @@ keywords = ["solana"]
 
 [dependencies]
 bincode = "1.3.3"
-prost = "0.11.9"
+prost = "0.12.1"
 solana-account-decoder = "=1.16.14"
 solana-sdk = "=1.16.14"
 solana-transaction-status = "=1.16.14"
-tonic = "0.9.2"
+tonic = "0.10.2"
 
 [build-dependencies]
 anyhow = "1.0.62"
 protobuf-src = "1.1.0"
-tonic-build = "0.9.2"
+tonic-build = "0.10.2"

yellowstone-grpc-proto/src/lib.rs

@@ -498,7 +498,7 @@ pub mod convert_from {
             lamports: reward.lamports,
             post_balance: reward.post_balance,
             reward_type: match ensure_some(
-                proto::RewardType::from_i32(reward.reward_type),
+                proto::RewardType::try_from(reward.reward_type).ok(),
                 "failed to parse reward_type",
             )? {
                 proto::RewardType::Unspecified => None,