@drift-labs/sdk 2.53.0-beta.8 → 2.53.0-beta.9

package/VERSION

@@ -1 +1 @@
-2.53.0-beta.8
+2.53.0-beta.9

package/lib/dlob/DLOB.d.ts

@@ -58,7 +58,7 @@ export declare class DLOB {
     initFromOrders(dlobOrders: DLOBOrders, slot: number): boolean;
     handleOrderRecord(record: OrderRecord, slot: number): void;
     handleOrderActionRecord(record: OrderActionRecord, slot: number): void;
-    insertOrder(order: Order, userAccount: PublicKey, slot: number, onInsert?: OrderBookCallback): void;
+    insertOrder(order: Order, userAccount: string, slot: number, onInsert?: OrderBookCallback): void;
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
     updateOrder(order: Order, userAccount: PublicKey, slot: number, cumulativeBaseAssetAmountFilled: BN, onUpdate?: OrderBookCallback): void;
     trigger(order: Order, userAccount: PublicKey, slot: number, onTrigger?: OrderBookCallback): void;

package/lib/dlob/DLOB.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DLOB = void 0;
 const NodeList_1 = require("./NodeList");
 const __1 = require("..");
+const web3_js_1 = require("@solana/web3.js");
 const exchangeStatus_1 = require("../math/exchangeStatus");
 const orderBookLevels_1 = require("./orderBookLevels");
 const SUPPORTED_ORDER_TYPES = [
@@ -60,8 +61,9 @@ class DLOB {
         for (const user of userMap.values()) {
             const userAccount = user.getUserAccount();
             const userAccountPubkey = user.getUserAccountPublicKey();
+            const userAccountPubkeyString = userAccountPubkey.toString();
             for (const order of userAccount.orders) {
-                this.insertOrder(order, userAccountPubkey, slot);
+                this.insertOrder(order, userAccountPubkeyString, slot);
             }
         }
         this.initialized = true;
@@ -72,13 +74,13 @@ class DLOB {
             return false;
         }
         for (const { user, order } of dlobOrders) {
-            this.insertOrder(order, user, slot);
+            this.insertOrder(order, user.toString(), slot);
         }
         this.initialized = true;
         return true;
     }
     handleOrderRecord(record, slot) {
-        this.insertOrder(record.order, record.user, slot);
+        this.insertOrder(record.order, record.user.toString(), slot);
     }
     handleOrderActionRecord(record, slot) {
         if ((0, __1.isOneOfVariant)(record.action, ['place', 'expire'])) {
@@ -187,7 +189,7 @@ class DLOB {
             ...order,
         };
         newOrder.baseAssetAmountFilled = cumulativeBaseAssetAmountFilled;
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.update(newOrder, userAccount);
+        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.update(newOrder, userAccount.toString());
         if (onUpdate) {
             onUpdate();
         }
@@ -204,8 +206,8 @@ class DLOB {
         const marketType = (0, __1.getVariant)(order.marketType);
         const triggerList = this.orderLists.get(marketType).get(order.marketIndex)
             .trigger[(0, __1.isVariant)(order.triggerCondition, 'above') ? 'above' : 'below'];
-        triggerList.remove(order, userAccount);
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount);
+        triggerList.remove(order, userAccount.toString());
+        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount.toString());
         if (onTrigger) {
             onTrigger();
         }
@@ -216,7 +218,7 @@ class DLOB {
             return;
         }
         this.updateRestingLimitOrders(slot);
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.remove(order, userAccount);
+        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.remove(order, userAccount.toString());
         if (onDelete) {
             onDelete();
         }
@@ -287,7 +289,7 @@ class DLOB {
         }
     }
     getOrder(orderId, userAccount) {
-        const orderSignature = (0, NodeList_1.getOrderSignature)(orderId, userAccount);
+        const orderSignature = (0, NodeList_1.getOrderSignature)(orderId, userAccount.toString());
         for (const nodeList of this.getNodeLists()) {
             const node = nodeList.get(orderSignature);
             if (node) {
@@ -445,7 +447,7 @@ class DLOB {
             const makerNodeGenerator = makerNodeGeneratorFn(marketIndex, slot, marketType, oraclePriceData);
             for (const makerNode of makerNodeGenerator) {
                 // Can't match orders from the same user
-                const sameUser = takerNode.userAccount.equals(makerNode.userAccount);
+                const sameUser = takerNode.userAccount === makerNode.userAccount;
                 if (sameUser) {
                     continue;
                 }
@@ -757,7 +759,7 @@ class DLOB {
                 const bidOrder = bidNode.order;
                 const askOrder = askNode.order;
                 // Can't match orders from the same user
-                const sameUser = bidNode.userAccount.equals(askNode.userAccount);
+                const sameUser = bidNode.userAccount === askNode.userAccount;
                 if (sameUser) {
                     continue;
                 }
@@ -985,7 +987,7 @@ class DLOB {
         for (const nodeList of this.getNodeLists()) {
             for (const node of nodeList.getGenerator()) {
                 dlobOrders.push({
-                    user: node.userAccount,
+                    user: new web3_js_1.PublicKey(node.userAccount),
                     order: node.order,
                 });
             }
@@ -1067,7 +1069,7 @@ class DLOB {
             asks.push({
                 price: ask.getPrice(oraclePriceData, slot),
                 size: ask.order.baseAssetAmount.sub(ask.order.baseAssetAmountFilled),
-                maker: ask.userAccount,
+                maker: new web3_js_1.PublicKey(ask.userAccount),
                 orderId: ask.order.orderId,
             });
         }
@@ -1076,7 +1078,7 @@ class DLOB {
             bids.push({
                 price: bid.getPrice(oraclePriceData, slot),
                 size: bid.order.baseAssetAmount.sub(bid.order.baseAssetAmountFilled),
-                maker: bid.userAccount,
+                maker: new web3_js_1.PublicKey(bid.userAccount),
                 orderId: bid.order.orderId,
             });
         }
@@ -1132,7 +1134,7 @@ class DLOB {
             : this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData);
         for (const node of generator) {
             if (!makers.has(node.userAccount.toString())) {
-                makers.set(node.userAccount.toString(), node.userAccount);
+                makers.set(node.userAccount.toString(), new web3_js_1.PublicKey(node.userAccount));
             }
             if (makers.size === numMakers) {
                 break;

package/lib/dlob/DLOBNode.d.ts

@@ -1,21 +1,20 @@
 /// <reference types="bn.js" />
 import { BN, OraclePriceData, Order } from '..';
-import { PublicKey } from '@solana/web3.js';
 export interface DLOBNode {
     getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
     isVammNode(): boolean;
     order: Order | undefined;
     isBaseFilled(): boolean;
     haveFilled: boolean;
-    userAccount: PublicKey | undefined;
+    userAccount: string | undefined;
 }
 export declare abstract class OrderNode implements DLOBNode {
     order: Order;
-    userAccount: PublicKey;
+    userAccount: string;
     sortValue: BN;
     haveFilled: boolean;
     haveTrigger: boolean;
-    constructor(order: Order, userAccount: PublicKey);
+    constructor(order: Order, userAccount: string);
     abstract getSortValue(order: Order): BN;
     getLabel(): string;
     getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
@@ -55,4 +54,4 @@ export type DLOBNodeMap = {
     trigger: TriggerOrderNode;
 };
 export type DLOBNodeType = 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
-export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: PublicKey): DLOBNodeMap[T];
+export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string): DLOBNodeMap[T];

package/lib/dlob/DLOBNode.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNode = exports.TriggerOrderNode = exports.MarketOrderNode = exports.FloatingLimitOrderNode = exports.RestingLimitOrderNode = exports.TakingLimitOrderNode = exports.OrderNode = void 0;
 const __1 = require("..");
+// import { PublicKey } from '@solana/web3.js';
 const NodeList_1 = require("./NodeList");
 class OrderNode {
     constructor(order, userAccount) {

package/lib/dlob/NodeList.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="bn.js" />
 import { BN, MarketTypeStr, Order } from '..';
-import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';
 export type SortDirection = 'asc' | 'desc';
-export declare function getOrderSignature(orderId: number, userAccount: PublicKey): string;
+export declare function getOrderSignature(orderId: number, userAccount: string): string;
 export interface DLOBNodeGenerator {
     getGenerator(): Generator<DLOBNode>;
 }
@@ -15,12 +14,12 @@ export declare class NodeList<NodeType extends keyof DLOBNodeMap> implements DLO
     nodeMap: Map<string, DLOBNodeMap[NodeType]>;
     constructor(nodeType: NodeType, sortDirection: SortDirection);
     clear(): void;
-    insert(order: Order, marketType: MarketTypeStr, userAccount: PublicKey): void;
+    insert(order: Order, marketType: MarketTypeStr, userAccount: string): void;
     prependNode(currentNode: DLOBNodeMap[NodeType], newNode: DLOBNodeMap[NodeType]): boolean;
-    update(order: Order, userAccount: PublicKey): void;
-    remove(order: Order, userAccount: PublicKey): void;
+    update(order: Order, userAccount: string): void;
+    remove(order: Order, userAccount: string): void;
     getGenerator(): Generator<DLOBNode>;
-    has(order: Order, userAccount: PublicKey): boolean;
+    has(order: Order, userAccount: string): boolean;
     get(orderSignature: string): DLOBNodeMap[NodeType] | undefined;
     print(): void;
     printTop(): void;

package/lib/dlob/NodeList.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVammNodeGenerator = exports.NodeList = exports.getOrderSignature = void 0;
 const __1 = require("..");
+// import { PublicKey } from '@solana/web3.js';
 const DLOBNode_1 = require("./DLOBNode");
 function getOrderSignature(orderId, userAccount) {
     return `${userAccount.toString()}-${orderId.toString()}`;

package/lib/driftClient.d.ts

@@ -245,7 +245,7 @@ export declare class DriftClient {
      * @param associatedTokenAddress - the token account to withdraw to. can be the wallet public key if using native sol
      * @param reduceOnly
      */
-    withdraw(amount: BN, marketIndex: number, associatedTokenAddress: PublicKey, reduceOnly?: boolean, subAccountId?: number): Promise<TransactionSignature>;
+    withdraw(amount: BN, marketIndex: number, associatedTokenAddress: PublicKey, reduceOnly?: boolean, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
     getWithdrawIx(amount: BN, marketIndex: number, userTokenAccount: PublicKey, reduceOnly?: boolean, subAccountId?: number): Promise<TransactionInstruction>;
     /**
      * Withdraws from the fromSubAccount and deposits into the toSubAccount

package/lib/driftClient.js

@@ -1169,7 +1169,7 @@ class DriftClient {
      * @param associatedTokenAddress - the token account to withdraw to. can be the wallet public key if using native sol
      * @param reduceOnly
      */
-    async withdraw(amount, marketIndex, associatedTokenAddress, reduceOnly = false, subAccountId) {
+    async withdraw(amount, marketIndex, associatedTokenAddress, reduceOnly = false, subAccountId, txParams) {
         const withdrawIxs = [];
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -1195,6 +1195,7 @@ class DriftClient {
             withdrawIxs.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAddress, authority, authority, []));
         }
         const tx = await this.buildTransaction(withdrawIxs, {
+            ...(txParams !== null && txParams !== void 0 ? txParams : this.txParams),
             computeUnits: 1400000,
         });
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);

package/lib/orderSubscriber/OrderSubscriber.js

@@ -131,9 +131,8 @@ class OrderSubscriber {
     async getDLOB(slot) {
         const dlob = new DLOB_1.DLOB();
         for (const [key, { userAccount }] of this.usersAccounts.entries()) {
-            const userAccountPubkey = new web3_js_1.PublicKey(key);
             for (const order of userAccount.orders) {
-                dlob.insertOrder(order, userAccountPubkey, slot);
+                dlob.insertOrder(order, key, slot);
             }
         }
         return dlob;

package/package.json

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

package/src/dlob/DLOB.ts

@@ -157,9 +157,10 @@ export class DLOB {
 		for (const user of userMap.values()) {
 			const userAccount = user.getUserAccount();
 			const userAccountPubkey = user.getUserAccountPublicKey();
+			const userAccountPubkeyString = userAccountPubkey.toString();
 
 			for (const order of userAccount.orders) {
-				this.insertOrder(order, userAccountPubkey, slot);
+				this.insertOrder(order, userAccountPubkeyString, slot);
 			}
 		}
 
@@ -173,7 +174,7 @@ export class DLOB {
 		}
 
 		for (const { user, order } of dlobOrders) {
-			this.insertOrder(order, user, slot);
+			this.insertOrder(order, user.toString(), slot);
 		}
 
 		this.initialized = true;
@@ -181,7 +182,7 @@ export class DLOB {
 	}
 
 	public handleOrderRecord(record: OrderRecord, slot: number): void {
-		this.insertOrder(record.order, record.user, slot);
+		this.insertOrder(record.order, record.user.toString(), slot);
 	}
 
 	public handleOrderActionRecord(
@@ -249,7 +250,7 @@ export class DLOB {
 
 	public insertOrder(
 		order: Order,
-		userAccount: PublicKey,
+		userAccount: string,
 		slot: number,
 		onInsert?: OrderBookCallback
 	): void {
@@ -327,7 +328,7 @@ export class DLOB {
 		};
 		newOrder.baseAssetAmountFilled = cumulativeBaseAssetAmountFilled;
 
-		this.getListForOrder(order, slot)?.update(newOrder, userAccount);
+		this.getListForOrder(order, slot)?.update(newOrder, userAccount.toString());
 
 		if (onUpdate) {
 			onUpdate();
@@ -354,9 +355,13 @@ export class DLOB {
 
 		const triggerList = this.orderLists.get(marketType).get(order.marketIndex)
 			.trigger[isVariant(order.triggerCondition, 'above') ? 'above' : 'below'];
-		triggerList.remove(order, userAccount);
+		triggerList.remove(order, userAccount.toString());
 
-		this.getListForOrder(order, slot)?.insert(order, marketType, userAccount);
+		this.getListForOrder(order, slot)?.insert(
+			order,
+			marketType,
+			userAccount.toString()
+		);
 		if (onTrigger) {
 			onTrigger();
 		}
@@ -374,7 +379,7 @@ export class DLOB {
 
 		this.updateRestingLimitOrders(slot);
 
-		this.getListForOrder(order, slot)?.remove(order, userAccount);
+		this.getListForOrder(order, slot)?.remove(order, userAccount.toString());
 		if (onDelete) {
 			onDelete();
 		}
@@ -472,7 +477,7 @@ export class DLOB {
 	}
 
 	public getOrder(orderId: number, userAccount: PublicKey): Order | undefined {
-		const orderSignature = getOrderSignature(orderId, userAccount);
+		const orderSignature = getOrderSignature(orderId, userAccount.toString());
 		for (const nodeList of this.getNodeLists()) {
 			const node = nodeList.get(orderSignature);
 			if (node) {
@@ -852,7 +857,7 @@ export class DLOB {
 
 			for (const makerNode of makerNodeGenerator) {
 				// Can't match orders from the same user
-				const sameUser = takerNode.userAccount.equals(makerNode.userAccount);
+				const sameUser = takerNode.userAccount === makerNode.userAccount;
 				if (sameUser) {
 					continue;
 				}
@@ -1377,7 +1382,7 @@ export class DLOB {
 				const askOrder = askNode.order;
 
 				// Can't match orders from the same user
-				const sameUser = bidNode.userAccount.equals(askNode.userAccount);
+				const sameUser = bidNode.userAccount === askNode.userAccount;
 				if (sameUser) {
 					continue;
 				}
@@ -1760,7 +1765,7 @@ export class DLOB {
 		for (const nodeList of this.getNodeLists()) {
 			for (const node of nodeList.getGenerator()) {
 				dlobOrders.push({
-					user: node.userAccount,
+					user: new PublicKey(node.userAccount),
 					order: node.order,
 				});
 			}
@@ -1902,7 +1907,7 @@ export class DLOB {
 			asks.push({
 				price: ask.getPrice(oraclePriceData, slot),
 				size: ask.order.baseAssetAmount.sub(ask.order.baseAssetAmountFilled),
-				maker: ask.userAccount,
+				maker: new PublicKey(ask.userAccount),
 				orderId: ask.order.orderId,
 			});
 		}
@@ -1918,7 +1923,7 @@ export class DLOB {
 			bids.push({
 				price: bid.getPrice(oraclePriceData, slot),
 				size: bid.order.baseAssetAmount.sub(bid.order.baseAssetAmountFilled),
-				maker: bid.userAccount,
+				maker: new PublicKey(bid.userAccount),
 				orderId: bid.order.orderId,
 			});
 		}
@@ -2028,7 +2033,10 @@ export class DLOB {
 
 		for (const node of generator) {
 			if (!makers.has(node.userAccount.toString())) {
-				makers.set(node.userAccount.toString(), node.userAccount);
+				makers.set(
+					node.userAccount.toString(),
+					new PublicKey(node.userAccount)
+				);
 			}
 
 			if (makers.size === numMakers) {

package/src/dlob/DLOBNode.ts

@@ -9,7 +9,7 @@ import {
 	Order,
 	ZERO,
 } from '..';
-import { PublicKey } from '@solana/web3.js';
+// import { PublicKey } from '@solana/web3.js';
 import { getOrderSignature } from './NodeList';
 
 export interface DLOBNode {
@@ -18,17 +18,17 @@ export interface DLOBNode {
 	order: Order | undefined;
 	isBaseFilled(): boolean;
 	haveFilled: boolean;
-	userAccount: PublicKey | undefined;
+	userAccount: string | undefined;
 }
 
 export abstract class OrderNode implements DLOBNode {
 	order: Order;
-	userAccount: PublicKey;
+	userAccount: string;
 	sortValue: BN;
 	haveFilled = false;
 	haveTrigger = false;
 
-	constructor(order: Order, userAccount: PublicKey) {
+	constructor(order: Order, userAccount: string) {
 		// Copy the order over to the node
 		this.order = { ...order };
 		this.userAccount = userAccount;
@@ -140,7 +140,7 @@ export type DLOBNodeType =
 export function createNode<T extends DLOBNodeType>(
 	nodeType: T,
 	order: Order,
-	userAccount: PublicKey
+	userAccount: string
 ): DLOBNodeMap[T] {
 	switch (nodeType) {
 		case 'floatingLimit':

package/src/dlob/NodeList.ts

@@ -1,12 +1,12 @@
 import { BN, isVariant, MarketTypeStr, Order } from '..';
-import { PublicKey } from '@solana/web3.js';
+// import { PublicKey } from '@solana/web3.js';
 import { createNode, DLOBNode, DLOBNodeMap } from './DLOBNode';
 
 export type SortDirection = 'asc' | 'desc';
 
 export function getOrderSignature(
 	orderId: number,
-	userAccount: PublicKey
+	userAccount: string
 ): string {
 	return `${userAccount.toString()}-${orderId.toString()}`;
 }
@@ -36,7 +36,7 @@ export class NodeList<NodeType extends keyof DLOBNodeMap>
 	public insert(
 		order: Order,
 		marketType: MarketTypeStr,
-		userAccount: PublicKey
+		userAccount: string
 	): void {
 		if (isVariant(order.status, 'init')) {
 			return;
@@ -101,7 +101,7 @@ export class NodeList<NodeType extends keyof DLOBNodeMap>
 		}
 	}
 
-	public update(order: Order, userAccount: PublicKey): void {
+	public update(order: Order, userAccount: string): void {
 		const orderId = getOrderSignature(order.orderId, userAccount);
 		if (this.nodeMap.has(orderId)) {
 			const node = this.nodeMap.get(orderId);
@@ -110,7 +110,7 @@ export class NodeList<NodeType extends keyof DLOBNodeMap>
 		}
 	}
 
-	public remove(order: Order, userAccount: PublicKey): void {
+	public remove(order: Order, userAccount: string): void {
 		const orderId = getOrderSignature(order.orderId, userAccount);
 		if (this.nodeMap.has(orderId)) {
 			const node = this.nodeMap.get(orderId);
@@ -142,7 +142,7 @@ export class NodeList<NodeType extends keyof DLOBNodeMap>
 		}
 	}
 
-	public has(order: Order, userAccount: PublicKey): boolean {
+	public has(order: Order, userAccount: string): boolean {
 		return this.nodeMap.has(getOrderSignature(order.orderId, userAccount));
 	}
 

package/src/driftClient.ts

@@ -2049,7 +2049,8 @@ export class DriftClient {
 		marketIndex: number,
 		associatedTokenAddress: PublicKey,
 		reduceOnly = false,
-		subAccountId?: number
+		subAccountId?: number,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const withdrawIxs = [];
 
@@ -2112,6 +2113,7 @@ export class DriftClient {
 		}
 
 		const tx = await this.buildTransaction(withdrawIxs, {
+			...(txParams ?? this.txParams),
 			computeUnits: 1_400_000,
 		});
 		const { txSig, slot } = await this.sendTransaction(

package/src/orderSubscriber/OrderSubscriber.ts

@@ -200,9 +200,8 @@ export class OrderSubscriber {
 	public async getDLOB(slot: number): Promise<DLOB> {
 		const dlob = new DLOB();
 		for (const [key, { userAccount }] of this.usersAccounts.entries()) {
-			const userAccountPubkey = new PublicKey(key);
 			for (const order of userAccount.orders) {
-				dlob.insertOrder(order, userAccountPubkey, slot);
+				dlob.insertOrder(order, key, slot);
 			}
 		}
 		return dlob;