remove sanitize and patch

Author: lvboudre

Cargo.lock

@@ -19,76 +19,79 @@ 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"
+etcd-client = "0.17.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"
+lru = "0.16.1"
 maplit = "1.0.2"
 pin-project = "1.1.5"
 prometheus = "0.13.3"
-prost = "0.13.3"
-prost-types = "0.13.3"
+prost = "0.14.1"
+prost-types = "0.14.1"
 quinn = "0.11.6"
 quinn-proto = "0.11.6"
-rand = "0.8.5"
+rand = "0.9.2"
 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.2.0"
+solana-connection-cache = "2.2.0"
+solana-net-utils = "2.2.0"
+solana-quic-client = "2.2.0"
+solana-rpc-client-api = "2.2.0"
+solana-streamer = "2.2.0"
+solana-tpu-client = "2.2.0"
+solana-version = "2.2.0"
+solana-rpc-client = "2.2.0"
+solana-transaction-status-client-types = "2.2.0"
+solana-system-interface = "1.0.0"
+solana-sdk-ids = "2.2.0"
+solana-bincode = "2.0.0"
+solana-tls-utils = "2.0.0"
 # --> Anza - Solana SDK (decoupled from agave)
 solana-program = "2"
 # 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.2.0"
+solana-pubkey = "2.2.0"
+solana-keypair = "2.2.0"
+solana-account = "2.2.0"
+solana-clock = "2.2.0"
+solana-hash = "2.2.0"
+solana-epoch-schedule = "2.2.0"
+solana-quic-definitions = "2.2.0"
+solana-signature = { version = "2.2.0", features = ["rand"] }
+solana-signer = "2.2.0"
+solana-transaction = "2.2.0"
+solana-epoch-info = "2.2.0"
+solana-commitment-config = "2.2.0"
+solana-transaction-error = "2.2.0"
+solana-transaction-status = "2.2.0"
+solana-message = "2.2.0"
+solana-compute-budget-interface = "2.2.0"
+solana-native-token = "2.2.0"
+solana-nonce = "2.2.0"
+solana-packet = "2.2.0"
+thiserror = "2.0.0"
 tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"] }
 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.2", features = ["tls-native-roots"] }
+tonic-prost = "0.14.2"
+tonic-health = "0.14.2"
+tower = "0.5.2"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.1", features = [
     "ansi",
@@ -97,23 +100,26 @@ 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"
-tokio-util = "0.7.16"
+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 = "0.3.0"
+tokio-util = "^0.7.16"
 
 [[bin]]
 name = "lewis-dummy-server"
 path = "src/bin/lewis_dummy_server.rs"
 
 [build-dependencies]
-anyhow = "1.0.69"
-cargo-lock = "10.0.1"
-git-version = "0.3.9"
-protobuf-src = "1.1.0"
-tonic-build = "0.12.3"
-vergen = { version = "9.0.1", features = ["build", "rustc"] }
+anyhow = "^1.0.69"
+cargo-lock = "^10.0.1"
+git-version = "^0.3.9"
+protobuf-src = "^1.1.0"
+tonic-build = "^0.14.2"
+tonic-prost-build = "^0.14.2"
+vergen = { version = "^9.0.1", features = ["build", "rustc"] }
 
 [lints.clippy]
 clone_on_ref_ptr = "deny"
@@ -124,15 +130,5 @@ trivially_copy_pass_by_ref = "deny"
 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" }
-
 [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

@@ -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,
@@ -368,7 +367,6 @@ async fn main() -> anyhow::Result<()> {
            let config = JetRpcSendTransactionConfig::new(
                 Some(RpcSendTransactionConfig {
                     skip_preflight: true,
-                    skip_sanitize: false,
                     preflight_commitment: Some(CommitmentLevel::Finalized),
                     encoding: Some(UiTransactionEncoding::Base64),
                     max_retries: config.max_retries,

src/bin/gentx.rs

@@ -48,7 +48,7 @@ use {
         },
         rpc::{RpcServer, RpcServerType, rpc_admin::RpcClient},
         setup_tracing,
-        solana::sanitize_transaction_support_check,
+        // solana::sanitize_transaction_support_check,
         solana_rpc_utils::{RetryRpcSender, RetryRpcSenderStrategy},
         stake::{self, StakeInfoMap, spawn_cache_stake_info_map},
         transaction_handler::TransactionHandler,
@@ -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>
@@ -410,13 +410,13 @@ async fn run_jet(config: ConfigJet) -> anyhow::Result<()> {
         vec![Box::new(gateway_identity_updater)];
 
     let tx_handler_rpc = Arc::new(SolanaRpcClient::new(config.upstream.rpc.clone()));
-    let sanitize_supported = sanitize_transaction_support_check(&tx_handler_rpc)
-        .await
-        .expect("sanitize transaction support check");
+    // let sanitize_supported = sanitize_transaction_support_check(&tx_handler_rpc)
+    //     .await
+    //     .expect("sanitize transaction support check");
     let tx_handler = TransactionHandler {
         transaction_sink: scheduler_in,
         rpc: tx_handler_rpc,
-        proxy_sanitize_check: config.listen_solana_like.proxy_sanitize_check && sanitize_supported,
+        // proxy_sanitize_check: config.listen_solana_like.proxy_sanitize_check && sanitize_supported,
         proxy_preflight_check: config.listen_solana_like.proxy_preflight_check,
     };
 

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),
+                from_slot: None,
+                max_decoding_message_size: Some(100_000_000),
+                accept_compression: None
             },
         }
     }

src/config.rs

@@ -280,7 +280,8 @@ impl TryFrom<(&VersionedTransaction, JetRpcSendTransactionConfig)> for Transacti
                     .map(|p| p.to_string())
                     .collect(),
                 skip_preflight: config_with_forwarding_policies.config.skip_preflight,
-                skip_sanitize: config_with_forwarding_policies.config.skip_sanitize,
+                skip_sanitize: true,
+                // skip_sanitize: config_with_forwarding_policies.config.skip_sanitize,
             }),
             timestamp: Some(ms_since_epoch()),
         }))
@@ -334,7 +335,8 @@ impl TryFrom<&TransactionConfig> for JetRpcSendTransactionConfig {
             Some(RpcSendTransactionConfig {
                 max_retries: proto_config.max_retries.map(|r| r as usize),
                 skip_preflight: proto_config.skip_preflight,
-                skip_sanitize: proto_config.skip_sanitize,
+                // skip_sanitize: proto_config.skip_sanitize,
+                // skip_sanitize: true,
                 preflight_commitment: None,
                 encoding: None,
                 min_context_slot: None,
@@ -371,7 +373,7 @@ mod tests {
             Some(RpcSendTransactionConfig {
                 encoding: Some(UiTransactionEncoding::Base58),
                 skip_preflight: true,
-                skip_sanitize: true,
+                // skip_sanitize: true,
                 ..Default::default()
             }),
             None,
@@ -485,7 +487,7 @@ mod tests {
         let config = JetRpcSendTransactionConfig::new(
             Some(RpcSendTransactionConfig {
                 skip_preflight: true,
-                skip_sanitize: true,
+                // skip_sanitize: true,
                 encoding: Some(UiTransactionEncoding::Base64),
                 ..Default::default()
             }),
@@ -501,7 +503,6 @@ mod tests {
         assert!(decoded_config.is_some());
         let config_with_forwarding_policies = decoded_config.unwrap();
         assert!(config_with_forwarding_policies.config.skip_preflight);
-        assert!(config_with_forwarding_policies.config.skip_sanitize);
         Ok(())
     }
 
@@ -511,7 +512,6 @@ mod tests {
         let original_config = JetRpcSendTransactionConfig::new(
             Some(RpcSendTransactionConfig {
                 skip_preflight: true,
-                skip_sanitize: false,
                 max_retries: Some(3),
                 preflight_commitment: None,
                 encoding: Some(UiTransactionEncoding::Base64),
@@ -533,10 +533,6 @@ mod tests {
             config_with_forwarding_policies.config.skip_preflight,
             original_config.config.skip_preflight
         );
-        assert_eq!(
-            config_with_forwarding_policies.config.skip_sanitize,
-            original_config.config.skip_sanitize
-        );
         Ok(())
     }
 
@@ -568,7 +564,7 @@ mod tests {
 
         assert_eq!(rpc_config.config.max_retries, None);
         assert!(!rpc_config.config.skip_preflight);
-        assert!(!rpc_config.config.skip_sanitize);
+        // assert!(!rpc_config.config.skip_sanitize);
         assert_eq!(rpc_config.forwarding_policies.len(), 0);
         Ok(())
     }
@@ -615,7 +611,7 @@ mod tests {
             Some(RpcSendTransactionConfig {
                 encoding: Some(UiTransactionEncoding::Base58),
                 skip_preflight: true,
-                skip_sanitize: true,
+                // skip_sanitize: true,
                 ..Default::default()
             }),
             Some(vec!["11111111111111111111111111111111".to_string()]),
@@ -638,7 +634,7 @@ mod tests {
         if let Some(config) = decoded_config {
             assert_eq!(config.forwarding_policies.len(), 0);
             assert!(config.config.skip_preflight);
-            assert!(config.config.skip_sanitize);
+            // assert!(config.config.skip_sanitize);
         } else {
             panic!("Decoded config is None");
         }

src/payload.rs

@@ -1,11 +1,11 @@
 use {
     crate::{cluster_tpu_info::ClusterTpuInfoProvider, transaction_handler::TransactionHandler},
     anyhow::Context as _,
-    futures::future::{BoxFuture, FutureExt, TryFutureExt, ready},
+    futures::future::{ready, BoxFuture, FutureExt, TryFutureExt},
     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 config = ServerConfigBuilder::default()
                     .max_request_body_size(MAX_REQUEST_BODY_SIZE)
+                    .build();
+                ServerBuilder::new()
+                    .set_config(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}"
                 ))