Rollback

src/trading/common/compute_budget_manager.rs

@@ -1,3 +1,4 @@
+use crate::common::PriorityFee;
 use dashmap::DashMap;
 use once_cell::sync::Lazy;
 use smallvec::SmallVec;
@@ -19,19 +20,20 @@ static COMPUTE_BUDGET_CACHE: Lazy<DashMap<ComputeBudgetCacheKey, SmallVec<[Instr
 
 #[inline(always)]
 pub fn compute_budget_instructions(
-    unit_price: u64,
-    unit_limit: u32,
+    priority_fee: &PriorityFee,
     data_size_limit: u32,
+    is_rpc: bool,
     is_buy: bool,
 ) -> SmallVec<[Instruction; 3]> {
-    // Create cache key
-    let cache_key = ComputeBudgetCacheKey {
-        data_size_limit,
-        unit_price: unit_price,
-        unit_limit: unit_limit,
-        is_buy,
+    let (unit_price, unit_limit) = if is_rpc {
+        (priority_fee.rpc_unit_price, priority_fee.rpc_unit_limit)
+    } else {
+        (priority_fee.tip_unit_price, priority_fee.tip_unit_limit)
     };
 
+    // Create cache key
+    let cache_key = ComputeBudgetCacheKey { data_size_limit, unit_price, unit_limit, is_buy };
+
     // Try to get from cache first
     if let Some(cached_insts) = COMPUTE_BUDGET_CACHE.get(&cache_key) {
         return cached_insts.clone();

src/trading/common/transaction_builder.rs

@@ -16,13 +16,12 @@ use super::{
     compute_budget_manager::compute_budget_instructions,
     nonce_manager::{add_nonce_instruction, get_transaction_blockhash},
 };
-use crate::trading::MiddlewareManager;
+use crate::{common::PriorityFee, trading::MiddlewareManager};
 
 /// Build standard RPC transaction
 pub async fn build_transaction(
     payer: Arc<Keypair>,
-    unit_limit: u32,
-    unit_price: u64,
+    priority_fee: &PriorityFee,
     business_instructions: Vec<Instruction>,
     lookup_table_key: Option<Pubkey>,
     recent_blockhash: Hash,
@@ -37,8 +36,10 @@ pub async fn build_transaction(
     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()) {
-        return Err(e);
+    if is_buy {
+        if let Err(e) = add_nonce_instruction(&mut instructions, payer.as_ref()) {
+            return Err(e);
+        }
     }
 
     // Add tip transfer instruction
@@ -52,9 +53,9 @@ pub async fn build_transaction(
 
     // Add compute budget instructions
     instructions.extend(compute_budget_instructions(
-        unit_price,
-        unit_limit,
+        priority_fee,
         data_size_limit,
+        !with_tip,
         is_buy,
     ));