update sol deps

Cargo.toml

@@ -26,6 +26,16 @@ crossbeam-channel = "0.5.8"
 futures-util = "0.3.28"
 geyser-grpc-plugin-client = { path = "client" }
 jito-geyser-protos = { path = "proto" }
+
+jito-solana-account-decoder = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-account-decoder" }
+jito-solana-geyser-plugin-interface = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-geyser-plugin-interface" }
+jito-solana-logger = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-logger" }
+jito-solana-metrics = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-metrics" }
+jito-solana-program = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-program" }
+jito-solana-sdk = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-sdk" }
+jito-solana-transaction-status = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-transaction-status" }
+jito-solana-vote-program = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "2a7dcc95483c50172545756685f842124d0d8032", package = "solana-vote-program" }
+
 log = "0.4"
 lru = "0.8" # keep old version due to MSRV of 1.60
 once_cell = "1.17.1"
@@ -35,14 +45,16 @@ rand = "0.8"
 serde = "1.0.160"
 serde_derive = "1.0.160"
 serde_json = "1.0.96"
-solana-account-decoder = "1.16.5"
-solana-geyser-plugin-interface = "1.16.5"
-solana-logger = "1.16.5"
-solana-metrics = "1.16.5"
-solana-program = "1.16.5"
-solana-sdk = "1.16.5"
-solana-transaction-status = "1.16.5"
-solana-vote-program = "1.16.5"
+
+solana-account-decoder = "1.16.14"
+solana-geyser-plugin-interface = "1.16.14"
+solana-logger = "1.16.14"
+solana-metrics = "1.16.14"
+solana-program = "1.16.14"
+solana-sdk = "1.16.14"
+solana-transaction-status = "1.16.14"
+solana-vote-program = "1.16.14"
+
 thiserror = "1.0.40"
 tokio = { version = "~1.14.1", features = ["rt-multi-thread"] }
 tokio-stream = "0.1"

client/Cargo.toml

@@ -7,6 +7,7 @@ edition =  { workspace = true }
 
 [dependencies]
 jito-geyser-protos = { workspace = true }
+jito-solana-sdk = { workspace = true, optional = true }
 log = { workspace = true }
 lru = { workspace = true }
 prost = { workspace = true }
@@ -21,3 +22,6 @@ tonic = { workspace = true, features = ["tls"] }
 
 [build-dependencies]
 tonic-build = { workspace = true }
+
+[features]
+jito-solana = ["jito-solana-sdk"]

client/src/lib.rs

@@ -2,6 +2,12 @@ pub mod geyser_consumer;
 pub mod interceptor;
 pub mod types;
 
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_sdk;
+
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_sdk as solana_sdk;
+
 use std::{
     str::FromStr,
     sync::{atomic::AtomicBool, Arc},

proto/Cargo.toml

@@ -8,6 +8,9 @@ description = "Jito's Solana geyser protobufs and helper libraries"
 
 [dependencies]
 bincode = { workspace = true }
+jito-solana-account-decoder = { workspace = true, optional = true }
+jito-solana-sdk = { workspace = true, optional = true }
+jito-solana-transaction-status = { workspace = true, optional = true }
 prost =  { workspace = true }
 prost-types =  { workspace = true }
 serde =  { workspace = true }
@@ -18,3 +21,6 @@ tonic =  { workspace = true }
 
 [build-dependencies]
 tonic-build =  { workspace = true }
+
+[features]
+jito-solana = ["jito-solana-account-decoder", "jito-solana-sdk", "jito-solana-transaction-status"]

proto/proto/transaction_by_addr.proto

@@ -60,6 +60,7 @@ enum TransactionErrorType {
   MAX_LOADED_ACCOUNTS_DATA_SIZE_EXCEEDED = 32;
   INVALID_LOADED_ACCOUNTS_DATA_SIZE_LIMIT = 33;
   RESANITIZATION_NEEDED = 34;
+  UNBALANCED_TRANSACTION = 36;
 }
 
 message InstructionError {

proto/src/convert.rs

@@ -908,6 +908,9 @@ impl From<TransactionError> for tx_by_addr::TransactionError {
                 }
                 TransactionError::ResanitizationNeeded => {
                     tx_by_addr::TransactionErrorType::ResanitizationNeeded
+                },
+                TransactionError::UnbalancedTransaction => {
+                    tx_by_addr::TransactionErrorType::UnbalancedTransaction
                 }
             } as i32,
             instruction_error: match transaction_error {

proto/src/lib.rs

@@ -13,6 +13,20 @@ use solana_transaction_status::{
     InnerInstructions, Reward, RewardType, TransactionStatusMeta, TransactionTokenBalance,
 };
 
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_account_decoder;
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_sdk;
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_transaction_status;
+
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_account_decoder as solana_account_decoder;
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_sdk as solana_sdk;
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_transaction_status as solana_transaction_status;
+
 pub mod convert;
 
 // NOTE: Jito added

server/Cargo.toml

@@ -12,7 +12,13 @@ crate-type = ["cdylib", "rlib"]
 bs58 = { workspace = true }
 crossbeam-channel = { workspace = true }
 futures-util = { workspace = true }
-jito-geyser-protos = { workspace = true }
+jito-geyser-protos = { workspace = true  }
+jito-solana-geyser-plugin-interface = { workspace = true, optional = true }
+jito-solana-logger = { workspace = true, optional = true }
+jito-solana-metrics = { workspace = true, optional = true }
+jito-solana-program = { workspace = true, optional = true }
+jito-solana-sdk = { workspace = true, optional = true }
+jito-solana-vote-program = { workspace = true, optional = true }
 log = { workspace = true }
 once_cell = { workspace = true }
 prost = { workspace = true }
@@ -38,3 +44,6 @@ tonic-build =  { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+jito-solana = ["jito-solana-geyser-plugin-interface", "jito-solana-logger", "jito-solana-metrics", "jito-solana-program", "jito-solana-sdk", "jito-solana-vote-program"]

server/src/lib.rs

@@ -1,3 +1,29 @@
 pub mod geyser_grpc_plugin;
 pub mod server;
 pub(crate) mod subscription_stream;
+
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_geyser_plugin_interface;
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_logger;
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_metrics;
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_program;
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_sdk;
+#[cfg(not(feature = "jito-solana"))]
+extern crate solana_vote_program;
+
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_geyser_plugin_interface as solana_geyser_plugin_interface;
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_logger as solana_logger;
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_metrics as solana_metrics;
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_program as solana_program;
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_sdk as solana_sdk;
+#[cfg(feature = "jito-solana")]
+extern crate jito_solana_vote_program as solana_vote_program;