From 522866b50831167f59e1ff8ca689dfc3ac0b02b9 Mon Sep 17 00:00:00 2001
From: godmodegalactus <godmodegalactus@gmail.com>
Date: Tue, 23 Apr 2024 10:40:51 +0200
Subject: [PATCH] Making blocks and accounts subscription compressed, slot and
 blockinfo uncompressed

---
 Cargo.lock                                 | 13 ++++++-------
 Cargo.toml                                 |  4 ++--
 cluster-endpoints/Cargo.toml               |  2 +-
 cluster-endpoints/src/grpc_multiplex.rs    |  3 +++
 cluster-endpoints/src/grpc_subscription.rs |  1 +
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c41574a..2ada0770 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1793,7 +1793,7 @@ dependencies = [
 [[package]]
 name = "geyser-grpc-connector"
 version = "0.10.6+yellowstone.1.13"
-source = "git+https://github.com/blockworks-foundation/geyser-grpc-connector.git?tag=v0.10.6+yellowstone.1.13+solana.1.17.28#20f29c1e21e1682f124c0a3386cd4a85b1854f01"
+source = "git+https://github.com/blockworks-foundation/geyser-grpc-connector.git?branch=release/solana-v0.17.31+yellowstone.1.13.0_compression#05f110c895bf26477d9b4d33c86a58a344eded0b"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -1807,6 +1807,7 @@ dependencies = [
  "merge-streams",
  "solana-sdk",
  "tokio",
+ "tonic",
  "tonic-health",
  "tracing",
  "url",
@@ -6814,9 +6815,8 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-client"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4f6d836d214cb8789002d039412da354049e9ffe983c643ec492c4d934698f"
+version = "1.14.0+solana.1.17.31"
+source = "git+https://github.com/blockworks-foundation/yellowstone-grpc.git?branch=v1.13.0+solana.1.17.31#9010786cb5e95b679356fb8d2440d5ab86ef21ec"
 dependencies = [
  "bytes",
  "futures",
@@ -6829,9 +6829,8 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-proto"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c00b66d40d85c405f14b420d7674e98c70d06f6b673f36c9e0285f81b9b797d"
+version = "1.13.0+solana.1.17.31"
+source = "git+https://github.com/blockworks-foundation/yellowstone-grpc.git?branch=v1.13.0+solana.1.17.31#9010786cb5e95b679356fb8d2440d5ab86ef21ec"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index 0e4d9aa7..635fb43b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,9 +87,9 @@ solana-lite-rpc-accounts = {path = "accounts", version = "0.2.4"}
 solana-lite-rpc-accounts-on-demand = {path = "accounts-on-demand", version = "0.2.4"}
 bench = { path = "bench", version="0.2.4" }
 
-yellowstone-grpc-proto = "1.13.0"
+yellowstone-grpc-proto = { git = "https://github.com/blockworks-foundation/yellowstone-grpc.git", branch = "v1.13.0+solana.1.17.31" }
 #geyser-grpc-connector = { path = "../../geyser-grpc-connector" }
-geyser-grpc-connector = { tag = "v0.10.6+yellowstone.1.13+solana.1.17.28", git = "https://github.com/blockworks-foundation/geyser-grpc-connector.git" }
+geyser-grpc-connector = { branch = "release/solana-v0.17.31+yellowstone.1.13.0_compression", git = "https://github.com/blockworks-foundation/geyser-grpc-connector.git" }
 
 
 async-trait = "0.1.68"
diff --git a/cluster-endpoints/Cargo.toml b/cluster-endpoints/Cargo.toml
index cbf6e6f5..a4e2fe2d 100644
--- a/cluster-endpoints/Cargo.toml
+++ b/cluster-endpoints/Cargo.toml
@@ -47,4 +47,4 @@ prometheus = { workspace = true }
 lazy_static = { workspace = true }
 tonic-health = { workspace = true }
 tonic = {workspace = true}
-yellowstone-grpc-client = "1.13.0"
\ No newline at end of file
+yellowstone-grpc-client = { git = "https://github.com/blockworks-foundation/yellowstone-grpc.git", branch = "v1.13.0+solana.1.17.31" }
\ No newline at end of file
diff --git a/cluster-endpoints/src/grpc_multiplex.rs b/cluster-endpoints/src/grpc_multiplex.rs
index 2d0f05f3..fde65890 100644
--- a/cluster-endpoints/src/grpc_multiplex.rs
+++ b/cluster-endpoints/src/grpc_multiplex.rs
@@ -42,6 +42,7 @@ fn create_grpc_multiplex_processed_block_task(
             GeyserFilter(COMMITMENT_CONFIG).blocks_and_txs(),
             autoconnect_tx.clone(),
             exit_notify.resubscribe(),
+            true,
         );
         tasks.push(task);
     }
@@ -145,6 +146,7 @@ fn create_grpc_multiplex_block_info_task(
             GeyserFilter(commitment_config).blocks_meta(),
             autoconnect_tx.clone(),
             exit_notify.resubscribe(),
+            false,
         );
         tasks.push(task);
     }
@@ -494,6 +496,7 @@ pub fn create_grpc_multiplex_processed_slots_subscription(
                         GeyserFilter(COMMITMENT_CONFIG).slots(),
                         autoconnect_tx.clone(),
                         exit_notify.resubscribe(),
+                        false,
                     )
                 })
                 .collect_vec();
diff --git a/cluster-endpoints/src/grpc_subscription.rs b/cluster-endpoints/src/grpc_subscription.rs
index 6343f24f..817c5d27 100644
--- a/cluster-endpoints/src/grpc_subscription.rs
+++ b/cluster-endpoints/src/grpc_subscription.rs
@@ -302,6 +302,7 @@ pub fn create_block_processing_task(
                     conn_window: Some(5242880),
                     stream_window: Some(4194304),
                 },
+                true,
             )
             .await?;
             let mut stream = tokio::select! {