program: skip isolated tier for auction start/end sanitize (#958)

* program: skip-isolated-tier-for-auction-start-end-override * update changelog
drift-labs · Mar 13, 2024 · 71811c8 · 71811c8
1 parent a0ef1b9
commit 71811c8
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Features
+- program: skip isolated tier for auction start/end sanitize ([#958](https://github.com/drift-labs/protocol-v2/pull/958))
 
 - program: check isolated perp market in validate spot margin trading ([#957](https://github.com/drift-labs/protocol-v2/pull/957))
 - program: improve update prelaunch oracles and add ability to delete ([#956](https://github.com/drift-labs/protocol-v2/pull/956))

diff --git a/programs/drift/src/state/order_params.rs b/programs/drift/src/state/order_params.rs
@@ -207,38 +207,40 @@ impl OrderParams {
 
             return Ok(());
         }
-
-        let new_start_price_offset =
-            OrderParams::get_perp_baseline_start_price_offset(perp_market, self.direction)?;
-        match self.direction {
-            PositionDirection::Long => {
-                let current_start_price_offset =
-                    self.get_auction_start_price_offset(oracle_price)?;
-                if current_start_price_offset > new_start_price_offset {
-                    self.auction_start_price = if !is_market_order {
-                        Some(new_start_price_offset)
-                    } else {
-                        Some(new_start_price_offset.safe_add(oracle_price)?)
-                    };
-                    msg!(
-                        "Updating auction start price to {}",
-                        self.auction_start_price.safe_unwrap()?
-                    );
+        // only update auction start price if the contract tier isn't Isolated
+        if perp_market.contract_tier != ContractTier::Isolated {
+            let new_start_price_offset =
+                OrderParams::get_perp_baseline_start_price_offset(perp_market, self.direction)?;
+            match self.direction {
+                PositionDirection::Long => {
+                    let current_start_price_offset =
+                        self.get_auction_start_price_offset(oracle_price)?;
+                    if current_start_price_offset > new_start_price_offset {
+                        self.auction_start_price = if !is_market_order {
+                            Some(new_start_price_offset)
+                        } else {
+                            Some(new_start_price_offset.safe_add(oracle_price)?)
+                        };
+                        msg!(
+                            "Updating auction start price to {}",
+                            self.auction_start_price.safe_unwrap()?
+                        );
+                    }
                 }
-            }
-            PositionDirection::Short => {
-                let current_start_price_offset =
-                    self.get_auction_start_price_offset(oracle_price)?;
-                if current_start_price_offset < new_start_price_offset {
-                    self.auction_start_price = if !is_market_order {
-                        Some(new_start_price_offset)
-                    } else {
-                        Some(new_start_price_offset.safe_add(oracle_price)?)
-                    };
-                    msg!(
-                        "Updating auction start price to {}",
-                        self.auction_start_price.safe_unwrap()?
-                    );
+                PositionDirection::Short => {
+                    let current_start_price_offset =
+                        self.get_auction_start_price_offset(oracle_price)?;
+                    if current_start_price_offset < new_start_price_offset {
+                        self.auction_start_price = if !is_market_order {
+                            Some(new_start_price_offset)
+                        } else {
+                            Some(new_start_price_offset.safe_add(oracle_price)?)
+                        };
+                        msg!(
+                            "Updating auction start price to {}",
+                            self.auction_start_price.safe_unwrap()?
+                        );
+                    }
                 }
             }
         }

diff --git a/programs/drift/src/state/order_params/tests.rs b/programs/drift/src/state/order_params/tests.rs
@@ -47,7 +47,7 @@ mod update_perp_auction_params {
     };
 
     #[test]
-    fn test_limit() {
+    fn test_sanitize_limit() {
         let oracle_price = 100 * PRICE_PRECISION_I64;
         let mut amm = AMM {
             base_asset_reserve: 100 * AMM_RESERVE_PRECISION,
@@ -237,7 +237,7 @@ mod update_perp_auction_params {
         amm.last_bid_price_twap =
             (amm.historical_oracle_data.last_oracle_price_twap as u64) + 17238;
 
-        let perp_market = PerpMarket {
+        let mut perp_market = PerpMarket {
             amm,
             contract_tier: ContractTier::B,
             ..PerpMarket::default()
@@ -280,6 +280,23 @@ mod update_perp_auction_params {
         assert_ne!(order_params_before, order_params_after);
         assert_eq!(order_params_after.auction_start_price.unwrap(), 99118879);
 
+        // skip for isolated tier
+        perp_market.contract_tier = ContractTier::Isolated;
+        let mut order_params_after = order_params_before;
+        order_params_after
+            .update_perp_auction_params(&perp_market, oracle_price)
+            .unwrap();
+        assert_eq!(
+            order_params_after.auction_start_price,
+            order_params_before.auction_start_price
+        );
+        assert_eq!(
+            order_params_after.auction_end_price,
+            order_params_before.auction_end_price
+        );
+
+        perp_market.contract_tier = ContractTier::B; // switch back
+
         let order_params_before = OrderParams {
             order_type: OrderType::Market,
             direction: PositionDirection::Short,