@drift-labs/sdk 2.28.0-beta.4 → 2.28.0-beta.5

package/src/driftClient.ts

@@ -56,6 +56,9 @@ import {
 	SystemProgram,
 	ComputeBudgetProgram,
 	AddressLookupTableAccount,
+	TransactionVersion,
+	VersionedTransaction,
+	TransactionMessage,
 } from '@solana/web3.js';
 
 import { TokenFaucet } from './tokenFaucet';
@@ -82,9 +85,14 @@ import {
 } from './accounts/types';
 import { TxSender, TxSigAndSlot } from './tx/types';
 import { wrapInTx } from './tx/utils';
-import { QUOTE_SPOT_MARKET_INDEX, ZERO } from './constants/numericConstants';
+import {
+	BASE_PRECISION,
+	PRICE_PRECISION,
+	QUOTE_SPOT_MARKET_INDEX,
+	ZERO,
+} from './constants/numericConstants';
 import { findDirectionToClose, positionIsAvailable } from './math/position';
-import { getTokenAmount } from './math/spotBalance';
+import { getSignedTokenAmount, getTokenAmount } from './math/spotBalance';
 import { decodeName, DEFAULT_USER_NAME, encodeName } from './userName';
 import { OraclePriceData } from './oracles/types';
 import { DriftClientConfig } from './driftClientConfig';
@@ -93,11 +101,17 @@ import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDrift
 import { RetryTxSender } from './tx/retryTxSender';
 import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
-import { configs, getMarketsAndOraclesForSubscription } from './config';
+import {
+	configs,
+	DRIFT_PROGRAM_ID,
+	getMarketsAndOraclesForSubscription,
+} from './config';
 import { WRAPPED_SOL_MINT } from './constants/spotMarkets';
 import { UserStats } from './userStats';
 import { isSpotPositionAvailable } from './math/spotPosition';
 import { calculateMarketMaxAvailableInsurance } from './math/market';
+import { fetchUserStatsAccount } from './accounts/fetch';
+import { castNumberToSpotPrecision } from './math/spotMarket';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -134,6 +148,7 @@ export class DriftClient {
 	includeDelegates?: boolean;
 	authoritySubAccountMap?: Map<string, number[]>;
 	skipLoadUsers?: boolean;
+	txVersion: TransactionVersion;
 
 	public get isSubscribed() {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -154,13 +169,14 @@ export class DriftClient {
 		);
 		this.program = new Program(
 			driftIDL as Idl,
-			config.programID,
+			config.programID ?? new PublicKey(DRIFT_PROGRAM_ID),
 			this.provider
 		);
 
 		this.authority = config.authority ?? this.wallet.publicKey;
 		this.activeSubAccountId = config.activeSubAccountId ?? 0;
 		this.skipLoadUsers = config.skipLoadUsers ?? false;
+		this.txVersion = config.txVersion ?? 'legacy';
 
 		if (config.includeDelegates && config.subAccountIds) {
 			throw new Error(
@@ -746,6 +762,21 @@ export class DriftClient {
 		});
 	}
 
+	async getNextSubAccountId(): Promise<number> {
+		const userStats = this.getUserStats();
+		let userStatsAccount: UserStatsAccount;
+		if (!userStats) {
+			userStatsAccount = await fetchUserStatsAccount(
+				this.connection,
+				this.program,
+				this.wallet.publicKey
+			);
+		} else {
+			userStatsAccount = userStats.getAccount();
+		}
+		return userStatsAccount.numberOfSubAccountsCreated;
+	}
+
 	public async initializeReferrerName(
 		name: string
 	): Promise<TransactionSignature> {
@@ -1002,7 +1033,7 @@ export class DriftClient {
 		});
 
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(ix, txParams?.computeUnits, txParams?.computeUnitsPrice),
+			await this.buildTransaction(ix, txParams),
 			[],
 			this.opts
 		);
@@ -1107,28 +1138,58 @@ export class DriftClient {
 	}
 
 	public getQuoteAssetTokenAmount(): BN {
-		const spotMarket = this.getSpotMarketAccount(QUOTE_SPOT_MARKET_INDEX);
-		const spotPosition = this.getSpotPosition(QUOTE_SPOT_MARKET_INDEX);
-		return getTokenAmount(
-			spotPosition.scaledBalance,
-			spotMarket,
-			spotPosition.balanceType
-		);
+		return this.getTokenAmount(QUOTE_SPOT_MARKET_INDEX);
 	}
 
+	/**
+	 * Returns the token amount for a given market. The spot market precision is based on the token mint decimals.
+	 * Positive if it is a deposit, negative if it is a borrow.
+	 * @param marketIndex
+	 */
 	public getTokenAmount(marketIndex: number): BN {
 		const spotPosition = this.getSpotPosition(marketIndex);
 		if (spotPosition === undefined) {
 			return ZERO;
 		}
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
-		return getTokenAmount(
-			spotPosition.scaledBalance,
-			spotMarket,
+		return getSignedTokenAmount(
+			getTokenAmount(
+				spotPosition.scaledBalance,
+				spotMarket,
+				spotPosition.balanceType
+			),
 			spotPosition.balanceType
 		);
 	}
 
+	/**
+	 * Converts an amount to the spot precision for a given market. The spot market precision is based on the token mint decimals.
+	 * @param marketIndex
+	 * @param amount
+	 */
+	public convertToSpotPrecision(marketIndex: number, amount: BN | number): BN {
+		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		return castNumberToSpotPrecision(amount, spotMarket);
+	}
+
+	/**
+	 * Converts an amount to the perp precision. The perp market precision is {@link BASE_PRECISION} (1e9).
+	 * @param amount
+	 */
+	public convertToPerpPrecision(amount: BN | number): BN {
+		amount = typeof amount === 'number' ? new BN(amount) : amount;
+		return amount.mul(BASE_PRECISION);
+	}
+
+	/**
+	 * Converts an amount to the price precision. The perp market precision is {@link PRICE_PRECISION} (1e6).
+	 * @param amount
+	 */
+	public convertToPricePrecision(amount: BN | number): BN {
+		amount = typeof amount === 'number' ? new BN(amount) : amount;
+		return amount.mul(PRICE_PRECISION);
+	}
+
 	getRemainingAccounts(params: RemainingAccountParams): AccountMeta[] {
 		const { oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap } =
 			this.getRemainingAccountMapsForUsers(params.userAccounts);
@@ -1412,10 +1473,41 @@ export class DriftClient {
 		);
 	}
 
+	/**
+	 * Get the associated token address for the given spot market
+	 * @param marketIndex
+	 * @param useNative
+	 */
+	public async getAssociatedTokenAccount(
+		marketIndex: number,
+		useNative = true
+	): Promise<PublicKey> {
+		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		if (useNative && spotMarket.mint.equals(WRAPPED_SOL_MINT)) {
+			return this.wallet.publicKey;
+		}
+		const mint = spotMarket.mint;
+		return await Token.getAssociatedTokenAddress(
+			ASSOCIATED_TOKEN_PROGRAM_ID,
+			TOKEN_PROGRAM_ID,
+			mint,
+			this.wallet.publicKey
+		);
+	}
+
+	/**
+	 * Deposit funds into the given spot market
+	 *
+	 * @param amount
+	 * @param marketIndex
+	 * @param associatedTokenAccount can be the wallet public key if using native sol
+	 * @param subAccountId
+	 * @param reduceOnly
+	 */
 	public async deposit(
 		amount: BN,
 		marketIndex: number,
-		collateralAccountPublicKey: PublicKey,
+		associatedTokenAccount: PublicKey,
 		subAccountId?: number,
 		reduceOnly = false
 	): Promise<TransactionSignature> {
@@ -1435,13 +1527,13 @@ export class DriftClient {
 		const signerAuthority = this.wallet.publicKey;
 
 		const createWSOLTokenAccount =
-			isSolMarket && collateralAccountPublicKey.equals(signerAuthority);
+			isSolMarket && associatedTokenAccount.equals(signerAuthority);
 
 		if (createWSOLTokenAccount) {
 			const { ixs, signers, pubkey } =
 				await this.getWrappedSolAccountCreationIxs(amount, true);
 
-			collateralAccountPublicKey = pubkey;
+			associatedTokenAccount = pubkey;
 
 			ixs.forEach((ix) => {
 				tx.add(ix);
@@ -1453,7 +1545,7 @@ export class DriftClient {
 		const depositCollateralIx = await this.getDepositInstruction(
 			amount,
 			marketIndex,
-			collateralAccountPublicKey,
+			associatedTokenAccount,
 			subAccountId,
 			reduceOnly,
 			true
@@ -1466,7 +1558,7 @@ export class DriftClient {
 			tx.add(
 				Token.createCloseAccountInstruction(
 					TOKEN_PROGRAM_ID,
-					collateralAccountPublicKey,
+					associatedTokenAccount,
 					signerAuthority,
 					signerAuthority,
 					[]
@@ -1777,10 +1869,17 @@ export class DriftClient {
 		return [txSig, userAccountPublicKey];
 	}
 
+	/**
+	 * Withdraws from a user account. If deposit doesn't already exist, creates a borrow
+	 * @param amount
+	 * @param marketIndex
+	 * @param associatedTokenAddress - the token account to withdraw to. can be the wallet public key if using native sol
+	 * @param reduceOnly
+	 */
 	public async withdraw(
 		amount: BN,
 		marketIndex: number,
-		userTokenAccount: PublicKey,
+		associatedTokenAddress: PublicKey,
 		reduceOnly = false
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
@@ -1799,13 +1898,13 @@ export class DriftClient {
 		const authority = this.wallet.publicKey;
 
 		const createWSOLTokenAccount =
-			isSolMarket && userTokenAccount.equals(authority);
+			isSolMarket && associatedTokenAddress.equals(authority);
 
 		if (createWSOLTokenAccount) {
 			const { ixs, signers, pubkey } =
 				await this.getWrappedSolAccountCreationIxs(amount, false);
 
-			userTokenAccount = pubkey;
+			associatedTokenAddress = pubkey;
 
 			ixs.forEach((ix) => {
 				tx.add(ix);
@@ -1813,13 +1912,15 @@ export class DriftClient {
 
 			signers.forEach((signer) => additionalSigners.push(signer));
 		} else {
-			const accountExists = await this.checkIfAccountExists(userTokenAccount);
+			const accountExists = await this.checkIfAccountExists(
+				associatedTokenAddress
+			);
 
 			if (!accountExists) {
 				const createAssociatedTokenAccountIx =
 					this.getAssociatedTokenAccountCreationIx(
 						spotMarketAccount.mint,
-						userTokenAccount
+						associatedTokenAddress
 					);
 
 				tx.add(createAssociatedTokenAccountIx);
@@ -1829,7 +1930,7 @@ export class DriftClient {
 		const withdrawCollateral = await this.getWithdrawIx(
 			amount,
 			spotMarketAccount.marketIndex,
-			userTokenAccount,
+			associatedTokenAddress,
 			reduceOnly
 		);
 
@@ -1840,7 +1941,7 @@ export class DriftClient {
 			tx.add(
 				Token.createCloseAccountInstruction(
 					TOKEN_PROGRAM_ID,
-					userTokenAccount,
+					associatedTokenAddress,
 					authority,
 					authority,
 					[]
@@ -1895,6 +1996,14 @@ export class DriftClient {
 		);
 	}
 
+	/**
+	 * Withdraws from the fromSubAccount and deposits into the toSubAccount
+	 * @param amount
+	 * @param marketIndex
+	 * @param fromSubAccountId
+	 * @param toSubAccountId
+	 * @param txParams
+	 */
 	public async transferDeposit(
 		amount: BN,
 		marketIndex: number,
@@ -1903,15 +2012,14 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getTransferDepositIx(
 					amount,
 					marketIndex,
 					fromSubAccountId,
 					toSubAccountId
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -1989,10 +2097,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.updateSpotMarketCumulativeInterestIx(marketIndex),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2019,10 +2126,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.settleLPIx(settleeUserAccountPublicKey, marketIndex),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2058,10 +2164,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2076,14 +2181,13 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getRemovePerpLpSharesInExpiringMarket(
 					marketIndex,
 					userAccountPublicKey,
 					sharesToBurn
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2168,10 +2272,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getAddPerpLpSharesIx(amount, marketIndex),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2201,6 +2304,9 @@ export class DriftClient {
 		});
 	}
 
+	/**
+	 * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
+	 */
 	public async openPosition(
 		direction: PositionDirection,
 		amount: BN,
@@ -2351,10 +2457,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getPlacePerpOrderIx(orderParams),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2400,10 +2505,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getUpdateAMMsIx(marketIndexes),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2450,10 +2554,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getSettleExpiredMarketIx(marketIndex),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2523,7 +2626,7 @@ export class DriftClient {
 			});
 
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(ix, txParams?.computeUnits, txParams?.computeUnitsPrice),
+			await this.buildTransaction(ix, txParams),
 			[],
 			this.opts
 		);
@@ -2536,10 +2639,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getCancelOrderIx(orderId),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2572,10 +2674,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getCancelOrderByUserIdIx(userOrderId),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2614,10 +2715,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getCancelOrdersIx(marketType, marketIndex, direction),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2710,7 +2810,7 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getFillPerpOrderIx(
 					userAccountPublicKey,
 					user,
@@ -2718,8 +2818,7 @@ export class DriftClient {
 					makerInfo,
 					referrerInfo
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2827,10 +2926,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getPlaceSpotOrderIx(orderParams),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -2878,7 +2976,7 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getFillSpotOrderIx(
 					userAccountPublicKey,
 					user,
@@ -2887,8 +2985,7 @@ export class DriftClient {
 					makerInfo,
 					referrerInfo
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3174,10 +3271,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getTriggerOrderIx(userAccountPublicKey, user, order),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3227,10 +3323,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getForceCancelOrdersIx(userAccountPublicKey, user),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3266,10 +3361,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getUpdateUserIdleIx(userAccountPublicKey, user),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3305,14 +3399,13 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getPlaceAndTakePerpOrderIx(
 					orderParams,
 					makerInfo,
 					referrerInfo
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3400,14 +3493,13 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getPlaceAndMakePerpOrderIx(
 					orderParams,
 					takerInfo,
 					referrerInfo
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3472,15 +3564,14 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getPlaceAndTakeSpotOrderIx(
 					orderParams,
 					fulfillmentConfig,
 					makerInfo,
 					referrerInfo
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3571,15 +3662,14 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getPlaceAndMakeSpotOrderIx(
 					orderParams,
 					takerInfo,
 					fulfillmentConfig,
 					referrerInfo
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3647,9 +3737,7 @@ export class DriftClient {
 	}
 
 	/**
-	 * Close an entire position. If you want to reduce a position, use the {@link openPosition} method in the opposite direction of the current position.
-	 * @param marketIndex
-	 * @returns
+	 * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
 	 */
 	public async closePosition(
 		marketIndex: number,
@@ -3783,10 +3871,9 @@ export class DriftClient {
 		};
 
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getModifyOrderIx(orderId, orderParams),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3883,10 +3970,9 @@ export class DriftClient {
 		};
 
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getModifyOrderByUserIdIx(userOrderId, orderParams),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -3959,14 +4045,13 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.settlePNLIx(
 					settleeUserAccountPublicKey,
 					settleeUserAccount,
 					marketIndex
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4005,7 +4090,7 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getLiquidatePerpIx(
 					userAccountPublicKey,
 					userAccount,
@@ -4013,8 +4098,7 @@ export class DriftClient {
 					maxBaseAssetAmount,
 					limitPrice
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4072,7 +4156,7 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getLiquidateSpotIx(
 					userAccountPublicKey,
 					userAccount,
@@ -4081,8 +4165,7 @@ export class DriftClient {
 					maxLiabilityTransfer,
 					limitPrice
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4143,7 +4226,7 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getLiquidateBorrowForPerpPnlIx(
 					userAccountPublicKey,
 					userAccount,
@@ -4152,8 +4235,7 @@ export class DriftClient {
 					maxLiabilityTransfer,
 					limitPrice
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4214,7 +4296,7 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getLiquidatePerpPnlForDepositIx(
 					userAccountPublicKey,
 					userAccount,
@@ -4223,8 +4305,7 @@ export class DriftClient {
 					maxPnlTransfer,
 					limitPrice
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4282,14 +4363,13 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getResolvePerpBankruptcyIx(
 					userAccountPublicKey,
 					userAccount,
 					marketIndex
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4346,14 +4426,13 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getResolveSpotBankruptcyIx(
 					userAccountPublicKey,
 					userAccount,
 					marketIndex
 				),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4404,10 +4483,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getUpdateFundingRateIx(perpMarketIndex, oracle),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4437,10 +4515,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getSettleFundingPaymentIx(userAccountPublicKey),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4499,10 +4576,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getInitializeInsuranceFundStakeIx(marketIndex),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4859,10 +4935,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			wrapInTx(
+			await this.buildTransaction(
 				await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex),
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
+				txParams
 			),
 			[],
 			this.opts
@@ -4956,11 +5031,71 @@ export class DriftClient {
 	}
 
 	sendTransaction(
-		tx: Transaction,
+		tx: Transaction | VersionedTransaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
 		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
-		return this.txSender.send(tx, additionalSigners, opts, preSigned);
+		// @ts-ignore
+		if (!tx.message) {
+			return this.txSender.send(
+				tx as Transaction,
+				additionalSigners,
+				opts,
+				preSigned
+			);
+		} else {
+			return this.txSender.sendVersionedTransaction(
+				tx as VersionedTransaction,
+				additionalSigners,
+				opts
+			);
+		}
+	}
+
+	async buildTransaction(
+		instructions: TransactionInstruction | TransactionInstruction[],
+		txParams?: TxParams
+	): Promise<Transaction | VersionedTransaction> {
+		const allIx = [];
+		const computeUnits = txParams?.computeUnits ?? 600_000;
+		if (computeUnits !== 200_000) {
+			allIx.push(
+				ComputeBudgetProgram.setComputeUnitLimit({
+					units: computeUnits,
+				})
+			);
+		}
+		const computeUnitsPrice = txParams?.computeUnitsPrice ?? 0;
+		if (computeUnitsPrice !== 0) {
+			allIx.push(
+				ComputeBudgetProgram.setComputeUnitPrice({
+					microLamports: computeUnitsPrice,
+				})
+			);
+		}
+
+		if (Array.isArray(instructions)) {
+			allIx.push(...instructions);
+		} else {
+			allIx.push(instructions);
+		}
+
+		if (this.txVersion === 'legacy') {
+			return new Transaction().add(...allIx);
+		} else {
+			const marketLookupTable = await this.fetchMarketLookupTableAccount();
+			const message = new TransactionMessage({
+				payerKey: this.provider.wallet.publicKey,
+				recentBlockhash: (
+					await this.provider.connection.getRecentBlockhash(
+						this.opts.preflightCommitment
+					)
+				).blockhash,
+				instructions: allIx,
+			}).compileToV0Message([marketLookupTable]);
+
+			return new VersionedTransaction(message);
+		}
 	}
 }