program: add isolated_position_deposit to swift params (#2002)

* program: add isolated_position_deposit to swift params

* CHANGELOG

Author: crispheaney

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- program: add isolated_position_deposit to signed msg params
+
 ### Fixes
 
 ### Breaking

programs/drift/src/state/order_params.rs

@@ -875,6 +875,7 @@ pub struct SignedMsgOrderParamsMessage {
     pub max_margin_ratio: Option<u16>,
     pub builder_idx: Option<u8>,
     pub builder_fee_tenth_bps: Option<u16>,
+    pub isolated_position_deposit: Option<u64>,
 }
 
 #[derive(AnchorSerialize, AnchorDeserialize, Clone, Default, Eq, PartialEq, Debug)]
@@ -888,6 +889,7 @@ pub struct SignedMsgOrderParamsDelegateMessage {
     pub max_margin_ratio: Option<u16>,
     pub builder_idx: Option<u8>,
     pub builder_fee_tenth_bps: Option<u16>,
+    pub isolated_position_deposit: Option<u64>,
 }
 
 #[derive(AnchorSerialize, AnchorDeserialize, Clone, Default, Eq, PartialEq, Debug)]

programs/drift/src/validation/sig_verification.rs

@@ -60,6 +60,7 @@ pub struct VerifiedMessage {
     pub max_margin_ratio: Option<u16>,
     pub builder_idx: Option<u8>,
     pub builder_fee_tenth_bps: Option<u16>,
+    pub isolated_position_deposit: Option<u64>,
     pub signature: [u8; 64],
 }
 
@@ -100,6 +101,7 @@ pub fn deserialize_into_verified_message(
             max_margin_ratio: deserialized.max_margin_ratio,
             builder_idx: deserialized.builder_idx,
             builder_fee_tenth_bps: deserialized.builder_fee_tenth_bps,
+            isolated_position_deposit: deserialized.isolated_position_deposit,
             signature: *signature,
         });
     } else {
@@ -129,6 +131,7 @@ pub fn deserialize_into_verified_message(
             max_margin_ratio: deserialized.max_margin_ratio,
             builder_idx: deserialized.builder_idx,
             builder_fee_tenth_bps: deserialized.builder_fee_tenth_bps,
+            isolated_position_deposit: deserialized.isolated_position_deposit,
             signature: *signature,
         });
     }

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

@@ -148,6 +148,55 @@ mod sig_verification {
         assert_eq!(order_params.auction_end_price, Some(237000000i64));
     }
 
+    #[test]
+    fn test_deserialize_into_verified_message_non_delegate_with_isolated_position_deposit() {
+        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, 1, 64, 58, 105, 13,
+            0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+        ];
+
+        // 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!(verified_message.isolated_position_deposit.is_some());
+        assert_eq!(verified_message.isolated_position_deposit.unwrap(), 1);
+
+        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_some());
+        let sl = verified_message.stop_loss_order_params.unwrap();
+        assert_eq!(sl.base_asset_amount, 3456000000u64);
+        assert_eq!(sl.trigger_price, 225000000u64);
+
+        // 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));
+    }
+
     #[test]
     fn test_deserialize_into_verified_message_delegate() {
         let signature = [1u8; 64];
@@ -353,4 +402,58 @@ mod sig_verification {
         assert_eq!(order_params.auction_start_price, Some(230000000i64));
         assert_eq!(order_params.auction_end_price, Some(237000000i64));
     }
+
+    #[test]
+    fn test_deserialize_into_verified_message_delegate_with_isolated_position_deposit() {
+        let signature = [1u8; 64];
+        let payload = vec![
+            66, 101, 102, 56, 199, 37, 158, 35, 0, 1, 1, 2, 0, 202, 154, 59, 0, 0, 0, 0, 64, 85,
+            32, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 1, 0, 28, 78, 14, 0, 0, 0, 0, 1,
+            128, 151, 47, 14, 0, 0, 0, 0, 241, 148, 164, 10, 232, 65, 33, 157, 18, 12, 251, 132,
+            245, 208, 37, 127, 112, 55, 83, 186, 54, 139, 1, 135, 220, 180, 208, 219, 189, 94, 79,
+            148, 41, 9, 0, 0, 0, 0, 0, 0, 67, 82, 79, 51, 105, 114, 71, 49, 1, 128, 133, 181, 13,
+            0, 0, 0, 0, 0, 202, 154, 59, 0, 0, 0, 0, 1, 128, 178, 230, 14, 0, 0, 0, 0, 0, 202, 154,
+            59, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+        ];
+
+        // Test deserialization with delegate signer
+        let result = deserialize_into_verified_message(payload, &signature, true);
+        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, None);
+        assert_eq!(
+            verified_message.delegate_signed_taker_pubkey,
+            Some(Pubkey::from_str("HG2iQKnRkkasrLptwMZewV6wT7KPstw9wkA8yyu8Nx3m").unwrap())
+        );
+        assert_eq!(verified_message.slot, 2345);
+        assert_eq!(verified_message.uuid, [67, 82, 79, 51, 105, 114, 71, 49]);
+        assert!(verified_message.isolated_position_deposit.is_some());
+        assert_eq!(verified_message.isolated_position_deposit.unwrap(), 1);
+
+        assert!(verified_message.take_profit_order_params.is_some());
+        let tp = verified_message.take_profit_order_params.unwrap();
+        assert_eq!(tp.base_asset_amount, 1000000000u64);
+        assert_eq!(tp.trigger_price, 230000000u64);
+
+        assert!(verified_message.stop_loss_order_params.is_some());
+        let sl = verified_message.stop_loss_order_params.unwrap();
+        assert_eq!(sl.base_asset_amount, 1000000000u64);
+        assert_eq!(sl.trigger_price, 250000000u64);
+
+        // Verify order params
+        let order_params = &verified_message.signed_msg_order_params;
+        assert_eq!(order_params.user_order_id, 2);
+        assert_eq!(order_params.direction, PositionDirection::Short);
+        assert_eq!(order_params.base_asset_amount, 1000000000u64);
+        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(240000000i64));
+        assert_eq!(order_params.auction_end_price, Some(238000000i64));
+    }
 }