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

package/VERSION

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

package/lib/driftClient.d.ts

@@ -213,7 +213,7 @@ export declare class DriftClient {
      * @param subAccountId subaccountId to deposit
      * @param reduceOnly if true, deposit must not increase account risk
      */
-    deposit(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean): Promise<TransactionSignature>;
+    deposit(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean, txParams?: TxParams): Promise<TransactionSignature>;
     getDepositInstruction(amount: BN, marketIndex: number, userTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean, userInitialized?: boolean): Promise<TransactionInstruction>;
     private checkIfAccountExists;
     getWrappedSolAccountCreationIxs(amount: BN, includeRent?: boolean): Promise<{

package/lib/driftClient.js

@@ -979,7 +979,7 @@ class DriftClient {
      * @param subAccountId subaccountId to deposit
      * @param reduceOnly if true, deposit must not increase account risk
      */
-    async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false) {
+    async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, txParams) {
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -997,7 +997,7 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             instructions.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
         }
-        const txParams = { ...this.txParams, computeUnits: 600000 };
+        txParams = { ...(txParams !== null && txParams !== void 0 ? txParams : this.txParams), computeUnits: 600000 };
         const tx = await this.buildTransaction(instructions, txParams);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);

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 {
@@ -13,7 +13,8 @@ export declare class FastSingleTxSender extends BaseTxSender {
     timoutCount: number;
     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,9 +22,10 @@ export declare class FastSingleTxSender extends BaseTxSender {
         blockhashRefreshInterval?: number;
         additionalConnections?: any;
         skipConfirmation?: boolean;
+        blockhashCommitment?: Commitment;
     });
     startBlockhashRefreshLoop(): 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

@@ -7,7 +7,7 @@ const baseTxSender_1 = require("./baseTxSender");
 const DEFAULT_TIMEOUT = 35000;
 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.connection = connection;
@@ -17,23 +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 {
-                this.recentBlockhash = (await this.connection.getLatestBlockhash(this.opts)).blockhash;
+                this.recentBlockhash = (await this.connection.getLatestBlockhash(this.blockhashCommitment)).blockhash;
             }
             catch (e) {
                 console.error('Error in startBlockhashRefreshLoop: ', e);
             }
         }, this.blockhashRefreshInterval);
     }
-    async prepareTx(tx, additionalSigners, opts) {
+    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.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.connection.getLatestBlockhash(this.blockhashCommitment))
                 .blockhash;
         additionalSigners
             .filter((s) => s !== undefined)

package/package.json

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

package/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);
 

package/src/tx/fastSingleTxSender.ts

@@ -9,6 +9,7 @@ import {
 	TransactionMessage,
 	TransactionInstruction,
 	AddressLookupTableAccount,
+	Commitment,
 } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
 import { IWallet } from '../types';
@@ -27,6 +28,7 @@ export class FastSingleTxSender extends BaseTxSender {
 	timoutCount = 0;
 	recentBlockhash: string;
 	skipConfirmation: boolean;
+	blockhashCommitment: Commitment;
 
 	public constructor({
 		connection,
@@ -36,6 +38,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH,
 		additionalConnections = new Array<Connection>(),
 		skipConfirmation = false,
+		blockhashCommitment = 'finalized',
 	}: {
 		connection: Connection;
 		wallet: IWallet;
@@ -44,6 +47,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		blockhashRefreshInterval?: number;
 		additionalConnections?;
 		skipConfirmation?: boolean;
+		blockhashCommitment?: Commitment;
 	}) {
 		super({ connection, wallet, opts, timeout, additionalConnections });
 		this.connection = connection;
@@ -53,6 +57,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		this.blockhashRefreshInterval = blockhashRefreshInterval;
 		this.additionalConnections = additionalConnections;
 		this.skipConfirmation = skipConfirmation;
+		this.blockhashCommitment = blockhashCommitment;
 		this.startBlockhashRefreshLoop();
 	}
 
@@ -60,7 +65,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		setInterval(async () => {
 			try {
 				this.recentBlockhash = (
-					await this.connection.getLatestBlockhash(this.opts)
+					await this.connection.getLatestBlockhash(this.blockhashCommitment)
 				).blockhash;
 			} catch (e) {
 				console.error('Error in startBlockhashRefreshLoop: ', e);
@@ -71,13 +76,13 @@ export class FastSingleTxSender extends BaseTxSender {
 	async prepareTx(
 		tx: Transaction,
 		additionalSigners: Array<Signer>,
-		opts: ConfirmOptions
+		_opts: ConfirmOptions
 	): Promise<Transaction> {
 		tx.feePayer = this.wallet.publicKey;
 
 		tx.recentBlockhash =
 			this.recentBlockhash ??
-			(await this.connection.getLatestBlockhash(opts.preflightCommitment))
+			(await this.connection.getLatestBlockhash(this.blockhashCommitment))
 				.blockhash;
 
 		additionalSigners