@drift-labs/sdk 2.53.0-beta.0 → 2.53.0-beta.2

package/VERSION

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

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/lib/userMap/userMap.d.ts

@@ -18,6 +18,7 @@ export declare class UserMap implements UserMapInterface {
     private connection;
     private commitment;
     private includeIdle;
+    private disableSyncOnTotalAccountsChange;
     private lastNumberOfSubAccounts;
     private subscription;
     private stateAccountUpdateCallback;

package/lib/userMap/userMap.js

@@ -13,7 +13,7 @@ class UserMap {
      * Constructs a new UserMap instance.
      */
     constructor(config) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
             if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
@@ -32,8 +32,10 @@ class UserMap {
         this.commitment =
             (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.driftClient.opts.commitment;
         this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
+        this.disableSyncOnTotalAccountsChange =
+            (_c = config.disableSyncOnTotalAccountsChange) !== null && _c !== void 0 ? _c : false;
         let decodeFn;
-        if ((_c = config.fastDecode) !== null && _c !== void 0 ? _c : true) {
+        if ((_d = config.fastDecode) !== null && _d !== void 0 ? _d : true) {
             decodeFn = (name, buffer) => (0, user_1.decodeUser)(buffer);
         }
         else {
@@ -65,7 +67,9 @@ class UserMap {
         await this.driftClient.subscribe();
         this.lastNumberOfSubAccounts =
             this.driftClient.getStateAccount().numberOfSubAccounts;
-        this.driftClient.eventEmitter.on('stateAccountUpdate', this.stateAccountUpdateCallback);
+        if (!this.disableSyncOnTotalAccountsChange) {
+            this.driftClient.eventEmitter.on('stateAccountUpdate', this.stateAccountUpdateCallback);
+        }
         await this.subscription.subscribe();
     }
     async addPubkey(userAccountPublicKey, userAccount, slot) {
@@ -260,7 +264,9 @@ class UserMap {
             this.userMap.delete(key);
         }
         if (this.lastNumberOfSubAccounts) {
-            this.driftClient.eventEmitter.removeListener('stateAccountUpdate', this.stateAccountUpdateCallback);
+            if (!this.disableSyncOnTotalAccountsChange) {
+                this.driftClient.eventEmitter.removeListener('stateAccountUpdate', this.stateAccountUpdateCallback);
+            }
             this.lastNumberOfSubAccounts = undefined;
         }
     }

package/lib/userMap/userMapConfig.d.ts

@@ -18,4 +18,5 @@ export type UserMapConfig = {
     skipInitialLoad?: boolean;
     includeIdle?: boolean;
     fastDecode?: boolean;
+    disableSyncOnTotalAccountsChange?: boolean;
 };

package/package.json

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

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,

package/src/userMap/userMap.ts

@@ -51,6 +51,7 @@ export class UserMap implements UserMapInterface {
 	private connection: Connection;
 	private commitment: Commitment;
 	private includeIdle: boolean;
+	private disableSyncOnTotalAccountsChange: boolean;
 	private lastNumberOfSubAccounts: BN;
 	private subscription: PollingSubscription | WebsocketSubscription;
 	private stateAccountUpdateCallback = async (state: StateAccount) => {
@@ -78,6 +79,8 @@ export class UserMap implements UserMapInterface {
 		this.commitment =
 			config.subscriptionConfig.commitment ?? this.driftClient.opts.commitment;
 		this.includeIdle = config.includeIdle ?? false;
+		this.disableSyncOnTotalAccountsChange =
+			config.disableSyncOnTotalAccountsChange ?? false;
 
 		let decodeFn;
 		if (config.fastDecode ?? true) {
@@ -115,10 +118,12 @@ export class UserMap implements UserMapInterface {
 		await this.driftClient.subscribe();
 		this.lastNumberOfSubAccounts =
 			this.driftClient.getStateAccount().numberOfSubAccounts;
-		this.driftClient.eventEmitter.on(
-			'stateAccountUpdate',
-			this.stateAccountUpdateCallback
-		);
+		if (!this.disableSyncOnTotalAccountsChange) {
+			this.driftClient.eventEmitter.on(
+				'stateAccountUpdate',
+				this.stateAccountUpdateCallback
+			);
+		}
 
 		await this.subscription.subscribe();
 	}
@@ -363,10 +368,13 @@ export class UserMap implements UserMapInterface {
 		}
 
 		if (this.lastNumberOfSubAccounts) {
-			this.driftClient.eventEmitter.removeListener(
-				'stateAccountUpdate',
-				this.stateAccountUpdateCallback
-			);
+			if (!this.disableSyncOnTotalAccountsChange) {
+				this.driftClient.eventEmitter.removeListener(
+					'stateAccountUpdate',
+					this.stateAccountUpdateCallback
+				);
+			}
+
 			this.lastNumberOfSubAccounts = undefined;
 		}
 	}

package/src/userMap/userMapConfig.ts

@@ -31,4 +31,8 @@ export type UserMapConfig = {
 
 	// Whether to skip loading available perp/spot positions and open orders
 	fastDecode?: boolean;
+
+	// If true, will not do a full sync whenever StateAccount.numberOfSubAccounts changes.
+	// default behavior is to do a full sync on changes.
+	disableSyncOnTotalAccountsChange?: boolean;
 };