solana: update to 1.18.15 (#354)

rpcpool · Jun 2, 2024 · 2f6a8cb · 2f6a8cb
1 parent f7e2f5c
commit 2f6a8cb
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 53 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libsasl2-dev
+          sudo apt-get install -y libsasl2-dev protobuf-compiler
 
       - name: Check Solana version
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,11 +12,25 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 ### Fixes
 
+### Features
+
+### Breaking
+
+## 2024-06-02
+
+- yellowstone-grpc-client-1.15.0+solana.1.18.15
+- yellowstone-grpc-geyser-1.14.2+solana.1.18.15
+- yellowstone-grpc-proto-1.14.0+solana.1.18.15
+- yellowstone-grpc-tools-1.0.0-rc.11+solana.1.18.15
+
+### Fixes
+
 - geyser: fix getLatestBlockhash unary method ([#349](https://github.com/rpcpool/yellowstone-grpc/pull/349))
 
 ### Features
 
-### Breaking
+- geyser: add optional x_token check in grpc server ([#345](https://github.com/rpcpool/yellowstone-grpc/pull/345))
+- solana: update to 1.18.15 ([#354](https://github.com/rpcpool/yellowstone-grpc/pull/354))
 
 ## 2024-05-21
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-    "examples/rust", # 1.13.0+solana.1.18.14
-    "yellowstone-grpc-client", # 1.15.0+solana.1.18.14
-    "yellowstone-grpc-geyser", # 1.14.2+solana.1.18.14
-    "yellowstone-grpc-proto", # 1.14.0+solana.1.18.14
-    "yellowstone-grpc-tools", # 1.0.0-rc.11+solana.1.18.14
+    "examples/rust", # 1.13.0+solana.1.18.15
+    "yellowstone-grpc-client", # 1.15.0+solana.1.18.15
+    "yellowstone-grpc-geyser", # 1.14.2+solana.1.18.15
+    "yellowstone-grpc-proto", # 1.14.0+solana.1.18.15
+    "yellowstone-grpc-tools", # 1.0.0-rc.11+solana.1.18.15
 ]
 
 [workspace.package]
@@ -56,11 +56,11 @@ serde_json = "1.0.86"
 serde_with = "3.7.0"
 serde_yaml = "0.9.25"
 sha2 = "0.10.7"
-solana-account-decoder = "=1.18.14"
-solana-geyser-plugin-interface = "=1.18.14"
-solana-logger = "=1.18.14"
-solana-sdk = "=1.18.14"
-solana-transaction-status = "=1.18.14"
+solana-account-decoder = "=1.18.15"
+solana-geyser-plugin-interface = "=1.18.15"
+solana-logger = "=1.18.15"
+solana-sdk = "=1.18.15"
+solana-transaction-status = "=1.18.15"
 spl-token-2022 = "0.9.0"
 thiserror = "1.0"
 tokio = "1.21.2"
@@ -72,8 +72,8 @@ tracing = "0.1.37"
 tracing-subscriber = "0.3.17"
 uuid = "1.8.0"
 vergen = "8.2.1"
-yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0+solana.1.18.14" }
-yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.14" }
+yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0+solana.1.18.15" }
+yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.15" }
 
 [profile.release]
 debug = true

diff --git a/yellowstone-grpc-client/Cargo.toml b/yellowstone-grpc-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-client"
-version = "1.15.0+solana.1.18.14"
+version = "1.15.0+solana.1.18.15"
 authors = { workspace = true }
 edition = { workspace = true }
 description = "Yellowstone gRPC Geyser Simple Client"

diff --git a/yellowstone-grpc-geyser/Cargo.toml b/yellowstone-grpc-geyser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-geyser"
-version = "1.14.2+solana.1.18.14"
+version = "1.14.2+solana.1.18.15"
 authors = { workspace = true }
 edition = { workspace = true }
 description = "Yellowstone gRPC Geyser Plugin"

diff --git a/yellowstone-grpc-geyser/src/grpc.rs b/yellowstone-grpc-geyser/src/grpc.rs
@@ -776,8 +776,9 @@ impl GrpcService {
 
         // Create Server
         let max_decoding_message_size = config.max_decoding_message_size;
+        let x_token = XTokenChecker::new(config.x_token.clone());
         let service = GeyserServer::new(Self {
-            config: config.clone(),
+            config,
             blocks_meta,
             subscribe_id: AtomicUsize::new(0),
             snapshot_rx: Mutex::new(snapshot_rx),
@@ -787,7 +788,7 @@ impl GrpcService {
         .accept_compressed(CompressionEncoding::Gzip)
         .send_compressed(CompressionEncoding::Gzip)
         .max_decoding_message_size(max_decoding_message_size);
-        let service = InterceptedService::new(service, XTokenChecker::new(config.x_token));
+        let service = InterceptedService::new(service, x_token);
 
         // Run geyser message loop
         let (messages_tx, messages_rx) = mpsc::unbounded_channel();
@@ -1479,7 +1480,7 @@ impl Interceptor for XTokenChecker {
     fn call(&mut self, req: Request<()>) -> Result<Request<()>, Status> {
         if let Some(x_token) = &self.x_token {
             match req.metadata().get("x-token") {
-                Some(t) if x_token == t => Ok(req),
+                Some(token) if x_token == token => Ok(req),
                 _ => Err(Status::unauthenticated("No valid auth token")),
             }
         } else {

diff --git a/yellowstone-grpc-proto/Cargo.toml b/yellowstone-grpc-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-proto"
-version = "1.14.0+solana.1.18.14"
+version = "1.14.0+solana.1.18.15"
 authors = { workspace = true }
 edition = { workspace = true }
 description = "Yellowstone gRPC Geyser Protobuf Definitions"

diff --git a/yellowstone-grpc-tools/Cargo.toml b/yellowstone-grpc-tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-tools"
-version = "1.0.0-rc.11+solana.1.18.14"
+version = "1.0.0-rc.11+solana.1.18.15"
 authors = { workspace = true }
 edition = { workspace = true }
 description = "Yellowstone gRPC Tools"