amm available for low risk orders

Author: moosecat2

programs/drift/src/controller/orders.rs

@@ -1104,10 +1104,27 @@ 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,
         )?;
 
-        oracle_valid_for_amm_fill =
-            is_oracle_valid_for_action(safe_oracle_validity, Some(DriftAction::FillOrderAmm))?;
+        let is_order_low_risk_for_amm = user.orders[order_index].is_low_risk_for_amm(
+            safe_oracle_price_data.delay,
+            state.min_perp_auction_duration,
+            slot,
+        )?;
+
+        let oracle_valid_for_amm_fill_immediate = is_oracle_valid_for_action(
+            safe_oracle_validity,
+            Some(DriftAction::FillOrderAmmImmediate),
+        )?;
+
+        let oracle_valid_for_amm_fill_low_risk = is_oracle_valid_for_action(
+            safe_oracle_validity,
+            Some(DriftAction::FillOrderAmmLowRisk),
+        )?;
+
+        oracle_valid_for_amm_fill = oracle_valid_for_amm_fill_immediate
+            || (is_order_low_risk_for_amm && oracle_valid_for_amm_fill_low_risk);
 
         oracle_stale_for_margin = mm_oracle_price_data.get_delay()
             > state
@@ -1134,8 +1151,11 @@ pub fn fill_perp_order(
         amm_has_low_enough_inventory = market
             .amm
             .amm_has_low_enough_inventory(amm_wants_to_jit_make)?;
-        amm_can_skip_duration =
-            market.can_skip_auction_duration(&state, amm_has_low_enough_inventory)?;
+        amm_can_skip_duration = market.can_skip_auction_duration(
+            &state,
+            amm_has_low_enough_inventory,
+            is_order_low_risk_for_amm,
+        )?;
 
         user_can_skip_duration = user.can_skip_auction_duration(user_stats)?;
 
@@ -3138,6 +3158,7 @@ pub fn trigger_order(
             .last_oracle_price_twap,
         perp_market.get_max_confidence_interval_multiplier()?,
         0,
+        0,
     )?;
 
     let is_oracle_valid =
@@ -5435,6 +5456,7 @@ pub fn trigger_spot_order(
         spot_market.historical_oracle_data.last_oracle_price_twap,
         spot_market.get_max_confidence_interval_multiplier()?,
         0,
+        0,
     )?;
     let strict_oracle_price = StrictOraclePrice {
         current: oracle_price_data.price,

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

@@ -2179,6 +2179,7 @@ pub mod fulfill_order_with_maker_order {
                 market.amm.historical_oracle_data.last_oracle_price_twap,
                 market.get_max_confidence_interval_multiplier().unwrap(),
                 0,
+                0,
             )
             .unwrap();
 
@@ -3107,6 +3108,32 @@ pub mod fulfill_order {
         assert!(validate_market_within_price_band(&market, &state, oracle_price).is_err());
     }
 
+    #[test]
+    fn test_order_is_low_risk_for_amm() {
+        let mut order = Order {
+            market_index: 0,
+            order_type: OrderType::Market,
+            direction: PositionDirection::Long,
+            base_asset_amount: 1000,
+            ..Order::default()
+        };
+
+        // True if no oracle delay and no auction duration
+        assert!(order.is_low_risk_for_amm(0, 0, 500).unwrap());
+
+        // True if oracle delay but order older than auction duration
+        order.slot = 95;
+        assert!(order.is_low_risk_for_amm(20, 3, 100).unwrap());
+
+        // True if order is new but the order slot is older than the oracle delay
+        order.slot = 97;
+        assert!(order.is_low_risk_for_amm(2, 3, 100).unwrap());
+
+        // False if order is newer than auction duration and oracle delay
+        order.slot = 98;
+        assert!(!order.is_low_risk_for_amm(4, 3, 100).unwrap());
+    }
+
     #[test]
     fn fulfill_with_amm_skip_auction_duration() {
         let mut oracle_price = get_pyth_price(100, 6);
@@ -3159,17 +3186,25 @@ pub mod fulfill_order {
             ..State::default()
         };
 
-        assert!(!market.can_skip_auction_duration(&state, false).unwrap());
+        assert!(!market
+            .can_skip_auction_duration(&state, false, false)
+            .unwrap());
 
         market.amm.net_revenue_since_last_funding = 1;
-        assert!(!market.can_skip_auction_duration(&state, false).unwrap());
-        assert!(market.can_skip_auction_duration(&state, true).unwrap());
+        assert!(!market
+            .can_skip_auction_duration(&state, false, false)
+            .unwrap());
+        assert!(market
+            .can_skip_auction_duration(&state, true, false)
+            .unwrap());
 
         assert!(!state.amm_immediate_fill_paused().unwrap());
         state.exchange_status = 0b10000000;
         assert!(state.amm_immediate_fill_paused().unwrap());
 
-        assert!(!market.can_skip_auction_duration(&state, true).unwrap());
+        assert!(!market
+            .can_skip_auction_duration(&state, true, false)
+            .unwrap());
     }
 
     #[test]

programs/drift/src/controller/pnl.rs

@@ -135,6 +135,7 @@ pub fn settle_pnl(
                     .last_oracle_price_twap,
                 perp_market.get_max_confidence_interval_multiplier()?,
                 0,
+                0,
             )?;
 
             if !is_oracle_valid_for_action(oracle_validity, Some(DriftAction::SettlePnl))?

programs/drift/src/controller/repeg.rs

@@ -176,6 +176,7 @@ pub fn _update_amm(
         &market.amm.oracle_source,
         oracle::LogMode::SafeMMOracle,
         0,
+        0,
     )?;
 
     let mut amm_update_cost = 0;
@@ -230,7 +231,7 @@ pub fn _update_amm(
 
     update_spreads(market, reserve_price_after, Some(clock_slot))?;
 
-    if is_oracle_valid_for_action(oracle_validity, Some(DriftAction::FillOrderAmm))? {
+    if is_oracle_valid_for_action(oracle_validity, Some(DriftAction::FillOrderAmmImmediate))? {
         if !amm_not_successfully_updated {
             market.amm.last_update_slot = clock_slot;
         }
@@ -265,6 +266,7 @@ pub fn update_amm_and_check_validity(
         &market.amm.oracle_source,
         LogMode::SafeMMOracle,
         0,
+        0,
     )?;
 
     validate!(

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

@@ -115,6 +115,7 @@ pub fn update_amm_test() {
         &market.amm.oracle_source,
         LogMode::ExchangeOracle,
         0,
+        0,
     )
     .unwrap()
         == OracleValidity::Valid;
@@ -249,6 +250,7 @@ pub fn update_amm_test_bad_oracle() {
         &market.amm.oracle_source,
         LogMode::None,
         0,
+        0,
     )
     .unwrap()
         == OracleValidity::Valid;

programs/drift/src/controller/spot_balance.rs

@@ -412,6 +412,7 @@ pub fn update_spot_market_and_check_validity(
         &spot_market.oracle_source,
         LogMode::ExchangeOracle,
         0,
+        0,
     )?;
 
     validate!(

programs/drift/src/instructions/admin.rs

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

programs/drift/src/instructions/user.rs

@@ -1789,6 +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,
         )?;
         step_size = perp_market.amm.order_step_size;
         tick_size = perp_market.amm.order_tick_size;

programs/drift/src/math/margin.rs

@@ -265,6 +265,7 @@ pub fn calculate_margin_requirement_and_total_collateral_and_liability_info(
             spot_market.historical_oracle_data.last_oracle_price_twap,
             spot_market.get_max_confidence_interval_multiplier()?,
             0,
+            0,
         )?;
 
         let mut skip_token_value = false;
@@ -517,6 +518,7 @@ pub fn calculate_margin_requirement_and_total_collateral_and_liability_info(
                     .last_oracle_price_twap,
                 quote_spot_market.get_max_confidence_interval_multiplier()?,
                 0,
+                0,
             )?;
 
         let strict_quote_price = StrictOraclePrice::new(
@@ -535,6 +537,7 @@ pub fn calculate_margin_requirement_and_total_collateral_and_liability_info(
             market.amm.historical_oracle_data.last_oracle_price_twap,
             market.get_max_confidence_interval_multiplier()?,
             0,
+            0,
         )?;
 
         let perp_position_custom_margin_ratio =
@@ -950,6 +953,7 @@ pub fn calculate_user_equity(
             spot_market.historical_oracle_data.last_oracle_price_twap,
             spot_market.get_max_confidence_interval_multiplier()?,
             0,
+            0,
         )?;
         all_oracles_valid &=
             is_oracle_valid_for_action(oracle_validity, Some(DriftAction::MarginCalc))?;
@@ -980,6 +984,7 @@ pub fn calculate_user_equity(
                         .last_oracle_price_twap,
                     quote_spot_market.get_max_confidence_interval_multiplier()?,
                     0,
+                    0,
                 )?;
 
             all_oracles_valid &=
@@ -995,6 +1000,7 @@ pub fn calculate_user_equity(
             market.amm.historical_oracle_data.last_oracle_price_twap,
             market.get_max_confidence_interval_multiplier()?,
             0,
+            0,
         )?;
 
         all_oracles_valid &=