revert change to prune orders

openbook-dex · Apr 7, 2024 · e643344 · e643344
1 parent 9d7173a
commit e643344
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/idl/openbook_v2.json b/idl/openbook_v2.json
@@ -1635,7 +1635,12 @@
           "isSigner": false
         }
       ],
-      "args": []
+      "args": [
+        {
+          "name": "limit",
+          "type": "u8"
+        }
+      ]
     },
     {
       "name": "stubOracleCreate",

diff --git a/programs/openbook-v2/src/instructions/prune_orders.rs b/programs/openbook-v2/src/instructions/prune_orders.rs
@@ -4,7 +4,7 @@ use crate::accounts_ix::*;
 use crate::error::*;
 use crate::state::*;
 
-pub fn prune_orders(ctx: Context<PruneOrders>) -> Result<()> {
+pub fn prune_orders(ctx: Context<PruneOrders>, limit: u8) -> Result<()> {
     let mut account = ctx.accounts.open_orders_account.load_mut()?;
     let market = ctx.accounts.market.load()?;
 
@@ -18,7 +18,7 @@ pub fn prune_orders(ctx: Context<PruneOrders>) -> Result<()> {
         asks: ctx.accounts.asks.load_mut()?,
     };
 
-    book.cancel_all_orders(&mut account, *market, u8::MAX, None, None)?;
+    book.cancel_all_orders(&mut account, *market, limit, None, None)?;
 
     Ok(())
 }
diff --git a/programs/openbook-v2/src/lib.rs b/programs/openbook-v2/src/lib.rs
@@ -584,9 +584,9 @@ pub mod openbook_v2 {
 
     /// Remove orders from the book when the market is expired (only
     /// [`close_market_admin`](crate::state::Market::close_market_admin)).
-    pub fn prune_orders(ctx: Context<PruneOrders>) -> Result<()> {
+    pub fn prune_orders(ctx: Context<PruneOrders>, limit: u8) -> Result<()> {
         #[cfg(feature = "enable-gpl")]
-        instructions::prune_orders(ctx)?;
+        instructions::prune_orders(ctx, limit)?;
         Ok(())
     }
 

diff --git a/ts/client/src/client.ts b/ts/client/src/client.ts
@@ -1065,10 +1065,11 @@ export class OpenBookV2Client {
     marketPublicKey: PublicKey,
     market: MarketAccount,
     openOrdersPublicKey: PublicKey,
+    limit: number,
     closeMarketAdmin: Keypair | null = null,
   ): Promise<[TransactionInstruction, Signer[]]> {
     const ix = await this.program.methods
-      .pruneOrders()
+      .pruneOrders(limit)
       .accounts({
         closeMarketAdmin: market.closeMarketAdmin.key,
         openOrdersAccount: openOrdersPublicKey,

diff --git a/ts/client/src/openbook_v2.ts b/ts/client/src/openbook_v2.ts
@@ -1619,7 +1619,12 @@ export type OpenbookV2 = {
           isSigner: false;
         },
       ];
-      args: [];
+      args: [
+        {
+          name: 'limit';
+          type: 'u8';
+        },
+      ];
     },
     {
       name: 'stubOracleCreate';
@@ -5316,7 +5321,12 @@ export const IDL: OpenbookV2 = {
           isSigner: false,
         },
       ],
-      args: [],
+      args: [
+        {
+          name: 'limit',
+          type: 'u8',
+        },
+      ],
     },
     {
       name: 'stubOracleCreate',