Cxp 13/fail on no fill place and take perp order

programs/drift/src/controller/orders.rs

@@ -892,7 +892,6 @@ pub fn fill_perp_order(
 ) -> DriftResult<(u64, u64)> {
     let now = clock.unix_timestamp;
     let slot = clock.slot;
-
     let filler_key = filler.key();
     let user_key = user.key();
     let user = &mut load_mut!(user)?;
@@ -1265,7 +1264,6 @@ pub fn fill_perp_order(
     }
 
     user.update_last_active_slot(slot);
-
     Ok((base_asset_amount, quote_asset_amount))
 }
 
@@ -1659,7 +1657,7 @@ fn fulfill_perp_order(
                         AMMLiquiditySplit::Shared,
                         fill_mode.is_liquidation(),
                     )?;
-
+          
                 (fill_base_asset_amount, fill_quote_asset_amount)
             }
             PerpFulfillmentMethod::Match(maker_key, maker_order_index) => {

programs/drift/src/error.rs

@@ -575,6 +575,8 @@ pub enum ErrorCode {
     LiquidationOrderFailedToFill,
     #[msg("Invalid prediction market order")]
     InvalidPredictionMarketOrder,
+    #[msg("Only partially completed")]
+    PartialFillError,
 }
 
 #[macro_export]

programs/drift/src/instructions/user.rs

@@ -1170,7 +1170,7 @@ pub fn handle_place_orders<'c: 'info, 'info>(
 pub fn handle_place_and_take_perp_order<'c: 'info, 'info>(
     ctx: Context<'_, '_, 'c, 'info, PlaceAndTake<'info>>,
     params: OrderParams,
-    _maker_order_id: Option<u32>,
+    should_fail_on_partial_or_no_fill: Option<bool>,
 ) -> Result<()> {
     let clock = Clock::get()?;
     let state = &ctx.accounts.state;
@@ -1248,6 +1248,11 @@ pub fn handle_place_and_take_perp_order<'c: 'info, 'info>(
         .iter()
         .any(|order| order.order_id == order_id);
 
+    msg!("order_exists: {}", order_exists);
+    if Some(true) == should_fail_on_partial_or_no_fill && order_exists {
+        return Err(ErrorCode::PartialFillError.into());
+    }
+
     if is_immediate_or_cancel && order_exists {
         controller::orders::cancel_order_by_order_id(
             order_id,

programs/drift/src/lib.rs

@@ -148,9 +148,9 @@ pub mod drift {
     pub fn place_and_take_perp_order<'c: 'info, 'info>(
         ctx: Context<'_, '_, 'c, 'info, PlaceAndTake<'info>>,
         params: OrderParams,
-        maker_order_id: Option<u32>,
+        should_fail_on_partial_or_no_fill: Option<bool>,
     ) -> Result<()> {
-        handle_place_and_take_perp_order(ctx, params, maker_order_id)
+        handle_place_and_take_perp_order(ctx, params, should_fail_on_partial_or_no_fill)
     }
 
     pub fn place_and_make_perp_order<'c: 'info, 'info>(

sdk/src/driftClient.ts

@@ -2893,6 +2893,7 @@ export class DriftClient {
 				baseAssetAmount: amount,
 				price: limitPrice,
 			},
+			false,
 			undefined,
 			undefined,
 			undefined,
@@ -4847,6 +4848,7 @@ export class DriftClient {
 
 	public async placeAndTakePerpOrder(
 		orderParams: OptionalOrderParams,
+		shouldFailOnPartialOrNoFill?: boolean,
 		makerInfo?: MakerInfo | MakerInfo[],
 		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams,
@@ -4856,6 +4858,7 @@ export class DriftClient {
 			await this.buildTransaction(
 				await this.getPlaceAndTakePerpOrderIx(
 					orderParams,
+					shouldFailOnPartialOrNoFill,
 					makerInfo,
 					referrerInfo,
 					subAccountId
@@ -4903,6 +4906,7 @@ export class DriftClient {
 		const prepPlaceAndTakeTx = async () => {
 			const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(
 				orderParams,
+				false,
 				makerInfo,
 				referrerInfo,
 				subAccountId
@@ -5092,6 +5096,7 @@ export class DriftClient {
 
 	public async getPlaceAndTakePerpOrderIx(
 		orderParams: OptionalOrderParams,
+		shouldFailOnPartialOrNoFill?: boolean,
 		makerInfo?: MakerInfo | MakerInfo[],
 		referrerInfo?: ReferrerInfo,
 		subAccountId?: number
@@ -5150,7 +5155,7 @@ export class DriftClient {
 
 		return await this.program.instruction.placeAndTakePerpOrder(
 			orderParams,
-			null,
+			shouldFailOnPartialOrNoFill || false,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -5476,6 +5481,7 @@ export class DriftClient {
 				reduceOnly: true,
 				price: limitPrice,
 			},
+			false,
 			undefined,
 			undefined,
 			undefined,