upgraded allow deps

Author: lvboudre

Cargo.lock

@@ -17,78 +17,77 @@ bs58 = "0.5.1"
 borsh = "1.5.1"
 bytes = "1.10.0"
 clap = { version = "4.5.2", features = ["cargo", "derive", "env"] }
-derivative = "2.2.0"
 derive_more = { version = "2.0.1", features = ["display"] }
-etcd-client = "0.14.0"
 futures = "0.3.30"
 hostname = "0.4.0"
 humantime-serde = "1.1.1"
 hyper = "1.5.0"
-jsonrpsee = { version = "0.24.7", features = [
+jsonrpsee = { version = "0.26.0", features = [
     "http-client",
     "macros",
     "server",
 ] }
 lazy_static = "1.4.0"
-lru = "0.12.3"
 maplit = "1.0.2"
 pin-project = "1.1.5"
-prometheus = "0.13.3"
-prost = "0.13.3"
-prost-types = "0.13.3"
+prometheus = "0.14.0"
+prost = "0.14.0"
+prost-types = "0.14.0"
 quinn = "0.11.6"
 quinn-proto = "0.11.6"
-rand = "0.8.5"
+rand = "0.9.0"
 rustls = { version = "0.23.15", default-features = false }
 semver = "1.0.22"
 serde = "1.0.215"
 serde_json = "1.0.116"
 serde_yaml = "0.9.25"
 
 # Agave Crates
-solana-client = "2"
-solana-connection-cache = "2"
-solana-net-utils = "2"
-solana-quic-client = "2"
-solana-rpc-client-api = "2"
-solana-streamer = "2"
-solana-tpu-client = "2"
-solana-version = "2"
-solana-rpc-client = "2"
-solana-transaction-status-client-types = "2"
-solana-system-interface = "1"
-solana-bincode = "2"
-solana-tls-utils = "2"
+solana-client = "2.0.0"
+solana-connection-cache = "2.0.0"
+solana-net-utils = "2.0.0"
+solana-quic-client = "2.0.0"
+solana-rpc-client-api = "2.0.0"
+solana-streamer = "2.0.0"
+solana-tpu-client = "2.0.0"
+solana-version = "2.0.0"
+solana-rpc-client = "2.0.0"
+solana-transaction-status-client-types = "2.0.0"
+solana-system-interface = "1.0.0"
+solana-bincode = "2.0.0"
+solana-tls-utils = "2.0.0"
 # --> Anza - Solana SDK (decoupled from agave)
-solana-program = "2"
+solana-program = "2.0.0"
 # TEMPORARY
 reqwest = { version = "0.12.15", features = ["json"] }
 retry = "2.0.0"
-solana-instruction = "2"
-solana-pubkey = "2"
-solana-keypair = "2"
-solana-account = "2"
-solana-clock = "2"
-solana-hash = "2"
-solana-epoch-schedule = "2"
-solana-quic-definitions = "2"
-solana-signature = { version = "2", features = ["rand"] }
-solana-signer = "2"
-solana-transaction = "2"
-solana-epoch-info = "2"
-solana-commitment-config = "2"
-solana-transaction-error = "2"
-solana-message = "2"
-solana-compute-budget-interface = "2"
-solana-native-token = "2"
-solana-nonce = "2"
-solana-packet = "2"
-thiserror = "1.0.58"
+solana-instruction = "2.0.0"
+solana-pubkey = "2.0.0"
+solana-keypair = "2.0.0"
+solana-account = "2.0.0"
+solana-clock = "2.0.0"
+solana-hash = "2.0.0"
+solana-epoch-schedule = "2.0.0"
+solana-quic-definitions = "2.0.0"
+solana-signature = { version = "2.0.0", features = ["rand"] }
+solana-signer = "2.0.0"
+solana-sdk-ids = "2.0.0"
+solana-transaction = "2.0.0"
+solana-epoch-info = "2.0.0"
+solana-commitment-config = "2.0.0"
+solana-transaction-error = "2.0.0"
+solana-message = "2.0.0"
+solana-compute-budget-interface = "2.0.0"
+solana-native-token = "2.0.0"
+solana-nonce = "2.0.0"
+solana-packet = "2.0.0"
+thiserror = "2.0.0"
 tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"] }
+tonic-prost = { version = "0.14.0" }
 tokio-stream = "0.1.15"
-tonic = { version = "0.12.3", features = ["tls-native-roots"] }
-tonic-health = "0.12.3"
-tower = "0.4.13"
+tonic = { version = "0.14.0", features = ["tls-native-roots"] }
+tonic-health = "0.14.0"
+tower = "0.5.0"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.1", features = [
     "ansi",
@@ -97,10 +96,12 @@ tracing-subscriber = { version = "0.3.1", features = [
 ] }
 uuid = { version = "1.11.0", features = ["v4", "serde"] }
 
-yellowstone-grpc-client = "7"
-yellowstone-grpc-proto = "7"
-yellowstone-shield-store = "~0.5.2"
-yellowstone-vixen = "0.2.0"
+yellowstone-grpc-client = "9.0.0"
+yellowstone-grpc-proto = "9.0.0"
+# yellowstone-shield-store = "~0.5.2"
+yellowstone-shield-store = { git = "https://github.com/rpcpool/yellowstone-shield.git", branch = "26-unpinned-crates" }
+yellowstone-vixen = "0.5.0"
+yellowstone-vixen-yellowstone-grpc-source = { version = "0.3.0" }
 tokio-util = "0.7.16"
 
 [[bin]]
@@ -112,7 +113,8 @@ anyhow = "1.0.69"
 cargo-lock = "10.0.1"
 git-version = "0.3.9"
 protobuf-src = "1.1.0"
-tonic-build = "0.12.3"
+tonic-build = "0.14.0"
+tonic-prost-build = "0.14.0"
 vergen = { version = "9.0.1", features = ["build", "rustc"] }
 
 [lints.clippy]
@@ -125,14 +127,20 @@ codegen-units = 1
 lto = true
 
 [patch.crates-io]
-solana-rpc-client = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
-solana-rpc-client-api = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
-solana-account-decoder-client-types = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
-solana-client = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
-solana-net-utils = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
-solana-streamer = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
-solana-transaction-context = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
-solana-transaction-status-client-types = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.2.19-triton-public" }
+solana-rpc-client = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-rpc-client-api = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-account-decoder = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-account-decoder-client-types = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-client = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-streamer = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-transaction-context = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-transaction-status = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-transaction-status-client-types = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+
+solana-net-utils   = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-tpu-client  = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+solana-quic-client = { git = "https://github.com/rpcpool/solana-public.git", tag = "v2.3.8-triton-public" }
+
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = "0.6"

Cargo.toml

@@ -25,7 +25,7 @@ fn main() -> anyhow::Result<()> {
 
     // TODO: Audit that the environment access only happens in single-threaded code.
     unsafe { std::env::set_var("PROTOC", protobuf_src::protoc()) };
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .compile_protos(&["proto/jet.proto", "proto/lewis.proto"], &["proto"])?;
 
     Ok(())

build.rs

@@ -9,18 +9,6 @@ ignore = [
     # web-time not maintained
     "RUSTSEC-2024-0384",
 
-    # derivative unmaintained warning
-    "RUSTSEC-2024-0388",
-
     # ed25519-dalek 1.0.1
     "RUSTSEC-2022-0093",
-
-    # ring vulnerability - coming from Solana dependencies
-    "RUSTSEC-2025-0009",
-
-    # protobuf issue
-    "RUSTSEC-2024-0437",
-
-    # paste
-    "RUSTSEC-2024-0436",
 ]

deny.toml

@@ -14,7 +14,6 @@ use {
     solana_keypair::{Keypair, read_keypair_file},
     solana_message::{VersionedMessage, v0},
     solana_native_token::LAMPORTS_PER_SOL,
-    solana_program::system_instruction,
     solana_pubkey::Pubkey,
     solana_signature::Signature,
     solana_signer::Signer,
@@ -348,7 +347,7 @@ async fn main() -> anyhow::Result<()> {
                 instructions.push(ComputeBudgetInstruction::set_compute_unit_price(price));
             }
             let lamports = 5_000 + index;
-            instructions.push(system_instruction::transfer(
+            instructions.push(solana_system_interface::instruction::transfer(
                 &wallet_pubkey,
                 &wallet_pubkey,
                 lamports,

src/bin/gentx.rs

@@ -273,7 +273,7 @@ async fn run_jet(config: ConfigJet) -> anyhow::Result<()> {
     {
         let policy_store = PolicyStore::build()
             .config(config.upstream.clone().into())
-            .run(&local)
+            .run()
             .await?;
 
         Arc::new(policy_store) as Arc<dyn TransactionPolicyStore + Send + Sync>

src/bin/jet.rs

@@ -26,7 +26,7 @@ use {
     },
     tokio::{fs, time::Duration},
     yellowstone_shield_store::{PolicyStoreConfig, PolicyStoreRpcConfig},
-    yellowstone_vixen::config::YellowstoneConfig,
+    yellowstone_vixen_yellowstone_grpc_source::YellowstoneGrpcConfig,
 };
 
 fn deserialize_pubkey<'de, D>(deserializer: D) -> Result<Pubkey, D::Error>
@@ -224,10 +224,14 @@ impl From<ConfigUpstream> for PolicyStoreConfig {
     ) -> Self {
         Self {
             rpc: PolicyStoreRpcConfig { endpoint: rpc },
-            grpc: YellowstoneConfig {
+            grpc: YellowstoneGrpcConfig {
                 endpoint,
                 x_token,
                 timeout: 60,
+                commitment_level: Some(yellowstone_vixen::CommitmentLevel::Finalized),
+                max_decoding_message_size: Some(100_000_000),
+                from_slot: None,
+                accept_compression: None,
             },
         }
     }

src/config.rs

@@ -430,7 +430,7 @@ impl GrpcServer {
                                                 Ok(_) => {
                                                     if let Some(gateway_timestamp) = timestamp {
                                                         let latency = ms_since_epoch().saturating_sub(gateway_timestamp);
-                                                        metrics::jet::observe_forwarded_txn_latency(latency as f64);
+                                                        metrics::jet::observe_forwarded_txn_latency(latency as f64, my_identity);
                                                     }
                                                     increment_send_transaction_success();
                                                 }

src/grpc_jet.rs

@@ -424,7 +424,7 @@ pub mod jet {
 
     pub fn incr_quic_gw_worker_tx_process_cnt(remote_peer: Pubkey, status: &str) {
         QUIC_GW_WORKER_TX_PROCESS_CNT
-            .with_label_values(&[&remote_peer.to_string(), status])
+            .with_label_values(&[remote_peer.to_string().as_str(), status])
             .inc_by(1);
     }
 
@@ -592,9 +592,9 @@ pub mod jet {
         SEND_TRANSACTION_SUCCESS.inc();
     }
 
-    pub fn observe_forwarded_txn_latency(duration: f64) {
+    pub fn observe_forwarded_txn_latency(duration: f64, identity: Pubkey) {
         FORWADED_TRANSACTION_LATENCY
-            .with_label_values(&[])
+            .with_label_values(&[identity.to_string()])
             .observe(duration);
     }
 
@@ -754,25 +754,29 @@ pub mod jet {
 
     pub fn quic_send_attempts_inc(leader: Pubkey, address: SocketAddr, status: &str) {
         QUIC_SEND_ATTEMPTS
-            .with_label_values(&[&leader.to_string(), &address.to_string(), status])
+            .with_label_values(&[
+                leader.to_string().as_str(),
+                &address.to_string().as_str(),
+                status,
+            ])
             .inc();
     }
 
     pub fn gateway_set_connected(endpoints: &[String], endpoint: String) {
         for endpoint in endpoints {
             GATEWAY_CONNECTED
-                .with_label_values(&[endpoint.as_ref()])
+                .with_label_values(&[endpoint.as_str()])
                 .set(0);
         }
         GATEWAY_CONNECTED
-            .with_label_values(&[endpoint.as_ref()])
+            .with_label_values(&[endpoint.as_str()])
             .set(1);
     }
 
     pub fn gateway_set_disconnected(endpoints: &[String]) {
         for endpoint in endpoints {
             GATEWAY_CONNECTED
-                .with_label_values(&[endpoint.as_ref()])
+                .with_label_values(&[endpoint.as_str()])
                 .set(0);
         }
     }

src/metrics.rs

@@ -5,7 +5,7 @@ use {
     hyper::{Request, Response, StatusCode},
     jsonrpsee::{
         core::http_helpers::Body,
-        server::{ServerBuilder, ServerHandle},
+        server::{ServerBuilder, ServerConfigBuilder, ServerHandle},
         types::error::{ErrorObject, ErrorObjectOwned, INVALID_PARAMS_CODE},
     },
     rpc_admin::JetIdentityUpdater,
@@ -103,9 +103,11 @@ impl RpcServer {
                 use rpc_solana_like::RpcServer;
 
                 let rpc_server_impl = Self::create_solana_like_rpc_server_impl(tx_handler);
-
-                ServerBuilder::new()
+                let server_config = ServerConfigBuilder::default()
                     .max_request_body_size(MAX_REQUEST_BODY_SIZE)
+                    .build();
+                ServerBuilder::new()
+                    .set_config(server_config)
                     .build(addr)
                     .await
                     .map(|server| server.start(rpc_server_impl.into_rpc()))
@@ -223,7 +225,7 @@ pub mod rpc_admin {
                     "set_identity_from_bytes with require_tower is not supported".to_owned(),
                 ));
             }
-            let keypair = Keypair::from_bytes(&identity_keypair).map_err(|err| {
+            let keypair = Keypair::try_from(identity_keypair.as_slice()).map_err(|err| {
                 invalid_params(format!(
                     "Failed to read identity keypair from provided byte array: {err}"
                 ))