tests pass + sdk changes + rename taker_speed_bump_override

moosecat2 · moosecat2 · commit dbc475c094d8 · 2025-10-21T17:00:59.000-07:00
diff --git a/programs/drift/src/controller/orders.rs b/programs/drift/src/controller/orders.rs
@@ -1090,7 +1090,7 @@ pub fn fill_perp_order(
             &market.amm.oracle_source,
             oracle::LogMode::SafeMMOracle,
             market.amm.oracle_slot_delay_override,
-            market.amm.taker_speed_bump_override,
+            market.amm.oracle_low_risk_slot_delay_override,
         )?;
 
         user_can_skip_duration = user.can_skip_auction_duration(user_stats)?;
diff --git a/programs/drift/src/controller/orders/amm_jit_tests.rs b/programs/drift/src/controller/orders/amm_jit_tests.rs
@@ -62,7 +62,7 @@ pub fn get_amm_is_available(
         &market.amm.oracle_source,
         oracle::LogMode::SafeMMOracle,
         market.amm.oracle_slot_delay_override,
-        market.amm.taker_speed_bump_override,
+        market.amm.oracle_low_risk_slot_delay_override,
     )
     .unwrap();
     market
diff --git a/programs/drift/src/controller/orders/fuel_tests.rs b/programs/drift/src/controller/orders/fuel_tests.rs
@@ -58,7 +58,7 @@ pub fn get_amm_is_available(
         &market.amm.oracle_source,
         crate::math::oracle::LogMode::SafeMMOracle,
         market.amm.oracle_slot_delay_override,
-        market.amm.taker_speed_bump_override,
+        market.amm.oracle_low_risk_slot_delay_override,
     )
     .unwrap();
     market
diff --git a/programs/drift/src/controller/orders/tests.rs b/programs/drift/src/controller/orders/tests.rs
@@ -62,7 +62,7 @@ pub fn get_amm_is_available(
         &market.amm.oracle_source,
         crate::math::oracle::LogMode::SafeMMOracle,
         market.amm.oracle_slot_delay_override,
-        market.amm.taker_speed_bump_override,
+        market.amm.oracle_low_risk_slot_delay_override,
     )
     .unwrap();
     market
diff --git a/programs/drift/src/controller/position/tests.rs b/programs/drift/src/controller/position/tests.rs
@@ -6,8 +6,7 @@ use crate::controller::repeg::_update_amm;
 
 use crate::math::amm::calculate_market_open_bids_asks;
 use crate::math::constants::{
-    AMM_RESERVE_PRECISION, AMM_RESERVE_PRECISION_I128, BASE_PRECISION, BASE_PRECISION_I64,
-    PRICE_PRECISION_I64, PRICE_PRECISION_U64, QUOTE_PRECISION_I128,
+    BASE_PRECISION, BASE_PRECISION_I64, PRICE_PRECISION_I64, PRICE_PRECISION_U64,
     SPOT_CUMULATIVE_INTEREST_PRECISION, SPOT_WEIGHT_PRECISION,
 };
 use crate::math::oracle::OracleValidity;
@@ -34,7 +33,6 @@ use crate::state::spot_market_map::SpotMarketMap;
 use crate::state::user::SpotPosition;
 use crate::test_utils::get_anchor_account_bytes;
 use crate::test_utils::get_hardcoded_pyth_price;
-use crate::QUOTE_PRECISION_I64;
 use anchor_lang::prelude::{AccountLoader, Clock};
 use anchor_lang::Owner;
 use solana_program::pubkey::Pubkey;
@@ -949,6 +947,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
     assert_eq!(perp_market.amm.last_update_slot, 353317544);
 
     perp_market.amm.curve_update_intensity = 200;
+    perp_market.amm.oracle_slot_delay_override = -1;
 
     let max_ref_offset = perp_market.amm.get_max_reference_price_offset().unwrap();
 
diff --git a/programs/drift/src/controller/repeg.rs b/programs/drift/src/controller/repeg.rs
@@ -166,6 +166,11 @@ pub fn _update_amm(
     }
 
     let oracle_data = &mm_oracle_price_data.get_safe_oracle_price_data();
+    let slot_delay_override = state
+        .oracle_guard_rails
+        .validity
+        .slots_before_stale_for_amm
+        .cast()?;
     let oracle_validity = oracle::oracle_validity(
         MarketType::Perp,
         market.market_index,
@@ -175,8 +180,8 @@ pub fn _update_amm(
         market.get_max_confidence_interval_multiplier()?,
         &market.amm.oracle_source,
         oracle::LogMode::SafeMMOracle,
-        0,
-        0,
+        slot_delay_override,
+        slot_delay_override,
     )?;
 
     let mut amm_update_cost = 0;
diff --git a/programs/drift/src/controller/repeg/tests.rs b/programs/drift/src/controller/repeg/tests.rs
@@ -114,8 +114,8 @@ pub fn update_amm_test() {
         market.get_max_confidence_interval_multiplier().unwrap(),
         &market.amm.oracle_source,
         LogMode::ExchangeOracle,
-        0,
-        0,
+        state.oracle_guard_rails.validity.slots_before_stale_for_amm as i8,
+        state.oracle_guard_rails.validity.slots_before_stale_for_amm as i8,
     )
     .unwrap()
         == OracleValidity::Valid;
diff --git a/programs/drift/src/instructions/admin.rs b/programs/drift/src/instructions/admin.rs
@@ -1071,8 +1071,8 @@ pub fn handle_initialize_perp_market(
             last_oracle_valid: false,
             target_base_asset_amount_per_lp: 0,
             per_lp_base: 0,
-            oracle_slot_delay_override: 0,
-            taker_speed_bump_override: 0,
+            oracle_slot_delay_override: -1,
+            oracle_low_risk_slot_delay_override: 0,
             amm_spread_adjustment: 0,
             mm_oracle_sequence_id: 0,
             net_unsettled_funding_pnl: 0,
@@ -4150,20 +4150,20 @@ pub fn handle_update_perp_market_protected_maker_params(
 #[access_control(
     perp_market_valid(&ctx.accounts.perp_market)
 )]
-pub fn handle_update_perp_market_taker_speed_bump_override(
+pub fn handle_update_perp_market_oracle_low_risk_slot_delay_override(
     ctx: Context<HotAdminUpdatePerpMarket>,
-    taker_speed_bump_override: i8,
+    oracle_low_risk_slot_delay_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.oracle_low_risk_slot_delay_override: {:?} -> {:?}",
+        perp_market.amm.oracle_low_risk_slot_delay_override,
+        oracle_low_risk_slot_delay_override
     );
 
-    perp_market.amm.taker_speed_bump_override = taker_speed_bump_override;
+    perp_market.amm.oracle_low_risk_slot_delay_override = oracle_low_risk_slot_delay_override;
     Ok(())
 }
 
diff --git a/programs/drift/src/instructions/user.rs b/programs/drift/src/instructions/user.rs
@@ -1789,7 +1789,7 @@ pub fn handle_transfer_perp_position<'c: 'info, 'info>(
                 .last_oracle_price_twap,
             perp_market.get_max_confidence_interval_multiplier()?,
             perp_market.amm.oracle_slot_delay_override,
-            perp_market.amm.taker_speed_bump_override,
+            perp_market.amm.oracle_low_risk_slot_delay_override,
         )?;
         step_size = perp_market.amm.order_step_size;
         tick_size = perp_market.amm.order_tick_size;
diff --git a/programs/drift/src/lib.rs b/programs/drift/src/lib.rs
@@ -1583,11 +1583,14 @@ pub mod drift {
         )
     }
 
-    pub fn update_perp_market_taker_speed_bump_override(
+    pub fn update_perp_market_oracle_low_risk_slot_delay_override(
         ctx: Context<HotAdminUpdatePerpMarket>,
-        taker_speed_bump_override: i8,
+        oracle_low_risk_slot_delay_override: i8,
     ) -> Result<()> {
-        handle_update_perp_market_taker_speed_bump_override(ctx, taker_speed_bump_override)
+        handle_update_perp_market_oracle_low_risk_slot_delay_override(
+            ctx,
+            oracle_low_risk_slot_delay_override,
+        )
     }
 
     pub fn update_perp_market_amm_spread_adjustment(
diff --git a/programs/drift/src/math/oracle.rs b/programs/drift/src/math/oracle.rs
@@ -209,6 +209,7 @@ pub fn get_oracle_status(
     guard_rails: &OracleGuardRails,
     reserve_price: u64,
 ) -> DriftResult<OracleStatus> {
+    let slot_delay_override = guard_rails.validity.slots_before_stale_for_amm.cast()?;
     let oracle_validity = oracle_validity(
         MarketType::Perp,
         market.market_index,
@@ -218,8 +219,8 @@ pub fn get_oracle_status(
         market.get_max_confidence_interval_multiplier()?,
         &market.amm.oracle_source,
         LogMode::None,
-        0,
-        0,
+        slot_delay_override,
+        slot_delay_override,
     )?;
     let oracle_reserve_price_spread_pct =
         amm::calculate_oracle_twap_5min_price_spread_pct(&market.amm, reserve_price)?;
@@ -254,7 +255,7 @@ pub fn oracle_validity(
     oracle_source: &OracleSource,
     log_mode: LogMode,
     slots_before_stale_for_amm_immdiate_override: i8,
-    taker_speed_bump_override: i8,
+    oracle_low_risk_slot_delay_override: i8,
 ) -> DriftResult<OracleValidity> {
     let OraclePriceData {
         price: oracle_price,
@@ -282,19 +283,18 @@ pub fn oracle_validity(
     let is_stale_for_amm_immediate = if slots_before_stale_for_amm_immdiate_override != 0 {
         oracle_delay.gt(&slots_before_stale_for_amm_immdiate_override.max(0).cast()?)
     } else {
-        oracle_delay.gt(&valid_oracle_guard_rails.slots_before_stale_for_amm)
+        true
     };
 
-    let is_stale_for_amm_low_risk = if taker_speed_bump_override != 0 {
-        oracle_delay.gt(&taker_speed_bump_override.max(0).cast()?)
+    let is_stale_for_amm_low_risk = if oracle_low_risk_slot_delay_override != 0 {
+        oracle_delay.gt(&oracle_low_risk_slot_delay_override.max(0).cast()?)
     } else {
-        // Default to current behavior if not set on the amm
-        false
+        oracle_delay.gt(&valid_oracle_guard_rails.slots_before_stale_for_amm)
     };
 
     let is_stale_for_margin = if matches!(
         oracle_source,
-        OracleSource::PythStableCoinPull | OracleSource::PythStableCoin
+        OracleSource::PythStableCoinPull | OracleSource::PythLazerStableCoin
     ) {
         oracle_delay.gt(&(valid_oracle_guard_rails
             .slots_before_stale_for_margin
diff --git a/programs/drift/src/math/repeg/tests.rs b/programs/drift/src/math/repeg/tests.rs
@@ -256,7 +256,7 @@ fn calculate_optimal_peg_and_budget_2_test() {
     let oracle_price_data = OraclePriceData {
         price: (17_800 * PRICE_PRECISION) as i64,
         confidence: 10233,
-        delay: 2,
+        delay: 0,
         has_sufficient_number_of_data_points: true,
         sequence_id: None,
     };
diff --git a/programs/drift/src/state/oracle_map.rs b/programs/drift/src/state/oracle_map.rs
@@ -89,7 +89,7 @@ impl<'a> OracleMap<'a> {
         last_oracle_price_twap: i64,
         max_confidence_interval_multiplier: u64,
         slots_before_stale_for_amm_override: i8,
-        taker_speed_bump_override_override: i8,
+        oracle_low_risk_slot_delay_override_override: i8,
     ) -> DriftResult<(&OraclePriceData, OracleValidity)> {
         if self.should_get_quote_asset_price_data(&oracle_id.0) {
             return Ok((&self.quote_asset_price_data, OracleValidity::Valid));
@@ -111,7 +111,7 @@ impl<'a> OracleMap<'a> {
                     &oracle_id.1,
                     LogMode::ExchangeOracle,
                     slots_before_stale_for_amm_override,
-                    taker_speed_bump_override_override,
+                    oracle_low_risk_slot_delay_override_override,
                 )?;
                 self.validity.insert(*oracle_id, oracle_validity);
                 oracle_validity
@@ -142,7 +142,7 @@ impl<'a> OracleMap<'a> {
             &oracle_id.1,
             LogMode::ExchangeOracle,
             slots_before_stale_for_amm_override,
-            taker_speed_bump_override_override,
+            oracle_low_risk_slot_delay_override_override,
         )?;
         self.validity.insert(*oracle_id, oracle_validity);
 
diff --git a/programs/drift/src/state/perp_market.rs b/programs/drift/src/state/perp_market.rs
@@ -323,16 +323,12 @@ impl PerpMarket {
         let amm_low_inventory_and_profitable = self.amm.net_revenue_since_last_funding
             >= DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT
             && amm_has_low_enough_inventory;
-        let amm_oracle_no_latency = self.amm.oracle_source == OracleSource::Prelaunch
-            || (self.amm.historical_oracle_data.last_oracle_delay == 0
-                && self.amm.oracle_source == OracleSource::PythLazer);
-        let can_skip = amm_low_inventory_and_profitable || amm_oracle_no_latency;
 
-        if can_skip {
+        if amm_low_inventory_and_profitable {
             msg!("market {} amm skipping auction duration", self.market_index);
         }
 
-        Ok(can_skip)
+        Ok(amm_low_inventory_and_profitable)
     }
 
     pub fn has_too_much_drawdown(&self) -> DriftResult<bool> {
@@ -838,7 +834,7 @@ impl PerpMarket {
                 &self.amm.oracle_source,
                 LogMode::MMOracle,
                 self.amm.oracle_slot_delay_override,
-                self.amm.taker_speed_bump_override,
+                self.amm.oracle_low_risk_slot_delay_override,
             )?
         };
         Ok(MMOraclePriceData::new(
@@ -885,12 +881,6 @@ impl PerpMarket {
         }
 
         // Determine if order is fillable with low risk
-        let safe_oracle_price_data = mm_oracle_price_data.get_safe_oracle_price_data();
-        let order_is_low_risk_for_amm = order.is_low_risk_for_amm(
-            safe_oracle_price_data.delay,
-            clock_slot,
-            fill_mode.is_liquidation(),
-        )?;
         let oracle_valid_for_amm_fill_low_risk = is_oracle_valid_for_action(
             safe_oracle_validity,
             Some(DriftAction::FillOrderAmmLowRisk),
@@ -899,7 +889,12 @@ impl PerpMarket {
             msg!("AMM cannot fill order: oracle not valid for low risk fills");
             return Ok(false);
         }
-        let can_fill_low_risk = order_is_low_risk_for_amm && oracle_valid_for_amm_fill_low_risk;
+        let safe_oracle_price_data = mm_oracle_price_data.get_safe_oracle_price_data();
+        let can_fill_low_risk = order.is_low_risk_for_amm(
+            safe_oracle_price_data.delay,
+            clock_slot,
+            fill_mode.is_liquidation(),
+        )?;
 
         // Proceed if order is low risk and we can fill it. Otherwise check if we can higher risk order immediately
         let can_fill_order = if can_fill_low_risk {
@@ -1222,7 +1217,7 @@ pub struct AMM {
     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 oracle_low_risk_slot_delay_override: i8,
     /// signed scale amm_spread similar to fee_adjustment logic (-100 = 0, 100 = double)
     pub amm_spread_adjustment: i8,
     pub oracle_slot_delay_override: i8,
@@ -1316,9 +1311,9 @@ impl Default for AMM {
             last_oracle_valid: false,
             target_base_asset_amount_per_lp: 0,
             per_lp_base: 0,
-            taker_speed_bump_override: 0,
+            oracle_low_risk_slot_delay_override: 0,
             amm_spread_adjustment: 0,
-            oracle_slot_delay_override: 0,
+            oracle_slot_delay_override: -1,
             mm_oracle_sequence_id: 0,
             net_unsettled_funding_pnl: 0,
             quote_asset_amount_with_unsettled_lp: 0,
diff --git a/sdk/src/adminClient.ts b/sdk/src/adminClient.ts
@@ -4048,34 +4048,34 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
-	public async updatePerpMarketTakerSpeedBumpOverride(
+	public async updatePerpMarketOracleLowRiskSlotDelayOverride(
 		perpMarketIndex: number,
-		takerSpeedBumpOverride: number
+		oracleLowRiskSlotDelayOverride: number
 	): Promise<TransactionSignature> {
-		const updatePerpMarketTakerSpeedBumpOverrideIx =
-			await this.getUpdatePerpMarketTakerSpeedBumpOverrideIx(
+		const updatePerpMarketOracleLowRiskSlotDelayOverrideIx =
+			await this.getUpdatePerpMarketOracleLowRiskSlotDelayOverrideIx(
 				perpMarketIndex,
-				takerSpeedBumpOverride
+				oracleLowRiskSlotDelayOverride
 			);
 		const tx = await this.buildTransaction(
-			updatePerpMarketTakerSpeedBumpOverrideIx
+			updatePerpMarketOracleLowRiskSlotDelayOverrideIx
 		);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
-	public async getUpdatePerpMarketTakerSpeedBumpOverrideIx(
+	public async getUpdatePerpMarketOracleLowRiskSlotDelayOverrideIx(
 		perpMarketIndex: number,
-		takerSpeedBumpOverride: number
+		oracleLowRiskSlotDelayOverride: number
 	): Promise<TransactionInstruction> {
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
 		);
 
-		return await this.program.instruction.updatePerpMarketTakerSpeedBumpOverride(
-			takerSpeedBumpOverride,
+		return await this.program.instruction.updatePerpMarketOracleLowRiskSlotDelayOverride(
+			oracleLowRiskSlotDelayOverride,
 			{
 				accounts: {
 					admin: this.useHotWalletAdmin
diff --git a/sdk/src/math/auction.ts b/sdk/src/math/auction.ts
@@ -55,8 +55,7 @@ export function isFallbackAvailableLiquiditySource(
 				mmOraclePriceData.hasSufficientNumberOfDataPoints,
 		},
 		state.oracleGuardRails,
-		new BN(slot),
-		state.minPerpAuctionDuration
+		new BN(slot)
 	);
 	if (oracleValidity <= OracleValidity.StaleForAMMLowRisk) {
 		return false;
diff --git a/sdk/src/math/oracles.ts b/sdk/src/math/oracles.ts
diff --git a/sdk/src/types.ts b/sdk/src/types.ts
diff --git a/sdk/tests/dlob/helpers.ts b/sdk/tests/dlob/helpers.ts

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ pub fn get_amm_is_available(`
`62`	`62`	`&market.amm.oracle_source,`
`63`	`63`	`oracle::LogMode::SafeMMOracle,`
`64`	`64`	`market.amm.oracle_slot_delay_override,`
`65`		`- market.amm.taker_speed_bump_override,`
	`65`	`+ market.amm.oracle_low_risk_slot_delay_override,`
`66`	`66`	`)`
`67`	`67`	`.unwrap();`
`68`	`68`	`market`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ pub fn get_amm_is_available(`
`58`	`58`	`&market.amm.oracle_source,`
`59`	`59`	`crate::math::oracle::LogMode::SafeMMOracle,`
`60`	`60`	`market.amm.oracle_slot_delay_override,`
`61`		`- market.amm.taker_speed_bump_override,`
	`61`	`+ market.amm.oracle_low_risk_slot_delay_override,`
`62`	`62`	`)`
`63`	`63`	`.unwrap();`
`64`	`64`	`market`
Original file line number	Diff line number	Diff line change
`@@ -1583,11 +1583,14 @@ pub mod drift {`
`1583`	`1583`	`)`
`1584`	`1584`	`}`
`1585`	`1585`
`1586`		`- pub fn update_perp_market_taker_speed_bump_override(`
	`1586`	`+ pub fn update_perp_market_oracle_low_risk_slot_delay_override(`
`1587`	`1587`	`ctx: Context<HotAdminUpdatePerpMarket>,`
`1588`		`- taker_speed_bump_override: i8,`
	`1588`	`+ oracle_low_risk_slot_delay_override: i8,`
`1589`	`1589`	`) -> Result<()> {`
`1590`		`- handle_update_perp_market_taker_speed_bump_override(ctx, taker_speed_bump_override)`
	`1590`	`+ handle_update_perp_market_oracle_low_risk_slot_delay_override(`
	`1591`	`+ ctx,`
	`1592`	`+ oracle_low_risk_slot_delay_override,`
	`1593`	`+ )`
`1591`	`1594`	`}`
`1592`	`1595`
`1593`	`1596`	`pub fn update_perp_market_amm_spread_adjustment(`