program: trigger price use 5min mark price

programs/drift/src/controller/orders.rs

@@ -3058,7 +3058,15 @@ pub fn trigger_order(
     let trigger_price =
         perp_market.get_trigger_price(oracle_price, now, state.use_median_trigger_price())?;
     let can_trigger = order_satisfies_trigger_condition(&user.orders[order_index], trigger_price)?;
-    validate!(can_trigger, ErrorCode::OrderDidNotSatisfyTriggerCondition)?;
+
+    validate!(
+        can_trigger,
+        ErrorCode::OrderDidNotSatisfyTriggerCondition,
+        "Order did not satisfy trigger condition. trigger_price: {} oracle_price: {} trigger_condition: {:?}",
+        trigger_price,
+        &user.orders[order_index].trigger_price,
+        &user.orders[order_index].trigger_condition
+    )?;
 
     let (_, worst_case_liability_value_before) = user
         .get_perp_position(market_index)?

programs/drift/src/state/perp_market.rs

@@ -766,7 +766,7 @@ impl PerpMarket {
 
         let last_fill_price = self.last_fill_price;
 
-        let mark_price_5min_twap = self.amm.last_mark_price_twap;
+        let mark_price_5min_twap = self.amm.last_mark_price_twap_5min;
         let last_oracle_price_twap_5min =
             self.amm.historical_oracle_data.last_oracle_price_twap_5min;
 
@@ -781,6 +781,10 @@ impl PerpMarket {
         let oracle_plus_funding_basis = oracle_price.safe_add(last_funding_basis)?.cast::<u64>()?;
 
         let median_price = if last_fill_price > 0 {
+            println!(
+                "last_fill_price: {} oracle_plus_funding_basis: {} oracle_plus_basis_5min: {}",
+                last_fill_price, oracle_plus_funding_basis, oracle_plus_basis_5min
+            );
             let mut prices = [
                 last_fill_price,
                 oracle_plus_funding_basis,

programs/drift/src/state/perp_market/tests.rs

@@ -234,7 +234,7 @@ mod get_trigger_price {
             .get_trigger_price(oracle_price, now, true)
             .unwrap();
 
-        assert_eq!(trigger_price, 109147085925);
+        assert_eq!(trigger_price, 109144736794);
     }
 
     #[test]