clean up oracle validity logs (#1984)

* clean up oracle validity logs

* generalize log level to oracle map

Author: moosecat2

programs/drift/src/controller/orders.rs

@@ -3086,8 +3086,9 @@ pub fn trigger_order(
             .historical_oracle_data
             .last_oracle_price_twap,
         perp_market.get_max_confidence_interval_multiplier()?,
-        0,
-        0,
+        perp_market.amm.oracle_slot_delay_override,
+        perp_market.amm.oracle_low_risk_slot_delay_override,
+        None,
     )?;
 
     let is_oracle_valid =
@@ -5386,6 +5387,7 @@ pub fn trigger_spot_order(
         spot_market.get_max_confidence_interval_multiplier()?,
         0,
         0,
+        None,
     )?;
     let strict_oracle_price = StrictOraclePrice {
         current: oracle_price_data.price,

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

@@ -2229,6 +2229,7 @@ pub mod fulfill_order_with_maker_order {
                 market.get_max_confidence_interval_multiplier().unwrap(),
                 0,
                 0,
+                None,
             )
             .unwrap();
 

programs/drift/src/controller/pnl.rs

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

programs/drift/src/controller/repeg.rs

@@ -265,8 +265,8 @@ pub fn update_amm_and_check_validity(
         market.get_max_confidence_interval_multiplier()?,
         &market.amm.oracle_source,
         LogMode::SafeMMOracle,
-        0,
-        0,
+        market.amm.oracle_slot_delay_override,
+        market.amm.oracle_low_risk_slot_delay_override,
     )?;
 
     validate!(

programs/drift/src/instructions/user.rs

@@ -42,6 +42,7 @@ use crate::math::margin::{
 };
 use crate::math::oracle::is_oracle_valid_for_action;
 use crate::math::oracle::DriftAction;
+use crate::math::oracle::LogMode;
 use crate::math::orders::calculate_existing_position_fields_for_order_action;
 use crate::math::orders::get_position_delta_for_fill;
 use crate::math::orders::is_multiple_of_step_size;
@@ -1790,6 +1791,7 @@ pub fn handle_transfer_perp_position<'c: 'info, 'info>(
             perp_market.get_max_confidence_interval_multiplier()?,
             perp_market.amm.oracle_slot_delay_override,
             perp_market.amm.oracle_low_risk_slot_delay_override,
+            Some(LogMode::Margin),
         )?;
         step_size = perp_market.amm.order_step_size;
         tick_size = perp_market.amm.order_tick_size;

programs/drift/src/math/margin.rs

@@ -4,6 +4,7 @@ use crate::math::constants::{
     MARGIN_PRECISION_U128, MAX_POSITIVE_UPNL_FOR_INITIAL_MARGIN, PERCENTAGE_PRECISION,
     PRICE_PRECISION, SPOT_IMF_PRECISION_U128, SPOT_WEIGHT_PRECISION, SPOT_WEIGHT_PRECISION_U128,
 };
+use crate::math::oracle::LogMode;
 use crate::math::position::calculate_base_asset_value_and_pnl_with_oracle_price;
 
 use crate::MARGIN_PRECISION;
@@ -305,6 +306,7 @@ pub fn calculate_margin_requirement_and_total_collateral_and_liability_info(
             spot_market.get_max_confidence_interval_multiplier()?,
             0,
             0,
+            Some(LogMode::Margin),
         )?;
 
         let mut skip_token_value = false;
@@ -558,6 +560,7 @@ pub fn calculate_margin_requirement_and_total_collateral_and_liability_info(
                 quote_spot_market.get_max_confidence_interval_multiplier()?,
                 0,
                 0,
+                Some(LogMode::Margin),
             )?;
 
         let strict_quote_price = StrictOraclePrice::new(
@@ -575,8 +578,9 @@ pub fn calculate_margin_requirement_and_total_collateral_and_liability_info(
             &market.oracle_id(),
             market.amm.historical_oracle_data.last_oracle_price_twap,
             market.get_max_confidence_interval_multiplier()?,
-            0,
-            0,
+            market.amm.oracle_slot_delay_override,
+            market.amm.oracle_low_risk_slot_delay_override,
+            Some(LogMode::Margin),
         )?;
 
         let perp_position_custom_margin_ratio =
@@ -993,6 +997,7 @@ pub fn calculate_user_equity(
             spot_market.get_max_confidence_interval_multiplier()?,
             0,
             0,
+            Some(LogMode::Margin),
         )?;
         all_oracles_valid &=
             is_oracle_valid_for_action(oracle_validity, Some(DriftAction::MarginCalc))?;
@@ -1024,6 +1029,7 @@ pub fn calculate_user_equity(
                     quote_spot_market.get_max_confidence_interval_multiplier()?,
                     0,
                     0,
+                    Some(LogMode::Margin),
                 )?;
 
             all_oracles_valid &=
@@ -1038,8 +1044,9 @@ pub fn calculate_user_equity(
             &market.oracle_id(),
             market.amm.historical_oracle_data.last_oracle_price_twap,
             market.get_max_confidence_interval_multiplier()?,
-            0,
-            0,
+            market.amm.oracle_slot_delay_override,
+            market.amm.oracle_low_risk_slot_delay_override,
+            Some(LogMode::Margin),
         )?;
 
         all_oracles_valid &=

programs/drift/src/math/oracle.rs

@@ -243,6 +243,7 @@ pub enum LogMode {
     ExchangeOracle,
     MMOracle,
     SafeMMOracle,
+    Margin,
 }
 
 pub fn oracle_validity(
@@ -323,7 +324,7 @@ pub fn oracle_validity(
     };
 
     if log_mode != LogMode::None {
-        let oracle_type = if log_mode == LogMode::ExchangeOracle {
+        let oracle_type = if log_mode == LogMode::ExchangeOracle || log_mode == LogMode::Margin {
             "Exchange"
         } else if log_mode == LogMode::SafeMMOracle {
             "SafeMM"
@@ -369,7 +370,18 @@ pub fn oracle_validity(
             );
         }
 
-        if is_stale_for_amm_immediate || is_stale_for_margin || is_stale_for_amm_low_risk {
+        if is_stale_for_margin {
+            crate::msg!(
+                "Invalid {} {} {} Oracle: Stale for Margin (oracle_delay={:?})",
+                market_type,
+                market_index,
+                oracle_type,
+                oracle_delay
+            );
+        }
+
+        if (is_stale_for_amm_immediate || is_stale_for_amm_low_risk) && log_mode != LogMode::Margin
+        {
             crate::msg!(
                 "Invalid {} {} {} Oracle: Stale (oracle_delay={:?}), (stale_for_amm_immediate={}, stale_for_amm_low_risk={}, stale_for_margin={})",
                 market_type,

programs/drift/src/state/oracle_map.rs

@@ -90,11 +90,18 @@ impl<'a> OracleMap<'a> {
         max_confidence_interval_multiplier: u64,
         slots_before_stale_for_amm_override: i8,
         oracle_low_risk_slot_delay_override_override: i8,
+        log_mode: Option<LogMode>,
     ) -> DriftResult<(&OraclePriceData, OracleValidity)> {
         if self.should_get_quote_asset_price_data(&oracle_id.0) {
             return Ok((&self.quote_asset_price_data, OracleValidity::Valid));
         }
 
+        let log_mode = if let Some(lm) = log_mode {
+            lm
+        } else {
+            LogMode::ExchangeOracle
+        };
+
         if self.price_data.contains_key(oracle_id) {
             let oracle_price_data = self.price_data.get(oracle_id).safe_unwrap()?;
 
@@ -109,7 +116,7 @@ impl<'a> OracleMap<'a> {
                     &self.oracle_guard_rails.validity,
                     max_confidence_interval_multiplier,
                     &oracle_id.1,
-                    LogMode::ExchangeOracle,
+                    log_mode,
                     slots_before_stale_for_amm_override,
                     oracle_low_risk_slot_delay_override_override,
                 )?;
@@ -140,7 +147,7 @@ impl<'a> OracleMap<'a> {
             &self.oracle_guard_rails.validity,
             max_confidence_interval_multiplier,
             &oracle_id.1,
-            LogMode::ExchangeOracle,
+            log_mode,
             slots_before_stale_for_amm_override,
             oracle_low_risk_slot_delay_override_override,
         )?;