program: ix to revert fill (#391)

* program: ix to revert fill

* CHANGELOG

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- program: revert fill ix ([#391](https://github.com/drift-labs/protocol-v2/pull/391))
 - program: flag users as idle on-chain ([#386](https://github.com/drift-labs/protocol-v2/pull/386))
 
 ### Fixes

programs/drift/src/controller/orders.rs

@@ -848,6 +848,7 @@ pub fn fill_perp_order(
                 filler.as_deref_mut(),
                 market.deref_mut(),
                 state.perp_fee_structure.flat_filler_fee,
+                slot,
             )?
         };
 
@@ -913,6 +914,7 @@ pub fn fill_perp_order(
                 filler.as_deref_mut(),
                 market.deref_mut(),
                 state.perp_fee_structure.flat_filler_fee,
+                slot,
             )?
         };
 
@@ -1148,6 +1150,7 @@ fn get_maker_orders_info(
                         filler.as_deref_mut(),
                         market.deref_mut(),
                         filler_reward,
+                        slot,
                     )?
                 };
 
@@ -1732,6 +1735,7 @@ pub fn fulfill_perp_order_with_amm(
                 .safe_unwrap()?
                 .update_filler_volume(quote_asset_amount, now)?;
         }
+        filler.update_last_active_slot(slot);
     }
 
     update_order_after_fill(
@@ -2096,6 +2100,7 @@ pub fn fulfill_perp_order_with_match(
                 .safe_unwrap()?
                 .update_filler_volume(quote_asset_amount, now)?;
         }
+        filler.update_last_active_slot(slot);
     }
 
     if let (Some(referrer), Some(referrer_stats)) = (referrer.as_mut(), referrer_stats.as_mut()) {
@@ -2358,6 +2363,7 @@ pub fn trigger_order(
         filler.as_deref_mut(),
         &mut perp_market,
         state.perp_fee_structure.flat_filler_fee,
+        slot,
     )?;
 
     let order_action_record = get_order_action_record(
@@ -2531,6 +2537,7 @@ pub fn pay_keeper_flat_reward_for_perps(
     filler: Option<&mut User>,
     market: &mut PerpMarket,
     filler_reward: u64,
+    slot: u64,
 ) -> DriftResult<u64> {
     let filler_reward = if let Some(filler) = filler {
         let user_position = user.get_perp_position_mut(market.market_index)?;
@@ -2540,6 +2547,7 @@ pub fn pay_keeper_flat_reward_for_perps(
             -filler_reward.cast()?,
         )?;
 
+        filler.update_last_active_slot(slot);
         // Dont throw error if filler doesnt have position available
         let filler_position = match filler.force_get_perp_position_mut(market.market_index) {
             Ok(position) => position,

programs/drift/src/error.rs

@@ -483,6 +483,8 @@ pub enum ErrorCode {
     UnableToLoadUserStatsAccount,
     #[msg("User Not Inactive")]
     UserNotInactive,
+    #[msg("RevertFill")]
+    RevertFill,
 }
 
 #[macro_export]

programs/drift/src/instructions/keeper.rs

@@ -107,6 +107,24 @@ fn fill_order(ctx: Context<FillOrder>, order_id: u32, market_index: u16) -> Resu
     Ok(())
 }
 
+#[access_control(
+    fill_not_paused(&ctx.accounts.state)
+)]
+pub fn handle_revert_fill<'info>(ctx: Context<RevertFill>) -> Result<()> {
+    let filler = load_mut!(ctx.accounts.filler)?;
+    let clock = Clock::get()?;
+
+    validate!(
+        filler.last_active_slot == clock.slot,
+        ErrorCode::RevertFill,
+        "filler last active slot ({}) != current slot ({})",
+        filler.last_active_slot,
+        clock.slot
+    )?;
+
+    Ok(())
+}
+
 #[derive(Clone, Copy, AnchorSerialize, AnchorDeserialize, PartialEq, Debug, Eq)]
 pub enum SpotFulfillmentType {
     SerumV3,
@@ -1299,6 +1317,22 @@ pub struct FillOrder<'info> {
     pub user_stats: AccountLoader<'info, UserStats>,
 }
 
+#[derive(Accounts)]
+pub struct RevertFill<'info> {
+    pub state: Box<Account<'info, State>>,
+    pub authority: Signer<'info>,
+    #[account(
+        mut,
+        constraint = can_sign_for_user(&filler, &authority)?
+    )]
+    pub filler: AccountLoader<'info, User>,
+    #[account(
+        mut,
+        constraint = is_stats_for_user(&filler, &filler_stats)?
+    )]
+    pub filler_stats: AccountLoader<'info, UserStats>,
+}
+
 #[derive(Accounts)]
 pub struct TriggerOrder<'info> {
     pub state: Box<Account<'info, State>>,

programs/drift/src/lib.rs

@@ -217,6 +217,10 @@ pub mod drift {
         handle_fill_perp_order(ctx, order_id)
     }
 
+    pub fn revert_fill(ctx: Context<RevertFill>) -> Result<()> {
+        handle_revert_fill(ctx)
+    }
+
     pub fn fill_spot_order(
         ctx: Context<FillOrder>,
         order_id: Option<u32>,

sdk/src/driftClient.ts

@@ -2394,6 +2394,20 @@ export class DriftClient {
 		});
 	}
 
+	public async getRevertFillIx(): Promise<TransactionInstruction> {
+		const fillerPublicKey = await this.getUserAccountPublicKey();
+		const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
+
+		return this.program.instruction.revertFill({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				filler: fillerPublicKey,
+				fillerStats: fillerStatsPublicKey,
+				authority: this.wallet.publicKey,
+			},
+		});
+	}
+
 	public async placeSpotOrder(
 		orderParams: OptionalOrderParams,
 		txParams?: TxParams

sdk/src/idl/drift.json

@@ -909,6 +909,32 @@
         }
       ]
     },
+    {
+      "name": "revertFill",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "filler",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "fillerStats",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "fillSpotOrder",
       "accounts": [
@@ -8768,6 +8794,11 @@
       "code": 6238,
       "name": "UserNotInactive",
       "msg": "User Not Inactive"
+    },
+    {
+      "code": 6239,
+      "name": "RevertFill",
+      "msg": "RevertFill"
     }
   ]
 }