program: simplify user can skip duration (#1668)

* program: simplify user can skip duration

* update context

* CHANGELOG

* fix test

* fix pmm tests

---------

Co-authored-by: Chris Heaney <[email protected]>

Author: 0xbigz

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- program: simplify user can skip duration ([#1668](https://github.com/drift-labs/protocol-v2/pull/1668))
 - program: allow limit orders without auctions in swift ([#1661](https://github.com/drift-labs/protocol-v2/pull/1661))
 
 ### Fixes

programs/drift/src/controller/orders.rs

@@ -1095,15 +1095,7 @@ pub fn fill_perp_order(
         amm_can_skip_duration =
             market.can_skip_auction_duration(&state, amm_lp_allowed_to_jit_make)?;
 
-        user_can_skip_duration = user.can_skip_auction_duration(
-            user_stats,
-            order_auction_duration > 0,
-            fill_mode.is_ioc(),
-            order_direction,
-            order_price,
-            order_oracle_price_offset,
-            oracle_price_data.price,
-        )?;
+        user_can_skip_duration = user.can_skip_auction_duration(user_stats)?;
 
         reserve_price_before = market.amm.reserve_price()?;
         oracle_price = oracle_price_data.price;

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

@@ -181,7 +181,12 @@ pub mod fill_order_protected_maker {
         let user_account_loader: AccountLoader<User> =
             AccountLoader::try_from(&user_account_info).unwrap();
 
-        create_anchor_account_info!(UserStats::default(), UserStats, user_stats_account_info);
+        let mut taker_stats = UserStats {
+            disable_update_perp_bid_ask_twap: true,
+            ..UserStats::default()
+        };
+
+        create_anchor_account_info!(taker_stats, UserStats, user_stats_account_info);
         let user_stats_account_loader: AccountLoader<UserStats> =
             AccountLoader::try_from(&user_stats_account_info).unwrap();
 
@@ -263,9 +268,18 @@ pub mod fill_order_protected_maker {
         .unwrap();
 
         assert_eq!(base_asset_amount, 1000000000);
-        assert_eq!(quote_asset_amount, 100_000_000 + 100_000_000 / 1000); // $100 + 10 bps
+        assert_eq!(quote_asset_amount, 100_000_000); // $100 + 10 bps
 
         // user exempt, no 10 bps applied for pmm
+        let mut taker_stats = UserStats {
+            disable_update_perp_bid_ask_twap: false,
+            ..UserStats::default()
+        };
+
+        create_anchor_account_info!(taker_stats, UserStats, user_stats_account_info);
+        let user_stats_account_loader: AccountLoader<UserStats> =
+            AccountLoader::try_from(&user_stats_account_info).unwrap();
+
         let mut user = User {
             // next_order_id: 10000000,
             next_order_id: 3000 - 2,

programs/drift/src/instructions/admin.rs

@@ -5057,10 +5057,10 @@ pub struct AdminUpdatePerpMarketOracle<'info> {
 
 #[derive(Accounts)]
 pub struct AdminDisableBidAskTwapUpdate<'info> {
-    pub admin: Signer<'info>,
     #[account(
-        has_one = admin
+        constraint = admin.key() == admin_hot_wallet::id() || admin.key() == state.admin
     )]
+    pub admin: Signer<'info>,
     pub state: Box<Account<'info, State>>,
     #[account(mut)]
     pub user_stats: AccountLoader<'info, UserStats>,

programs/drift/src/state/user.rs

@@ -612,51 +612,12 @@ impl User {
         Ok(true)
     }
 
-    pub fn can_skip_auction_duration(
-        &self,
-        user_stats: &UserStats,
-        is_auction: bool,
-        is_ioc: bool,
-        order_direction: PositionDirection,
-        order_price: u64,
-        oracle_price_offset: i32,
-        oracle_price: i64,
-    ) -> DriftResult<bool> {
-        if self.next_order_id > 9000 {
-            return Ok(false);
-        }
-
-        if self.next_order_id > 1000 && (!is_auction || is_ioc) {
-            return Ok(false);
-        }
-
-        if user_stats.number_of_sub_accounts_created > 10 {
-            return Ok(false);
-        }
-
+    pub fn can_skip_auction_duration(&self, user_stats: &UserStats) -> DriftResult<bool> {
         if user_stats.disable_update_perp_bid_ask_twap {
             return Ok(false);
         }
 
-        return if order_price == 0 {
-            Ok(true)
-        } else {
-            let mut order_offset: i64 = if order_price != 0 {
-                order_price.cast::<i64>()?.safe_sub(oracle_price)?
-            } else {
-                oracle_price_offset.cast::<i64>()?
-            };
-
-            if order_direction == PositionDirection::Short {
-                order_offset = -order_offset;
-            }
-
-            // worst price is 10 bps past oracle
-            Ok(order_offset
-                .safe_mul(PERCENTAGE_PRECISION_I64)?
-                .safe_div(oracle_price)?
-                >= 1000)
-        };
+        return Ok(true);
     }
 }