@drift-labs/sdk 2.28.0-beta.1 → 2.28.0-beta.2

package/lib/driftClient.d.ts

@@ -203,6 +203,11 @@ export declare class DriftClient {
     getCancelOrderByUserIdIx(userOrderId: number): Promise<TransactionInstruction>;
     cancelOrders(marketType?: MarketType, marketIndex?: number, direction?: PositionDirection, txParams?: TxParams): Promise<TransactionSignature>;
     getCancelOrdersIx(marketType: MarketType | null, marketIndex: number | null, direction: PositionDirection | null): Promise<TransactionInstruction>;
+    cancelAndPlaceOrders(cancelOrderParams: {
+        marketType?: MarketType;
+        marketIndex?: number;
+        direction?: PositionDirection;
+    }, placeOrderParams: OrderParams[], txParams?: TxParams): Promise<TransactionSignature>;
     fillPerpOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
     getFillPerpOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     getRevertFillIx(): Promise<TransactionInstruction>;

package/lib/driftClient.js

@@ -1525,6 +1525,25 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    async cancelAndPlaceOrders(cancelOrderParams, placeOrderParams, txParams) {
+        const tx = (0, utils_1.wrapInTx)(await this.getCancelOrdersIx(cancelOrderParams.marketType, cancelOrderParams.marketIndex, cancelOrderParams.direction), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
+        for (const placeOrderParam of placeOrderParams) {
+            const marketType = placeOrderParam.marketType;
+            if (!marketType) {
+                throw new Error('marketType must be set on placeOrderParams');
+            }
+            let ix;
+            if ((0, types_1.isVariant)(marketType, 'perp')) {
+                ix = this.getPlacePerpOrderIx(placeOrderParam);
+            }
+            else {
+                ix = this.getPlaceSpotOrderIx(placeOrderParam);
+            }
+            tx.add(ix);
+        }
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
     async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo, txParams) {
         const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         return txSig;

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.28.0-beta.1",
+    "version": "2.28.0-beta.2",
     "name": "drift",
     "instructions": [
         {

package/lib/phoenix/phoenixSubscriber.d.ts

@@ -29,8 +29,8 @@ export declare class PhoenixSubscriber implements L2OrderBookGenerator {
     lastUnixTimestamp: number;
     constructor(config: PhoenixMarketSubscriberConfig);
     subscribe(): Promise<void>;
-    getBestBid(): BN;
-    getBestAsk(): BN;
+    getBestBid(): BN | undefined;
+    getBestAsk(): BN | undefined;
     getL2Bids(): Generator<L2Level>;
     getL2Asks(): Generator<L2Level>;
     getL2Levels(side: 'bids' | 'asks'): Generator<L2Level>;

package/lib/phoenix/phoenixSubscriber.js

@@ -54,11 +54,19 @@ class PhoenixSubscriber {
     }
     getBestBid() {
         const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 1);
-        return new anchor_1.BN(Math.floor(ladder.bids[0][0] * numericConstants_1.PRICE_PRECISION.toNumber()));
+        const bestBid = ladder.bids[0];
+        if (!bestBid) {
+            return undefined;
+        }
+        return new anchor_1.BN(Math.floor(bestBid[0] * numericConstants_1.PRICE_PRECISION.toNumber()));
     }
     getBestAsk() {
         const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 1);
-        return new anchor_1.BN(Math.floor(ladder.asks[0][0] * numericConstants_1.PRICE_PRECISION.toNumber()));
+        const bestAsk = ladder.asks[0];
+        if (!bestAsk) {
+            return undefined;
+        }
+        return new anchor_1.BN(Math.floor(bestAsk[0] * numericConstants_1.PRICE_PRECISION.toNumber()));
     }
     getL2Bids() {
         return this.getL2Levels('bids');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.28.0-beta.1",
+	"version": "2.28.0-beta.2",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/driftClient.ts

@@ -2664,6 +2664,43 @@ export class DriftClient {
 		);
 	}
 
+	public async cancelAndPlaceOrders(
+		cancelOrderParams: {
+			marketType?: MarketType;
+			marketIndex?: number;
+			direction?: PositionDirection;
+		},
+		placeOrderParams: OrderParams[],
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const tx = wrapInTx(
+			await this.getCancelOrdersIx(
+				cancelOrderParams.marketType,
+				cancelOrderParams.marketIndex,
+				cancelOrderParams.direction
+			),
+			txParams?.computeUnits,
+			txParams?.computeUnitsPrice
+		);
+
+		for (const placeOrderParam of placeOrderParams) {
+			const marketType = placeOrderParam.marketType;
+			if (!marketType) {
+				throw new Error('marketType must be set on placeOrderParams');
+			}
+			let ix;
+			if (isVariant(marketType, 'perp')) {
+				ix = this.getPlacePerpOrderIx(placeOrderParam);
+			} else {
+				ix = this.getPlaceSpotOrderIx(placeOrderParam);
+			}
+			tx.add(ix);
+		}
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
 	public async fillPerpOrder(
 		userAccountPublicKey: PublicKey,
 		user: UserAccount,

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.28.0-beta.1",
+  "version": "2.28.0-beta.2",
   "name": "drift",
   "instructions": [
     {

package/src/phoenix/phoenixSubscriber.ts

@@ -108,24 +108,33 @@ export class PhoenixSubscriber implements L2OrderBookGenerator {
 		this.subscribed = true;
 	}
 
-	public getBestBid(): BN {
+	public getBestBid(): BN | undefined {
 		const ladder = getMarketUiLadder(
 			this.market,
 			this.lastSlot,
 			this.lastUnixTimestamp,
 			1
 		);
-		return new BN(Math.floor(ladder.bids[0][0] * PRICE_PRECISION.toNumber()));
+		const bestBid = ladder.bids[0];
+		if (!bestBid) {
+			return undefined;
+		}
+		return new BN(Math.floor(bestBid[0] * PRICE_PRECISION.toNumber()));
 	}
 
-	public getBestAsk(): BN {
+	public getBestAsk(): BN | undefined {
 		const ladder = getMarketUiLadder(
 			this.market,
 			this.lastSlot,
 			this.lastUnixTimestamp,
 			1
 		);
-		return new BN(Math.floor(ladder.asks[0][0] * PRICE_PRECISION.toNumber()));
+
+		const bestAsk = ladder.asks[0];
+		if (!bestAsk) {
+			return undefined;
+		}
+		return new BN(Math.floor(bestAsk[0] * PRICE_PRECISION.toNumber()));
 	}
 
 	public getL2Bids(): Generator<L2Level> {