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

package/VERSION

@@ -1 +1 @@
-2.53.0-beta.1
+2.53.0-beta.3

package/lib/dlob/DLOB.d.ts

@@ -91,8 +91,8 @@ export declare class DLOB {
         takerNode: DLOBNode;
         makerNode: DLOBNode;
     } | undefined;
-    getBestAsk(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN;
-    getBestBid(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN;
+    getBestAsk(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN | undefined;
+    getBestBid(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN | undefined;
     getStopLosses(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;
     getStopLossMarkets(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;
     getStopLossLimits(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;

package/lib/dlob/DLOB.js

@@ -822,14 +822,18 @@ class DLOB {
         }
     }
     getBestAsk(marketIndex, slot, marketType, oraclePriceData) {
-        return this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)
-            .next()
-            .value.getPrice(oraclePriceData, slot);
+        const bestAsk = this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData).next().value;
+        if (bestAsk) {
+            return bestAsk.getPrice(oraclePriceData, slot);
+        }
+        return undefined;
     }
     getBestBid(marketIndex, slot, marketType, oraclePriceData) {
-        return this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData)
-            .next()
-            .value.getPrice(oraclePriceData, slot);
+        const bestBid = this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData).next().value;
+        if (bestBid) {
+            return bestBid.getPrice(oraclePriceData, slot);
+        }
+        return undefined;
     }
     *getStopLosses(marketIndex, marketType, direction) {
         const marketTypeStr = (0, __1.getVariant)(marketType);

package/lib/tx/fastSingleTxSender.d.ts

@@ -11,7 +11,7 @@ export declare class FastSingleTxSender extends BaseTxSender {
     blockhashRefreshInterval: number;
     additionalConnections: Connection[];
     timoutCount: number;
-    recentBlockhash: string;
+    blockhashQueue: string[];
     constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, }: {
         connection: Connection;
         wallet: IWallet;
@@ -21,6 +21,7 @@ export declare class FastSingleTxSender extends BaseTxSender {
         additionalConnections?: any;
     });
     startBlockhashRefreshLoop(): void;
+    addBlockhashToQueue(blockhash: string): void;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;

package/lib/tx/fastSingleTxSender.js

@@ -5,11 +5,13 @@ const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
 const DEFAULT_TIMEOUT = 35000;
-const DEFAULT_BLOCKHASH_REFRESH = 10000;
+const DEFAULT_BLOCKHASH_REFRESH = 500;
+const MAX_BLOCKHASH_QUEUE_LENGTH = 100;
 class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
     constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), }) {
         super({ connection, wallet, opts, timeout, additionalConnections });
         this.timoutCount = 0;
+        this.blockhashQueue = [];
         this.connection = connection;
         this.wallet = wallet;
         this.opts = opts;
@@ -21,18 +23,29 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
     startBlockhashRefreshLoop() {
         setInterval(async () => {
             try {
-                this.recentBlockhash = (await this.connection.getLatestBlockhash(this.opts)).blockhash;
+                const blockhash = (await this.connection.getLatestBlockhash(this.opts))
+                    .blockhash;
+                this.addBlockhashToQueue(blockhash);
             }
             catch (e) {
                 console.error('Error in startBlockhashRefreshLoop: ', e);
             }
         }, this.blockhashRefreshInterval);
     }
+    addBlockhashToQueue(blockhash) {
+        if (blockhash !== this.blockhashQueue[0]) {
+            this.blockhashQueue.push(blockhash);
+            return;
+        }
+        if (this.blockhashQueue.length > MAX_BLOCKHASH_QUEUE_LENGTH) {
+            this.blockhashQueue.shift();
+        }
+    }
     async prepareTx(tx, additionalSigners, opts) {
         var _a;
         tx.feePayer = this.wallet.publicKey;
         tx.recentBlockhash =
-            (_a = this.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(opts.preflightCommitment))
+            (_a = this.blockhashQueue.shift()) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(opts.preflightCommitment))
                 .blockhash;
         additionalSigners
             .filter((s) => s !== undefined)
@@ -52,7 +65,7 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
         }
         const message = new web3_js_1.TransactionMessage({
             payerKey: this.wallet.publicKey,
-            recentBlockhash: (_a = this.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(opts.preflightCommitment))
+            recentBlockhash: (_a = this.blockhashQueue.shift()) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(opts.preflightCommitment))
                 .blockhash,
             instructions: ixs,
         }).compileToV0Message(lookupTableAccounts);

package/package.json

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

package/src/dlob/DLOB.ts

@@ -1472,15 +1472,18 @@ 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(
@@ -1488,15 +1491,18 @@ export class DLOB {
 		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(

package/src/tx/fastSingleTxSender.ts

@@ -15,7 +15,8 @@ import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
 
 const DEFAULT_TIMEOUT = 35000;
-const DEFAULT_BLOCKHASH_REFRESH = 10000;
+const DEFAULT_BLOCKHASH_REFRESH = 500;
+const MAX_BLOCKHASH_QUEUE_LENGTH = 100;
 
 export class FastSingleTxSender extends BaseTxSender {
 	connection: Connection;
@@ -25,7 +26,7 @@ export class FastSingleTxSender extends BaseTxSender {
 	blockhashRefreshInterval: number;
 	additionalConnections: Connection[];
 	timoutCount = 0;
-	recentBlockhash: string;
+	blockhashQueue: string[] = [];
 
 	public constructor({
 		connection,
@@ -55,15 +56,25 @@ export class FastSingleTxSender extends BaseTxSender {
 	startBlockhashRefreshLoop(): void {
 		setInterval(async () => {
 			try {
-				this.recentBlockhash = (
-					await this.connection.getLatestBlockhash(this.opts)
-				).blockhash;
+				const blockhash = (await this.connection.getLatestBlockhash(this.opts))
+					.blockhash;
+				this.addBlockhashToQueue(blockhash);
 			} catch (e) {
 				console.error('Error in startBlockhashRefreshLoop: ', e);
 			}
 		}, this.blockhashRefreshInterval);
 	}
 
+	addBlockhashToQueue(blockhash: string): void {
+		if (blockhash !== this.blockhashQueue[0]) {
+			this.blockhashQueue.push(blockhash);
+			return;
+		}
+		if (this.blockhashQueue.length > MAX_BLOCKHASH_QUEUE_LENGTH) {
+			this.blockhashQueue.shift();
+		}
+	}
+
 	async prepareTx(
 		tx: Transaction,
 		additionalSigners: Array<Signer>,
@@ -72,7 +83,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		tx.feePayer = this.wallet.publicKey;
 
 		tx.recentBlockhash =
-			this.recentBlockhash ??
+			this.blockhashQueue.shift() ??
 			(await this.connection.getLatestBlockhash(opts.preflightCommitment))
 				.blockhash;
 
@@ -103,7 +114,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		const message = new TransactionMessage({
 			payerKey: this.wallet.publicKey,
 			recentBlockhash:
-				this.recentBlockhash ??
+				this.blockhashQueue.shift() ??
 				(await this.connection.getLatestBlockhash(opts.preflightCommitment))
 					.blockhash,
 			instructions: ixs,