Devnet auto cancel tpsl 2 (#2109)

* program: add auto cancel reduce only tpsl

* cargo test

* cargo fmt --

* tweaks

* program: rm should_expire_order_before_fill (#2103)

* fix conditional

* program: remove same slot matching restriction (#2104)

* remove same slot restriction for swift limit fills

* update comment

* add changelog

---------

Co-authored-by: Chris Heaney <chrisheaney30@gmail.com>
Co-authored-by: 0xahzam <104062587+0xahzam@users.noreply.github.com>

Author: 3 people

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- program: remove same slot matching restriction [#2104](https://github.com/drift-labs/protocol-v2/pull/2104)
+
 ### Fixes
 
 ### Breaking
@@ -47,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixes
 
 ### Breaking
+
 - sdk: `channelOptions` in the GrpcConfigs type has been updated to work with new grpc lib
 
 ## [2.153.0] - 2025-12-30
@@ -104,11 +107,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixes
 
 ### Breaking
+
 - program: add DepositRecord::spot_balance_after [#2034](https://github.com/drift-labs/protocol-v2/pull/2034)
 
 ## [2.149.0] - 2025-11-19
 
 ### Features
+
 - sdk: allow deposit from external authority directly to drift account
 
 ### Fixes
@@ -171,7 +176,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
-- program: use-5min-for-target-expiry-price  ([#1967](https://github.com/drift-labs/protocol-v2/pull/1967))
+- program: use-5min-for-target-expiry-price ([#1967](https://github.com/drift-labs/protocol-v2/pull/1967))
 
 ### Fixes
 

programs/drift/src/controller/orders.rs

@@ -1232,7 +1232,7 @@ pub fn fill_perp_order(
         }
     }
 
-    let should_expire_order = should_expire_order_before_fill(user, order_index, now)?;
+    let should_expire_order = should_expire_order(user, order_index, now)?;
 
     let position_index =
         get_position_index(&user.perp_positions, user.orders[order_index].market_index)?;
@@ -1369,7 +1369,7 @@ pub fn fill_perp_order(
         )?
     }
 
-    if base_asset_amount_after == 0 && user.perp_positions[position_index].open_orders != 0 {
+    if base_asset_amount_after == 0 && user.perp_positions[position_index].open_asks == 0 && user.perp_positions[position_index].open_bids == 0 {
         cancel_reduce_only_trigger_orders(
             user,
             &user_key,
@@ -4134,7 +4134,7 @@ pub fn fill_spot_order(
         }
     }
 
-    let should_expire_order = should_expire_order_before_fill(user, order_index, now)?;
+    let should_expire_order = should_expire_order(user, order_index, now)?;
 
     let should_cancel_reduce_only = if user.orders[order_index].reduce_only {
         let market_index = user.orders[order_index].market_index;

programs/drift/src/math/matching.rs

@@ -17,10 +17,8 @@ pub fn is_maker_for_taker(
     taker_order: &Order,
     slot: u64,
 ) -> DriftResult<bool> {
-    // Maker and taker order not allowed to match if both were placed in the current slot
-    if slot == maker_order.slot && slot == taker_order.slot && !maker_order.is_jit_maker() {
-        return Ok(false);
-    };
+    // Self match protection handled upstream via maker_key != taker_key check.
+    // Removed slot equality restriction to enable same slot fills.
 
     // taker cant be post only and maker must be resting limit order
     if taker_order.post_only || !maker_order.is_resting_limit_order(slot)? {

programs/drift/src/math/matching/tests.rs

@@ -177,6 +177,55 @@ mod is_maker_for_taker {
 
         assert_eq!(is_maker_for_taker(&maker, &taker, slot).unwrap(), true);
     }
+
+    #[test]
+    fn same_slot_maker_taker_non_resting() {
+        let slot = 0;
+
+        // Taker market order
+        let taker = Order {
+            post_only: false,
+            order_type: OrderType::Market,
+            slot: 0,
+            ..Default::default()
+        };
+
+        // Maker resting with 0 auction
+        let maker = Order {
+            post_only: false,
+            order_type: OrderType::Limit,
+            slot: 0,
+            auction_duration: 0,
+            ..Default::default()
+        };
+
+        assert_eq!(is_maker_for_taker(&maker, &taker, slot).unwrap(), true);
+    }
+
+    #[test]
+    fn same_slot_maker_taker_both_resting() {
+        let slot = 20;
+
+        // Resting taker order
+        let taker = Order {
+            post_only: false,
+            order_type: OrderType::Limit,
+            slot: 10,
+            auction_duration: 5,
+            ..Default::default()
+        };
+
+        // Resting maker order (older)
+        let maker = Order {
+            post_only: false,
+            order_type: OrderType::Limit,
+            slot: 5,
+            auction_duration: 2,
+            ..Default::default()
+        };
+
+        assert_eq!(is_maker_for_taker(&maker, &taker, slot).unwrap(), true);
+    }
 }
 
 #[test]

programs/drift/src/math/orders.rs

@@ -354,24 +354,6 @@ pub fn get_position_delta_for_fill(
     })
 }
 
-#[inline(always)]
-pub fn should_expire_order_before_fill(
-    user: &User,
-    order_index: usize,
-    now: i64,
-) -> DriftResult<bool> {
-    let should_order_be_expired = should_expire_order(user, order_index, now)?;
-    if should_order_be_expired && user.orders[order_index].is_limit_order() {
-        let now_sub_buffer = now.safe_sub(15)?;
-        if !should_expire_order(user, order_index, now_sub_buffer)? {
-            msg!("invalid fill. cant force expire limit order until 15s after max_ts. max ts {}, now {}, now plus buffer {}", user.orders[order_index].max_ts, now, now_sub_buffer);
-            return Err(ErrorCode::ImpossibleFill);
-        }
-    }
-
-    Ok(should_order_be_expired)
-}
-
 #[inline(always)]
 pub fn should_expire_order(user: &User, user_order_index: usize, now: i64) -> DriftResult<bool> {
     let order = &user.orders[user_order_index];