add get_existing_position_params_for_order_action

Author: 0xbigz

programs/drift/src/controller/pnl.rs

@@ -21,6 +21,7 @@ use crate::math::safe_math::SafeMath;
 use crate::math::spot_balance::get_token_amount;
 
 use crate::get_then_update_id;
+use crate::math::orders::calculate_existing_position_fields_for_order_action;
 use crate::msg;
 use crate::state::events::{
     LiquidateBorrowForPerpPnlRecord, LiquidatePerpPnlForDepositRecord, LiquidatePerpRecord,
@@ -457,23 +458,6 @@ pub fn settle_expired_position(
         .safe_mul(fee_structure.fee_tiers[0].fee_numerator as i64)?
         .safe_div(fee_structure.fee_tiers[0].fee_denominator as i64)?;
 
-    update_quote_asset_and_break_even_amount(
-        &mut user.perp_positions[position_index],
-        perp_market,
-        -fee.abs(),
-    )?;
-
-    let pnl = user.perp_positions[position_index].quote_asset_amount;
-
-    let pnl_to_settle_with_user =
-        update_pnl_pool_and_user_balance(perp_market, quote_spot_market, user, pnl.cast()?)?;
-
-    update_quote_asset_amount(
-        &mut user.perp_positions[position_index],
-        perp_market,
-        -pnl_to_settle_with_user.cast()?,
-    )?;
-
     if position_delta.base_asset_amount != 0 {
         // get ids for order fills
         let user_order_id = get_then_update_id!(user, next_order_id);
@@ -503,6 +487,23 @@ pub fn settle_expired_position(
             order: user_order
         });
 
+        let (taker_existing_position, taker_existing_position_params_for_order_action) = {
+            let taker_position = user.perp_positions[position_index];
+
+            (
+                taker_position.base_asset_amount,
+                taker_position.get_existing_position_params_for_order_action(
+                    user_existing_position_direction,
+                ),
+            )
+        };
+
+        let (taker_existing_quote_entry_amount, taker_existing_base_asset_amount) =
+            calculate_existing_position_fields_for_order_action(
+                base_asset_amount.unsigned_abs(),
+                taker_existing_position_params_for_order_action,
+            )?;
+
         let fill_record = OrderActionRecord {
             ts: now,
             action: OrderAction::Fill,
@@ -513,7 +514,7 @@ pub fn settle_expired_position(
             filler_reward: None,
             fill_record_id: Some(fill_record_id),
             base_asset_amount_filled: Some(base_asset_amount.unsigned_abs()),
-            quote_asset_amount_filled: Some(pnl.unsigned_abs()),
+            quote_asset_amount_filled: Some(base_asset_value.unsigned_abs()),
             taker_fee: Some(fee.unsigned_abs()),
             maker_fee: None,
             referrer_reward: None,
@@ -533,8 +534,8 @@ pub fn settle_expired_position(
             maker_order_cumulative_quote_asset_amount_filled: None,
             oracle_price: perp_market.expiry_price,
             bit_flags: 0,
-            taker_existing_quote_entry_amount: Some(quote_entry_amount.unsigned_abs()),
-            taker_existing_base_asset_amount: Some(base_asset_amount.unsigned_abs()),
+            taker_existing_quote_entry_amount: Some(taker_existing_quote_entry_amount.unsigned_abs()),
+            taker_existing_base_asset_amount: Some(taker_existing_base_asset_amount.unsigned_abs()),
             maker_existing_quote_entry_amount: None,
             maker_existing_base_asset_amount: None,
             trigger_price: None,
@@ -544,6 +545,23 @@ pub fn settle_expired_position(
         emit!(fill_record);
     }
 
+    update_quote_asset_and_break_even_amount(
+        &mut user.perp_positions[position_index],
+        perp_market,
+        -fee.abs(),
+    )?;
+
+    let pnl = user.perp_positions[position_index].quote_asset_amount;
+
+    let pnl_to_settle_with_user =
+        update_pnl_pool_and_user_balance(perp_market, quote_spot_market, user, pnl.cast()?)?;
+
+    update_quote_asset_amount(
+        &mut user.perp_positions[position_index],
+        perp_market,
+        -pnl_to_settle_with_user.cast()?,
+    )?;
+
     update_settled_pnl(user, position_index, pnl_to_settle_with_user.cast()?)?;
 
     perp_market.amm.base_asset_amount_with_amm = perp_market