repurpose taker_speed_bump_override

Author: moosecat2

programs/drift/src/controller/orders.rs

@@ -1090,7 +1090,7 @@ pub fn fill_perp_order(
             &market.amm.oracle_source,
             oracle::LogMode::SafeMMOracle,
             market.amm.oracle_slot_delay_override,
-            market.amm.slots_before_stale_for_amm_low_risk,
+            market.amm.taker_speed_bump_override,
         )?;
 
         user_can_skip_duration = user.can_skip_auction_duration(user_stats)?;

programs/drift/src/controller/orders/amm_jit_tests.rs

@@ -62,7 +62,7 @@ pub fn get_amm_is_available(
         &market.amm.oracle_source,
         oracle::LogMode::SafeMMOracle,
         market.amm.oracle_slot_delay_override,
-        market.amm.slots_before_stale_for_amm_low_risk,
+        market.amm.taker_speed_bump_override,
     )
     .unwrap();
     market
@@ -565,9 +565,9 @@ pub mod amm_jit {
             Some(PRICE_PRECISION_I64),
             now,
             slot,
-            is_amm_available,
-            FillMode::Fill,
             false,
+            FillMode::Fill,
+            is_amm_available,
             &mut None,
             false,
         )
@@ -581,7 +581,6 @@ pub mod amm_jit {
             -(BASE_PRECISION_I64 + BASE_PRECISION_I64 / 2)
         );
 
-        println!("amm is available: {}", is_amm_available);
         // nets to zero
         let market_after = market_map.get_ref(&0).unwrap();
         assert_eq!(market_after.amm.base_asset_amount_with_amm, 0);

programs/drift/src/controller/orders/fuel_tests.rs

@@ -58,7 +58,7 @@ pub fn get_amm_is_available(
         &market.amm.oracle_source,
         crate::math::oracle::LogMode::SafeMMOracle,
         market.amm.oracle_slot_delay_override,
-        market.amm.slots_before_stale_for_amm_low_risk,
+        market.amm.taker_speed_bump_override,
     )
     .unwrap();
     market

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

@@ -62,7 +62,7 @@ pub fn get_amm_is_available(
         &market.amm.oracle_source,
         crate::math::oracle::LogMode::SafeMMOracle,
         market.amm.oracle_slot_delay_override,
-        market.amm.slots_before_stale_for_amm_low_risk,
+        market.amm.taker_speed_bump_override,
     )
     .unwrap();
     market

programs/drift/src/instructions/admin.rs

@@ -1080,8 +1080,7 @@ pub fn handle_initialize_perp_market(
             reference_price_offset: 0,
             amm_inventory_spread_adjustment: 0,
             reference_price_offset_deadband_pct: 0,
-            slots_before_stale_for_amm_low_risk: 0,
-            padding: [0; 1],
+            padding: [0; 2],
             last_funding_oracle_twap: 0,
         },
     };

programs/drift/src/instructions/user.rs

@@ -1789,7 +1789,7 @@ pub fn handle_transfer_perp_position<'c: 'info, 'info>(
                 .last_oracle_price_twap,
             perp_market.get_max_confidence_interval_multiplier()?,
             perp_market.amm.oracle_slot_delay_override,
-            perp_market.amm.slots_before_stale_for_amm_low_risk,
+            perp_market.amm.taker_speed_bump_override,
         )?;
         step_size = perp_market.amm.order_step_size;
         tick_size = perp_market.amm.order_tick_size;

programs/drift/src/math/oracle.rs

@@ -254,7 +254,7 @@ pub fn oracle_validity(
     oracle_source: &OracleSource,
     log_mode: LogMode,
     slots_before_stale_for_amm_immdiate_override: i8,
-    slots_before_stale_for_amm_low_risk: i8,
+    taker_speed_bump_override: i8,
 ) -> DriftResult<OracleValidity> {
     let OraclePriceData {
         price: oracle_price,
@@ -285,8 +285,8 @@ pub fn oracle_validity(
         oracle_delay.gt(&valid_oracle_guard_rails.slots_before_stale_for_amm)
     };
 
-    let is_stale_for_amm_low_risk = if slots_before_stale_for_amm_low_risk != 0 {
-        oracle_delay.gt(&slots_before_stale_for_amm_low_risk.max(0).cast()?)
+    let is_stale_for_amm_low_risk = if taker_speed_bump_override != 0 {
+        oracle_delay.gt(&taker_speed_bump_override.max(0).cast()?)
     } else {
         // Default to current behavior if not set on the amm
         false

programs/drift/src/state/oracle_map.rs

@@ -89,7 +89,7 @@ impl<'a> OracleMap<'a> {
         last_oracle_price_twap: i64,
         max_confidence_interval_multiplier: u64,
         slots_before_stale_for_amm_override: i8,
-        slots_before_stale_for_amm_low_risk_override: i8,
+        taker_speed_bump_override_override: i8,
     ) -> DriftResult<(&OraclePriceData, OracleValidity)> {
         if self.should_get_quote_asset_price_data(&oracle_id.0) {
             return Ok((&self.quote_asset_price_data, OracleValidity::Valid));
@@ -111,7 +111,7 @@ impl<'a> OracleMap<'a> {
                     &oracle_id.1,
                     LogMode::ExchangeOracle,
                     slots_before_stale_for_amm_override,
-                    slots_before_stale_for_amm_low_risk_override,
+                    taker_speed_bump_override_override,
                 )?;
                 self.validity.insert(*oracle_id, oracle_validity);
                 oracle_validity
@@ -142,7 +142,7 @@ impl<'a> OracleMap<'a> {
             &oracle_id.1,
             LogMode::ExchangeOracle,
             slots_before_stale_for_amm_override,
-            slots_before_stale_for_amm_low_risk_override,
+            taker_speed_bump_override_override,
         )?;
         self.validity.insert(*oracle_id, oracle_validity);
 

programs/drift/src/state/perp_market.rs

@@ -846,7 +846,7 @@ impl PerpMarket {
                 &self.amm.oracle_source,
                 LogMode::MMOracle,
                 self.amm.oracle_slot_delay_override,
-                self.amm.slots_before_stale_for_amm_low_risk,
+                self.amm.taker_speed_bump_override,
             )?
         };
         Ok(MMOraclePriceData::new(
@@ -1231,8 +1231,7 @@ pub struct AMM {
     /// signed scale amm_spread similar to fee_adjustment logic (-100 = 0, 100 = double)
     pub amm_inventory_spread_adjustment: i8,
     pub reference_price_offset_deadband_pct: u8,
-    pub slots_before_stale_for_amm_low_risk: i8,
-    pub padding: [u8; 1],
+    pub padding: [u8; 2],
     pub last_funding_oracle_twap: i64,
 }
 
@@ -1324,8 +1323,7 @@ impl Default for AMM {
             reference_price_offset: 0,
             amm_inventory_spread_adjustment: 0,
             reference_price_offset_deadband_pct: 0,
-            slots_before_stale_for_amm_low_risk: 0,
-            padding: [0; 1],
+            padding: [0; 2],
             last_funding_oracle_twap: 0,
         }
     }