rebuild nonce and swqos strategy

2025-09-20 14:00:45 +08:00
parent 4df22f2057
commit b46582a273
7 changed files with 120 additions and 124 deletions
@@ -2,6 +2,8 @@ use solana_hash::Hash;
 use solana_sdk::{instruction::Instruction, pubkey::Pubkey, signature::Keypair, signer::Signer};
 use solana_system_interface::instruction::advance_nonce_account;

+use crate::common::nonce_cache::DurableNonceInfo;
+
 /// Add nonce advance instruction to the instruction set
 ///
 /// Nonce functionality is only used when nonce_pubkey is provided
@@ -10,26 +12,29 @@ use solana_system_interface::instruction::advance_nonce_account;
 pub fn add_nonce_instruction(
    instructions: &mut Vec<Instruction>,
    payer: &Keypair,
-    nonce_account: Option<Pubkey>,
-    current_nonce: Option<Hash>,
+    // nonce_account: Option<Pubkey>,
+    // current_nonce: Option<Hash>,
+    durable_nonce: Option<DurableNonceInfo>,
 ) -> Result<(), anyhow::Error> {
-    if nonce_account.is_some() && current_nonce.is_some() {
-        let nonce_advance_ix = advance_nonce_account(&nonce_account.unwrap(), &payer.pubkey());
+    if let Some(durable_nonce) = durable_nonce {
+        let nonce_advance_ix = advance_nonce_account(&durable_nonce.nonce_account.unwrap(), &payer.pubkey());
        instructions.push(nonce_advance_ix);
    }
+ 
    Ok(())
 }

 /// Get blockhash for transaction
 /// If nonce account is used, return blockhash from nonce, otherwise return the provided recent_blockhash
 pub fn get_transaction_blockhash(
-    recent_blockhash: Hash,
-    nonce_account: Option<Pubkey>,
-    current_nonce: Option<Hash>,
+    recent_blockhash: Option<Hash>,
+    durable_nonce: Option<DurableNonceInfo>,
+    // nonce_account: Option<Pubkey>,
+    // current_nonce: Option<Hash>,
 ) -> Hash {
-    if nonce_account.is_some() && current_nonce.is_some() {
-        current_nonce.unwrap()
+    if let Some(durable_nonce) = durable_nonce {
+        durable_nonce.current_nonce.unwrap()
    } else {
-        recent_blockhash
+        recent_blockhash.unwrap()
    }
 }
@@ -16,7 +16,7 @@ use super::{
    compute_budget_manager::compute_budget_instructions,
    nonce_manager::{add_nonce_instruction, get_transaction_blockhash},
 };
-use crate::{common::SolanaRpcClient, trading::MiddlewareManager};
+use crate::{common::{nonce_cache::DurableNonceInfo, SolanaRpcClient}, trading::MiddlewareManager};

 /// Build standard RPC transaction
 pub async fn build_transaction(
@@ -26,7 +26,7 @@ pub async fn build_transaction(
    unit_price: u64,
    business_instructions: Vec<Instruction>,
    lookup_table_key: Option<Pubkey>,
-    recent_blockhash: Hash,
+    recent_blockhash: Option<Hash>,
    data_size_limit: u32,
    middleware_manager: Option<Arc<MiddlewareManager>>,
    protocol_name: &str,
@@ -34,14 +34,15 @@ pub async fn build_transaction(
    with_tip: bool,
    tip_account: &Pubkey,
    tip_amount: f64,
-    nonce_account: Option<Pubkey>,
-    current_nonce: Option<Hash>,
+    durable_nonce: Option<DurableNonceInfo>,
+    // nonce_account: Option<Pubkey>,
+    // current_nonce: Option<Hash>,
 ) -> Result<VersionedTransaction, anyhow::Error> {
    let mut instructions = Vec::with_capacity(business_instructions.len() + 5);

    // Add nonce instruction
    if let Err(e) =
-        add_nonce_instruction(&mut instructions, payer.as_ref(), nonce_account, current_nonce)
+        add_nonce_instruction(&mut instructions, payer.as_ref(), durable_nonce.clone())
    {
        return Err(e);
    }
@@ -67,7 +68,7 @@ pub async fn build_transaction(
    instructions.extend(business_instructions);

    // Get blockhash for transaction
-    let blockhash = get_transaction_blockhash(recent_blockhash, nonce_account, current_nonce);
+    let blockhash = get_transaction_blockhash(recent_blockhash, durable_nonce.clone());

    // Get address lookup table accounts
    let address_lookup_table_accounts =
@@ -9,6 +9,7 @@ use tokio::task::JoinHandle;

 use crate::{
    common::{GasFeeStrategy, SolanaRpcClient},
+    common::nonce_cache::DurableNonceInfo,
    swqos::{SwqosClient, SwqosType, TradeType},
    trading::{common::build_transaction, BuyParams, MiddlewareManager, SellParams},
 };
@@ -25,8 +26,9 @@ pub async fn buy_parallel_execute(
        instructions,
        params.lookup_table_key,
        params.recent_blockhash,
-        params.nonce_account,
-        params.current_nonce,
+        params.durable_nonce.clone(),
+        // params.nonce_account,
+        // params.current_nonce,
        params.data_size_limit,
        params.middleware_manager,
        protocol_name,
@@ -49,8 +51,9 @@ pub async fn sell_parallel_execute(
        instructions,
        params.lookup_table_key,
        params.recent_blockhash,
-        params.nonce_account,
-        params.current_nonce,
+        params.durable_nonce.clone(),
+        // params.nonce_account,
+        // params.current_nonce,
        0,
        params.middleware_manager,
        protocol_name,
@@ -68,9 +71,10 @@ async fn parallel_execute(
    rpc: Option<Arc<SolanaRpcClient>>,
    instructions: Vec<Instruction>,
    lookup_table_key: Option<Pubkey>,
-    recent_blockhash: Hash,
-    nonce_account: Option<Pubkey>,
-    current_nonce: Option<Hash>,
+    recent_blockhash: Option<Hash>,
+    durable_nonce: Option<DurableNonceInfo>,
+    // nonce_account: Option<Pubkey>,
+    // current_nonce: Option<Hash>,
    data_size_limit: u32,
    middleware_manager: Option<Arc<MiddlewareManager>>,
    protocol_name: &'static str,
@@ -133,6 +137,7 @@ async fn parallel_execute(
        let swqos_type = swqos_type.clone();
        let tip_account = tip_account.clone();
        let rpc = rpc.clone();
+        let durable_nonce = durable_nonce.clone();

        let handle = tokio::spawn(async move {
            core_affinity::set_for_current(core_id);
@@ -156,8 +161,8 @@ async fn parallel_execute(
                swqos_type != SwqosType::Default,
                &tip_account,
                tip_amount,
-                nonce_account,
-                current_nonce,
+                durable_nonce,
+                // current_nonce,
            )
            .await?;

@@ -1,6 +1,7 @@
 use super::traits::ProtocolParams;
 use crate::common::bonding_curve::BondingCurveAccount;
 use crate::common::SolanaRpcClient;
+use crate::common::nonce_cache::DurableNonceInfo;
 use crate::solana_streamer_sdk::streaming::event_parser::common::EventType;
 use crate::solana_streamer_sdk::streaming::event_parser::protocols::bonk::BonkTradeEvent;
 use crate::swqos::SwqosClient;
@@ -25,7 +26,7 @@ pub struct BuyParams {
    pub sol_amount: u64,
    pub slippage_basis_points: Option<u64>,
    pub lookup_table_key: Option<Pubkey>,
-    pub recent_blockhash: Hash,
+    pub recent_blockhash: Option<Hash>,
    pub data_size_limit: u32,
    pub wait_transaction_confirmed: bool,
    pub protocol_params: Box<dyn ProtocolParams>,
@@ -35,8 +36,9 @@ pub struct BuyParams {
    pub create_wsol_ata: bool,
    pub close_wsol_ata: bool,
    pub create_mint_ata: bool,
-    pub nonce_account: Option<Pubkey>,
-    pub current_nonce: Option<Hash>,
+    // pub nonce_account: Option<Pubkey>,
+    // pub current_nonce: Option<Hash>,
+    pub durable_nonce: Option<DurableNonceInfo>,
 }

 /// Sell parameters
@@ -48,7 +50,7 @@ pub struct SellParams {
    pub token_amount: Option<u64>,
    pub slippage_basis_points: Option<u64>,
    pub lookup_table_key: Option<Pubkey>,
-    pub recent_blockhash: Hash,
+    pub recent_blockhash: Option<Hash>,
    pub wait_transaction_confirmed: bool,
    pub with_tip: bool,
    pub protocol_params: Box<dyn ProtocolParams>,
@@ -57,8 +59,9 @@ pub struct SellParams {
    pub middleware_manager: Option<Arc<MiddlewareManager>>,
    pub create_wsol_ata: bool,
    pub close_wsol_ata: bool,
-    pub nonce_account: Option<Pubkey>,
-    pub current_nonce: Option<Hash>,
+    // pub nonce_account: Option<Pubkey>,
+    // pub current_nonce: Option<Hash>,
+    pub durable_nonce: Option<DurableNonceInfo>,
 }

 impl std::fmt::Debug for BuyParams {