updated all solana crates

Author: lvboudre

Cargo.lock

@@ -14,7 +14,7 @@ edition = "2024"
 homepage = "https://triton.one"
 repository = "https://github.com/rpcpool/yellowstone-jet"
 license = "Apache-2.0"
-rust-version = "1.89.0"
+rust-version = "1.91.0"
 keywords = ["yellowstone", "solana", "rpc", "jet", "tpu", "triton"]
 publish = false
 
@@ -91,10 +91,10 @@ solana-commitment-config = "3.0.0"
 solana-compute-budget-interface = "3.0.0"
 solana-epoch-info = "3.0.0"
 solana-epoch-schedule = "3.0.0"
-solana-hash = "4.0.0"
+solana-hash = "4.5.0"
 solana-instruction = "3.0.0"
 solana-keypair = "3.0.0"
-solana-message = "3.0.0"
+solana-message = "4.0.0"
 solana-native-token = "3.0.0"
 solana-nonce = "3.0.0"
 solana-packet = "4.0.0"
@@ -103,20 +103,20 @@ solana-quic-definitions = "3.0.0"
 solana-sdk-ids = "3.0.0"
 solana-signature = "3.0.0"
 solana-signer = "3.0.0"
-solana-transaction = "3.0.0"
+solana-transaction = "4.0.0"
 solana-transaction-error = "3.0.0"
-solana-leader-schedule = "4.0.0"
 
 # Yellowstone
 yellowstone-grpc-client = "13.1.0"
 yellowstone-grpc-proto = "12.5.0"
 yellowstone-jet-tpu-client = { path = "crates/tpu-client", version = "0.4.0" }
-yellowstone-shield-store = "0.10.0"
+yellowstone-shield-store = "0.11.0"
 
 [workspace.lints.clippy]
 clone_on_ref_ptr = "deny"
 missing_const_for_fn = "deny"
 trivially_copy_pass_by_ref = "deny"
+collapsible_if = "allow"
 
 [profile.release]
 codegen-units = 1

Cargo.toml

@@ -8,6 +8,7 @@ license.workspace = true
 homepage.workspace = true
 repository.workspace = true
 publish = false
+rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
@@ -75,7 +76,7 @@ solana-commitment-config = { workspace = true }
 solana-compute-budget-interface = { workspace = true }
 solana-epoch-info = { workspace = true }
 solana-epoch-schedule = { workspace = true }
-solana-hash = { workspace = true }
+solana-hash = { workspace = true, features = ["atomic"] }
 solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
 solana-message = { workspace = true }
@@ -89,7 +90,6 @@ solana-signature = { workspace = true, features = ["rand"] }
 solana-signer = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
-solana-leader-schedule = { workspace = true, features = ["agave-unstable-api"] }
 
 # Yellowstone
 yellowstone-grpc-client = { workspace = true }

apps/jet/Cargo.toml

@@ -116,6 +116,7 @@ fn print_summary(encoding: &str, bytes: &[u8], tx: &VersionedTransaction, detail
     let message_version = match &tx.message {
         VersionedMessage::Legacy(_) => "legacy",
         VersionedMessage::V0(_) => "v0",
+        VersionedMessage::V1(_) => "v1",
     };
     let instruction_count = tx.message.instructions().len();
     let static_accounts = tx
@@ -151,6 +152,9 @@ fn print_summary(encoding: &str, bytes: &[u8], tx: &VersionedTransaction, detail
                 );
             }
         }
+        VersionedMessage::V1(_) => {
+            println!("alt accounts: none (v1 message)");
+        }
     }
 
     if let Some(first_sig) = tx.signatures.first() {
@@ -229,5 +233,31 @@ fn print_detailed_transaction(tx: &VersionedTransaction) {
                 );
             }
         }
+        VersionedMessage::V1(message) => {
+            println!("message: v1");
+            println!(
+                "header: required_signatures={} readonly_signed={} readonly_unsigned={}",
+                message.header.num_required_signatures,
+                message.header.num_readonly_signed_accounts,
+                message.header.num_readonly_unsigned_accounts
+            );
+            println!("recent_blockhash: {}", message.lifetime_specifier);
+            println!("config: {:?}", message.config);
+            println!("account_keys ({}):", message.account_keys.len());
+            for (i, key) in message.account_keys.iter().enumerate() {
+                println!("- [{i}] {key}");
+            }
+            println!("instructions ({}):", message.instructions.len());
+            for (i, ix) in message.instructions.iter().enumerate() {
+                println!(
+                    "- [{i}] program_id_index={} accounts={:?} data_len={} data={:?}",
+                    ix.program_id_index,
+                    ix.accounts,
+                    ix.data.len(),
+                    ix.data
+                );
+            }
+            println!("address_table_lookups: none (v1 message)");
+        }
     }
 }

apps/jet/src/bin/txn-inspector.rs

@@ -1,5 +1,3 @@
-#[allow(deprecated)]
-use solana_clock::NUM_CONSECUTIVE_LEADER_SLOTS;
 use {
     crate::{
         grpc_geyser::SlotUpdateWithStatus,
@@ -61,6 +59,8 @@ impl ClusterTpuInfoProvider for ClusterTpuInfo {
 // This provides a buffer to avoid constantly fetching new schedules
 const LEADER_SCHEDULE_RETENTION_SLOTS: u64 = 42;
 
+const NUM_CONSECUTIVE_LEADER_SLOTS: u64 = 4;
+
 #[derive(Debug, Clone, Copy)]
 pub struct TpuInfo {
     pub leader: Pubkey,
@@ -155,8 +155,6 @@ impl ClusterTpuInfo {
         cluster_nodes_update_interval: Duration,
         cancellation_token: CancellationToken,
     ) -> (Self, impl Future<Output = ()>) {
-        assert_eq!(NUM_CONSECUTIVE_LEADER_SLOTS, 4);
-
         let inner = Arc::new(StdRwLock::new(ClusterTpuInfoInner {
             epoch_schedule: ClusterTpuInfoInner::get_epoch_schedule(Arc::clone(&rpc)).await,
             ..Default::default()
@@ -188,12 +186,10 @@ impl ClusterTpuInfo {
     }
 
     pub fn latest_seen_slot(&self) -> Slot {
-        let result = self
-            .inner
+        self.inner
             .read()
             .expect("rwlock schedule poisoned")
-            .latest_seen_slot;
-        result
+            .latest_seen_slot
     }
 
     pub fn get_cluster_nodes(&self) -> HashMap<Pubkey, RpcContactInfo> {
@@ -461,13 +457,11 @@ impl ClusterTpuInfo {
             .read()
             .expect("rwlock epoch schedule is poisoned");
 
-        let result = (0..=leader_forward_count as u64)
+        (0..=leader_forward_count as u64)
             .filter_map(|i| {
                 let leader_slot = inner.latest_seen_slot + i * NUM_CONSECUTIVE_LEADER_SLOTS;
                 inner.get_tpu_info(leader_slot)
             })
-            .collect::<Vec<_>>();
-
-        result
+            .collect::<Vec<_>>()
     }
 }

apps/jet/src/cluster_tpu_info.rs

@@ -280,11 +280,11 @@ async fn connect_and_stream(
 
     loop {
         // Check stream timeout
-        if let Some(deadline) = stream_deadline {
-            if tokio::time::Instant::now() >= deadline {
-                warn!("Stream timeout reached after {:?}", config.stream_timeout);
-                break;
-            }
+        if let Some(deadline) = stream_deadline
+            && tokio::time::Instant::now() >= deadline
+        {
+            warn!("Stream timeout reached after {:?}", config.stream_timeout);
+            break;
         }
 
         tokio::select! {

apps/jet/src/grpc_lewis.rs

@@ -17,14 +17,14 @@ pub enum SlotEvent {
 }
 
 impl SlotEvent {
-    pub fn slot(&self) -> Slot {
+    pub const fn slot(&self) -> Slot {
         match self {
             SlotEvent::Start(slot) => *slot,
             SlotEvent::End(slot) => *slot,
         }
     }
 
-    pub fn is_start(&self) -> bool {
+    pub const fn is_start(&self) -> bool {
         matches!(self, SlotEvent::Start(_))
     }
 }

apps/jet/src/recent_leader_slot.rs

@@ -278,10 +278,10 @@ pub mod rpc_admin {
 
     impl RpcServerImpl {
         async fn set_keypair(&self, identity: Keypair) -> RpcResult<()> {
-            if let Some(allow_ident) = &self.allowed_identity {
-                if allow_ident != &identity.pubkey() {
-                    return Err(invalid_params("invalid identity".to_owned()));
-                }
+            if let Some(allow_ident) = &self.allowed_identity
+                && allow_ident != &identity.pubkey()
+            {
+                return Err(invalid_params("invalid identity".to_owned()));
             }
             let pubkey = identity.pubkey();
             self.jet_identity_updater
@@ -402,16 +402,14 @@ pub mod rpc_solana_like {
                         } else {
                             Cow::Borrowed("unknown")
                         }
+                    } else if maybe_txn_sig.is_some() {
+                        Cow::Borrowed("[REDACTED]")
                     } else {
-                        if maybe_txn_sig.is_some() {
-                            Cow::Borrowed("[REDACTED]")
-                        } else {
-                            Cow::Borrowed("unknown")
-                        }
+                        Cow::Borrowed("unknown")
                     };
                     warn!(
                         signature = %sig,
-                        x_request_id = %maybe_request_id.unwrap_or_else(|| Cow::Borrowed("unknown")),
+                        x_request_id = %maybe_request_id.unwrap_or(Cow::Borrowed("unknown")),
                         error = %err,
                         "send_transaction failed"
                     )

apps/jet/src/rpc.rs

@@ -369,6 +369,7 @@ pub mod tests {
             epoch_credits: vec![],
             last_vote: 1,
             root_slot: 1,
+            inflation_rewards_commission_bps: None,
         }
     }
 

apps/jet/src/stake.rs

@@ -155,7 +155,7 @@ impl IncrementalBackoff {
             let next_delay = self.initial_interval * 2u32.pow(retries);
             sleep(self.max_interval.min(next_delay)).await;
 
-            self.retries = Some(retries.checked_add(1).unwrap_or(u32::MAX));
+            self.retries = Some(retries.saturating_add(1));
         }
     }
 }