rebuild nonce and swqos strategy

src/trading/common/nonce_manager.rs

@@ -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()
     }
 }

src/trading/common/transaction_builder.rs

@@ -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 =