Merge remote changes with DexParamEnum API update

This commit is contained in:
Wood
2025-12-08 01:42:54 +08:00
14 changed files with 535 additions and 51 deletions
@@ -5,6 +5,14 @@ use solana_sdk::{
use crate::constants::{ASSOCIATED_TOKEN_PROGRAM_ID, SYSTEM_PROGRAM};
/// Get the associated token address with a specified token program ID.
///
/// # Warning
/// **This SDK enables seed optimization by default.** When seed is enabled, you should use
/// [`get_associated_token_address_with_program_id_fast_use_seed`] instead for better performance.
/// This function performs PDA derivation which is slower than the optimized version.
///
/// [`get_associated_token_address_with_program_id_fast_use_seed`]: crate::common::token_account::get_associated_token_address_with_program_id_fast_use_seed
pub fn get_associated_token_address_with_program_id(
wallet_address: &Pubkey,
token_mint_address: &Pubkey,
@@ -17,6 +25,14 @@ pub fn get_associated_token_address_with_program_id(
.0
}
/// Get the associated token address for the default token program.
///
/// # Warning
/// **This SDK enables seed optimization by default.** When seed is enabled, you should use
/// [`get_associated_token_address_with_program_id_fast_use_seed`] instead for better performance.
/// This function performs PDA derivation which is slower than the optimized version.
///
/// [`get_associated_token_address_with_program_id_fast_use_seed`]: crate::common::token_account::get_associated_token_address_with_program_id_fast_use_seed
pub fn get_associated_token_address(
wallet_address: &Pubkey,
token_mint_address: &Pubkey,
+36 -9
View File
@@ -109,6 +109,20 @@ pub const ASTRALANE_TIP_ACCOUNTS: &[Pubkey] = &[
pubkey!("astrawVNP4xDBKT7rAdxrLYiTSTdqtUr63fSMduivXK"),
];
pub const STELLIUM_TIP_ACCOUNTS: &[Pubkey] = &[
pubkey!("ste11JV3MLMM7x7EJUM2sXcJC1H7F4jBLnP9a9PG8PH"),
pubkey!("ste11MWPjXCRfQryCshzi86SGhuXjF4Lv6xMXD2AoSt"),
pubkey!("ste11p5x8tJ53H1NbNQsRBg1YNRd4GcVpxtDw8PBpmb"),
pubkey!("ste11p7e2KLYou5bwtt35H7BM6uMdo4pvioGjJXKFcN"),
pubkey!("ste11TMV68LMi1BguM4RQujtbNCZvf1sjsASpqgAvSX"),
];
// Lightspeed (Solana Vibe Station) tip accounts
pub const LIGHTSPEED_TIP_ACCOUNTS: &[Pubkey] = &[
pubkey!("53PhM3UTdMQWu5t81wcd35AHGc5xpmHoRjem7GQPvXjA"),
pubkey!("9tYF5yPDC1NP8s6diiB3kAX6ZZnva9DM3iDwJkBRarBB"),
];
// NewYork,
// Frankfurt,
// Amsterdam,
@@ -142,13 +156,13 @@ pub const SWQOS_ENDPOINTS_NEXTBLOCK: [&str; 8] = [
pub const SWQOS_ENDPOINTS_ZERO_SLOT: [&str; 8] = [
"http://ny.0slot.trade",
"http://de.0slot.trade",
"http://de2.0slot.trade", // Use de2 for TSW, and de1 for OVH
"http://ams.0slot.trade",
"http://ny.0slot.trade",
"http://jp.0slot.trade",
"http://ams.0slot.trade",
"http://la.0slot.trade",
"http://de.0slot.trade",
"http://de2.0slot.trade", // Use de2 for TSW, and de1 for OVH
];
pub const SWQOS_ENDPOINTS_TEMPORAL: [&str; 8] = [
@@ -179,7 +193,7 @@ pub const SWQOS_ENDPOINTS_NODE1: [&str; 8] = [
"http://ams.node1.me",
"http://ny.node1.me",
"http://fra.node1.me",
"http://ams.node1.me",
"http://lon.node1.me",
"http://ny.node1.me",
"http://fra.node1.me",
];
@@ -217,13 +231,26 @@ pub const SWQOS_ENDPOINTS_ASTRALANE: [&str; 8] = [
"http://lim.gateway.astralane.io/iris",
];
pub const SWQOS_ENDPOINTS_STELLIUM: [&str; 8] = [
"http://ewr1.flashrpc.com",
"http://fra1.flashrpc.com",
"http://ams1.flashrpc.com",
"http://ewr1.flashrpc.com",
"http://tyo1.flashrpc.com",
"http://lhr1.flashrpc.com",
"http://ewr1.flashrpc.com",
"http://fra1.flashrpc.com",
];
pub const SWQOS_MIN_TIP_DEFAULT: f64 = 0.00001; // 其它SWQOS默认最低小费
pub const SWQOS_MIN_TIP_JITO: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_NEXTBLOCK: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_ZERO_SLOT: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_TEMPORAL: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_BLOXROUTE: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_NEXTBLOCK: f64 = 0.001;
pub const SWQOS_MIN_TIP_ZERO_SLOT: f64 = 0.001;
pub const SWQOS_MIN_TIP_TEMPORAL: f64 = 0.001;
pub const SWQOS_MIN_TIP_BLOXROUTE: f64 = 0.001;
pub const SWQOS_MIN_TIP_NODE1: f64 = 0.002; // 如需更高阈值可调整
pub const SWQOS_MIN_TIP_FLASHBLOCK: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_BLOCKRAZOR: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_FLASHBLOCK: f64 = 0.001;
pub const SWQOS_MIN_TIP_BLOCKRAZOR: f64 = 0.001;
pub const SWQOS_MIN_TIP_ASTRALANE: f64 = SWQOS_MIN_TIP_DEFAULT;
pub const SWQOS_MIN_TIP_STELLIUM: f64 = 0.001; // Stellium requires minimum 0.001 SOL tip
pub const SWQOS_MIN_TIP_LIGHTSPEED: f64 = 0.001; // Lightspeed requires minimum 0.001 SOL tip
+125
View File
@@ -0,0 +1,125 @@
use crate::swqos::common::{poll_transaction_confirmation, serialize_transaction_and_encode};
use rand::seq::IndexedRandom;
use reqwest::Client;
use serde_json::json;
use std::{sync::Arc, time::Instant};
use std::time::Duration;
use solana_transaction_status::UiTransactionEncoding;
use anyhow::Result;
use solana_sdk::transaction::VersionedTransaction;
use crate::swqos::{SwqosType, TradeType};
use crate::swqos::SwqosClientTrait;
use crate::{common::SolanaRpcClient, constants::swqos::LIGHTSPEED_TIP_ACCOUNTS};
#[derive(Clone)]
pub struct LightspeedClient {
pub endpoint: String,
pub auth_token: String,
pub rpc_client: Arc<SolanaRpcClient>,
pub http_client: Client,
}
#[async_trait::async_trait]
impl SwqosClientTrait for LightspeedClient {
async fn send_transaction(&self, trade_type: TradeType, transaction: &VersionedTransaction) -> Result<()> {
self.send_transaction(trade_type, transaction).await
}
async fn send_transactions(&self, trade_type: TradeType, transactions: &Vec<VersionedTransaction>) -> Result<()> {
self.send_transactions(trade_type, transactions).await
}
fn get_tip_account(&self) -> Result<String> {
let tip_account = *LIGHTSPEED_TIP_ACCOUNTS.choose(&mut rand::rng()).or_else(|| LIGHTSPEED_TIP_ACCOUNTS.first()).unwrap();
Ok(tip_account.to_string())
}
fn get_swqos_type(&self) -> SwqosType {
SwqosType::Lightspeed
}
}
impl LightspeedClient {
pub fn new(rpc_url: String, endpoint: String, auth_token: String) -> Self {
// Lightspeed endpoint should already include /lightspeed path
// Format: https://<tier>.rpc.solanavibestation.com/lightspeed?api_key=<key>
let rpc_client = SolanaRpcClient::new(rpc_url);
let http_client = Client::builder()
// Optimized connection pool settings for high performance
.pool_idle_timeout(Duration::from_secs(120))
.pool_max_idle_per_host(256)
.tcp_keepalive(Some(Duration::from_secs(60)))
.tcp_nodelay(true) // Disable Nagle's algorithm for lower latency
.http2_keep_alive_interval(Duration::from_secs(10))
.http2_keep_alive_timeout(Duration::from_secs(5))
.http2_adaptive_window(true) // Enable adaptive flow control
.timeout(Duration::from_millis(3000))
.connect_timeout(Duration::from_millis(2000))
.build()
.unwrap();
Self { rpc_client: Arc::new(rpc_client), endpoint, auth_token, http_client }
}
pub async fn send_transaction(&self, trade_type: TradeType, transaction: &VersionedTransaction) -> Result<()> {
let start_time = Instant::now();
let (content, signature) = serialize_transaction_and_encode(transaction, UiTransactionEncoding::Base64).await?;
// Lightspeed uses standard Solana JSON-RPC format for sendTransaction
let request_body = serde_json::to_string(&json!({
"jsonrpc": "2.0",
"id": 1,
"method": "sendTransaction",
"params": [
content,
{
"encoding": "base64",
"skipPreflight": true,
"preflightCommitment": "processed",
"maxRetries": 0
}
]
}))?;
let response_text = self.http_client.post(&self.endpoint)
.body(request_body)
.header("Content-Type", "application/json")
.send()
.await?
.text()
.await?;
if let Ok(response_json) = serde_json::from_str::<serde_json::Value>(&response_text) {
if response_json.get("result").is_some() {
println!(" [lightspeed] {} submitted: {:?}", trade_type, start_time.elapsed());
} else if let Some(_error) = response_json.get("error") {
eprintln!(" [lightspeed] {} submission failed: {:?}", trade_type, _error);
}
} else {
eprintln!(" [lightspeed] {} submission failed: {:?}", trade_type, response_text);
}
let start_time: Instant = Instant::now();
match poll_transaction_confirmation(&self.rpc_client, signature).await {
Ok(_) => (),
Err(e) => {
println!(" signature: {:?}", signature);
println!(" [lightspeed] {} confirmation failed: {:?}", trade_type, start_time.elapsed());
return Err(e);
},
}
println!(" signature: {:?}", signature);
println!(" [lightspeed] {} confirmed: {:?}", trade_type, start_time.elapsed());
Ok(())
}
pub async fn send_transactions(&self, trade_type: TradeType, transactions: &Vec<VersionedTransaction>) -> Result<()> {
for transaction in transactions {
self.send_transaction(trade_type, transaction).await?;
}
Ok(())
}
}
+54 -19
View File
@@ -10,6 +10,8 @@ pub mod node1;
pub mod flashblock;
pub mod blockrazor;
pub mod astralane;
pub mod stellium;
pub mod lightspeed;
use std::sync::Arc;
@@ -20,29 +22,32 @@ use tokio::sync::RwLock;
use anyhow::Result;
use crate::{
common::SolanaRpcClient,
common::SolanaRpcClient,
constants::swqos::{
SWQOS_ENDPOINTS_BLOX,
SWQOS_ENDPOINTS_JITO,
SWQOS_ENDPOINTS_NEXTBLOCK,
SWQOS_ENDPOINTS_TEMPORAL,
SWQOS_ENDPOINTS_ZERO_SLOT,
SWQOS_ENDPOINTS_NODE1,
SWQOS_ENDPOINTS_BLOX,
SWQOS_ENDPOINTS_JITO,
SWQOS_ENDPOINTS_NEXTBLOCK,
SWQOS_ENDPOINTS_TEMPORAL,
SWQOS_ENDPOINTS_ZERO_SLOT,
SWQOS_ENDPOINTS_NODE1,
SWQOS_ENDPOINTS_FLASHBLOCK,
SWQOS_ENDPOINTS_BLOCKRAZOR,
SWQOS_ENDPOINTS_ASTRALANE
},
SWQOS_ENDPOINTS_ASTRALANE,
SWQOS_ENDPOINTS_STELLIUM
},
swqos::{
bloxroute::BloxrouteClient,
jito::JitoClient,
nextblock::NextBlockClient,
solana_rpc::SolRpcClient,
temporal::TemporalClient,
zeroslot::ZeroSlotClient,
node1::Node1Client,
bloxroute::BloxrouteClient,
jito::JitoClient,
nextblock::NextBlockClient,
solana_rpc::SolRpcClient,
temporal::TemporalClient,
zeroslot::ZeroSlotClient,
node1::Node1Client,
flashblock::FlashBlockClient,
blockrazor::BlockRazorClient,
astralane::AstralaneClient
astralane::AstralaneClient,
stellium::StelliumClient,
lightspeed::LightspeedClient
}
};
@@ -81,6 +86,8 @@ pub enum SwqosType {
FlashBlock,
BlockRazor,
Astralane,
Stellium,
Lightspeed,
Default,
}
@@ -96,6 +103,8 @@ impl SwqosType {
Self::FlashBlock,
Self::BlockRazor,
Self::Astralane,
Self::Stellium,
Self::Lightspeed,
Self::Default,
]
}
@@ -144,6 +153,12 @@ pub enum SwqosConfig {
BlockRazor(String, SwqosRegion, Option<String>),
/// Astralane(api_token, region, custom_url)
Astralane(String, SwqosRegion, Option<String>),
/// Stellium(api_token, region, custom_url)
Stellium(String, SwqosRegion, Option<String>),
/// Lightspeed(api_key, region, custom_url) - Solana Vibe Station
/// Endpoint format: https://<tier>.rpc.solanavibestation.com/lightspeed?api_key=<key>
/// Minimum tip: 0.001 SOL
Lightspeed(String, SwqosRegion, Option<String>),
}
impl SwqosConfig {
@@ -151,7 +166,7 @@ impl SwqosConfig {
if let Some(custom_url) = url {
return custom_url;
}
match swqos_type {
SwqosType::Jito => SWQOS_ENDPOINTS_JITO[region as usize].to_string(),
SwqosType::NextBlock => SWQOS_ENDPOINTS_NEXTBLOCK[region as usize].to_string(),
@@ -162,6 +177,8 @@ impl SwqosConfig {
SwqosType::FlashBlock => SWQOS_ENDPOINTS_FLASHBLOCK[region as usize].to_string(),
SwqosType::BlockRazor => SWQOS_ENDPOINTS_BLOCKRAZOR[region as usize].to_string(),
SwqosType::Astralane => SWQOS_ENDPOINTS_ASTRALANE[region as usize].to_string(),
SwqosType::Stellium => SWQOS_ENDPOINTS_STELLIUM[region as usize].to_string(),
SwqosType::Lightspeed => "".to_string(), // Lightspeed requires custom URL with api_key
SwqosType::Default => "".to_string(),
}
}
@@ -249,11 +266,29 @@ impl SwqosConfig {
);
Arc::new(astralane_client)
},
SwqosConfig::Stellium(auth_token, region, url) => {
let endpoint = SwqosConfig::get_endpoint(SwqosType::Stellium, region, url);
let stellium_client = StelliumClient::new(
rpc_url.clone(),
endpoint.to_string(),
auth_token
);
Arc::new(stellium_client)
},
SwqosConfig::Lightspeed(auth_token, region, url) => {
let endpoint = SwqosConfig::get_endpoint(SwqosType::Lightspeed, region, url);
let lightspeed_client = LightspeedClient::new(
rpc_url.clone(),
endpoint.to_string(),
auth_token
);
Arc::new(lightspeed_client)
},
SwqosConfig::Default(endpoint) => {
let rpc = SolanaRpcClient::new_with_commitment(
endpoint,
commitment
);
);
let rpc_client = SolRpcClient::new(Arc::new(rpc));
Arc::new(rpc_client)
}
+190
View File
@@ -0,0 +1,190 @@
use crate::swqos::common::{poll_transaction_confirmation, serialize_transaction_and_encode};
use rand::seq::IndexedRandom;
use reqwest::Client;
use serde_json::json;
use std::{sync::Arc, time::Instant};
use std::sync::atomic::{AtomicBool, Ordering};
use std::time::Duration;
use solana_transaction_status::UiTransactionEncoding;
use anyhow::Result;
use solana_sdk::transaction::VersionedTransaction;
use crate::swqos::{SwqosType, TradeType};
use crate::swqos::SwqosClientTrait;
use crate::{common::SolanaRpcClient, constants::swqos::STELLIUM_TIP_ACCOUNTS};
#[derive(Clone)]
pub struct StelliumClient {
pub endpoint: String,
pub auth_token: String,
pub rpc_client: Arc<SolanaRpcClient>,
pub http_client: Client,
keep_alive_running: Arc<AtomicBool>,
}
#[async_trait::async_trait]
impl SwqosClientTrait for StelliumClient {
async fn send_transaction(&self, trade_type: TradeType, transaction: &VersionedTransaction) -> Result<()> {
self.send_transaction(trade_type, transaction).await
}
async fn send_transactions(&self, trade_type: TradeType, transactions: &Vec<VersionedTransaction>) -> Result<()> {
self.send_transactions(trade_type, transactions).await
}
fn get_tip_account(&self) -> Result<String> {
let tip_account = *STELLIUM_TIP_ACCOUNTS.choose(&mut rand::rng()).or_else(|| STELLIUM_TIP_ACCOUNTS.first()).unwrap();
Ok(tip_account.to_string())
}
fn get_swqos_type(&self) -> SwqosType {
SwqosType::Stellium
}
}
impl StelliumClient {
pub fn new(rpc_url: String, endpoint: String, auth_token: String) -> Self {
let rpc_client = SolanaRpcClient::new(rpc_url);
let http_client = Client::builder()
// Optimized connection pool settings for high performance
.pool_idle_timeout(Duration::from_secs(120))
.pool_max_idle_per_host(256) // Increased from 64 to 256
.tcp_keepalive(Some(Duration::from_secs(60))) // Reduced from 1200 to 60
.tcp_nodelay(true) // Disable Nagle's algorithm for lower latency
.http2_keep_alive_interval(Duration::from_secs(10))
.http2_keep_alive_timeout(Duration::from_secs(5))
.http2_adaptive_window(true) // Enable adaptive flow control
.timeout(Duration::from_millis(3000)) // Reduced from 10s to 3s
.connect_timeout(Duration::from_millis(2000)) // Reduced from 5s to 2s
.build()
.unwrap();
let keep_alive_running = Arc::new(AtomicBool::new(true));
let client = Self {
rpc_client: Arc::new(rpc_client),
endpoint: endpoint.clone(),
auth_token: auth_token.clone(),
http_client: http_client.clone(),
keep_alive_running: keep_alive_running.clone(),
};
// Start ping task
let client_clone = client.clone();
tokio::spawn(async move {
client_clone.start_ping_task().await;
});
client
}
/// Start periodic ping task to keep connections active
async fn start_ping_task(&self) {
let endpoint = self.endpoint.clone();
let auth_token = self.auth_token.clone();
let http_client = self.http_client.clone();
let stop_ping = self.keep_alive_running.clone();
tokio::spawn(async move {
let mut interval = tokio::time::interval(Duration::from_secs(60)); // Ping every 60 seconds
loop {
interval.tick().await;
if stop_ping.load(Ordering::Relaxed) {
break;
}
// Send ping request
let url = format!("{}/{}", endpoint, auth_token);
match http_client.get(&url).send().await {
Ok(response) => {
if !response.status().is_success() {
eprintln!(" [Stellium] Ping failed with status: {}", response.status());
}
}
Err(e) => {
eprintln!(" [Stellium] Ping request error: {:?}", e);
}
}
}
});
}
pub async fn send_transaction(&self, trade_type: TradeType, transaction: &VersionedTransaction) -> Result<()> {
let start_time = Instant::now();
let (content, signature) = serialize_transaction_and_encode(transaction, UiTransactionEncoding::Base64).await?;
// Stellium uses standard Solana sendTransaction format
let request_body = serde_json::to_string(&json!({
"jsonrpc": "2.0",
"id": 1,
"method": "sendTransaction",
"params": [
content,
{ "encoding": "base64" }
]
}))?;
// Build the URL with the API key
let url = format!("{}/{}", self.endpoint, self.auth_token);
// Send request to Stellium
let response_text = self.http_client.post(&url)
.body(request_body)
.header("Content-Type", "application/json")
.header("Connection", "keep-alive")
.header("Keep-Alive", "timeout=30, max=1000")
.send()
.await?
.text()
.await?;
// Parse response
if let Ok(response_json) = serde_json::from_str::<serde_json::Value>(&response_text) {
if response_json.get("result").is_some() {
println!(" [Stellium] {} submitted: {:?}", trade_type, start_time.elapsed());
} else if let Some(_error) = response_json.get("error") {
eprintln!(" [Stellium] {} submission failed: {:?}", trade_type, _error);
}
} else {
eprintln!(" [Stellium] {} submission failed: {:?}", trade_type, response_text);
}
let start_time: Instant = Instant::now();
match poll_transaction_confirmation(&self.rpc_client, signature).await {
Ok(_) => (),
Err(e) => {
println!(" signature: {:?}", signature);
println!(" [Stellium] {} confirmation failed: {:?}", trade_type, start_time.elapsed());
return Err(e);
},
}
println!(" signature: {:?}", signature);
println!(" [Stellium] {} confirmed: {:?}", trade_type, start_time.elapsed());
Ok(())
}
pub async fn send_transactions(&self, trade_type: TradeType, transactions: &Vec<VersionedTransaction>) -> Result<()> {
for transaction in transactions {
self.send_transaction(trade_type, transaction).await?;
}
Ok(())
}
/// Stop the ping task
pub fn stop_ping_task(&self) {
self.keep_alive_running.store(false, Ordering::Relaxed);
}
}
impl Drop for StelliumClient {
fn drop(&mut self) {
// Stop ping task when client is dropped
self.keep_alive_running.store(false, Ordering::Relaxed);
}
}
+10
View File
@@ -26,6 +26,8 @@ use crate::{
SWQOS_MIN_TIP_FLASHBLOCK,
SWQOS_MIN_TIP_BLOCKRAZOR,
SWQOS_MIN_TIP_ASTRALANE,
SWQOS_MIN_TIP_STELLIUM,
SWQOS_MIN_TIP_LIGHTSPEED,
},
};
@@ -204,8 +206,16 @@ pub async fn execute_parallel(
SwqosType::FlashBlock => SWQOS_MIN_TIP_FLASHBLOCK,
SwqosType::BlockRazor => SWQOS_MIN_TIP_BLOCKRAZOR,
SwqosType::Astralane => SWQOS_MIN_TIP_ASTRALANE,
SwqosType::Stellium => SWQOS_MIN_TIP_STELLIUM,
SwqosType::Lightspeed => SWQOS_MIN_TIP_LIGHTSPEED,
SwqosType::Default => SWQOS_MIN_TIP_DEFAULT,
};
if config.2.tip < min_tip {
println!(
"⚠️ Config filtered: {:?} tip {} is below minimum required tip {}",
config.0, config.2.tip, min_tip
);
}
config.2.tip >= min_tip
} else {
true