Devnet

CHANGELOG.md

@@ -82,6 +82,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+### Fixes
+
+### Breaking
+
+## [2.142.0] - 2025-10-14
+
+### Features
+
 - program: add titan to whitelisted swap programs ([#1952](https://github.com/drift-labs/protocol-v2/pull/1952))
 - program: allow hot wallet to increase max spread and pause funding ([#1957](https://github.com/drift-labs/protocol-v2/pull/1957))
 

package.json

@@ -95,4 +95,4 @@
 		"supports-hyperlinks": "<4.1.1",
 		"has-ansi": "<6.0.1"
 	}
-}
+}

programs/drift/src/controller/amm.rs

@@ -595,7 +595,7 @@ fn calculate_revenue_pool_transfer(
 pub fn update_pool_balances(
     market: &mut PerpMarket,
     spot_market: &mut SpotMarket,
-    user_quote_position: &SpotPosition,
+    user_quote_token_amount: i128,
     user_unsettled_pnl: i128,
     now: i64,
 ) -> DriftResult<i128> {
@@ -743,12 +743,13 @@ pub fn update_pool_balances(
     let pnl_to_settle_with_user = if user_unsettled_pnl > 0 {
         min(user_unsettled_pnl, pnl_pool_token_amount.cast::<i128>()?)
     } else {
-        let token_amount = user_quote_position.get_signed_token_amount(spot_market)?;
-
         // dont settle negative pnl to spot borrows when utilization is high (> 80%)
-        let max_withdraw_amount =
-            -get_max_withdraw_for_market_with_token_amount(spot_market, token_amount, false)?
-                .cast::<i128>()?;
+        let max_withdraw_amount = -get_max_withdraw_for_market_with_token_amount(
+            spot_market,
+            user_quote_token_amount,
+            false,
+        )?
+        .cast::<i128>()?;
 
         max_withdraw_amount.max(user_unsettled_pnl)
     };
@@ -788,15 +789,15 @@ pub fn update_pool_balances(
 
 pub fn update_pnl_pool_and_user_balance(
     market: &mut PerpMarket,
-    bank: &mut SpotMarket,
+    quote_spot_market: &mut SpotMarket,
     user: &mut User,
     unrealized_pnl_with_fee: i128,
 ) -> DriftResult<i128> {
     let pnl_to_settle_with_user = if unrealized_pnl_with_fee > 0 {
         unrealized_pnl_with_fee.min(
             get_token_amount(
                 market.pnl_pool.scaled_balance,
-                bank,
+                quote_spot_market,
                 market.pnl_pool.balance_type(),
             )?
             .cast()?,
@@ -827,14 +828,37 @@ pub fn update_pnl_pool_and_user_balance(
         return Ok(0);
     }
 
-    let user_spot_position = user.get_quote_spot_position_mut();
+    let is_isolated_position = user.get_perp_position(market.market_index)?.is_isolated();
+    if is_isolated_position {
+        let perp_position = user.force_get_isolated_perp_position_mut(market.market_index)?;
+        let perp_position_token_amount =
+            perp_position.get_isolated_token_amount(quote_spot_market)?;
+
+        if pnl_to_settle_with_user < 0 {
+            validate!(
+                perp_position_token_amount >= pnl_to_settle_with_user.unsigned_abs(),
+                ErrorCode::InsufficientCollateral,
+                "user has insufficient deposit for market {}",
+                market.market_index
+            )?;
+        }
 
-    transfer_spot_balances(
-        pnl_to_settle_with_user,
-        bank,
-        &mut market.pnl_pool,
-        user_spot_position,
-    )?;
+        transfer_spot_balances(
+            pnl_to_settle_with_user,
+            quote_spot_market,
+            &mut market.pnl_pool,
+            perp_position,
+        )?;
+    } else {
+        let user_spot_position = user.get_quote_spot_position_mut();
+
+        transfer_spot_balances(
+            pnl_to_settle_with_user,
+            quote_spot_market,
+            &mut market.pnl_pool,
+            user_spot_position,
+        )?;
+    }
 
     Ok(pnl_to_settle_with_user)
 }