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

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.3",
     "name": "drift",
     "instructions": [
         {

package/lib/index.d.ts

@@ -67,6 +67,7 @@ export * from './dlob/DLOBNode';
 export * from './dlob/DLOBOrders';
 export * from './dlob/NodeList';
 export * from './dlob/DLOBSubscriber';
+export * from './dlob/DLOBApiClient';
 export * from './dlob/types';
 export * from './dlob/orderBookLevels';
 export * from './userMap/userMap';

package/lib/index.js

@@ -91,6 +91,7 @@ __exportStar(require("./dlob/DLOBNode"), exports);
 __exportStar(require("./dlob/DLOBOrders"), exports);
 __exportStar(require("./dlob/NodeList"), exports);
 __exportStar(require("./dlob/DLOBSubscriber"), exports);
+__exportStar(require("./dlob/DLOBApiClient"), exports);
 __exportStar(require("./dlob/types"), exports);
 __exportStar(require("./dlob/orderBookLevels"), exports);
 __exportStar(require("./userMap/userMap"), exports);

package/lib/phoenix/phoenixSubscriber.d.ts

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
-import { MarketData, Client } from '@ellipsis-labs/phoenix-sdk';
+import { Client, Market } from '@ellipsis-labs/phoenix-sdk';
 import { BN } from '@coral-xyz/anchor';
 import { L2Level, L2OrderBookGenerator } from '../dlob/orderBookLevels';
 export type PhoenixMarketSubscriberConfig = {
@@ -21,7 +21,7 @@ export declare class PhoenixSubscriber implements L2OrderBookGenerator {
     marketAddress: PublicKey;
     subscriptionType: 'polling' | 'websocket';
     accountLoader: BulkAccountLoader | undefined;
-    market: MarketData;
+    market: Market;
     marketCallbackId: string | number;
     clockCallbackId: string | number;
     subscribed: boolean;
@@ -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

@@ -24,41 +24,73 @@ class PhoenixSubscriber {
         if (this.subscribed) {
             return;
         }
-        this.market = (0, phoenix_sdk_1.deserializeMarketData)((await this.connection.getAccountInfo(this.marketAddress, 'confirmed'))
-            .data);
+        this.market = await phoenix_sdk_1.Market.loadFromAddress({
+            connection: this.connection,
+            address: this.marketAddress,
+        });
         const clock = (0, phoenix_sdk_1.deserializeClockData)((await this.connection.getAccountInfo(web3_js_1.SYSVAR_CLOCK_PUBKEY, 'confirmed'))
             .data);
         this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
         if (this.subscriptionType === 'websocket') {
             this.marketCallbackId = this.connection.onAccountChange(this.marketAddress, (accountInfo, _ctx) => {
-                this.market = (0, phoenix_sdk_1.deserializeMarketData)(accountInfo.data);
+                try {
+                    this.market = this.market.reload(accountInfo.data);
+                }
+                catch {
+                    console.error('Failed to reload Phoenix market data');
+                }
             });
             this.clockCallbackId = this.connection.onAccountChange(web3_js_1.SYSVAR_CLOCK_PUBKEY, (accountInfo, ctx) => {
-                this.lastSlot = ctx.slot;
-                const clock = (0, phoenix_sdk_1.deserializeClockData)(accountInfo.data);
-                this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
+                try {
+                    this.lastSlot = ctx.slot;
+                    const clock = (0, phoenix_sdk_1.deserializeClockData)(accountInfo.data);
+                    this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
+                }
+                catch {
+                    console.error('Failed to reload clock data');
+                }
             });
         }
         else {
             this.marketCallbackId = await this.accountLoader.addAccount(this.marketAddress, (buffer, slot) => {
-                this.lastSlot = slot;
-                this.market = (0, phoenix_sdk_1.deserializeMarketData)(buffer);
+                try {
+                    this.lastSlot = slot;
+                    if (buffer) {
+                        this.market = this.market.reload(buffer);
+                    }
+                }
+                catch {
+                    console.error('Failed to reload Phoenix market data');
+                }
             });
             this.clockCallbackId = await this.accountLoader.addAccount(web3_js_1.SYSVAR_CLOCK_PUBKEY, (buffer, slot) => {
-                this.lastSlot = slot;
-                const clock = (0, phoenix_sdk_1.deserializeClockData)(buffer);
-                this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
+                try {
+                    this.lastSlot = slot;
+                    const clock = (0, phoenix_sdk_1.deserializeClockData)(buffer);
+                    this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
+                }
+                catch {
+                    console.error('Failed to reload clock data');
+                }
             });
         }
         this.subscribed = true;
     }
     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.price * 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.price * numericConstants_1.PRICE_PRECISION.toNumber()));
     }
     getL2Bids() {
         return this.getL2Levels('bids');
@@ -72,10 +104,10 @@ class PhoenixSubscriber {
         const pricePrecision = numericConstants_1.PRICE_PRECISION.toNumber();
         const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 20);
         for (let i = 0; i < ladder[side].length; i++) {
-            const [priceNum, sizeNum] = ladder[side][i];
-            const size = new anchor_1.BN(Math.floor(sizeNum * basePrecision));
+            const { price, quantity } = ladder[side][i];
+            const size = new anchor_1.BN(Math.floor(quantity * basePrecision));
             yield {
-                price: new anchor_1.BN(Math.floor(priceNum * pricePrecision)),
+                price: new anchor_1.BN(Math.floor(price * pricePrecision)),
                 size,
                 sources: {
                     phoenix: size,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.28.0-beta.1",
+	"version": "2.28.0-beta.3",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@coral-xyz/anchor": "0.26.0",
-		"@ellipsis-labs/phoenix-sdk": "^1.3.2",
+		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
 		"@solana/spl-token": "^0.1.6",

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.3",
   "name": "drift",
   "instructions": [
     {

package/src/index.ts

@@ -69,6 +69,7 @@ export * from './dlob/DLOBNode';
 export * from './dlob/DLOBOrders';
 export * from './dlob/NodeList';
 export * from './dlob/DLOBSubscriber';
+export * from './dlob/DLOBApiClient';
 export * from './dlob/types';
 export * from './dlob/orderBookLevels';
 export * from './userMap/userMap';

package/src/phoenix/phoenixSubscriber.ts

@@ -1,12 +1,11 @@
 import { Connection, PublicKey, SYSVAR_CLOCK_PUBKEY } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import {
-	MarketData,
 	Client,
-	deserializeMarketData,
 	deserializeClockData,
 	toNum,
 	getMarketUiLadder,
+	Market,
 } from '@ellipsis-labs/phoenix-sdk';
 import { PRICE_PRECISION } from '../constants/numericConstants';
 import { BN } from '@coral-xyz/anchor';
@@ -34,7 +33,7 @@ export class PhoenixSubscriber implements L2OrderBookGenerator {
 	marketAddress: PublicKey;
 	subscriptionType: 'polling' | 'websocket';
 	accountLoader: BulkAccountLoader | undefined;
-	market: MarketData;
+	market: Market;
 	marketCallbackId: string | number;
 	clockCallbackId: string | number;
 
@@ -61,10 +60,10 @@ export class PhoenixSubscriber implements L2OrderBookGenerator {
 			return;
 		}
 
-		this.market = deserializeMarketData(
-			(await this.connection.getAccountInfo(this.marketAddress, 'confirmed'))
-				.data
-		);
+		this.market = await Market.loadFromAddress({
+			connection: this.connection,
+			address: this.marketAddress,
+		});
 
 		const clock = deserializeClockData(
 			(await this.connection.getAccountInfo(SYSVAR_CLOCK_PUBKEY, 'confirmed'))
@@ -76,31 +75,49 @@ export class PhoenixSubscriber implements L2OrderBookGenerator {
 			this.marketCallbackId = this.connection.onAccountChange(
 				this.marketAddress,
 				(accountInfo, _ctx) => {
-					this.market = deserializeMarketData(accountInfo.data);
+					try {
+						this.market = this.market.reload(accountInfo.data);
+					} catch {
+						console.error('Failed to reload Phoenix market data');
+					}
 				}
 			);
 			this.clockCallbackId = this.connection.onAccountChange(
 				SYSVAR_CLOCK_PUBKEY,
 				(accountInfo, ctx) => {
-					this.lastSlot = ctx.slot;
-					const clock = deserializeClockData(accountInfo.data);
-					this.lastUnixTimestamp = toNum(clock.unixTimestamp);
+					try {
+						this.lastSlot = ctx.slot;
+						const clock = deserializeClockData(accountInfo.data);
+						this.lastUnixTimestamp = toNum(clock.unixTimestamp);
+					} catch {
+						console.error('Failed to reload clock data');
+					}
 				}
 			);
 		} else {
 			this.marketCallbackId = await this.accountLoader.addAccount(
 				this.marketAddress,
 				(buffer, slot) => {
-					this.lastSlot = slot;
-					this.market = deserializeMarketData(buffer);
+					try {
+						this.lastSlot = slot;
+						if (buffer) {
+							this.market = this.market.reload(buffer);
+						}
+					} catch {
+						console.error('Failed to reload Phoenix market data');
+					}
 				}
 			);
 			this.clockCallbackId = await this.accountLoader.addAccount(
 				SYSVAR_CLOCK_PUBKEY,
 				(buffer, slot) => {
-					this.lastSlot = slot;
-					const clock = deserializeClockData(buffer);
-					this.lastUnixTimestamp = toNum(clock.unixTimestamp);
+					try {
+						this.lastSlot = slot;
+						const clock = deserializeClockData(buffer);
+						this.lastUnixTimestamp = toNum(clock.unixTimestamp);
+					} catch {
+						console.error('Failed to reload clock data');
+					}
 				}
 			);
 		}
@@ -108,24 +125,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.price * 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.price * PRICE_PRECISION.toNumber()));
 	}
 
 	public getL2Bids(): Generator<L2Level> {
@@ -149,10 +175,10 @@ export class PhoenixSubscriber implements L2OrderBookGenerator {
 		);
 
 		for (let i = 0; i < ladder[side].length; i++) {
-			const [priceNum, sizeNum] = ladder[side][i];
-			const size = new BN(Math.floor(sizeNum * basePrecision));
+			const { price, quantity } = ladder[side][i];
+			const size = new BN(Math.floor(quantity * basePrecision));
 			yield {
-				price: new BN(Math.floor(priceNum * pricePrecision)),
+				price: new BN(Math.floor(price * pricePrecision)),
 				size,
 				sources: {
 					phoenix: size,