Update master (#68)

buffalu · web-flow · commit 5b53ea40ffa4 · 2025-11-25T11:49:54.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,32 +1,27 @@
 [workspace]
-members = [
-    "cli",
-    "client",
-    "proto",
-    "server"
-]
+members = ["cli", "client", "proto", "server"]
 
 # This prevents a Travis CI error when building for Windows.
 resolver = "2"
 
 [workspace.package]
-version = "2.0.15"
+version = "3.1.0"
 license = "Apache-2.0"
 authors = ["Jito Foundation <team@jito.network>"]
 edition = "2021"
 repository = "https://github.com/jito-foundation/geyser-grpc-plugin"
 homepage = "https://jito.network/"
 
 [workspace.dependencies]
-agave-geyser-plugin-interface = "=2.2"
+agave-geyser-plugin-interface = "=3.1"
 bincode = "1.3.3"
 bs58 = "0.5.0"
 clap = { version = "4.4.6", features = ["derive", "env"] }
 crossbeam-channel = "0.5.8"
 enum-iterator = "2.1.0"
 futures-util = "0.3.28"
-geyser-grpc-plugin-client = { path = "client", version = "=2.0.15" }
-jito-geyser-protos = { path = "proto", version = "=2.0.15" }
+geyser-grpc-plugin-client = { path = "client", version = "=3.1.0" }
+jito-geyser-protos = { path = "proto", version = "=3.1.0" }
 log = "0.4.17"
 lru = "0.13.0"
 once_cell = "1.17.1"
@@ -37,13 +32,24 @@ serde = "1.0.160"
 serde_derive = "1.0.160"
 serde_json = "1.0.96"
 serde_with = "=3.12.0"
-solana-account-decoder = "=2.2"
-solana-logger = "=2.2"
-solana-metrics = "=2.2"
-solana-program = "=2.2"
-solana-sdk = "=2.2"
-solana-transaction-status = "=2.2"
-solana-vote-program = "=2.2"
+solana-account-decoder = "3.1"
+solana-address = "3.1"
+solana-clock = "3.0"
+solana-hash = "3.1"
+solana-instruction = "3.1"
+solana-logger = "3.0"
+solana-message = "3.0"
+solana-metrics = "3.1"
+solana-program = "3.0"
+solana-pubkey = "3.0"
+solana-serde = "3.0"
+solana-signature = "3.1"
+solana-slot-hashes = "3.0"
+solana-transaction = "3.0"
+solana-transaction-context = "3.1"
+solana-transaction-error = "3.0"
+solana-transaction-status = "3.1"
+solana-vote-interface = "3.0"
 thiserror = "2.0.12"
 tokio = { version = "1.44.1", features = ["rt-multi-thread"] }
 tokio-stream = "0.1"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -11,7 +11,7 @@ futures-util = { workspace = true }
 geyser-grpc-plugin-client = { workspace = true }
 jito-geyser-protos = { workspace = true }
 prost-types = { workspace = true }
-solana-sdk = { workspace = true }
+solana-pubkey = { workspace = true }
 tokio = { workspace = true }
 tonic = { workspace = true }
 uuid = { workspace = true }
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -13,7 +13,7 @@ use jito_geyser_protos::solana::geyser::{
     SubscribeTransactionUpdatesRequest, TimestampedAccountUpdate,
 };
 use prost_types::Timestamp;
-use solana_sdk::pubkey::Pubkey;
+use solana_pubkey::Pubkey;
 use tonic::{transport::channel::Endpoint, Streaming};
 use uuid::Uuid;
 
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -9,7 +9,9 @@ edition = { workspace = true }
 jito-geyser-protos = { workspace = true }
 log = { workspace = true }
 lru = { workspace = true }
-solana-sdk = { workspace = true }
+solana-clock = { workspace = true }
+solana-pubkey = { workspace = true }
+solana-slot-hashes = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tonic = { workspace = true }
diff --git a/client/src/geyser_consumer.rs b/client/src/geyser_consumer.rs
@@ -24,6 +24,8 @@ use jito_geyser_protos::solana::geyser::{
 };
 use log::*;
 use lru::LruCache;
+use solana_clock::Slot;
+use solana_pubkey::Pubkey;
 use thiserror::Error;
 use tokio::{
     sync::mpsc::UnboundedSender,
@@ -36,7 +38,7 @@ use crate::{
     types::{
         AccountUpdate, AccountUpdateNotification, PartialAccountUpdate, SlotEntryUpdate, SlotUpdate,
     },
-    GrpcInterceptor, Pubkey, Slot,
+    GrpcInterceptor,
 };
 
 #[derive(Error, Debug)]
diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -8,7 +8,6 @@ use std::{
 };
 
 use jito_geyser_protos::solana::geyser::geyser_client::GeyserClient;
-use solana_sdk::{clock::Slot, pubkey::Pubkey};
 use tonic::transport::{ClientTlsConfig, Endpoint};
 
 use crate::{geyser_consumer::GeyserConsumer, interceptor::GrpcInterceptor};
diff --git a/client/src/types.rs b/client/src/types.rs
@@ -1,7 +1,8 @@
 //! Contains application specific representations of proto definitions.
 
 use jito_geyser_protos::solana::geyser;
-use solana_sdk::{pubkey::Pubkey, slot_hashes::Slot};
+use solana_clock::Slot;
+use solana_pubkey::Pubkey;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum SlotStatus {
diff --git a/proto/Cargo.toml b/proto/Cargo.toml
@@ -12,7 +12,15 @@ prost = { workspace = true }
 prost-types = { workspace = true }
 serde = { workspace = true }
 solana-account-decoder = { workspace = true }
-solana-sdk = { workspace = true }
+solana-hash = { workspace = true }
+solana-instruction = { workspace = true }
+solana-message = { workspace = true }
+solana-pubkey = { workspace = true }
+solana-serde = { workspace = true }
+solana-signature = { workspace = true }
+solana-transaction = { workspace = true }
+solana-transaction-context = { workspace = true }
+solana-transaction-error = { workspace = true }
 solana-transaction-status = { workspace = true }
 tonic = { workspace = true }
 
diff --git a/proto/proto/confirmed_block.proto b/proto/proto/confirmed_block.proto
@@ -65,6 +65,7 @@ message TransactionStatusMeta {
     // Available since Solana v1.10.35 / v1.11.6.
     // Set to `None` for txs executed on earlier versions.
     optional uint64 compute_units_consumed = 16;
+    optional uint64 cost_units = 17;
 }
 
 message TransactionError {
diff --git a/proto/src/convert.rs b/proto/src/convert.rs
@@ -4,19 +4,19 @@ use std::{
 };
 
 use solana_account_decoder::parse_token::{real_number_string_trimmed, UiTokenAmount};
-use solana_sdk::{
-    hash::{Hash, HASH_BYTES},
-    instruction::{CompiledInstruction, InstructionError},
-    message::{
-        legacy::Message as LegacyMessage,
-        v0::{self, LoadedAddresses, MessageAddressTableLookup},
-        MessageHeader, VersionedMessage,
-    },
-    pubkey::Pubkey,
-    signature::Signature,
-    transaction::{Transaction, TransactionError, VersionedTransaction},
-    transaction_context::TransactionReturnData,
+use solana_hash::{Hash, HASH_BYTES};
+use solana_instruction::error::InstructionError;
+use solana_message::{
+    compiled_instruction::CompiledInstruction,
+    legacy::Message as LegacyMessage,
+    v0::{self, LoadedAddresses, MessageAddressTableLookup},
+    MessageHeader, VersionedMessage,
 };
+use solana_pubkey::Pubkey;
+use solana_signature::Signature;
+use solana_transaction::{versioned::VersionedTransaction, Transaction};
+use solana_transaction_context::TransactionReturnData;
+use solana_transaction_error::TransactionError;
 use solana_transaction_status::{
     ConfirmedBlock, EntrySummary, InnerInstruction, InnerInstructions, Reward, RewardType,
     RewardsAndNumPartitions, TransactionByAddrInfo, TransactionStatusMeta, TransactionTokenBalance,
@@ -395,6 +395,7 @@ impl From<TransactionStatusMeta> for confirmed_block::TransactionStatusMeta {
             loaded_addresses,
             return_data,
             compute_units_consumed,
+            cost_units,
         } = value;
         let err = match status {
             Ok(()) => None,
@@ -455,6 +456,7 @@ impl From<TransactionStatusMeta> for confirmed_block::TransactionStatusMeta {
             return_data,
             return_data_none,
             compute_units_consumed,
+            cost_units,
         }
     }
 }
@@ -489,6 +491,7 @@ impl TryFrom<confirmed_block::TransactionStatusMeta> for TransactionStatusMeta {
             return_data,
             return_data_none,
             compute_units_consumed,
+            cost_units,
         } = value;
         let status = match &err {
             None => Ok(()),
@@ -558,6 +561,7 @@ impl TryFrom<confirmed_block::TransactionStatusMeta> for TransactionStatusMeta {
             loaded_addresses,
             return_data,
             compute_units_consumed,
+            cost_units,
         })
     }
 }
@@ -741,6 +745,7 @@ impl TryFrom<tx_by_addr::TransactionError> for TransactionError {
                     16 => InstructionError::DuplicateAccountIndex,
                     17 => InstructionError::ExecutableModified,
                     18 => InstructionError::RentEpochModified,
+                    #[allow(deprecated)]
                     19 => InstructionError::NotEnoughAccountKeys,
                     20 => InstructionError::AccountDataSizeChanged,
                     21 => InstructionError::AccountNotExecutable,
@@ -765,7 +770,7 @@ impl TryFrom<tx_by_addr::TransactionError> for TransactionError {
                     41 => InstructionError::ProgramFailedToCompile,
                     42 => InstructionError::Immutable,
                     43 => InstructionError::IncorrectAuthority,
-                    44 => InstructionError::BorshIoError(String::new()),
+                    44 => InstructionError::BorshIoError,
                     45 => InstructionError::AccountNotRentExempt,
                     46 => InstructionError::InvalidAccountOwner,
                     47 => InstructionError::ArithmeticOverflow,
@@ -1030,6 +1035,7 @@ impl From<TransactionError> for tx_by_addr::TransactionError {
                             InstructionError::RentEpochModified => {
                                 tx_by_addr::InstructionErrorType::RentEpochModified
                             }
+                            #[allow(deprecated)]
                             InstructionError::NotEnoughAccountKeys => {
                                 tx_by_addr::InstructionErrorType::NotEnoughAccountKeys
                             }
@@ -1103,7 +1109,7 @@ impl From<TransactionError> for tx_by_addr::TransactionError {
                             InstructionError::IncorrectAuthority => {
                                 tx_by_addr::InstructionErrorType::IncorrectAuthority
                             }
-                            InstructionError::BorshIoError(_) => {
+                            InstructionError::BorshIoError => {
                                 tx_by_addr::InstructionErrorType::BorshIoError
                             }
                             InstructionError::AccountNotRentExempt => {
@@ -1744,6 +1750,7 @@ mod test {
             tx_by_addr_transaction_error.try_into().unwrap()
         );
 
+        #[allow(deprecated)]
         let transaction_error =
             TransactionError::InstructionError(10, InstructionError::NotEnoughAccountKeys);
         let tx_by_addr_transaction_error: tx_by_addr::TransactionError =
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
@@ -1,17 +1,18 @@
 #[allow(clippy::all)]
-use std::str::FromStr;
-
-use serde::{Deserialize, Serialize};
-use solana_account_decoder::{
-    parse_token::{real_number_string_trimmed, UiTokenAmount},
-    StringAmount,
-};
-use solana_sdk::{
-    deserialize_utils::default_on_eof, message::v0::LoadedAddresses, transaction::Result,
-    transaction_context::TransactionReturnData,
-};
-use solana_transaction_status::{
-    InnerInstructions, Reward, RewardType, TransactionStatusMeta, TransactionTokenBalance,
+use {
+    serde::{Deserialize, Serialize},
+    solana_account_decoder::{
+        parse_token::{real_number_string_trimmed, UiTokenAmount},
+        StringAmount,
+    },
+    solana_message::v0::LoadedAddresses,
+    solana_serde::default_on_eof,
+    solana_transaction_context::TransactionReturnData,
+    solana_transaction_error::TransactionResult as Result,
+    solana_transaction_status::{
+        InnerInstructions, Reward, RewardType, TransactionStatusMeta, TransactionTokenBalance,
+    },
+    std::str::FromStr,
 };
 
 pub mod convert;
@@ -195,6 +196,8 @@ pub struct StoredTransactionStatusMeta {
     pub return_data: Option<TransactionReturnData>,
     #[serde(deserialize_with = "default_on_eof")]
     pub compute_units_consumed: Option<u64>,
+    #[serde(deserialize_with = "default_on_eof")]
+    pub cost_units: Option<u64>,
 }
 
 impl From<StoredTransactionStatusMeta> for TransactionStatusMeta {
@@ -211,6 +214,7 @@ impl From<StoredTransactionStatusMeta> for TransactionStatusMeta {
             rewards,
             return_data,
             compute_units_consumed,
+            cost_units,
         } = value;
         Self {
             status,
@@ -228,6 +232,7 @@ impl From<StoredTransactionStatusMeta> for TransactionStatusMeta {
             loaded_addresses: LoadedAddresses::default(),
             return_data,
             compute_units_consumed,
+            cost_units,
         }
     }
 }
@@ -248,6 +253,7 @@ impl TryFrom<TransactionStatusMeta> for StoredTransactionStatusMeta {
             loaded_addresses,
             return_data,
             compute_units_consumed,
+            cost_units,
         } = value;
 
         if !loaded_addresses.is_empty() {
@@ -273,6 +279,7 @@ impl TryFrom<TransactionStatusMeta> for StoredTransactionStatusMeta {
                 .map(|rewards| rewards.into_iter().map(|reward| reward.into()).collect()),
             return_data,
             compute_units_consumed,
+            cost_units,
         })
     }
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.84.1"
+channel = "1.86.0"
 components = [ "rustfmt", "rustc-dev", "clippy", "cargo" ]
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -5,6 +5,9 @@ license = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -25,9 +28,8 @@ serde_with = { workspace = true }
 solana-logger = { workspace = true }
 solana-metrics = { workspace = true }
 solana-program = { workspace = true }
-solana-sdk = { workspace = true }
 solana-transaction-status = { workspace = true }
-solana-vote-program = { workspace = true }
+solana-vote-interface = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
@@ -36,6 +38,3 @@ uuid = { workspace = true }
 
 [build-dependencies]
 tonic-build = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/server/src/geyser_grpc_plugin.rs b/server/src/geyser_grpc_plugin.rs
@@ -417,6 +417,19 @@ impl GeyserPlugin for GeyserGrpcPlugin {
                     }),
                 }),
             },
+            ReplicaTransactionInfoVersions::V0_0_3(tx) => TimestampedTransactionUpdate {
+                ts: Some(prost_types::Timestamp::from(SystemTime::now())),
+                transaction: Some(TransactionUpdate {
+                    slot,
+                    signature: tx.signature.to_string(),
+                    is_vote: tx.is_vote,
+                    tx_idx: tx.index as u64,
+                    tx: Some(ConfirmedTransaction {
+                        transaction: Some(tx.transaction.clone().into()),
+                        meta: Some(tx.transaction_status_meta.clone().into()),
+                    }),
+                }),
+            },
         };
 
         match data.transaction_update_sender.try_send(transaction_update) {
diff --git a/server/src/server.rs b/server/src/server.rs

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ message TransactionStatusMeta {`
`65`	`65`	`// Available since Solana v1.10.35 / v1.11.6.`
`66`	`66`	// Set to `None` for txs executed on earlier versions.
`67`	`67`	`optional uint64 compute_units_consumed = 16;`
	`68`	`+ optional uint64 cost_units = 17;`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`message TransactionError {`