Pass through OracleGuardRails for margin calc

drift-labs · Sep 27, 2024 · a5413ea · a5413ea
1 parent b51befc
commit a5413ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/exports.rs b/src/exports.rs
@@ -87,7 +87,7 @@ pub extern "C" fn math_calculate_margin_requirement_and_total_collateral_and_lia
     let mut oracle_map = OracleMap::load(
         &mut oracle_accounts.iter().peekable(),
         accounts.latest_slot,
-        None,
+        accounts.oracle_guard_rails,
     )
     .unwrap();
 

diff --git a/src/types.rs b/src/types.rs
@@ -1,7 +1,8 @@
 //! cross-boundary FFI types
 use abi_stable::std_types::RResult;
 use drift_program::{
-    math::margin::MarginRequirementType, state::margin_calculation::MarginContext,
+    math::margin::MarginRequirementType,
+    state::{margin_calculation::MarginContext, state::OracleGuardRails},
 };
 use solana_sdk::{
     account::Account,
@@ -44,11 +45,11 @@ impl<'a> IntoAccountInfo<'a> for &'a mut AccountWithKey {
 
 /// FFI equivalent of an `AccountMap`
 #[repr(C)]
-#[derive(Debug)]
 pub struct AccountsList<'a> {
     pub perp_markets: &'a mut [AccountWithKey],
     pub spot_markets: &'a mut [AccountWithKey],
     pub oracles: &'a mut [AccountWithKey],
+    pub oracle_guard_rails: Option<OracleGuardRails>,
     pub latest_slot: Slot,
 }