program: relax fill validation for spot/swap (#1796)

* program: relax fill validation for spot/swap

* account for external fills

* CHANGELOG

Author: crispheaney

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixes
 
+- program: less aggressive fill bands for spot swaps ([#1796](https://github.com/drift-labs/protocol-v2/pull/1796))
+
 ### Breaking
 
 ## [2.130.0] - 2025-07-29

programs/drift/src/controller/orders.rs

@@ -1336,6 +1336,7 @@ pub fn fill_perp_order(
                 .oracle_guard_rails
                 .max_oracle_twap_5min_percent_divergence(),
             perp_market.is_prediction_market(),
+            None,
         )?;
 
         perp_market.last_fill_price = fill_price;
@@ -4102,6 +4103,11 @@ pub fn fill_spot_order(
                 .oracle_guard_rails
                 .max_oracle_twap_5min_percent_divergence(),
             false,
+            if fulfillment_params.is_external() {
+                Some(order_direction)
+            } else {
+                None
+            },
         )?;
     }
 

programs/drift/src/math/orders.rs

@@ -491,6 +491,7 @@ pub fn validate_fill_price_within_price_bands(
     margin_ratio_initial: u32,
     oracle_twap_5min_percent_divergence: u64,
     is_prediction_market: bool,
+    direction: Option<PositionDirection>,
 ) -> DriftResult {
     if is_prediction_market {
         validate!(
@@ -504,6 +505,22 @@ pub fn validate_fill_price_within_price_bands(
         return Ok(());
     }
 
+    if let Some(direction) = direction {
+        if direction == PositionDirection::Long {
+            if fill_price < oracle_price.cast::<u64>()?
+                && fill_price < oracle_twap_5min.cast::<u64>()?
+            {
+                return Ok(());
+            }
+        } else {
+            if fill_price > oracle_price.cast::<u64>()?
+                && fill_price > oracle_twap_5min.cast::<u64>()?
+            {
+                return Ok(());
+            }
+        }
+    }
+
     let max_oracle_diff = margin_ratio_initial.cast::<u128>()?;
     let max_oracle_twap_diff = oracle_twap_5min_percent_divergence.cast::<u128>()?; // 50%
 

programs/drift/src/math/orders/tests.rs

@@ -3177,6 +3177,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_ok())
     }
@@ -3195,6 +3196,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_ok())
     }
@@ -3214,6 +3216,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_err())
     }
@@ -3233,6 +3236,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_err())
     }
@@ -3252,6 +3256,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_err())
     }
@@ -3271,6 +3276,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_err())
     }
@@ -3290,6 +3296,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_err())
     }
@@ -3309,6 +3316,7 @@ pub mod validate_fill_price_within_price_bands {
             margin_ratio_initial,
             (PERCENTAGE_PRECISION / 2) as u64,
             false,
+            None,
         )
         .is_err())
     }

programs/drift/src/math/spot_swap.rs

@@ -100,7 +100,7 @@ pub fn validate_price_bands_for_swap(
     out_price: i64,
     oracle_twap_5min_percent_divergence: u64,
 ) -> DriftResult {
-    let (fill_price, oracle_price, oracle_twap_5min, margin_ratio) = {
+    let (fill_price, direction, oracle_price, oracle_twap_5min, margin_ratio) = {
         let in_market_margin_ratio = in_market.get_margin_ratio(&MarginRequirementType::Initial)?;
 
         if in_market_margin_ratio != 0 {
@@ -113,6 +113,7 @@ pub fn validate_price_bands_for_swap(
 
             (
                 fill_price,
+                PositionDirection::Short,
                 in_price,
                 in_market.historical_oracle_data.last_oracle_price_twap_5min,
                 in_market_margin_ratio,
@@ -123,6 +124,7 @@ pub fn validate_price_bands_for_swap(
 
             (
                 fill_price,
+                PositionDirection::Long,
                 out_price,
                 out_market
                     .historical_oracle_data
@@ -139,6 +141,7 @@ pub fn validate_price_bands_for_swap(
         margin_ratio,
         oracle_twap_5min_percent_divergence,
         false,
+        Some(direction),
     )?;
 
     Ok(())