Merge branch 'master' into crispheaney/isolated-position

crispheaney · crispheaney · commit 5d61bd37fbd2 · 2025-09-20T10:43:37.000-04:00
diff --git a/programs/drift/src/controller/insurance.rs b/programs/drift/src/controller/insurance.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
diff --git a/programs/drift/src/controller/liquidation.rs b/programs/drift/src/controller/liquidation.rs
@@ -53,10 +53,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};
@@ -68,7 +67,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};
diff --git a/programs/drift/src/controller/orders.rs b/programs/drift/src/controller/orders.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};
@@ -996,23 +994,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!(
@@ -2287,7 +2274,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,
@@ -2304,9 +2291,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()?)?;
diff --git a/programs/drift/src/controller/pnl.rs b/programs/drift/src/controller/pnl.rs
@@ -19,7 +19,6 @@ use crate::math::margin::{
 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};
diff --git a/programs/drift/src/controller/repeg.rs b/programs/drift/src/controller/repeg.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::*;
 
diff --git a/programs/drift/src/instructions/admin.rs b/programs/drift/src/instructions/admin.rs
@@ -1601,7 +1601,6 @@ pub fn handle_recenter_perp_market_amm_crank(
     depth: Option<u128>,
 ) -> Result<()> {
     let perp_market = &mut load_mut!(ctx.accounts.perp_market)?;
-    let spot_market = &mut load!(ctx.accounts.spot_market)?;
 
     let clock = Clock::get()?;
     let price_oracle = &ctx.accounts.oracle;
@@ -4780,9 +4779,6 @@ pub fn handle_initialize_if_rebalance_config(
     ctx: Context<InitializeIfRebalanceConfig>,
     params: IfRebalanceConfigParams,
 ) -> Result<()> {
-    let clock = Clock::get()?;
-    let now = clock.unix_timestamp;
-
     let pubkey = ctx.accounts.if_rebalance_config.to_account_info().key;
     let mut config = ctx.accounts.if_rebalance_config.load_init()?;
 
diff --git a/programs/drift/src/instructions/if_staker.rs b/programs/drift/src/instructions/if_staker.rs
@@ -375,9 +375,7 @@ pub fn handle_begin_insurance_fund_swap<'c: 'info, 'info>(
 
     let remaining_accounts_iter = &mut ctx.remaining_accounts.iter().peekable();
     let AccountMaps {
-        perp_market_map,
-        spot_market_map,
-        mut oracle_map,
+        spot_market_map, ..
     } = load_maps(
         remaining_accounts_iter,
         &MarketSet::new(),
@@ -602,14 +600,13 @@ pub fn handle_end_insurance_fund_swap<'c: 'info, 'info>(
 ) -> Result<()> {
     let state = &ctx.accounts.state;
     let clock = Clock::get()?;
-    let slot = clock.slot;
     let now = clock.unix_timestamp;
 
     let remaining_accounts = &mut ctx.remaining_accounts.iter().peekable();
     let AccountMaps {
-        perp_market_map,
         spot_market_map,
         mut oracle_map,
+        ..
     } = load_maps(
         remaining_accounts,
         &MarketSet::new(),
diff --git a/programs/drift/src/instructions/keeper.rs b/programs/drift/src/instructions/keeper.rs
@@ -1,5 +1,4 @@
 use std::cell::RefMut;
-use std::collections::BTreeMap;
 use std::convert::TryFrom;
 
 use anchor_lang::prelude::*;
@@ -69,7 +68,6 @@ use crate::validation::sig_verification::verify_and_decode_ed25519_msg;
 use crate::validation::user::{validate_user_deletion, validate_user_is_idle};
 use crate::{
     controller, load, math, print_error, safe_decrement, OracleSource, GOV_SPOT_MARKET_INDEX,
-    MARGIN_PRECISION,
 };
 use crate::{load_mut, QUOTE_PRECISION_U64};
 use crate::{math_error, ID};
diff --git a/programs/drift/src/instructions/user.rs b/programs/drift/src/instructions/user.rs
@@ -63,7 +63,7 @@ use crate::state::events::OrderActionRecord;
 use crate::state::events::OrderRecord;
 use crate::state::events::{
     DepositDirection, DepositExplanation, DepositRecord, FuelSeasonRecord, FuelSweepRecord,
-    LPAction, LPRecord, NewUserRecord, OrderActionExplanation, SwapRecord,
+    NewUserRecord, OrderActionExplanation, SwapRecord,
 };
 use crate::state::fill_mode::FillMode;
 use crate::state::fulfillment_params::drift::MatchFulfillmentParams;
@@ -78,7 +78,6 @@ use crate::state::order_params::{
     PlaceOrderOptions, PostOnlyParam,
 };
 use crate::state::paused_operations::{PerpOperation, SpotOperation};
-use crate::state::perp_market::ContractType;
 use crate::state::perp_market::MarketStatus;
 use crate::state::perp_market_map::{get_writable_perp_market_set, MarketSet};
 use crate::state::protected_maker_mode_config::ProtectedMakerModeConfig;
diff --git a/programs/drift/src/math/fees.rs b/programs/drift/src/math/fees.rs
@@ -6,9 +6,9 @@ use crate::error::DriftResult;
 use crate::math::casting::Cast;
 
 use crate::math::constants::{
-    FIFTY_MILLION_QUOTE, FIVE_MILLION_QUOTE, ONE_HUNDRED_MILLION_QUOTE, ONE_HUNDRED_THOUSAND_QUOTE,
-    ONE_MILLION_QUOTE, ONE_THOUSAND_QUOTE, TEN_BPS, TEN_MILLION_QUOTE, TEN_THOUSAND_QUOTE,
-    TWENTY_FIVE_THOUSAND_QUOTE, TWO_HUNDRED_FIFTY_THOUSAND_QUOTE,
+    FIVE_MILLION_QUOTE, ONE_HUNDRED_MILLION_QUOTE, ONE_HUNDRED_THOUSAND_QUOTE, ONE_MILLION_QUOTE,
+    ONE_THOUSAND_QUOTE, TEN_BPS, TEN_MILLION_QUOTE, TEN_THOUSAND_QUOTE, TWENTY_FIVE_THOUSAND_QUOTE,
+    TWO_HUNDRED_FIFTY_THOUSAND_QUOTE,
 };
 use crate::math::helpers::get_proportion_u128;
 use crate::math::safe_math::SafeMath;
diff --git a/programs/drift/src/math/orders.rs b/programs/drift/src/math/orders.rs
@@ -1,8 +1,6 @@
 use std::cmp::min;
 use std::ops::Sub;
 
-use crate::math::constants::PERCENTAGE_PRECISION;
-use crate::math::constants::PERCENTAGE_PRECISION_I128;
 use crate::msg;
 
 use crate::controller::position::PositionDelta;
@@ -12,6 +10,7 @@ use crate::math::amm::calculate_amm_available_liquidity;
 use crate::math::casting::Cast;
 use crate::state::protected_maker_mode_config::ProtectedMakerParams;
 use crate::state::user::OrderBitFlag;
+use crate::PERCENTAGE_PRECISION_I128;
 use crate::{
     load, math, FeeTier, BASE_PRECISION_I128, FEE_ADJUSTMENT_MAX, MARGIN_PRECISION_I128,
     MAX_PREDICTION_MARKET_PRICE, MAX_PREDICTION_MARKET_PRICE_I64, OPEN_ORDER_MARGIN_REQUIREMENT,
diff --git a/programs/drift/src/math/position.rs b/programs/drift/src/math/position.rs
@@ -1,22 +1,19 @@
-use crate::msg;
-
 use crate::controller::amm::SwapDirection;
 use crate::controller::position::PositionDelta;
-use crate::error::{DriftResult, ErrorCode};
+use crate::error::DriftResult;
 use crate::math::amm;
 use crate::math::amm::calculate_quote_asset_amount_swapped;
 use crate::math::casting::Cast;
 use crate::math::constants::{
     AMM_RESERVE_PRECISION_I128, PRICE_TIMES_AMM_TO_QUOTE_PRECISION_RATIO,
     PRICE_TIMES_AMM_TO_QUOTE_PRECISION_RATIO_I128,
 };
-use crate::math::helpers::get_proportion_u128;
 use crate::math::pnl::calculate_pnl;
 use crate::math::safe_math::SafeMath;
 
-use crate::state::perp_market::{ContractType, PerpMarket, AMM};
+use crate::state::perp_market::{ContractType, AMM};
 use crate::state::user::PerpPosition;
-use crate::{validate, BASE_PRECISION, MAX_PREDICTION_MARKET_PRICE_U128};
+use crate::{BASE_PRECISION, MAX_PREDICTION_MARKET_PRICE_U128};
 
 pub fn calculate_base_asset_value_and_pnl(
     base_asset_amount: i128,
@@ -195,7 +192,7 @@ pub fn get_new_position_amounts(
         .quote_asset_amount
         .safe_add(delta.quote_asset_amount)?;
 
-    let mut new_base_asset_amount = position
+    let new_base_asset_amount = position
         .base_asset_amount
         .safe_add(delta.base_asset_amount)?;
 
diff --git a/programs/drift/src/state/perp_market.rs b/programs/drift/src/state/perp_market.rs
@@ -5,31 +5,27 @@ use anchor_lang::prelude::*;
 use crate::state::state::{State, ValidityGuardRails};
 use std::cmp::max;
 
-use crate::controller::position::{PositionDelta, PositionDirection};
+use crate::controller::position::PositionDirection;
 use crate::error::{DriftResult, ErrorCode};
 use crate::math::amm;
 use crate::math::casting::Cast;
 #[cfg(test)]
 use crate::math::constants::{AMM_RESERVE_PRECISION, MAX_CONCENTRATION_COEFFICIENT};
 use crate::math::constants::{
-    AMM_RESERVE_PRECISION_I128, AMM_TO_QUOTE_PRECISION_RATIO, BID_ASK_SPREAD_PRECISION,
-    BID_ASK_SPREAD_PRECISION_I128, BID_ASK_SPREAD_PRECISION_U128,
-    DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT, FUNDING_RATE_BUFFER_I128,
-    FUNDING_RATE_OFFSET_PERCENTAGE, LIQUIDATION_FEE_PRECISION,
-    LIQUIDATION_FEE_TO_MARGIN_PRECISION_RATIO, LP_FEE_SLICE_DENOMINATOR, LP_FEE_SLICE_NUMERATOR,
-    MARGIN_PRECISION, MARGIN_PRECISION_U128, MAX_LIQUIDATION_MULTIPLIER, PEG_PRECISION,
-    PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I128, PERCENTAGE_PRECISION_I64,
-    PERCENTAGE_PRECISION_U64, PRICE_PRECISION, PRICE_PRECISION_I128, PRICE_PRECISION_I64,
+    AMM_TO_QUOTE_PRECISION_RATIO, BID_ASK_SPREAD_PRECISION, BID_ASK_SPREAD_PRECISION_I128,
+    BID_ASK_SPREAD_PRECISION_U128, DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT,
+    FUNDING_RATE_BUFFER_I128, FUNDING_RATE_OFFSET_PERCENTAGE, LIQUIDATION_FEE_PRECISION,
+    LIQUIDATION_FEE_TO_MARGIN_PRECISION_RATIO, MARGIN_PRECISION, MARGIN_PRECISION_U128,
+    MAX_LIQUIDATION_MULTIPLIER, PEG_PRECISION, PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I128,
+    PERCENTAGE_PRECISION_I64, PERCENTAGE_PRECISION_U64, PRICE_PRECISION, PRICE_PRECISION_I128,
     SPOT_WEIGHT_PRECISION, TWENTY_FOUR_HOUR,
 };
-use crate::math::helpers::get_proportion_i128;
 use crate::math::margin::{
     calculate_size_discount_asset_weight, calculate_size_premium_liability_weight,
     MarginRequirementType,
 };
 use crate::math::safe_math::SafeMath;
 use crate::math::stats;
-use crate::state::events::OrderActionExplanation;
 use num_integer::Roots;
 
 use crate::state::oracle::{
diff --git a/programs/drift/src/state/user.rs b/programs/drift/src/state/user.rs
@@ -4,7 +4,7 @@ use crate::math::auction::{calculate_auction_price, is_auction_complete};
 use crate::math::casting::Cast;
 use crate::math::constants::{
     EPOCH_DURATION, FUEL_OVERFLOW_THRESHOLD_U32, FUEL_START_TS, OPEN_ORDER_MARGIN_REQUIREMENT,
-    PRICE_TIMES_AMM_TO_QUOTE_PRECISION_RATIO, QUOTE_PRECISION, QUOTE_SPOT_MARKET_INDEX, THIRTY_DAY,
+    QUOTE_SPOT_MARKET_INDEX, THIRTY_DAY,
 };
 use crate::math::margin::MarginRequirementType;
 use crate::math::orders::{
