Add new arg for TPSL force cancels (#376)

zetamarkets · Apr 3, 2024 · f1a2c06 · f1a2c06
1 parent 3506027
commit f1a2c06
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/src/exchange.ts b/src/exchange.ts
@@ -1138,7 +1138,8 @@ export class Exchange {
 
   public async adminCancelTriggerOrder(
     orderIndex: number,
-    crossMarginAccount: PublicKey
+    crossMarginAccount: PublicKey,
+    enforceTpslConditions: boolean = true
   ) {
     let triggerAccount = utils.getTriggerOrder(
       this.programId,
@@ -1150,7 +1151,8 @@ export class Exchange {
         orderIndex,
         this._provider.wallet.publicKey,
         triggerAccount,
-        crossMarginAccount
+        crossMarginAccount,
+        enforceTpslConditions
       )
     );
     return await utils.processTransaction(this._provider, tx);

diff --git a/src/idl/zeta.json b/src/idl/zeta.json
@@ -5066,6 +5066,10 @@
         {
           "name": "triggerOrderBit",
           "type": "u8"
+        },
+        {
+          "name": "enforceTpslConditions",
+          "type": "bool"
         }
       ]
     },
@@ -11152,6 +11156,11 @@
       "code": 6166,
       "name": "OORemainingEvents",
       "msg": "Open orders has remaining events"
+    },
+    {
+      "code": 6167,
+      "name": "CannotForceCancelTriggerOrder",
+      "msg": "Cannot force cancel trigger order"
     }
   ]
 }
diff --git a/src/program-instructions.ts b/src/program-instructions.ts
@@ -797,16 +797,21 @@ export function forceCancelTriggerOrderIx(
   triggerOrderBit: number,
   authority: PublicKey,
   triggerOrder: PublicKey,
-  marginAccount: PublicKey
+  marginAccount: PublicKey,
+  enforceTpslConditions: boolean = true
 ): TransactionInstruction {
-  return Exchange.program.instruction.forceCancelTriggerOrder(triggerOrderBit, {
-    accounts: {
-      state: Exchange.stateAddress,
-      admin: authority,
-      triggerOrder: triggerOrder,
-      marginAccount: marginAccount,
-    },
-  });
+  return Exchange.program.instruction.forceCancelTriggerOrder(
+    triggerOrderBit,
+    enforceTpslConditions,
+    {
+      accounts: {
+        state: Exchange.stateAddress,
+        admin: authority,
+        triggerOrder: triggerOrder,
+        marginAccount: marginAccount,
+      },
+    }
+  );
 }
 
 export function editTriggerOrderIx(

diff --git a/src/types/zeta.ts b/src/types/zeta.ts
@@ -5066,6 +5066,10 @@ export type Zeta = {
         {
           "name": "triggerOrderBit",
           "type": "u8"
+        },
+        {
+          "name": "enforceTpslConditions",
+          "type": "bool"
         }
       ]
     },
@@ -11152,6 +11156,11 @@ export type Zeta = {
       "code": 6166,
       "name": "OORemainingEvents",
       "msg": "Open orders has remaining events"
+    },
+    {
+      "code": 6167,
+      "name": "CannotForceCancelTriggerOrder",
+      "msg": "Cannot force cancel trigger order"
     }
   ]
 };
@@ -16224,6 +16233,10 @@ export const IDL: Zeta = {
         {
           "name": "triggerOrderBit",
           "type": "u8"
+        },
+        {
+          "name": "enforceTpslConditions",
+          "type": "bool"
         }
       ]
     },
@@ -22310,6 +22323,11 @@ export const IDL: Zeta = {
       "code": 6166,
       "name": "OORemainingEvents",
       "msg": "Open orders has remaining events"
+    },
+    {
+      "code": 6167,
+      "name": "CannotForceCancelTriggerOrder",
+      "msg": "Cannot force cancel trigger order"
     }
   ]
 };