feat: 为 buy 和 sell 方法添加 Signature 返回值
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
use anyhow::{anyhow, Result};
|
||||
use solana_hash::Hash;
|
||||
use solana_sdk::{instruction::Instruction, pubkey::Pubkey, signature::Keypair};
|
||||
// use solana_program::example_mocks::solana_signature::Signature;
|
||||
use solana_sdk::{
|
||||
instruction::Instruction, pubkey::Pubkey, signature::Keypair, signature::Signature,
|
||||
};
|
||||
use std::{str::FromStr, sync::Arc, time::Instant};
|
||||
use tokio::sync::mpsc;
|
||||
use tokio::task::JoinHandle;
|
||||
@@ -25,9 +28,9 @@ pub async fn parallel_execute_with_tips(
|
||||
is_buy: bool,
|
||||
wait_transaction_confirmed: bool,
|
||||
with_tip: bool,
|
||||
) -> Result<()> {
|
||||
) -> Result<Signature> {
|
||||
let cores = core_affinity::get_core_ids().unwrap();
|
||||
let mut handles: Vec<JoinHandle<Result<()>>> = Vec::with_capacity(swqos_clients.len());
|
||||
let mut handles: Vec<JoinHandle<Result<Signature>>> = Vec::with_capacity(swqos_clients.len());
|
||||
if is_buy
|
||||
&& (swqos_clients.len() > priority_fee.buy_tip_fees.len()
|
||||
|| priority_fee.buy_tip_fees.is_empty())
|
||||
@@ -103,7 +106,11 @@ pub async fn parallel_execute_with_tips(
|
||||
start.elapsed()
|
||||
);
|
||||
|
||||
Ok::<(), anyhow::Error>(())
|
||||
transaction
|
||||
.signatures
|
||||
.first()
|
||||
.ok_or_else(|| anyhow!("Transaction has no signatures"))
|
||||
.cloned()
|
||||
});
|
||||
|
||||
handles.push(handle);
|
||||
@@ -125,13 +132,20 @@ pub async fn parallel_execute_with_tips(
|
||||
let mut errors = Vec::new();
|
||||
|
||||
if !wait_transaction_confirmed {
|
||||
return Ok(());
|
||||
if let Some(result) = rx.recv().await {
|
||||
match result {
|
||||
Ok(Ok(sig)) => return Ok(sig),
|
||||
Ok(Err(e)) => errors.push(format!("Task error: {}", e)),
|
||||
Err(e) => errors.push(format!("Join error: {}", e)),
|
||||
}
|
||||
}
|
||||
return Err(anyhow!("No transaction signature available"));
|
||||
}
|
||||
|
||||
while let Some(result) = rx.recv().await {
|
||||
match result {
|
||||
Ok(Ok(_)) => {
|
||||
return Ok(());
|
||||
Ok(Ok(sig)) => {
|
||||
return Ok(sig);
|
||||
}
|
||||
Ok(Err(e)) => errors.push(format!("Task error: {}", e)),
|
||||
Err(e) => errors.push(format!("Join error: {}", e)),
|
||||
|
||||
Reference in New Issue
Block a user