@drift-labs/sdk 2.53.0-beta.5 → 2.53.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.53.0-beta.5
+2.53.0-beta.7

package/lib/tx/fastSingleTxSender.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { TxSigAndSlot } from './types';
-import { ConfirmOptions, Signer, Transaction, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
+import { ConfirmOptions, Signer, Transaction, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount, Commitment } from '@solana/web3.js';
 import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
 export declare class FastSingleTxSender extends BaseTxSender {
@@ -11,9 +11,10 @@ export declare class FastSingleTxSender extends BaseTxSender {
     blockhashRefreshInterval: number;
     additionalConnections: Connection[];
     timoutCount: number;
-    blockhashQueue: string[];
+    recentBlockhash: string;
     skipConfirmation: boolean;
-    constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, skipConfirmation, }: {
+    blockhashCommitment: Commitment;
+    constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, skipConfirmation, blockhashCommitment, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
@@ -21,10 +22,10 @@ export declare class FastSingleTxSender extends BaseTxSender {
         blockhashRefreshInterval?: number;
         additionalConnections?: any;
         skipConfirmation?: boolean;
+        blockhashCommitment?: Commitment;
     });
     startBlockhashRefreshLoop(): void;
-    addBlockhashToQueue(blockhash: string): void;
-    prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
+    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,13 +5,11 @@ 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 = 500;
-const MAX_BLOCKHASH_QUEUE_LENGTH = 100;
+const DEFAULT_BLOCKHASH_REFRESH = 10000;
 class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, }) {
+    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, blockhashCommitment = 'finalized', }) {
         super({ connection, wallet, opts, timeout, additionalConnections });
         this.timoutCount = 0;
-        this.blockhashQueue = [];
         this.connection = connection;
         this.wallet = wallet;
         this.opts = opts;
@@ -19,34 +17,24 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
         this.blockhashRefreshInterval = blockhashRefreshInterval;
         this.additionalConnections = additionalConnections;
         this.skipConfirmation = skipConfirmation;
+        this.blockhashCommitment = blockhashCommitment;
         this.startBlockhashRefreshLoop();
     }
     startBlockhashRefreshLoop() {
         setInterval(async () => {
             try {
-                const blockhash = (await this.connection.getLatestBlockhash(this.opts))
-                    .blockhash;
-                this.addBlockhashToQueue(blockhash);
+                this.recentBlockhash = (await this.connection.getLatestBlockhash(this.blockhashCommitment)).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) {
+    async prepareTx(tx, additionalSigners, _opts) {
         var _a;
         tx.feePayer = this.wallet.publicKey;
         tx.recentBlockhash =
-            (_a = this.blockhashQueue.shift()) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(opts.preflightCommitment))
+            (_a = this.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(this.blockhashCommitment))
                 .blockhash;
         additionalSigners
             .filter((s) => s !== undefined)
@@ -66,7 +54,7 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
         }
         const message = new web3_js_1.TransactionMessage({
             payerKey: this.wallet.publicKey,
-            recentBlockhash: (_a = this.blockhashQueue.shift()) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(opts.preflightCommitment))
+            recentBlockhash: (_a = this.recentBlockhash) !== 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.5",
+	"version": "2.53.0-beta.7",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/tx/fastSingleTxSender.ts

@@ -9,14 +9,14 @@ import {
 	TransactionMessage,
 	TransactionInstruction,
 	AddressLookupTableAccount,
+	Commitment,
 } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
 import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
 
 const DEFAULT_TIMEOUT = 35000;
-const DEFAULT_BLOCKHASH_REFRESH = 500;
-const MAX_BLOCKHASH_QUEUE_LENGTH = 100;
+const DEFAULT_BLOCKHASH_REFRESH = 10000;
 
 export class FastSingleTxSender extends BaseTxSender {
 	connection: Connection;
@@ -26,8 +26,9 @@ export class FastSingleTxSender extends BaseTxSender {
 	blockhashRefreshInterval: number;
 	additionalConnections: Connection[];
 	timoutCount = 0;
-	blockhashQueue: string[] = [];
+	recentBlockhash: string;
 	skipConfirmation: boolean;
+	blockhashCommitment: Commitment;
 
 	public constructor({
 		connection,
@@ -37,6 +38,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH,
 		additionalConnections = new Array<Connection>(),
 		skipConfirmation = false,
+		blockhashCommitment = 'finalized',
 	}: {
 		connection: Connection;
 		wallet: IWallet;
@@ -45,6 +47,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		blockhashRefreshInterval?: number;
 		additionalConnections?;
 		skipConfirmation?: boolean;
+		blockhashCommitment?: Commitment;
 	}) {
 		super({ connection, wallet, opts, timeout, additionalConnections });
 		this.connection = connection;
@@ -54,41 +57,32 @@ export class FastSingleTxSender extends BaseTxSender {
 		this.blockhashRefreshInterval = blockhashRefreshInterval;
 		this.additionalConnections = additionalConnections;
 		this.skipConfirmation = skipConfirmation;
+		this.blockhashCommitment = blockhashCommitment;
 		this.startBlockhashRefreshLoop();
 	}
 
 	startBlockhashRefreshLoop(): void {
 		setInterval(async () => {
 			try {
-				const blockhash = (await this.connection.getLatestBlockhash(this.opts))
-					.blockhash;
-				this.addBlockhashToQueue(blockhash);
+				this.recentBlockhash = (
+					await this.connection.getLatestBlockhash(this.blockhashCommitment)
+				).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>,
-		opts: ConfirmOptions
+		_opts: ConfirmOptions
 	): Promise<Transaction> {
 		tx.feePayer = this.wallet.publicKey;
 
 		tx.recentBlockhash =
-			this.blockhashQueue.shift() ??
-			(await this.connection.getLatestBlockhash(opts.preflightCommitment))
+			this.recentBlockhash ??
+			(await this.connection.getLatestBlockhash(this.blockhashCommitment))
 				.blockhash;
 
 		additionalSigners
@@ -118,7 +112,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		const message = new TransactionMessage({
 			payerKey: this.wallet.publicKey,
 			recentBlockhash:
-				this.blockhashQueue.shift() ??
+				this.recentBlockhash ??
 				(await this.connection.getLatestBlockhash(opts.preflightCommitment))
 					.blockhash,
 			instructions: ixs,