0cd276d6cb
- Add Helius Sender client (helius.rs) with dual routing and swqos_only mode - Helius min tip: 0.0002 SOL default, 0.000005 SOL when swqos_only=true - Add TradeConfig.check_min_tip (default false) to skip min-tip validation for lower latency - Thread check_min_tip through SwapParams and execute_parallel; only call min_tip_sol when enabled - Add SWQOS_ENDPOINTS_HELIUS and HELIUS_TIP_ACCOUNTS in constants - Extend SwqosConfig/SwqosType for Helius; add Helius to get_endpoint and get_swqos_client - Update trading_client, shared_infrastructure and middleware_system examples Made-with: Cursor
399 lines
14 KiB
Rust
399 lines
14 KiB
Rust
//! Parallel executor for multi-SWQOS submit.
|
|
|
|
use anyhow::{anyhow, Result};
|
|
use crossbeam_queue::ArrayQueue;
|
|
use solana_hash::Hash;
|
|
use solana_sdk::message::AddressLookupTableAccount;
|
|
use solana_sdk::{
|
|
instruction::Instruction, pubkey::Pubkey, signature::Keypair, signature::Signature,
|
|
};
|
|
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
|
|
use std::{str::FromStr, sync::Arc, time::Instant};
|
|
|
|
use crate::{
|
|
common::nonce_cache::DurableNonceInfo,
|
|
common::{GasFeeStrategy, SolanaRpcClient},
|
|
swqos::{SwqosClient, SwqosType, TradeType},
|
|
trading::{common::build_transaction, MiddlewareManager},
|
|
};
|
|
|
|
#[repr(align(64))]
|
|
struct TaskResult {
|
|
success: bool,
|
|
signature: Signature,
|
|
error: Option<anyhow::Error>,
|
|
#[allow(dead_code)]
|
|
swqos_type: SwqosType,
|
|
landed_on_chain: bool,
|
|
}
|
|
|
|
/// Check if an error indicates the transaction landed on-chain (vs network/timeout error)
|
|
fn is_landed_error(error: &anyhow::Error) -> bool {
|
|
use crate::swqos::common::TradeError;
|
|
|
|
// If it's a TradeError with a non-zero code, the tx landed but failed on-chain
|
|
if let Some(trade_error) = error.downcast_ref::<TradeError>() {
|
|
// Code 500 with "timed out" message means tx never landed
|
|
if trade_error.code == 500 && trade_error.message.contains("timed out") {
|
|
return false;
|
|
}
|
|
// Any other TradeError means the tx landed (e.g., ExceededSlippage = 6004)
|
|
return trade_error.code > 0;
|
|
}
|
|
|
|
// Check error message for timeout indication
|
|
let msg = error.to_string();
|
|
if msg.contains("timed out") || msg.contains("timeout") {
|
|
return false;
|
|
}
|
|
|
|
// Assume other errors might indicate landed tx (be conservative)
|
|
false
|
|
}
|
|
|
|
struct ResultCollector {
|
|
results: Arc<ArrayQueue<TaskResult>>,
|
|
success_flag: Arc<AtomicBool>,
|
|
landed_failed_flag: Arc<AtomicBool>, // 🔧 Tx landed on-chain but failed (nonce consumed)
|
|
completed_count: Arc<AtomicUsize>,
|
|
total_tasks: usize,
|
|
}
|
|
|
|
impl ResultCollector {
|
|
fn new(capacity: usize) -> Self {
|
|
Self {
|
|
results: Arc::new(ArrayQueue::new(capacity)),
|
|
success_flag: Arc::new(AtomicBool::new(false)),
|
|
landed_failed_flag: Arc::new(AtomicBool::new(false)),
|
|
completed_count: Arc::new(AtomicUsize::new(0)),
|
|
total_tasks: capacity,
|
|
}
|
|
}
|
|
|
|
fn submit(&self, result: TaskResult) {
|
|
// ArrayQueue is already synchronized; no extra fence needed
|
|
let is_success = result.success;
|
|
let is_landed_failed = result.landed_on_chain && !result.success;
|
|
|
|
let _ = self.results.push(result);
|
|
|
|
if is_success {
|
|
self.success_flag.store(true, Ordering::Release);
|
|
} else if is_landed_failed {
|
|
// 🔧 Tx landed but failed (e.g., ExceededSlippage) - nonce is consumed, no point waiting
|
|
self.landed_failed_flag.store(true, Ordering::Release);
|
|
}
|
|
|
|
self.completed_count.fetch_add(1, Ordering::Release);
|
|
}
|
|
|
|
async fn wait_for_success(&self) -> Option<(bool, Vec<Signature>, Option<anyhow::Error>)> {
|
|
let start = Instant::now();
|
|
let timeout = std::time::Duration::from_secs(5);
|
|
let poll_interval = std::time::Duration::from_millis(1000);
|
|
|
|
loop {
|
|
if self.success_flag.load(Ordering::Acquire) {
|
|
let mut signatures = Vec::new();
|
|
let mut has_success = false;
|
|
while let Some(result) = self.results.pop() {
|
|
signatures.push(result.signature);
|
|
if result.success {
|
|
has_success = true;
|
|
}
|
|
}
|
|
if has_success && !signatures.is_empty() {
|
|
return Some((true, signatures, None));
|
|
}
|
|
}
|
|
|
|
// Early exit: if a tx landed but failed (e.g., ExceededSlippage),
|
|
// nonce is consumed and other channels can't succeed - return immediately
|
|
if self.landed_failed_flag.load(Ordering::Acquire) {
|
|
let mut signatures = Vec::new();
|
|
let mut landed_error = None;
|
|
while let Some(result) = self.results.pop() {
|
|
signatures.push(result.signature);
|
|
// Prefer the error from the tx that actually landed
|
|
if result.landed_on_chain && result.error.is_some() {
|
|
landed_error = result.error;
|
|
}
|
|
}
|
|
if !signatures.is_empty() {
|
|
return Some((false, signatures, landed_error));
|
|
}
|
|
}
|
|
|
|
let completed = self.completed_count.load(Ordering::Acquire);
|
|
if completed >= self.total_tasks {
|
|
let mut signatures = Vec::new();
|
|
let mut last_error = None;
|
|
let mut any_success = false;
|
|
while let Some(result) = self.results.pop() {
|
|
signatures.push(result.signature);
|
|
if result.success {
|
|
any_success = true;
|
|
}
|
|
if result.error.is_some() {
|
|
last_error = result.error;
|
|
}
|
|
}
|
|
if !signatures.is_empty() {
|
|
return Some((any_success, signatures, last_error));
|
|
}
|
|
return None;
|
|
}
|
|
|
|
if start.elapsed() > timeout {
|
|
return None;
|
|
}
|
|
tokio::time::sleep(poll_interval).await;
|
|
}
|
|
}
|
|
|
|
fn get_first(&self) -> Option<(bool, Vec<Signature>, Option<anyhow::Error>)> {
|
|
let mut signatures = Vec::new();
|
|
let mut has_success = false;
|
|
let mut last_error = None;
|
|
|
|
while let Some(result) = self.results.pop() {
|
|
signatures.push(result.signature);
|
|
if result.success {
|
|
has_success = true;
|
|
}
|
|
if result.error.is_some() {
|
|
last_error = result.error;
|
|
}
|
|
}
|
|
|
|
if !signatures.is_empty() {
|
|
Some((has_success, signatures, last_error))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// 等待全部任务完成(不等待链上确认),然后收集并返回所有签名。用于「多路提交」时返回多笔签名。
|
|
async fn wait_for_all_submitted(&self, timeout_secs: u64) -> Option<(bool, Vec<Signature>, Option<anyhow::Error>)> {
|
|
let start = Instant::now();
|
|
let timeout = std::time::Duration::from_secs(timeout_secs);
|
|
let poll_interval = std::time::Duration::from_millis(50);
|
|
while self.completed_count.load(Ordering::Acquire) < self.total_tasks {
|
|
if start.elapsed() > timeout {
|
|
break;
|
|
}
|
|
tokio::time::sleep(poll_interval).await;
|
|
}
|
|
self.get_first()
|
|
}
|
|
}
|
|
|
|
/// Execute trade on multiple SWQOS clients in parallel; returns success flag, all signatures, and last error.
|
|
pub async fn execute_parallel(
|
|
swqos_clients: &[Arc<SwqosClient>],
|
|
payer: Arc<Keypair>,
|
|
rpc: Option<Arc<SolanaRpcClient>>,
|
|
instructions: Vec<Instruction>,
|
|
address_lookup_table_account: Option<AddressLookupTableAccount>,
|
|
recent_blockhash: Option<Hash>,
|
|
durable_nonce: Option<DurableNonceInfo>,
|
|
middleware_manager: Option<Arc<MiddlewareManager>>,
|
|
protocol_name: &'static str,
|
|
is_buy: bool,
|
|
wait_transaction_confirmed: bool,
|
|
with_tip: bool,
|
|
gas_fee_strategy: GasFeeStrategy,
|
|
use_core_affinity: bool,
|
|
check_min_tip: bool,
|
|
) -> Result<(bool, Vec<Signature>, Option<anyhow::Error>)> {
|
|
let _exec_start = Instant::now();
|
|
|
|
if swqos_clients.is_empty() {
|
|
return Err(anyhow!("swqos_clients is empty"));
|
|
}
|
|
|
|
if !with_tip
|
|
&& swqos_clients
|
|
.iter()
|
|
.find(|swqos| matches!(swqos.get_swqos_type(), SwqosType::Default))
|
|
.is_none()
|
|
{
|
|
return Err(anyhow!("No Rpc Default Swqos configured."));
|
|
}
|
|
|
|
let cores = core_affinity::get_core_ids().unwrap_or_default();
|
|
let instructions = Arc::new(instructions);
|
|
|
|
// Precompute all valid (client, gas config) combinations
|
|
let task_configs: Vec<_> = swqos_clients
|
|
.iter()
|
|
.enumerate()
|
|
.filter(|(_, swqos_client)| {
|
|
with_tip || matches!(swqos_client.get_swqos_type(), SwqosType::Default)
|
|
})
|
|
.flat_map(|(i, swqos_client)| {
|
|
let swqos_type = swqos_client.get_swqos_type();
|
|
let gas_fee_strategy_configs = gas_fee_strategy.get_strategies(if is_buy {
|
|
TradeType::Buy
|
|
} else {
|
|
TradeType::Sell
|
|
});
|
|
let check_tip = with_tip && !matches!(swqos_type, SwqosType::Default) && check_min_tip;
|
|
let min_tip = if check_tip {
|
|
swqos_client.min_tip_sol()
|
|
} else {
|
|
0.0
|
|
};
|
|
gas_fee_strategy_configs
|
|
.into_iter()
|
|
.filter(move |config| config.0 == swqos_type)
|
|
.filter(move |config| {
|
|
if check_tip {
|
|
if config.2.tip < min_tip && crate::common::sdk_log::sdk_log_enabled() {
|
|
println!(
|
|
"⚠️ Config filtered: {:?} tip {} is below minimum required {}",
|
|
config.0, config.2.tip, min_tip
|
|
);
|
|
}
|
|
config.2.tip >= min_tip
|
|
} else {
|
|
true
|
|
}
|
|
})
|
|
.map(move |config| (i, swqos_client.clone(), config))
|
|
})
|
|
.collect();
|
|
|
|
if task_configs.is_empty() {
|
|
return Err(anyhow!("No available gas fee strategy configs"));
|
|
}
|
|
|
|
if is_buy && task_configs.len() > 1 && durable_nonce.is_none() {
|
|
return Err(anyhow!("Multiple swqos transactions require durable_nonce to be set.",));
|
|
}
|
|
|
|
// Task preparation completed
|
|
|
|
let collector = Arc::new(ResultCollector::new(task_configs.len()));
|
|
let _spawn_start = Instant::now();
|
|
|
|
for (i, swqos_client, gas_fee_strategy_config) in task_configs {
|
|
let core_id = cores.get(i % cores.len().max(1)).copied();
|
|
let use_affinity = use_core_affinity;
|
|
let payer = payer.clone();
|
|
let instructions = instructions.clone();
|
|
let middleware_manager = middleware_manager.clone();
|
|
let swqos_type = swqos_client.get_swqos_type();
|
|
let tip_account_str = swqos_client.get_tip_account()?;
|
|
let tip_account = Arc::new(Pubkey::from_str(&tip_account_str).unwrap_or_default());
|
|
let collector = collector.clone();
|
|
|
|
let tip = gas_fee_strategy_config.2.tip;
|
|
let unit_limit = gas_fee_strategy_config.2.cu_limit;
|
|
let unit_price = gas_fee_strategy_config.2.cu_price;
|
|
let rpc = rpc.clone();
|
|
let durable_nonce = durable_nonce.clone();
|
|
let address_lookup_table_account = address_lookup_table_account.clone();
|
|
let recent_blockhash_task = recent_blockhash.clone();
|
|
|
|
tokio::spawn(async move {
|
|
let _task_start = Instant::now();
|
|
if use_affinity {
|
|
if let Some(cid) = core_id {
|
|
core_affinity::set_for_current(cid);
|
|
}
|
|
}
|
|
|
|
let tip_amount = if with_tip { tip } else { 0.0 };
|
|
|
|
let _build_start = Instant::now();
|
|
let transaction = match build_transaction(
|
|
payer,
|
|
rpc,
|
|
unit_limit,
|
|
unit_price,
|
|
instructions.as_ref(),
|
|
address_lookup_table_account,
|
|
recent_blockhash_task,
|
|
middleware_manager,
|
|
protocol_name,
|
|
is_buy,
|
|
swqos_type != SwqosType::Default,
|
|
&tip_account,
|
|
tip_amount,
|
|
durable_nonce,
|
|
)
|
|
.await
|
|
{
|
|
Ok(tx) => tx,
|
|
Err(e) => {
|
|
// Build transaction failed
|
|
collector.submit(TaskResult {
|
|
success: false,
|
|
signature: Signature::default(),
|
|
error: Some(e),
|
|
swqos_type,
|
|
landed_on_chain: false,
|
|
});
|
|
return;
|
|
}
|
|
};
|
|
|
|
// Transaction built
|
|
|
|
let _send_start = Instant::now();
|
|
let mut err: Option<anyhow::Error> = None;
|
|
#[allow(unused_assignments)]
|
|
let mut landed_on_chain = false;
|
|
let success = match swqos_client
|
|
.send_transaction(
|
|
if is_buy { TradeType::Buy } else { TradeType::Sell },
|
|
&transaction,
|
|
wait_transaction_confirmed,
|
|
)
|
|
.await
|
|
{
|
|
Ok(()) => {
|
|
landed_on_chain = true; // Success means tx confirmed on-chain
|
|
true
|
|
}
|
|
Err(e) => {
|
|
// Check if this error indicates the tx landed but failed (e.g., ExceededSlippage)
|
|
landed_on_chain = is_landed_error(&e);
|
|
err = Some(e);
|
|
// Send transaction failed
|
|
false
|
|
}
|
|
};
|
|
|
|
// Transaction sent: always submit a result so collector never has "no result" for this task.
|
|
// If transaction has no signatures (malformed), submit with default signature and success=false.
|
|
let sig = transaction.signatures.first().copied().unwrap_or_default();
|
|
collector.submit(TaskResult {
|
|
success,
|
|
signature: sig,
|
|
error: err,
|
|
swqos_type,
|
|
landed_on_chain,
|
|
});
|
|
});
|
|
}
|
|
|
|
// All tasks spawned
|
|
|
|
if !wait_transaction_confirmed {
|
|
const SUBMIT_TIMEOUT_SECS: u64 = 30;
|
|
let (success, signatures, last_error) = collector
|
|
.wait_for_all_submitted(SUBMIT_TIMEOUT_SECS)
|
|
.await
|
|
.unwrap_or((false, vec![], Some(anyhow!("No SWQOS result within {}s", SUBMIT_TIMEOUT_SECS))));
|
|
return Ok((success, signatures, last_error));
|
|
}
|
|
|
|
if let Some(result) = collector.wait_for_success().await {
|
|
Ok(result)
|
|
} else {
|
|
Err(anyhow!("All transactions failed"))
|
|
}
|
|
}
|