Merge branch 'master' into lukas/per-market-lev-swift-plus-more

Author: lowkeynicc

CHANGELOG.md

@@ -9,7 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- program: auction order params account for twap divergence ([#1882](https://github.com/drift-labs/protocol-v2/pull/1882))
+- program: add delegate stake if ([#1859](https://github.com/drift-labs/protocol-v2/pull/1859))
+
+### Fixes
+
+### Breaking
+
+## [2.138.0] - 2025-09-22
+
+### Features
+
 - program: support scaled ui extension ([#1894](https://github.com/drift-labs/protocol-v2/pull/1894))
+- Revert "Crispeaney/revert swift max margin ratio ([#1877](https://github.com/drift-labs/protocol-v2/pull/1877))
 
 ### Fixes
 

Cargo.lock

@@ -50,7 +50,7 @@
 		"prettify:fix": "prettier --write './sdk/src/**/*.ts' './tests/**.ts' './cli/**.ts'",
 		"lint": "eslint . --ext ts --quiet --format unix",
 		"lint:fix": "eslint . --ext ts --fix",
-		"update-idl": "cp target/idl/drift.json sdk/src/idl/drift.json"
+		"update-idl": "anchor build -- --features anchor-test && cp target/idl/drift.json sdk/src/idl/drift.json"
 	},
 	"engines": {
 		"node": ">=12"

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "drift"
-version = "2.137.0"
+version = "2.138.0"
 description = "Created with Anchor"
 edition = "2018"
 

programs/drift/Cargo.toml

@@ -15,8 +15,8 @@ use crate::math::amm::calculate_quote_asset_amount_swapped;
 use crate::math::amm_spread::{calculate_spread_reserves, get_spread_reserves};
 use crate::math::casting::Cast;
 use crate::math::constants::{
-    CONCENTRATION_PRECISION, FEE_ADJUSTMENT_MAX, FEE_POOL_TO_REVENUE_POOL_THRESHOLD,
-    K_BPS_UPDATE_SCALE, MAX_CONCENTRATION_COEFFICIENT, MAX_K_BPS_INCREASE, MAX_SQRT_K,
+    CONCENTRATION_PRECISION, FEE_POOL_TO_REVENUE_POOL_THRESHOLD, K_BPS_UPDATE_SCALE,
+    MAX_CONCENTRATION_COEFFICIENT, MAX_K_BPS_INCREASE, MAX_SQRT_K,
 };
 use crate::math::cp_curve::get_update_k_result;
 use crate::math::repeg::get_total_fee_lower_bound;

programs/drift/src/controller/amm.rs

@@ -973,7 +973,7 @@ pub fn handle_if_begin_swap(
     out_insurance_fund_vault_amount: u64,
     in_spot_market: &mut SpotMarket,
     out_spot_market: &mut SpotMarket,
-    in_amount: u64,
+    _in_amount: u64,
     now: i64,
 ) -> DriftResult<()> {
     if now
@@ -1098,6 +1098,14 @@ pub fn handle_if_end_swap(
         if_rebalance_config.epoch_max_in_amount
     )?;
 
+    validate!(
+        if_rebalance_config.current_in_amount <= if_rebalance_config.total_in_amount,
+        ErrorCode::InvalidIfRebalanceSwap,
+        "current_in_amount={} > total_in_amount={}",
+        if_rebalance_config.current_in_amount,
+        if_rebalance_config.total_in_amount
+    )?;
+
     let oracle_twap = out_spot_market
         .historical_oracle_data
         .last_oracle_price_twap;

programs/drift/src/controller/insurance.rs

@@ -50,10 +50,9 @@ use crate::math::safe_math::SafeMath;
 
 use crate::math::spot_balance::get_token_value;
 use crate::state::events::{
-    emit_stack, LPAction, LPRecord, LiquidateBorrowForPerpPnlRecord,
-    LiquidatePerpPnlForDepositRecord, LiquidatePerpRecord, LiquidateSpotRecord, LiquidationRecord,
-    LiquidationType, OrderAction, OrderActionExplanation, OrderActionRecord, OrderRecord,
-    PerpBankruptcyRecord, SpotBankruptcyRecord,
+    LiquidateBorrowForPerpPnlRecord, LiquidatePerpPnlForDepositRecord, LiquidatePerpRecord,
+    LiquidateSpotRecord, LiquidationRecord, LiquidationType, OrderAction, OrderActionExplanation,
+    OrderActionRecord, OrderRecord, PerpBankruptcyRecord, SpotBankruptcyRecord,
 };
 use crate::state::fill_mode::FillMode;
 use crate::state::margin_calculation::{MarginCalculation, MarginContext, MarketIdentifier};
@@ -65,7 +64,6 @@ use crate::state::perp_market_map::PerpMarketMap;
 use crate::state::spot_market::SpotBalanceType;
 use crate::state::spot_market_map::SpotMarketMap;
 use crate::state::state::State;
-use crate::state::traits::Size;
 use crate::state::user::{MarketType, Order, OrderStatus, OrderType, User, UserStats};
 use crate::state::user_map::{UserMap, UserStatsMap};
 use crate::{get_then_update_id, load_mut, LST_POOL_ID};

programs/drift/src/controller/liquidation.rs

@@ -48,9 +48,7 @@ use crate::math::spot_balance::{get_signed_token_amount, get_token_amount};
 use crate::math::spot_swap::select_margin_type_for_swap;
 use crate::math::{amm, fees, margin::*, orders::*};
 use crate::print_error;
-use crate::state::events::{
-    emit_stack, get_order_action_record, LPAction, LPRecord, OrderActionRecord, OrderRecord,
-};
+use crate::state::events::{emit_stack, get_order_action_record, OrderActionRecord, OrderRecord};
 use crate::state::events::{OrderAction, OrderActionExplanation};
 use crate::state::fill_mode::FillMode;
 use crate::state::fulfillment::{PerpFulfillmentMethod, SpotFulfillmentMethod};
@@ -985,23 +983,12 @@ pub fn fill_perp_order(
         .position(|order| order.order_id == order_id && order.status == OrderStatus::Open)
         .ok_or_else(print_error!(ErrorCode::OrderDoesNotExist))?;
 
-    let (
-        order_status,
-        market_index,
-        order_market_type,
-        order_price,
-        order_oracle_price_offset,
-        order_direction,
-        order_auction_duration,
-    ) = get_struct_values!(
+    let (order_status, market_index, order_market_type, order_direction) = get_struct_values!(
         user.orders[order_index],
         status,
         market_index,
         market_type,
-        price,
-        oracle_price_offset,
-        direction,
-        auction_duration
+        direction
     );
 
     validate!(
@@ -2246,7 +2233,7 @@ pub fn fulfill_perp_order_with_amm(
         filler_reward,
         referee_discount,
         referrer_reward,
-        fee_to_market_for_lp,
+        fee_to_market_for_lp: _fee_to_market_for_lp,
         maker_rebate,
     } = fees::calculate_fee_for_fulfillment_with_amm(
         user_stats,
@@ -2263,9 +2250,6 @@ pub fn fulfill_perp_order_with_amm(
         user.is_high_leverage_mode(MarginRequirementType::Initial),
     )?;
 
-    let user_position_delta =
-        get_position_delta_for_fill(base_asset_amount, quote_asset_amount, order_direction)?;
-
     // Increment the protocol's total fee variables
     market.amm.total_fee = market.amm.total_fee.safe_add(fee_to_market.cast()?)?;
     market.amm.total_exchange_fee = market.amm.total_exchange_fee.safe_add(user_fee.cast()?)?;

programs/drift/src/controller/orders.rs

@@ -14,14 +14,11 @@ use crate::math::oracle::{is_oracle_valid_for_action, DriftAction};
 
 use crate::math::casting::Cast;
 use crate::math::margin::{
-    calculate_margin_requirement_and_total_collateral_and_liability_info,
     meets_maintenance_margin_requirement, meets_settle_pnl_maintenance_margin_requirement,
-    MarginRequirementType,
 };
 use crate::math::position::calculate_base_asset_value_with_expiry_price;
 use crate::math::safe_math::SafeMath;
 use crate::math::spot_balance::get_token_amount;
-use crate::state::margin_calculation::MarginContext;
 
 use crate::msg;
 use crate::state::events::{OrderActionExplanation, SettlePnlExplanation, SettlePnlRecord};

programs/drift/src/controller/pnl.rs

@@ -3,7 +3,6 @@ use std::cmp::min;
 use crate::math::oracle::LogMode;
 use crate::msg;
 use crate::state::oracle::MMOraclePriceData;
-use crate::state::oracle::OraclePriceData;
 use anchor_lang::prelude::AccountInfo;
 use anchor_lang::prelude::*;