Revert "program: add taker_speed_bump_override and amm_spread_adjustment"

This reverts commit 1e19b7e.

Author: crispheaney

programs/drift/src/controller/orders.rs

@@ -1057,7 +1057,6 @@ pub fn fill_perp_order(
     let amm_lp_allowed_to_jit_make: bool;
     let oracle_valid_for_amm_fill: bool;
     let oracle_stale_for_margin: bool;
-    let min_auction_duration: u8;
     let mut amm_is_available = !state.amm_paused()?;
     {
         let market = &mut perp_market_map.get_ref_mut(&market_index)?;
@@ -1114,8 +1113,6 @@ pub fn fill_perp_order(
             .last_oracle_price_twap_5min;
         oracle_validity = _oracle_validity;
         perp_market_index = market.market_index;
-
-        min_auction_duration = market.get_min_perp_auction_duration(state.min_perp_auction_duration);
     }
 
     // allow oracle price to be used to calculate limit price if it's valid or stale for amm
@@ -1291,7 +1288,7 @@ pub fn fill_perp_order(
         valid_oracle_price,
         now,
         slot,
-        min_auction_duration,
+        state.min_perp_auction_duration,
         amm_availability,
         fill_mode,
         oracle_stale_for_margin,

programs/drift/src/instructions/admin.rs

@@ -1041,8 +1041,7 @@ pub fn handle_initialize_perp_market(
             target_base_asset_amount_per_lp: 0,
             per_lp_base: 0,
             padding1: 0,
-            taker_speed_bump_override: 0,
-            amm_spread_adjustment: 0,
+            padding2: 0,
             total_fee_earned_per_lp: 0,
             net_unsettled_funding_pnl: 0,
             quote_asset_amount_with_unsettled_lp: 0,
@@ -3911,7 +3910,7 @@ pub fn handle_update_perp_market_number_of_users(
 }
 
 pub fn handle_update_perp_market_fuel(
-    ctx: Context<HotAdminUpdatePerpMarket>,
+    ctx: Context<AdminUpdatePerpMarketFuel>,
     fuel_boost_taker: Option<u8>,
     fuel_boost_maker: Option<u8>,
     fuel_boost_position: Option<u8>,
@@ -3988,46 +3987,6 @@ pub fn handle_update_perp_market_protected_maker_params(
     Ok(())
 }
 
-#[access_control(
-    perp_market_valid(&ctx.accounts.perp_market)
-)]
-pub fn handle_update_perp_market_taker_speed_bump_override(
-    ctx: Context<HotAdminUpdatePerpMarket>,
-    taker_speed_bump_override: i8,
-) -> Result<()> {
-    let perp_market = &mut load_mut!(ctx.accounts.perp_market)?;
-    msg!("perp market {}", perp_market.market_index);
-
-    msg!(
-        "perp_market.amm.taker_speed_bump_override: {:?} -> {:?}",
-        perp_market.amm.taker_speed_bump_override,
-        taker_speed_bump_override
-    );
-
-    perp_market.amm.taker_speed_bump_override = taker_speed_bump_override;
-    Ok(())
-}
-
-#[access_control(
-    perp_market_valid(&ctx.accounts.perp_market)
-)]
-pub fn handle_update_perp_market_amm_spread_adjustment(
-    ctx: Context<HotAdminUpdatePerpMarket>,
-    amm_spread_adjustment: i8,
-) -> Result<()> {
-    let perp_market = &mut load_mut!(ctx.accounts.perp_market)?;
-    msg!("perp market {}", perp_market.market_index);
-
-    msg!(
-        "perp_market.amm.amm_spread_adjustment: {:?} -> {:?}",
-        perp_market.amm.amm_spread_adjustment,
-        amm_spread_adjustment
-    );
-
-    perp_market.amm.amm_spread_adjustment = amm_spread_adjustment;
-    Ok(())
-}
-
 #[access_control(
     spot_market_valid(&ctx.accounts.spot_market)
 )]
@@ -4906,7 +4865,7 @@ pub struct AdminUpdatePerpMarket<'info> {
 }
 
 #[derive(Accounts)]
-pub struct HotAdminUpdatePerpMarket<'info> {
+pub struct AdminUpdatePerpMarketFuel<'info> {
     #[account(
         constraint = admin.key() == admin_hot_wallet::id() || admin.key() == state.admin
     )]

programs/drift/src/lib.rs

@@ -1513,7 +1513,7 @@ pub mod drift {
     }
 
     pub fn update_perp_market_fuel(
-        ctx: Context<HotAdminUpdatePerpMarket>,
+        ctx: Context<AdminUpdatePerpMarketFuel>,
         fuel_boost_taker: Option<u8>,
         fuel_boost_maker: Option<u8>,
         fuel_boost_position: Option<u8>,
@@ -1533,20 +1533,6 @@ pub mod drift {
         )
     }
 
-    pub fn update_perp_market_taker_speed_bump_override(
-        ctx: Context<HotAdminUpdatePerpMarket>,
-        taker_speed_bump_override: i8,
-    ) -> Result<()> {
-        handle_update_perp_market_taker_speed_bump_override(ctx, taker_speed_bump_override)
-    }
-
-    pub fn update_perp_market_amm_spread_adjustment(
-        ctx: Context<HotAdminUpdatePerpMarket>,
-        amm_spread_adjustment: i8,
-    ) -> Result<()> {
-        handle_update_perp_market_amm_spread_adjustment(ctx, amm_spread_adjustment)
-    }
-
     pub fn update_spot_market_fuel(
         ctx: Context<AdminUpdateSpotMarketFuel>,
         fuel_boost_deposits: Option<u8>,

programs/drift/src/math/orders.rs

@@ -12,6 +12,7 @@ use crate::math::casting::Cast;
 use crate::state::fill_mode::FillMode;
 use crate::state::protected_maker_mode_config::ProtectedMakerParams;
 use crate::state::user::OrderBitFlag;
+use crate::BASE_PRECISION_U64;
 use crate::{
     load, math, FeeTier, State, BASE_PRECISION_I128, FEE_ADJUSTMENT_MAX,
     MAX_PREDICTION_MARKET_PRICE, MAX_PREDICTION_MARKET_PRICE_I64, OPEN_ORDER_MARGIN_REQUIREMENT,

programs/drift/src/state/perp_market.rs

@@ -735,14 +735,6 @@ impl PerpMarket {
             tick_size: self.amm.order_tick_size,
         }
     }
-
-    pub fn get_min_perp_auction_duration(&self, default_min_auction_duration: u8) -> u8 {
-        if self.amm.taker_speed_bump_override != 0 {
-            self.amm.taker_speed_bump_override.max(0).unsigned_abs()
-        } else {
-            default_min_auction_duration
-        }
-    }
 }
 
 #[cfg(test)]
@@ -1042,11 +1034,8 @@ pub struct AMM {
     pub target_base_asset_amount_per_lp: i32,
     /// expo for unit of per_lp, base 10 (if per_lp_base=X, then per_lp unit is 10^X)
     pub per_lp_base: i8,
-    /// the override for the state.min_perp_auction_duration
-    /// 0 is no override, -1 is disable speed bump, 1-100 is literal speed bump
-    pub taker_speed_bump_override: i8,
-    pub amm_spread_adjustment: i8,
     pub padding1: u8,
+    pub padding2: u16,
     pub total_fee_earned_per_lp: u64,
     pub net_unsettled_funding_pnl: i64,
     pub quote_asset_amount_with_unsettled_lp: i64,
@@ -1134,9 +1123,8 @@ impl Default for AMM {
             last_oracle_valid: false,
             target_base_asset_amount_per_lp: 0,
             per_lp_base: 0,
-            taker_speed_bump_override: 0,
-            amm_spread_adjustment: 0,
             padding1: 0,
+            padding2: 0,
             total_fee_earned_per_lp: 0,
             net_unsettled_funding_pnl: 0,
             quote_asset_amount_with_unsettled_lp: 0,