diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40f91465..6ad9c958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,17 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 ## 2024-03-04
 
+- yellowstone-grpc-client-1.14.0+solana.1.18.4
+- yellowstone-grpc-geyser-1.13.0+solana.1.18.4
+- yellowstone-grpc-proto-1.13.0+solana.1.18.4
+- yellowstone-grpc-tools-1.0.0-rc.10+solana.1.18.4
+
+### Features
+
+- solana: update to 1.18.4 ([#293](https://github.com/rpcpool/yellowstone-grpc/pull/293))
+
+## 2024-03-04
+
 - yellowstone-grpc-client-1.14.0+solana.1.17.22
 - yellowstone-grpc-geyser-1.13.0+solana.1.17.22
 - yellowstone-grpc-proto-1.13.0+solana.1.17.22
@@ -40,6 +51,17 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 - tools: add metrics, new config for google-pubsub ([#280](https://github.com/rpcpool/yellowstone-grpc/pull/280))
 
+## 2024-02-27
+
+- yellowstone-grpc-client-1.13.0+solana.1.18.3
+- yellowstone-grpc-geyser-1.12.0+solana.1.18.3
+- yellowstone-grpc-proto-1.12.0+solana.1.18.3
+- yellowstone-grpc-tools-1.0.0-rc.9+solana.1.18.3
+
+### Features
+
+- solana: update to 1.18.3
+
 ## 2024-02-06
 
 - yellowstone-grpc-client-1.13.0+solana.1.17.20
@@ -47,6 +69,10 @@ The minor version will be incremented upon a breaking change and the patch versi
 - yellowstone-grpc-proto-1.12.0+solana.1.17.20
 - yellowstone-grpc-tools-1.0.0-rc.9+solana.1.17.20
 
+### Features
+
+- solana: update to 1.17.20
+
 ## 2024-01-26
 
 - yellowstone-grpc-client-1.13.0+solana.1.17.18
diff --git a/Cargo.lock b/Cargo.lock
index 5124d5ed..3f451ae0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,7 +81,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.12",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -583,6 +582,16 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667"
+dependencies = [
+ "borsh-derive 1.3.1",
+ "cfg_aliases",
+]
+
 [[package]]
 name = "borsh-derive"
 version = "0.9.3"
@@ -609,6 +618,20 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "borsh-derive"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+ "syn_derive",
+]
+
 [[package]]
 name = "borsh-derive-internal"
 version = "0.9.3"
@@ -756,6 +779,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "chrono"
 version = "0.4.34"
@@ -2713,6 +2742,29 @@ dependencies = [
  "toml_edit 0.21.1",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.78"
@@ -3529,6 +3581,12 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
 [[package]]
 name = "sized-chunks"
 version = "0.6.5"
@@ -3566,9 +3624,9 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b156055847d132a22dbf639433fde5af6e7cd1bf97dcb677af6fe60a897c09c9"
+checksum = "e769cfd7410944d41208631c6c69f8d7a8fa92cc5af85593ce7c6984375c6335"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -3591,9 +3649,9 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6672519beb874283076e34caa08cd3bf6557496b951a34efdfc10b328a72925e"
+checksum = "7d61ec5e55f26061a56fd4bf6484c5fa1a9a8a3d3b2188b4983369df2a564a70"
 dependencies = [
  "bincode",
  "chrono",
@@ -3605,17 +3663,13 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9ac7bbff73e7f0e42f2453c2a514c1f7e1976617e655c5eea4c8d4f74d01d6"
+checksum = "0e608aeeb42922e803589258af0028e2c9e70fbfb04e1f1ff6c5f07019c2af95"
 dependencies = [
- "ahash 0.8.5",
- "blake3",
  "block-buffer 0.10.4",
  "bs58",
  "bv",
- "byteorder",
- "cc",
  "either",
  "generic-array",
  "im",
@@ -3626,7 +3680,6 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "serde_json",
  "sha2 0.10.8",
  "solana-frozen-abi-macro",
  "subtle",
@@ -3635,9 +3688,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d6a65acf04814029dc7d8f34bf4d3e264183d1d0f2af528a6d28ce3343a22fd"
+checksum = "1cc7a55ad8a177287f3abb1be371b2a252d4c474d71c2e3983a7dff7db15d3f2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3647,9 +3700,9 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-interface"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c4ba7d383ed4ca7578957d1b7c63e81f8234184a6d7c322f6728f62de9962"
+checksum = "861fa1a95c06cc89b3657ee1aed273dcf39039607f31b5b937326f5352d3dfcc"
 dependencies = [
  "log",
  "solana-sdk",
@@ -3659,9 +3712,9 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ea479b76e53b869443fd1a46d3d678dfc4a3cdf1e76e777b7871276d4b71d4"
+checksum = "c2f507f00c12d7309475fde8bfc58502ed87bd4024769760223cc9c03dd5aa53"
 dependencies = [
  "env_logger 0.9.3",
  "lazy_static",
@@ -3670,9 +3723,9 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b687234214e00da23702b0e5d7ac7761e712a955170afeb8b51cb38288d628c5"
+checksum = "9671ea55a8613da1fa3bfcbf211cc19881b08097db2a6b6c188579c4bb82c660"
 dependencies = [
  "log",
  "solana-sdk",
@@ -3680,9 +3733,9 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9189752ea7948ca54d22a69263fc76292e9efa2cde34da3802a2cf892d9be7bf"
+checksum = "4f136e251c6eb16898947d6128cd3fbc5aa4b25362f1537cb00e0987123dd495"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -3695,9 +3748,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8038b87341412d9a5dd5fd9a47501a13716bf22bd5f0e091089b2822eaea1e"
+checksum = "91fad730d66a6f33ef5bb180def74a3d84e7487b829a8f67ff58570332481f6c"
 dependencies = [
  "ark-bn254",
  "ark-ec",
@@ -3709,6 +3762,7 @@ dependencies = [
  "blake3",
  "borsh 0.10.3",
  "borsh 0.9.3",
+ "borsh 1.3.1",
  "bs58",
  "bv",
  "bytemuck",
@@ -3726,7 +3780,7 @@ dependencies = [
  "log",
  "memoffset",
  "num-bigint 0.4.4",
- "num-derive 0.3.3",
+ "num-derive 0.4.2",
  "num-traits",
  "parking_lot",
  "rand 0.8.5",
@@ -3749,9 +3803,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665fa881356492633725990cbcd3a47234edd63f57959951ece072d77c79f32"
+checksum = "7ea72e967256cbeb1279b7e83bdee17fa9ff641676dde07e34a98842d1d9562d"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -3760,7 +3814,7 @@ dependencies = [
  "itertools 0.10.5",
  "libc",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.2",
  "num-traits",
  "percentage",
  "rand 0.8.5",
@@ -3777,15 +3831,15 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4fa260b2ddae30b9e31574ea81a2b157dba991e3908b544ab9bc4436c19c891"
+checksum = "6d3612d0b4c2120c2a4cef6bac8af469908575319249e1a5c0de5a487fb7610f"
 dependencies = [
  "assert_matches",
  "base64 0.21.7",
  "bincode",
  "bitflags 2.4.2",
- "borsh 0.10.3",
+ "borsh 1.3.1",
  "bs58",
  "bytemuck",
  "byteorder",
@@ -3802,9 +3856,9 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2",
- "num-derive 0.3.3",
+ "num-derive 0.4.2",
  "num-traits",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
  "pbkdf2 0.11.0",
  "qstring",
  "qualifier_attr",
@@ -3819,6 +3873,7 @@ dependencies = [
  "serde_with",
  "sha2 0.10.8",
  "sha3 0.10.8",
+ "siphasher",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
@@ -3831,9 +3886,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "204ed709eac41f4d67417eaacc8c66b0435b0f2b07ec367c15f97a0624fa09ca"
+checksum = "df952c230e35ba179882cef765655b171b8f99f512f04fc4a84800fa43cfe592"
 dependencies = [
  "bs58",
  "proc-macro2",
@@ -3850,9 +3905,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527a268c187be16cd2e769550fdcaae84ac86d361544a9bf7dc9f968a54221b8"
+checksum = "7e7fed91baf079b21ea8b9a70ab61910f2a539e6d08740f0f6f6c1f90784472b"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -3875,9 +3930,9 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.17.22"
+version = "1.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535c3af389866ddaac91a28df6bb351dcf3b73d489ee7f982e043ef10232877a"
+checksum = "cdd13a3e898ab98d3a3cb781935f2d0298ba85d11d589b82be5537d6498bf42d"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.21.7",
@@ -3889,7 +3944,7 @@ dependencies = [
  "itertools 0.10.5",
  "lazy_static",
  "merlin",
- "num-derive 0.3.3",
+ "num-derive 0.4.2",
  "num-traits",
  "rand 0.7.3",
  "serde",
@@ -4226,6 +4281,18 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -5174,7 +5241,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-client"
-version = "1.14.0+solana.1.17.22"
+version = "1.14.0+solana.1.18.4"
 dependencies = [
  "bytes",
  "futures",
@@ -5188,7 +5255,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-client-simple"
-version = "1.12.0+solana.1.17.22"
+version = "1.12.0+solana.1.18.4"
 dependencies = [
  "anyhow",
  "backoff",
@@ -5211,7 +5278,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-geyser"
-version = "1.13.0+solana.1.17.22"
+version = "1.13.0+solana.1.18.4"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -5244,7 +5311,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-proto"
-version = "1.13.0+solana.1.17.22"
+version = "1.13.0+solana.1.18.4"
 dependencies = [
  "anyhow",
  "bincode",
@@ -5259,7 +5326,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-tools"
-version = "1.0.0-rc.10+solana.1.17.22"
+version = "1.0.0-rc.10+solana.1.18.4"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 9a89f265..273545d1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-    "examples/rust", # 1.12.0+solana.1.17.22
-    "yellowstone-grpc-client", # 1.14.0+solana.1.17.22
-    "yellowstone-grpc-geyser", # 1.13.0+solana.1.17.22
-    "yellowstone-grpc-proto", # 1.13.0+solana.1.17.22
-    "yellowstone-grpc-tools", # 1.0.0-rc.10+solana.1.17.22
+    "examples/rust", # 1.12.0+solana.1.18.4
+    "yellowstone-grpc-client", # 1.14.0+solana.1.18.4
+    "yellowstone-grpc-geyser", # 1.13.0+solana.1.18.4
+    "yellowstone-grpc-proto", # 1.13.0+solana.1.18.4
+    "yellowstone-grpc-tools", # 1.0.0-rc.10+solana.1.18.4
 ]
 
 [workspace.package]
@@ -51,11 +51,11 @@ serde = "1.0.145"
 serde_json = "1.0.86"
 serde_yaml = "0.9.25"
 sha2 = "0.10.7"
-solana-account-decoder = "=1.17.22"
-solana-geyser-plugin-interface = "=1.17.22"
-solana-logger = "=1.17.22"
-solana-sdk = "=1.17.22"
-solana-transaction-status = "=1.17.22"
+solana-account-decoder = "=1.18.4"
+solana-geyser-plugin-interface = "=1.18.4"
+solana-logger = "=1.18.4"
+solana-sdk = "=1.18.4"
+solana-transaction-status = "=1.18.4"
 spl-token-2022 = "0.9.0"
 thiserror = "1.0"
 tokio = "1.21.2"
@@ -66,8 +66,8 @@ tonic-health = "0.10.2"
 tracing = "0.1.37"
 tracing-subscriber = "0.3.17"
 vergen = "8.2.1"
-yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.14.0+solana.1.17.22" }
-yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.13.0+solana.1.17.22" }
+yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.14.0+solana.1.18.4" }
+yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.13.0+solana.1.18.4" }
 
 [profile.release]
 debug = true
diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml
index 5aaac90d..9a0be813 100644
--- a/examples/rust/Cargo.toml
+++ b/examples/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-client-simple"
-version = "1.12.0+solana.1.17.22"
+version = "1.12.0+solana.1.18.4"
 authors = { workspace = true }
 edition = { workspace = true }
 homepage = { workspace = true }
diff --git a/examples/rust/src/bin/client.rs b/examples/rust/src/bin/client.rs
index 3d6a8d58..9a088906 100644
--- a/examples/rust/src/bin/client.rs
+++ b/examples/rust/src/bin/client.rs
@@ -5,13 +5,8 @@ use {
     log::{error, info},
     solana_sdk::{pubkey::Pubkey, signature::Signature},
     solana_transaction_status::{EncodedTransactionWithStatusMeta, UiTransactionEncoding},
-    std::{
-        collections::HashMap,
-        env, fmt,
-        fs::File,
-        sync::{Arc, Mutex},
-        time::Duration,
-    },
+    std::{collections::HashMap, env, fmt, fs::File, sync::Arc, time::Duration},
+    tokio::sync::Mutex,
     yellowstone_grpc_client::{GeyserGrpcClient, GeyserGrpcClientError},
     yellowstone_grpc_proto::{
         prelude::{
@@ -446,12 +441,13 @@ async fn main() -> anyhow::Result<()> {
         let zero_attempts = Arc::clone(&zero_attempts);
 
         async move {
-            let mut zero_attempts = zero_attempts.lock().unwrap();
+            let mut zero_attempts = zero_attempts.lock().await;
             if *zero_attempts {
                 *zero_attempts = false;
             } else {
                 info!("Retry to connect to the server");
             }
+            drop(zero_attempts);
 
             let commitment = args.get_commitment();
             let mut client = GeyserGrpcClient::connect_with_timeout(
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 30b679bc..eb84afdf 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.73.0"
+channel = "1.75.0"
 components = ["clippy", "rustfmt"]
 targets = []
 profile = "minimal"
diff --git a/yellowstone-grpc-client/Cargo.toml b/yellowstone-grpc-client/Cargo.toml
index 47b8cb9b..73926edd 100644
--- a/yellowstone-grpc-client/Cargo.toml
+++ b/yellowstone-grpc-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-client"
-version = "1.14.0+solana.1.17.22"
+version = "1.14.0+solana.1.18.4"
 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
index b159b497..af41860e 100644
--- a/yellowstone-grpc-geyser/Cargo.toml
+++ b/yellowstone-grpc-geyser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-geyser"
-version = "1.13.0+solana.1.17.22"
+version = "1.13.0+solana.1.18.4"
 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
index 288451bf..8eec85fa 100644
--- a/yellowstone-grpc-geyser/src/grpc.rs
+++ b/yellowstone-grpc-geyser/src/grpc.rs
@@ -7,7 +7,7 @@ use {
     },
     log::{error, info},
     solana_geyser_plugin_interface::geyser_plugin_interface::{
-        ReplicaAccountInfoV3, ReplicaBlockInfoV3, ReplicaEntryInfo, ReplicaTransactionInfoV2,
+        ReplicaAccountInfoV3, ReplicaBlockInfoV3, ReplicaEntryInfoV2, ReplicaTransactionInfoV2,
         SlotStatus,
     },
     solana_sdk::{
@@ -195,15 +195,18 @@ pub struct MessageEntry {
     pub starting_transaction_index: u64,
 }
 
-impl From<&ReplicaEntryInfo<'_>> for MessageEntry {
-    fn from(entry: &ReplicaEntryInfo) -> Self {
+impl From<&ReplicaEntryInfoV2<'_>> for MessageEntry {
+    fn from(entry: &ReplicaEntryInfoV2) -> Self {
         Self {
             slot: entry.slot,
             index: entry.index,
             num_hashes: entry.num_hashes,
             hash: entry.hash.into(),
             executed_transaction_count: entry.executed_transaction_count,
-            starting_transaction_index: 0,
+            starting_transaction_index: entry
+                .starting_transaction_index
+                .try_into()
+                .expect("failed convert usize to u64"),
         }
     }
 }
@@ -700,6 +703,7 @@ impl GrpcService {
     pub async fn create(
         config: ConfigGrpc,
         block_fail_action: ConfigBlockFailAction,
+        is_reload: bool,
     ) -> Result<
         (
             Option<crossbeam_channel::Sender<Option<Message>>>,
@@ -717,11 +721,11 @@ impl GrpcService {
 
         // Snapshot channel
         let (snapshot_tx, snapshot_rx) = match config.snapshot_plugin_channel_capacity {
-            Some(cap) => {
+            Some(cap) if !is_reload => {
                 let (tx, rx) = crossbeam_channel::bounded(cap);
                 (Some(tx), Some(rx))
             }
-            None => (None, None),
+            _ => (None, None),
         };
 
         // Blocks meta storage
diff --git a/yellowstone-grpc-geyser/src/plugin.rs b/yellowstone-grpc-geyser/src/plugin.rs
index a28c4e1f..0947580a 100644
--- a/yellowstone-grpc-geyser/src/plugin.rs
+++ b/yellowstone-grpc-geyser/src/plugin.rs
@@ -60,7 +60,7 @@ impl GeyserPlugin for Plugin {
         concat!(env!("CARGO_PKG_NAME"), "-", env!("CARGO_PKG_VERSION"))
     }
 
-    fn on_load(&mut self, config_file: &str) -> PluginResult<()> {
+    fn on_load(&mut self, config_file: &str, is_reload: bool) -> PluginResult<()> {
         let config = Config::load_from_file(config_file)?;
 
         // Setup logger
@@ -80,7 +80,7 @@ impl GeyserPlugin for Plugin {
         let (snapshot_channel, grpc_channel, grpc_shutdown, prometheus) =
             runtime.block_on(async move {
                 let (snapshot_channel, grpc_channel, grpc_shutdown) =
-                    GrpcService::create(config.grpc, config.block_fail_action)
+                    GrpcService::create(config.grpc, config.block_fail_action, is_reload)
                         .await
                         .map_err(GeyserPluginError::Custom)?;
                 let prometheus = PrometheusService::new(config.prometheus)
@@ -196,7 +196,10 @@ impl GeyserPlugin for Plugin {
         self.with_inner(|inner| {
             #[allow(clippy::infallible_destructuring_match)]
             let entry = match entry {
-                ReplicaEntryInfoVersions::V0_0_1(entry) => entry,
+                ReplicaEntryInfoVersions::V0_0_1(_entry) => {
+                    unreachable!("ReplicaEntryInfoVersions::V0_0_1 is not supported")
+                }
+                ReplicaEntryInfoVersions::V0_0_2(entry) => entry,
             };
 
             let message = Message::Entry(entry.into());
diff --git a/yellowstone-grpc-proto/Cargo.toml b/yellowstone-grpc-proto/Cargo.toml
index b24838ab..0dd2e816 100644
--- a/yellowstone-grpc-proto/Cargo.toml
+++ b/yellowstone-grpc-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-proto"
-version = "1.13.0+solana.1.17.22"
+version = "1.13.0+solana.1.18.4"
 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
index dac28f3f..fce9f70a 100644
--- 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.10+solana.1.17.22"
+version = "1.0.0-rc.10+solana.1.18.4"
 authors = { workspace = true }
 edition = { workspace = true }
 description = "Yellowstone gRPC Tools"