Merge branch 'crispheaney/isolated-position' into devnet

Author: crispheaney

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Features
+
+### Fixes
+
+### Breaking
+
+## [2.143.0] - 2025-10-22
+
 - program: relax filling conditions for low risk orders vs amm ([#1968](https://github.com/drift-labs/protocol-v2/pull/1968))
 - sdk: make oracle validity match program and propogate to dlob and math functions ([#1968](https://github.com/drift-labs/protocol-v2/pull/1968))
 

Cargo.lock

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

programs/drift/Cargo.toml

@@ -58,7 +58,6 @@ pub fn settle_pnl(
     mut mode: SettlePnlMode,
 ) -> DriftResult {
     validate!(!user.is_bankrupt(), ErrorCode::UserBankrupt)?;
-    let slot = clock.slot;
     let now = clock.unix_timestamp;
     let tvl_before;
     let deposits_balance_before;
@@ -354,21 +353,6 @@ pub fn settle_pnl(
     drop(perp_market);
     drop(spot_market);
 
-    if user.perp_positions[position_index].can_transfer_isolated_position_deposit() {
-        transfer_isolated_perp_position_deposit(
-            user,
-            None,
-            perp_market_map,
-            spot_market_map,
-            oracle_map,
-            slot,
-            now,
-            0,
-            market_index,
-            i64::MIN,
-        )?;
-    }
-
     let perp_market = perp_market_map.get_ref(&market_index)?;
     let spot_market = spot_market_map.get_quote_spot_market()?;
 

programs/drift/src/controller/pnl.rs

@@ -18,6 +18,7 @@ use crate::controller::liquidation::{
 };
 use crate::controller::orders::cancel_orders;
 use crate::controller::orders::validate_market_within_price_band;
+use crate::controller::position::get_position_index;
 use crate::controller::position::PositionDirection;
 use crate::controller::spot_balance::update_spot_balances;
 use crate::controller::token::{receive, send_from_program_vault};
@@ -652,7 +653,7 @@ pub fn handle_place_signed_msg_taker_order<'c: 'info, 'info>(
     // TODO: generalize to support multiple market types
     let AccountMaps {
         perp_market_map,
-        spot_market_map,
+        mut spot_market_map,
         mut oracle_map,
     } = load_maps(
         &mut remaining_accounts,
@@ -683,7 +684,7 @@ pub fn handle_place_signed_msg_taker_order<'c: 'info, 'info>(
         signed_msg_order_params_message_bytes,
         &ctx.accounts.ix_sysvar.to_account_info(),
         &perp_market_map,
-        &spot_market_map,
+        &mut spot_market_map,
         &mut oracle_map,
         high_leverage_mode_config,
         escrow,
@@ -701,7 +702,7 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
     taker_order_params_message_bytes: Vec<u8>,
     ix_sysvar: &AccountInfo<'info>,
     perp_market_map: &PerpMarketMap,
-    spot_market_map: &SpotMarketMap,
+    spot_market_map: &mut SpotMarketMap,
     oracle_map: &mut OracleMap,
     high_leverage_mode_config: Option<AccountLoader<HighLeverageModeConfig>>,
     escrow: Option<RevenueShareEscrowZeroCopyMut<'info>>,
@@ -849,6 +850,7 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
     }
 
     if let Some(isolated_position_deposit) = verified_message_and_signature.isolated_position_deposit {
+        spot_market_map.update_writable_spot_market(0)?;
         transfer_isolated_perp_position_deposit(
             taker,
             Some(taker_stats),
@@ -1091,7 +1093,6 @@ pub fn handle_settle_pnl<'c: 'info, 'info>(
     )?;
 
     let mut remaining_accounts = ctx.remaining_accounts.iter().peekable();
-
     let AccountMaps {
         perp_market_map,
         spot_market_map,
@@ -1176,6 +1177,23 @@ pub fn handle_settle_pnl<'c: 'info, 'info>(
         }
     }
 
+    if let Ok(position_index) = get_position_index(&user.perp_positions, market_index) {
+        if user.perp_positions[position_index].can_transfer_isolated_position_deposit() {
+            transfer_isolated_perp_position_deposit(
+                user,
+                None,
+                &perp_market_map,
+                &spot_market_map,
+                &mut oracle_map,
+                clock.slot,
+                clock.unix_timestamp,
+                QUOTE_SPOT_MARKET_INDEX,
+                market_index,
+                i64::MIN,
+            )?;
+        }
+    }
+
     let spot_market = spot_market_map.get_quote_spot_market()?;
     validate_spot_market_vault_amount(&spot_market, ctx.accounts.spot_market_vault.amount)?;
 
@@ -1197,7 +1215,6 @@ pub fn handle_settle_multiple_pnls<'c: 'info, 'info>(
     let user = &mut load_mut!(ctx.accounts.user)?;
 
     let mut remaining_accounts = ctx.remaining_accounts.iter().peekable();
-
     let AccountMaps {
         perp_market_map,
         spot_market_map,
@@ -1289,6 +1306,23 @@ pub fn handle_settle_multiple_pnls<'c: 'info, 'info>(
                 }
             }
         }
+
+        if let Ok(position_index) = get_position_index(&user.perp_positions, *market_index) {
+            if user.perp_positions[position_index].can_transfer_isolated_position_deposit() {
+                transfer_isolated_perp_position_deposit(
+                    user,
+                    None,
+                    &perp_market_map,
+                    &spot_market_map,
+                    &mut oracle_map,
+                    clock.slot,
+                    clock.unix_timestamp,
+                    QUOTE_SPOT_MARKET_INDEX,
+                    *market_index,
+                    i64::MIN,
+                )?;
+            }
+        }
     }
 
     let spot_market = spot_market_map.get_quote_spot_market()?;

programs/drift/src/instructions/keeper.rs

@@ -599,7 +599,7 @@ pub fn handle_begin_lp_swap<'c: 'info, 'info>(
     let admin = &ctx.accounts.admin;
     #[cfg(feature = "anchor-test")]
     validate!(
-        admin.key() == admin_hot_wallet::id() || admin.key() == state.admin,
+        admin.key() == admin_hot_wallet::id() || admin.key() == ctx.accounts.state.key(),
         ErrorCode::Unauthorized,
         "Wrong signer for lp taker swap"
     )?;

programs/drift/src/instructions/lp_admin.rs

@@ -221,6 +221,21 @@ impl<'a> SpotMarketMap<'a> {
 
         Ok(spot_market_map)
     }
+
+    pub fn update_writable_spot_market(&mut self, market_index: u16) -> DriftResult {
+        if !self.0.contains_key(&market_index) {
+            return Err(ErrorCode::InvalidSpotMarketAccount);
+        }
+
+        let account_loader = self.0.get(&market_index).safe_unwrap()?;
+        if !account_loader.as_ref().is_writable {
+            return Err(ErrorCode::SpotMarketWrongMutability);
+        }
+
+        self.1.insert(market_index);
+
+        Ok(())
+    }
 }
 
 #[cfg(test)]

programs/drift/src/state/spot_market_map.rs

@@ -1286,6 +1286,7 @@ impl PerpPosition {
 
     pub fn can_transfer_isolated_position_deposit(&self) -> bool {
         self.is_isolated()
+            && self.isolated_position_scaled_balance > 0
             && !self.is_open_position()
             && !self.has_open_order()
             && !self.has_unsettled_pnl()

programs/drift/src/state/user.rs

@@ -156,7 +156,7 @@ mod sig_verification {
             32, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 1, 128, 133, 181, 13, 0, 0, 0, 0,
             1, 64, 85, 32, 14, 0, 0, 0, 0, 2, 0, 41, 9, 0, 0, 0, 0, 0, 0, 67, 82, 79, 51, 105, 114,
             71, 49, 1, 0, 28, 78, 14, 0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 1, 64, 58, 105, 13,
-            0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 0, 1, 1,
+            0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 0, 0, 0, 1, 1,
         ];
 
         // Test deserialization with delegate signer
@@ -355,52 +355,4 @@ mod sig_verification {
         assert_eq!(order_params.auction_start_price, Some(240000000i64));
         assert_eq!(order_params.auction_end_price, Some(238000000i64));
     }
-
-    #[test]
-    fn test_deserialize_into_verified_message_delegate_with_max_margin_ratio_and_builder_params() {
-        let signature = [1u8; 64];
-        let payload = vec![
-            200, 213, 166, 94, 34, 52, 245, 93, 0, 1, 0, 3, 0, 96, 254, 205, 0, 0, 0, 0, 64, 85,
-            32, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 1, 128, 133, 181, 13, 0, 0, 0, 0,
-            1, 64, 85, 32, 14, 0, 0, 0, 0, 2, 0, 41, 9, 0, 0, 0, 0, 0, 0, 67, 82, 79, 51, 105, 114,
-            71, 49, 1, 0, 28, 78, 14, 0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 0, 1, 255, 255, 1,
-            1, 1, 58, 0,
-        ];
-
-        // Test deserialization with delegate signer
-        let result = deserialize_into_verified_message(payload, &signature, false);
-
-        assert!(result.is_ok());
-
-        let verified_message = result.unwrap();
-
-        // Verify the deserialized message has expected structure
-        assert_eq!(verified_message.signature, signature);
-        assert_eq!(verified_message.sub_account_id, Some(2));
-        assert_eq!(verified_message.delegate_signed_taker_pubkey, None);
-        assert_eq!(verified_message.slot, 2345);
-        assert_eq!(verified_message.uuid, [67, 82, 79, 51, 105, 114, 71, 49]);
-        assert_eq!(verified_message.max_margin_ratio.unwrap(), 65535);
-        assert_eq!(verified_message.builder_idx.unwrap(), 1);
-        assert_eq!(verified_message.builder_fee_tenth_bps.unwrap(), 58);
-
-        assert!(verified_message.take_profit_order_params.is_some());
-        let tp = verified_message.take_profit_order_params.unwrap();
-        assert_eq!(tp.base_asset_amount, 3456000000u64);
-        assert_eq!(tp.trigger_price, 240000000u64);
-
-        assert!(verified_message.stop_loss_order_params.is_none());
-
-        // Verify order params
-        let order_params = &verified_message.signed_msg_order_params;
-        assert_eq!(order_params.user_order_id, 3);
-        assert_eq!(order_params.direction, PositionDirection::Long);
-        assert_eq!(order_params.base_asset_amount, 3456000000u64);
-        assert_eq!(order_params.price, 237000000u64);
-        assert_eq!(order_params.market_index, 0);
-        assert_eq!(order_params.reduce_only, false);
-        assert_eq!(order_params.auction_duration, Some(10));
-        assert_eq!(order_params.auction_start_price, Some(230000000i64));
-        assert_eq!(order_params.auction_end_price, Some(237000000i64));
-    }
 }

programs/drift/src/validation/sig_verification/tests.rs

@@ -1 +1 @@
-2.143.0-beta.8
+2.144.0-beta.1