@drift-labs/sdk 0.1.36-master.4 → 0.1.36-master.5

package/lib/clearingHouse.d.ts

@@ -126,8 +126,10 @@ export declare class ClearingHouse {
     getCancelOrderIx(orderId: BN, oracle?: PublicKey): Promise<TransactionInstruction>;
     cancelOrderByUserId(userOrderId: number, oracle?: PublicKey): Promise<TransactionSignature>;
     getCancelOrderByUserIdIx(userOrderId: number, oracle?: PublicKey): Promise<TransactionInstruction>;
-    cancelAllOrders(oracles?: PublicKey[]): Promise<TransactionSignature>;
-    getCancelAllOrdersIx(oracles: PublicKey[]): Promise<TransactionInstruction>;
+    cancelAllOrders(oracles?: PublicKey[], bestEffort?: boolean): Promise<TransactionSignature>;
+    getCancelAllOrdersIx(oracles: PublicKey[], bestEffort?: boolean): Promise<TransactionInstruction>;
+    cancelOrdersByMarketAndSide(oracles?: PublicKey[], bestEffort?: boolean, marketIndexOnly?: BN, directionOnly?: PositionDirection): Promise<TransactionSignature>;
+    getCancelOrdersByMarketAndSideIx(oracles: PublicKey[], bestEffort?: boolean, marketIndexOnly?: BN, directionOnly?: PositionDirection): Promise<TransactionInstruction>;
     fillOrder(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionSignature>;
     getFillOrderIx(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionInstruction>;
     initializeUserOrdersThenPlaceAndFillOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;

package/lib/clearingHouse.js

@@ -622,12 +622,12 @@ class ClearingHouse {
             });
         });
     }
-    cancelAllOrders(oracles) {
+    cancelAllOrders(oracles, bestEffort) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelAllOrdersIx(oracles)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelAllOrdersIx(oracles, bestEffort)), [], this.opts);
         });
     }
-    getCancelAllOrdersIx(oracles) {
+    getCancelAllOrdersIx(oracles, bestEffort) {
         return __awaiter(this, void 0, void 0, function* () {
             const userAccountPublicKey = yield this.getUserAccountPublicKey();
             const userAccount = yield this.getUserAccount();
@@ -641,7 +641,43 @@ class ClearingHouse {
                     isSigner: false,
                 });
             }
-            return yield this.program.instruction.cancelAllOrders({
+            return yield this.program.instruction.cancelAllOrders(bestEffort, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    markets: state.markets,
+                    userOrders: yield this.getUserOrdersAccountPublicKey(),
+                    userPositions: userAccount.positions,
+                    fundingPaymentHistory: state.fundingPaymentHistory,
+                    fundingRateHistory: state.fundingRateHistory,
+                    orderState: yield this.getOrderStatePublicKey(),
+                    orderHistory: orderState.orderHistory,
+                },
+                remainingAccounts,
+            });
+        });
+    }
+    cancelOrdersByMarketAndSide(oracles, bestEffort, marketIndexOnly, directionOnly) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelOrdersByMarketAndSideIx(oracles, bestEffort, marketIndexOnly, directionOnly)), [], this.opts);
+        });
+    }
+    getCancelOrdersByMarketAndSideIx(oracles, bestEffort, marketIndexOnly, directionOnly) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userAccountPublicKey = yield this.getUserAccountPublicKey();
+            const userAccount = yield this.getUserAccount();
+            const state = this.getStateAccount();
+            const orderState = this.getOrderStateAccount();
+            const remainingAccounts = [];
+            for (const oracle of oracles) {
+                remainingAccounts.push({
+                    pubkey: oracle,
+                    isWritable: false,
+                    isSigner: false,
+                });
+            }
+            return yield this.program.instruction.cancelOrdersByMarketAndSide(bestEffort, marketIndexOnly, directionOnly, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     user: userAccountPublicKey,

package/lib/idl/clearing_house.json

@@ -726,7 +726,78 @@
                     "isSigner": false
                 }
             ],
-            "args": []
+            "args": [
+                {
+                    "name": "bestEffort",
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "cancelOrdersByMarketAndSide",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "orderState",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "markets",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "userPositions",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userOrders",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "fundingPaymentHistory",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "orderHistory",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "bestEffort",
+                    "type": "bool"
+                },
+                {
+                    "name": "marketIndexOnly",
+                    "type": "u64"
+                },
+                {
+                    "name": "directionOnly",
+                    "type": {
+                        "defined": "PositionDirection"
+                    }
+                }
+            ]
         },
         {
             "name": "expireOrders",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.36-master.4",
+	"version": "0.1.36-master.5",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/clearingHouse.ts

@@ -917,17 +917,19 @@ export class ClearingHouse {
 	}
 
 	public async cancelAllOrders(
-		oracles?: PublicKey[]
+		oracles?: PublicKey[],
+		bestEffort?: boolean
 	): Promise<TransactionSignature> {
 		return await this.txSender.send(
-			wrapInTx(await this.getCancelAllOrdersIx(oracles)),
+			wrapInTx(await this.getCancelAllOrdersIx(oracles, bestEffort)),
 			[],
 			this.opts
 		);
 	}
 
 	public async getCancelAllOrdersIx(
-		oracles: PublicKey[]
+		oracles: PublicKey[],
+		bestEffort?: boolean
 	): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await this.getUserAccountPublicKey();
 		const userAccount = await this.getUserAccount();
@@ -944,7 +946,7 @@ export class ClearingHouse {
 			});
 		}
 
-		return await this.program.instruction.cancelAllOrders({
+		return await this.program.instruction.cancelAllOrders(bestEffort, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user: userAccountPublicKey,
@@ -961,6 +963,69 @@ export class ClearingHouse {
 		});
 	}
 
+	public async cancelOrdersByMarketAndSide(
+		oracles?: PublicKey[],
+		bestEffort?: boolean,
+		marketIndexOnly?: BN,
+		directionOnly?: PositionDirection
+	): Promise<TransactionSignature> {
+		return await this.txSender.send(
+			wrapInTx(
+				await this.getCancelOrdersByMarketAndSideIx(
+					oracles,
+					bestEffort,
+					marketIndexOnly,
+					directionOnly
+				)
+			),
+			[],
+			this.opts
+		);
+	}
+
+	public async getCancelOrdersByMarketAndSideIx(
+		oracles: PublicKey[],
+		bestEffort?: boolean,
+		marketIndexOnly?: BN,
+		directionOnly?: PositionDirection
+	): Promise<TransactionInstruction> {
+		const userAccountPublicKey = await this.getUserAccountPublicKey();
+		const userAccount = await this.getUserAccount();
+
+		const state = this.getStateAccount();
+		const orderState = this.getOrderStateAccount();
+
+		const remainingAccounts = [];
+		for (const oracle of oracles) {
+			remainingAccounts.push({
+				pubkey: oracle,
+				isWritable: false,
+				isSigner: false,
+			});
+		}
+
+		return await this.program.instruction.cancelOrdersByMarketAndSide(
+			bestEffort,
+			marketIndexOnly,
+			directionOnly,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user: userAccountPublicKey,
+					authority: this.wallet.publicKey,
+					markets: state.markets,
+					userOrders: await this.getUserOrdersAccountPublicKey(),
+					userPositions: userAccount.positions,
+					fundingPaymentHistory: state.fundingPaymentHistory,
+					fundingRateHistory: state.fundingRateHistory,
+					orderState: await this.getOrderStatePublicKey(),
+					orderHistory: orderState.orderHistory,
+				},
+				remainingAccounts,
+			}
+		);
+	}
+
 	public async fillOrder(
 		userAccountPublicKey: PublicKey,
 		userOrdersAccountPublicKey: PublicKey,

package/src/idl/clearing_house.json

@@ -726,7 +726,78 @@
           "isSigner": false
         }
       ],
-      "args": []
+      "args": [
+        {
+          "name": "bestEffort",
+          "type": "bool"
+        }
+      ]
+    },
+    {
+      "name": "cancelOrdersByMarketAndSide",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "orderState",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "markets",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "userPositions",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userOrders",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "fundingPaymentHistory",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "orderHistory",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "bestEffort",
+          "type": "bool"
+        },
+        {
+          "name": "marketIndexOnly",
+          "type": "u64"
+        },
+        {
+          "name": "directionOnly",
+          "type": {
+            "defined": "PositionDirection"
+          }
+        }
+      ]
     },
     {
       "name": "expireOrders",