Merge branch 'master' into luke/dpe-1738-priority-fee-improvements

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixes
 
+- sdk: use tx params passed into deposit function
+
 ### Breaking
 
 ## [2.52.0] - 2023-12-22

programs/drift/src/controller/orders.rs

@@ -1829,7 +1829,8 @@ pub fn fulfill_perp_order_with_amm(
         // if is an actual swap (and not amm jit order) then msg!
         if override_base_asset_amount.is_none() {
             msg!(
-                "Amm cant fulfill order. base asset amount {} market.amm.min_order_size {}",
+                "Amm cant fulfill order. market index {} base asset amount {} market.amm.min_order_size {}",
+                market.market_index,
                 base_asset_amount,
                 market.amm.min_order_size
             );

sdk/VERSION

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

sdk/package.json

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

sdk/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,15 +174,15 @@ export class DLOB {
 		}
 
 		for (const { user, order } of dlobOrders) {
-			this.insertOrder(order, user, slot);
+			this.insertOrder(order, user.toString(), slot);
 		}
 
 		this.initialized = true;
 		return true;
 	}
 
 	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;
 				}
@@ -1472,31 +1477,37 @@ export class DLOB {
 		slot: number,
 		marketType: MarketType,
 		oraclePriceData: OraclePriceData
-	): BN {
-		return this.getRestingLimitAsks(
+	): BN | undefined {
+		const bestAsk = this.getRestingLimitAsks(
 			marketIndex,
 			slot,
 			marketType,
 			oraclePriceData
-		)
-			.next()
-			.value.getPrice(oraclePriceData, slot);
+		).next().value;
+
+		if (bestAsk) {
+			return bestAsk.getPrice(oraclePriceData, slot);
+		}
+		return undefined;
 	}
 
 	public getBestBid(
 		marketIndex: number,
 		slot: number,
 		marketType: MarketType,
 		oraclePriceData: OraclePriceData
-	): BN {
-		return this.getRestingLimitBids(
+	): BN | undefined {
+		const bestBid = this.getRestingLimitBids(
 			marketIndex,
 			slot,
 			marketType,
 			oraclePriceData
-		)
-			.next()
-			.value.getPrice(oraclePriceData, slot);
+		).next().value;
+
+		if (bestBid) {
+			return bestBid.getPrice(oraclePriceData, slot);
+		}
+		return undefined;
 	}
 
 	public *getStopLosses(
@@ -1754,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,
 				});
 			}
@@ -1896,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,
 			});
 		}
@@ -1912,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,
 			});
 		}
@@ -2022,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) {

sdk/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':

sdk/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));
 	}
 

sdk/src/driftClient.ts

@@ -1652,7 +1652,8 @@ export class DriftClient {
 		marketIndex: number,
 		associatedTokenAccount: PublicKey,
 		subAccountId?: number,
-		reduceOnly = false
+		reduceOnly = false,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const additionalSigners: Array<Signer> = [];
 
@@ -1701,7 +1702,7 @@ export class DriftClient {
 			);
 		}
 
-		const txParams = { ...this.txParams, computeUnits: 600_000 };
+		txParams = { ...(txParams ?? this.txParams), computeUnits: 600_000 };
 
 		const tx = await this.buildTransaction(instructions, txParams);
 
@@ -3865,6 +3866,7 @@ export class DriftClient {
 				slippageBps,
 				swapMode,
 				onlyDirectRoutes,
+				excludeDexes: ['Raydium CLMM'], // temp exclude to workaround bug with raydium clmm
 			});
 
 			quote = fetchedQuote;