@drift-labs/sdk 2.152.0-beta.2 → 2.153.0-beta.0

package/src/driftClient.ts

@@ -221,6 +221,7 @@ import {
 } from './math/builder';
 import { TitanClient, SwapMode as TitanSwapMode } from './titan/titanClient';
 import { UnifiedSwapClient } from './swap/UnifiedSwapClient';
+import { DEFAULT_COMMITMENT_LEVEL } from './constants';
 
 /**
  * Union type for swap clients (Titan and Jupiter) - Legacy type
@@ -428,19 +429,17 @@ export class DriftClient {
 			});
 		}
 
-		this.marketLookupTable = config.marketLookupTable;
-		if (!this.marketLookupTable) {
-			this.marketLookupTable = new PublicKey(
-				configs[this.env].MARKET_LOOKUP_TABLE
-			);
-		}
+		this.marketLookupTable = config.marketLookupTable
+			? config.marketLookupTable
+			: (this.marketLookupTable = new PublicKey(
+					configs[this.env].MARKET_LOOKUP_TABLE
+			  ));
 
-		this.marketLookupTables = config.marketLookupTables;
-		if (!this.marketLookupTables) {
-			this.marketLookupTables = configs[this.env].MARKET_LOOKUP_TABLES.map(
-				(tableAddr) => new PublicKey(tableAddr)
-			);
-		}
+		this.marketLookupTables = config.marketLookupTables
+			? config.marketLookupTables
+			: configs[this.env].MARKET_LOOKUP_TABLES.map(
+					(tableAddr) => new PublicKey(tableAddr)
+			  );
 
 		const delistedMarketSetting =
 			config.delistedMarketSetting || DelistedMarketSetting.Unsubscribe;
@@ -2469,6 +2468,15 @@ export class DriftClient {
 		return this.getTokenAmount(QUOTE_SPOT_MARKET_INDEX);
 	}
 
+	public getIsolatedPerpPositionTokenAmount(
+		perpMarketIndex: number,
+		subAccountId?: number
+	): BN {
+		return this.getUser(subAccountId).getIsolatePerpPositionTokenAmount(
+			perpMarketIndex
+		);
+	}
+
 	/**
 	 * 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.
@@ -3367,6 +3375,25 @@ export class DriftClient {
 			ixs.push(...startIxs);
 		}
 
+		// For Token2022 tokens, check if the user's token account exists and create it if it doesn't
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
+		if (
+			!isSolMarket &&
+			!isFromSubaccount &&
+			!tokenProgram.equals(TOKEN_PROGRAM_ID)
+		) {
+			const accountExists = await this.checkIfAccountExists(userTokenAccount);
+
+			if (!accountExists) {
+				const createAtaIx = this.getAssociatedTokenAccountCreationIx(
+					spotMarket.mint,
+					userTokenAccount,
+					tokenProgram
+				);
+				ixs.push(createAtaIx);
+			}
+		}
+
 		const depositCollateralIx = isFromSubaccount
 			? await this.getTransferDepositIx(
 					amount,
@@ -4082,6 +4109,191 @@ export class DriftClient {
 		);
 	}
 
+	async depositIntoIsolatedPerpPosition(
+		amount: BN,
+		perpMarketIndex: number,
+		userTokenAccount: PublicKey,
+		subAccountId?: number,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const { txSig } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getDepositIntoIsolatedPerpPositionIx(
+					amount,
+					perpMarketIndex,
+					userTokenAccount,
+					subAccountId
+				),
+				txParams
+			),
+			[],
+			this.opts
+		);
+		return txSig;
+	}
+
+	async getDepositIntoIsolatedPerpPositionIx(
+		amount: BN,
+		perpMarketIndex: number,
+		userTokenAccount: PublicKey,
+		subAccountId?: number
+	): Promise<TransactionInstruction> {
+		const userAccountPublicKey = await getUserAccountPublicKey(
+			this.program.programId,
+			this.authority,
+			subAccountId ?? this.activeSubAccountId
+		);
+
+		const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+		const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
+		const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [],
+			writableSpotMarketIndexes: [spotMarketIndex],
+			readablePerpMarketIndex: [perpMarketIndex],
+		});
+
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
+		return await this.program.instruction.depositIntoIsolatedPerpPosition(
+			spotMarketIndex,
+			perpMarketIndex,
+			amount,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					spotMarketVault: spotMarketAccount.vault,
+					user: userAccountPublicKey,
+					userStats: this.getUserStatsAccountPublicKey(),
+					userTokenAccount: userTokenAccount,
+					authority: this.wallet.publicKey,
+					tokenProgram,
+				},
+				remainingAccounts,
+			}
+		);
+	}
+
+	public async transferIsolatedPerpPositionDeposit(
+		amount: BN,
+		perpMarketIndex: number,
+		subAccountId?: number,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const { txSig } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getTransferIsolatedPerpPositionDepositIx(
+					amount,
+					perpMarketIndex,
+					subAccountId
+				),
+				txParams
+			),
+			[],
+			this.opts
+		);
+		return txSig;
+	}
+
+	public async getTransferIsolatedPerpPositionDepositIx(
+		amount: BN,
+		perpMarketIndex: number,
+		subAccountId?: number
+	): Promise<TransactionInstruction> {
+		const userAccountPublicKey = await getUserAccountPublicKey(
+			this.program.programId,
+			this.authority,
+			subAccountId ?? this.activeSubAccountId
+		);
+
+		const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+		const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
+		const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+		const user = await this.getUserAccount(subAccountId);
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [user],
+			writableSpotMarketIndexes: [spotMarketIndex],
+			readablePerpMarketIndex: [perpMarketIndex],
+		});
+
+		return await this.program.instruction.transferIsolatedPerpPositionDeposit(
+			spotMarketIndex,
+			perpMarketIndex,
+			amount,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					spotMarketVault: spotMarketAccount.vault,
+					user: userAccountPublicKey,
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority: this.wallet.publicKey,
+				},
+				remainingAccounts,
+			}
+		);
+	}
+
+	public async withdrawFromIsolatedPerpPosition(
+		amount: BN,
+		perpMarketIndex: number,
+		userTokenAccount: PublicKey,
+		subAccountId?: number,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const { txSig } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getWithdrawFromIsolatedPerpPositionIx(
+					amount,
+					perpMarketIndex,
+					userTokenAccount,
+					subAccountId
+				),
+				txParams
+			)
+		);
+		return txSig;
+	}
+
+	public async getWithdrawFromIsolatedPerpPositionIx(
+		amount: BN,
+		perpMarketIndex: number,
+		userTokenAccount: PublicKey,
+		subAccountId?: number
+	): Promise<TransactionInstruction> {
+		const userAccountPublicKey = await getUserAccountPublicKey(
+			this.program.programId,
+			this.authority,
+			subAccountId ?? this.activeSubAccountId
+		);
+		const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+		const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
+		const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [this.getUserAccount(subAccountId)],
+			writableSpotMarketIndexes: [spotMarketIndex],
+			readablePerpMarketIndex: [perpMarketIndex],
+		});
+
+		return await this.program.instruction.withdrawFromIsolatedPerpPosition(
+			spotMarketIndex,
+			perpMarketIndex,
+			amount,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					spotMarketVault: spotMarketAccount.vault,
+					user: userAccountPublicKey,
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority: this.wallet.publicKey,
+					userTokenAccount: userTokenAccount,
+					tokenProgram: this.getTokenProgramForSpotMarket(spotMarketAccount),
+					driftSigner: this.getSignerPublicKey(),
+				},
+				remainingAccounts,
+			}
+		);
+	}
+
 	public async updateSpotMarketCumulativeInterest(
 		marketIndex: number,
 		txParams?: TxParams
@@ -8862,8 +9074,14 @@ export class DriftClient {
 		);
 		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
 
+		const liquidatorUser = this.getUserAccount(liquidatorSubAccountId);
+		if (!liquidatorUser) {
+			throw new Error(
+				`Liquidator user account not found for subaccount id ${liquidatorSubAccountId}`
+			);
+		}
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+			userAccounts: [liquidatorUser, userAccount],
 			useMarketLastSlotCache: true,
 			writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
 		});
@@ -8924,7 +9142,17 @@ export class DriftClient {
 		lookupTables: AddressLookupTableAccount[];
 	}> {
 		const liabilityMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+		if (!liabilityMarket) {
+			throw new Error(
+				`Liability spot market account not found for index ${liabilityMarketIndex}`
+			);
+		}
 		const assetMarket = this.getSpotMarketAccount(assetMarketIndex);
+		if (!assetMarket) {
+			throw new Error(
+				`Asset spot market account not found for index ${assetMarketIndex}`
+			);
+		}
 
 		if (!quote) {
 			const fetchedQuote = await jupiterClient.getQuote({
@@ -8963,7 +9191,7 @@ export class DriftClient {
 			outputMint: liabilityMarket.mint,
 		});
 
-		const preInstructions = [];
+		const preInstructions: TransactionInstruction[] = [];
 		if (!liabilityTokenAccount) {
 			const tokenProgram = this.getTokenProgramForSpotMarket(liabilityMarket);
 			liabilityTokenAccount = await this.getAssociatedTokenAccount(
@@ -9073,7 +9301,17 @@ export class DriftClient {
 		});
 
 		const liabilitySpotMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+		if (!liabilitySpotMarket) {
+			throw new Error(
+				`Liability spot market account not found for index ${liabilityMarketIndex}`
+			);
+		}
 		const assetSpotMarket = this.getSpotMarketAccount(assetMarketIndex);
+		if (!assetSpotMarket) {
+			throw new Error(
+				`Asset spot market account not found for index ${assetMarketIndex}`
+			);
+		}
 
 		const liabilityTokenProgram =
 			this.getTokenProgramForSpotMarket(liabilitySpotMarket);
@@ -9189,7 +9427,17 @@ export class DriftClient {
 		});
 
 		const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
+		if (!inSpotMarket) {
+			throw new Error(
+				`In spot market account not found for index ${inMarketIndex}`
+			);
+		}
 		const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
+		if (!outSpotMarket) {
+			throw new Error(
+				`Out spot market account not found for index ${outMarketIndex}`
+			);
+		}
 
 		if (this.isToken2022(inSpotMarket) || this.isToken2022(outSpotMarket)) {
 			remainingAccounts.push({
@@ -9315,9 +9563,15 @@ export class DriftClient {
 			liquidatorSubAccountId
 		);
 		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+		const liquidatorUser = this.getUserAccount(liquidatorSubAccountId);
+		if (!liquidatorUser) {
+			throw new Error(
+				`Liquidator user account not found for subaccount id ${liquidatorSubAccountId}`
+			);
+		}
 
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+			userAccounts: [liquidatorUser, userAccount],
 			writablePerpMarketIndexes: [perpMarketIndex],
 			writableSpotMarketIndexes: [liabilityMarketIndex],
 		});
@@ -9390,9 +9644,15 @@ export class DriftClient {
 			liquidatorSubAccountId
 		);
 		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+		const liquidatorUser = this.getUserAccount(liquidatorSubAccountId);
+		if (!liquidatorUser) {
+			throw new Error(
+				`Liquidator user account not found for subaccount id ${liquidatorSubAccountId}`
+			);
+		}
 
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+			userAccounts: [liquidatorUser, userAccount],
 			writablePerpMarketIndexes: [perpMarketIndex],
 			writableSpotMarketIndexes: [assetMarketIndex],
 		});
@@ -9454,9 +9714,15 @@ export class DriftClient {
 			liquidatorSubAccountId
 		);
 		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+		const liquidatorUser = this.getUserAccount(liquidatorSubAccountId);
+		if (!liquidatorUser) {
+			throw new Error(
+				`Liquidator user account not found for subaccount id ${liquidatorSubAccountId}`
+			);
+		}
 
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+			userAccounts: [liquidatorUser, userAccount],
 			writablePerpMarketIndexes: [marketIndex],
 			writableSpotMarketIndexes: [QUOTE_SPOT_MARKET_INDEX],
 		});
@@ -9523,12 +9789,22 @@ export class DriftClient {
 		);
 		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
 
+		const liquidatorUser = this.getUserAccount(liquidatorSubAccountId);
+		if (!liquidatorUser) {
+			throw new Error(
+				`Liquidator user account not found for subaccount id ${liquidatorSubAccountId}`
+			);
+		}
+
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+			userAccounts: [liquidatorUser, userAccount],
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarket) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
 
 		this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
@@ -9608,6 +9884,11 @@ export class DriftClient {
 		perpMarketIndex: number
 	): Promise<TransactionInstruction> {
 		const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
+		if (!perpMarket) {
+			throw new Error(
+				`Perp market account not found for index ${perpMarketIndex}`
+			);
+		}
 
 		if (!isVariant(perpMarket.amm.oracleSource, 'prelaunch')) {
 			throw new Error(`Wrong oracle source ${perpMarket.amm.oracleSource}`);
@@ -9643,8 +9924,13 @@ export class DriftClient {
 		makers: [PublicKey, PublicKey][]
 	): Promise<TransactionInstruction> {
 		const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
+		if (!perpMarket) {
+			throw new Error(
+				`Perp market account not found for index ${perpMarketIndex}`
+			);
+		}
 
-		const remainingAccounts = [];
+		const remainingAccounts: AccountMeta[] = [];
 		for (const [maker, makerStats] of makers) {
 			remainingAccounts.push({
 				pubkey: maker,
@@ -9692,7 +9978,7 @@ export class DriftClient {
 			userAccountPublicKey
 		)) as UserAccount;
 
-		const writablePerpMarketIndexes = [];
+		const writablePerpMarketIndexes: number[] = [];
 		for (const position of userAccount.perpPositions) {
 			if (!positionIsAvailable(position)) {
 				writablePerpMarketIndexes.push(position.marketIndex);
@@ -9717,15 +10003,25 @@ export class DriftClient {
 		this.eventEmitter.emit(eventName, data);
 	}
 
-	public getOracleDataForPerpMarket(marketIndex: number): OraclePriceData {
+	public getOracleDataForPerpMarket(
+		marketIndex: number
+	): OraclePriceData | undefined {
 		return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(
 			marketIndex
-		).data;
+		)?.data;
 	}
 
-	public getMMOracleDataForPerpMarket(marketIndex: number): MMOraclePriceData {
+	public getMMOracleDataForPerpMarket(
+		marketIndex: number
+	): MMOraclePriceData | undefined {
 		const perpMarket = this.getPerpMarketAccount(marketIndex);
+		if (!perpMarket) {
+			throw new Error(`Perp market account not found for index ${marketIndex}`);
+		}
 		const oracleData = this.getOracleDataForPerpMarket(marketIndex);
+		if (!oracleData) {
+			return undefined;
+		}
 		const stateAccountAndSlot = this.accountSubscriber.getStateAccountAndSlot();
 		const isMMOracleActive = !perpMarket.amm.mmOracleSlot.eq(ZERO);
 		const pctDiff = perpMarket.amm.mmOraclePrice
@@ -9754,7 +10050,7 @@ export class DriftClient {
 			isExchangeOracleMoreRecent = false;
 		} else if (
 			!doSlotCheckForRecency &&
-			oracleData.sequenceId < mmOracleSequenceId
+			(oracleData.sequenceId ?? ZERO) < mmOracleSequenceId
 		) {
 			isExchangeOracleMoreRecent = false;
 		}
@@ -9791,10 +10087,12 @@ export class DriftClient {
 		}
 	}
 
-	public getOracleDataForSpotMarket(marketIndex: number): OraclePriceData {
+	public getOracleDataForSpotMarket(
+		marketIndex: number
+	): OraclePriceData | undefined {
 		return this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(
 			marketIndex
-		).data;
+		)?.data;
 	}
 
 	public async initializeInsuranceFundStake(
@@ -9821,9 +10119,14 @@ export class DriftClient {
 			marketIndex
 		);
 
+		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarket) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
+
 		const accounts = {
 			insuranceFundStake: ifStakeAccountPublicKey,
-			spotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
+			spotMarket: spotMarket.pubkey,
 			userStats: getUserStatsAccountPublicKey(
 				this.program.programId,
 				this.wallet.publicKey // only allow payer to initialize own insurance fund stake account
@@ -9849,6 +10152,9 @@ export class DriftClient {
 		collateralAccountPublicKey: PublicKey
 	): Promise<TransactionInstruction> {
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarket) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
 			this.wallet.publicKey,
@@ -9969,9 +10275,12 @@ export class DriftClient {
 		 */
 		fromSubaccount?: boolean;
 	}): Promise<TransactionInstruction[]> {
-		const addIfStakeIxs = [];
+		const addIfStakeIxs: TransactionInstruction[] = [];
 
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarketAccount) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
 		const createWSOLTokenAccount =
 			isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
@@ -10065,6 +10374,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarketAccount) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
 			this.wallet.publicKey,
@@ -10100,6 +10412,9 @@ export class DriftClient {
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarketAccount) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
 			this.wallet.publicKey,
@@ -10135,8 +10450,11 @@ export class DriftClient {
 		collateralAccountPublicKey: PublicKey,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const removeIfStakeIxs = [];
+		const removeIfStakeIxs: TransactionInstruction[] = [];
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarketAccount) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
 			this.wallet.publicKey,
@@ -10246,6 +10564,9 @@ export class DriftClient {
 	): Promise<TransactionInstruction> {
 		const marketIndex = QUOTE_SPOT_MARKET_INDEX;
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarket) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
 			authority,
@@ -10285,6 +10606,9 @@ export class DriftClient {
 	): Promise<TransactionInstruction> {
 		const marketIndex = GOV_SPOT_MARKET_INDEX;
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		if (!spotMarket) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
 			authority,
@@ -10325,6 +10649,11 @@ export class DriftClient {
 		spotMarketIndex: number
 	): Promise<TransactionInstruction> {
 		const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+		if (!spotMarketAccount) {
+			throw new Error(
+				`Spot market account not found for index ${spotMarketIndex}`
+			);
+		}
 		const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarketAccount);
 
 		const remainingAccounts = [];
@@ -10373,13 +10702,24 @@ export class DriftClient {
 		spotMarketIndex: number,
 		perpMarketIndex: number
 	): Promise<TransactionInstruction> {
+		const userAccount = this.getUserAccount();
+		if (!userAccount) {
+			throw new Error(
+				`User account not found. Something is wrong with driftClient config`
+			);
+		}
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount()],
+			userAccounts: [userAccount],
 			writablePerpMarketIndexes: [perpMarketIndex],
 			writableSpotMarketIndexes: [spotMarketIndex],
 		});
 
 		const spotMarket = this.getSpotMarketAccount(spotMarketIndex);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${spotMarketIndex}`
+			);
+		}
 		const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
 
 		return await this.program.instruction.resolvePerpPnlDeficit(
@@ -10405,6 +10745,9 @@ export class DriftClient {
 		userTokenAccountPublicKey: PublicKey
 	): Promise<TransactionInstruction> {
 		const spotMarket = await this.getSpotMarketAccount(marketIndex);
+		if (!spotMarket) {
+			throw new Error(`Spot market account not found for index ${marketIndex}`);
+		}
 
 		const remainingAccounts = [];
 		this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
@@ -10458,9 +10801,17 @@ export class DriftClient {
 
 	public getPerpMarketExtendedInfo(
 		marketIndex: number
-	): PerpMarketExtendedInfo {
+	): PerpMarketExtendedInfo | undefined {
 		const marketAccount = this.getPerpMarketAccount(marketIndex);
+		if (!marketAccount) {
+			return undefined;
+		}
 		const quoteAccount = this.getSpotMarketAccount(QUOTE_SPOT_MARKET_INDEX);
+		if (!quoteAccount) {
+			throw new Error(
+				`Quote spot market account not found. Something is wrong with driftClient config`
+			);
+		}
 
 		const extendedInfo: PerpMarketExtendedInfo = {
 			marketIndex,
@@ -10511,18 +10862,23 @@ export class DriftClient {
 			feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
 
 		if (marketIndex !== undefined) {
-			let marketAccount = null;
+			let marketAccount:
+				| null
+				| undefined
+				| PerpMarketAccount
+				| SpotMarketAccount = null;
+			let feeAdjustment = 1;
 			if (isVariant(marketType, 'perp')) {
 				marketAccount = this.getPerpMarketAccount(marketIndex);
+				feeAdjustment = marketAccount?.feeAdjustment ?? 0;
 			} else {
 				marketAccount = this.getSpotMarketAccount(marketIndex);
 			}
-
-			takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
+			takerFee += (takerFee * feeAdjustment) / 100;
 			if (userHLM) {
 				takerFee *= 2;
 			}
-			makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
+			makerFee += (makerFee * feeAdjustment) / 100;
 		}
 
 		return {
@@ -10573,7 +10929,9 @@ export class DriftClient {
 		return this.receiverProgram;
 	}
 
-	public async getSwitchboardOnDemandProgram(): Promise<Program30<Idl30>> {
+	public async getSwitchboardOnDemandProgram(): Promise<
+		Program30<Idl30> | undefined
+	> {
 		if (this.sbOnDemandProgram === undefined) {
 			this.sbOnDemandProgram = await AnchorUtils.loadProgramFromConnection(
 				this.connection
@@ -10876,6 +11234,9 @@ export class DriftClient {
 		numSignatures = 3
 	): Promise<TransactionInstruction | undefined> {
 		const program = await this.getSwitchboardOnDemandProgram();
+		if (!program) {
+			return undefined;
+		}
 		const feedAccount = new PullFeed(program, feed);
 		if (!this.sbProgramFeedConfigs) {
 			this.sbProgramFeedConfigs = new Map();
@@ -10904,7 +11265,7 @@ export class DriftClient {
 		feed: PublicKey,
 		recentSlothash?: Slothash,
 		numSignatures = 3
-	): Promise<TransactionSignature> {
+	): Promise<TransactionSignature | undefined> {
 		const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(
 			feed,
 			recentSlothash,
@@ -11037,7 +11398,12 @@ export class DriftClient {
 		const signingAuthority =
 			overrides?.signingAuthority ?? this.wallet.publicKey;
 		const userAccount =
-			overrides?.user.getUserAccount() ?? this.getUserAccount(subAccountId);
+			overrides?.user?.getUserAccount() ?? this.getUserAccount(subAccountId);
+		if (!userAccount) {
+			throw new Error(
+				`User account not found for subAccountId ${subAccountId}`
+			);
+		}
 
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: depositToTradeArgs?.isMakingNewAccount ? [] : [userAccount],
@@ -11177,6 +11543,11 @@ export class DriftClient {
 		spotMarketIndex: number
 	): Promise<TransactionInstruction> {
 		const spotMarket = await this.getSpotMarketAccount(spotMarketIndex);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${spotMarketIndex}`
+			);
+		}
 		return this.program.instruction.pauseSpotMarketDepositWithdraw({
 			accounts: {
 				state: await this.getStatePublicKey(),
@@ -11233,12 +11604,17 @@ export class DriftClient {
 		data.set(oraclePrice.toArrayLike(Buffer, 'le', 8), 5); // next 8 bytes
 		data.set(oracleSequenceId.toArrayLike(Buffer, 'le', 8), 13); // next 8 bytes
 
+		const perpMarket = this.getPerpMarketAccount(marketIndex);
+		if (!perpMarket) {
+			throw new Error(`Perp market account not found for index ${marketIndex}`);
+		}
+
 		// Build the instruction manually
 		return new TransactionInstruction({
 			programId: this.program.programId,
 			keys: [
 				{
-					pubkey: this.getPerpMarketAccount(marketIndex).pubkey,
+					pubkey: perpMarket.pubkey,
 					isWritable: true,
 					isSigner: false,
 				},
@@ -11289,12 +11665,16 @@ export class DriftClient {
 		data.set(discriminatorBuffer, 0);
 		data.writeInt8(ammSpreadAdjustment, 5); // next byte
 
+		const perpMarket = this.getPerpMarketAccount(marketIndex);
+		if (!perpMarket) {
+			throw new Error(`Perp market account not found for index ${marketIndex}`);
+		}
 		// Build the instruction manually
 		return new TransactionInstruction({
 			programId: this.program.programId,
 			keys: [
 				{
-					pubkey: this.getPerpMarketAccount(marketIndex).pubkey,
+					pubkey: perpMarket.pubkey,
 					isWritable: true,
 					isSigner: false,
 				},
@@ -11463,12 +11843,17 @@ export class DriftClient {
 			readablePerpMarketIndex: perpMarketIndexes,
 		});
 
+		const quoteMarket = this.getSpotMarketAccount(0);
+		if (!quoteMarket) {
+			throw new Error(`Quote spot market account not found for index 0`);
+		}
+
 		return this.program.instruction.updateAmmCache({
 			accounts: {
 				state: await this.getStatePublicKey(),
 				keeper: this.wallet.publicKey,
 				ammCache: getAmmCachePublicKey(this.program.programId),
-				quoteMarket: this.getSpotMarketAccount(0).pubkey,
+				quoteMarket: quoteMarket.pubkey,
 			},
 			remainingAccounts,
 		});
@@ -11492,6 +11877,11 @@ export class DriftClient {
 		constituent: ConstituentAccount
 	): Promise<TransactionInstruction> {
 		const spotMarket = this.getSpotMarketAccount(constituent.spotMarketIndex);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${constituent.spotMarketIndex}`
+			);
+		}
 		return this.program.instruction.updateConstituentOracleInfo({
 			accounts: {
 				keeper: this.wallet.publicKey,
@@ -11553,12 +11943,26 @@ export class DriftClient {
 			lpPool,
 			outMarketIndex
 		);
+
+		const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
+		if (!inSpotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${inMarketIndex}`
+			);
+		}
+		const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
+		if (!outSpotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${outMarketIndex}`
+			);
+		}
+
 		const userInTokenAccount = await getAssociatedTokenAddress(
-			this.getSpotMarketAccount(inMarketIndex).mint,
+			inSpotMarket.mint,
 			userAuthority
 		);
 		const userOutTokenAccount = await getAssociatedTokenAddress(
-			this.getSpotMarketAccount(outMarketIndex).mint,
+			outSpotMarket.mint,
 			userAuthority
 		);
 		const inConstituent = getConstituentPublicKey(
@@ -11571,8 +11975,8 @@ export class DriftClient {
 			lpPool,
 			outMarketIndex
 		);
-		const inMarketMint = this.getSpotMarketAccount(inMarketIndex).mint;
-		const outMarketMint = this.getSpotMarketAccount(outMarketIndex).mint;
+		const inMarketMint = inSpotMarket.mint;
+		const outMarketMint = outSpotMarket.mint;
 
 		const constituentTargetBase = getConstituentTargetBasePublicKey(
 			this.program.programId,
@@ -11771,6 +12175,11 @@ export class DriftClient {
 		});
 
 		const spotMarket = this.getSpotMarketAccount(inMarketIndex);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${inMarketIndex}`
+			);
+		}
 		const inMarketMint = spotMarket.mint;
 		const isSolMarket = inMarketMint.equals(WRAPPED_SOL_MINT);
 
@@ -11986,6 +12395,11 @@ export class DriftClient {
 		});
 
 		const spotMarket = this.getSpotMarketAccount(outMarketIndex);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${outMarketIndex}`
+			);
+		}
 		const outMarketMint = spotMarket.mint;
 		const outConstituent = getConstituentPublicKey(
 			this.program.programId,
@@ -12097,6 +12511,11 @@ export class DriftClient {
 		});
 
 		const spotMarket = this.getSpotMarketAccount(outMarketIndex);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market account not found for index ${outMarketIndex}`
+			);
+		}
 		const outMarketMint = spotMarket.mint;
 		const outConstituent = getConstituentPublicKey(
 			this.program.programId,
@@ -12331,11 +12750,11 @@ export class DriftClient {
 		lpPoolId: number,
 		perpMarketIndexes: number[]
 	): Promise<TransactionInstruction> {
-		const remainingAccounts = [];
+		const remainingAccounts: AccountMeta[] = [];
 		remainingAccounts.push(
 			...perpMarketIndexes.map((index) => {
 				return {
-					pubkey: this.getPerpMarketAccount(index).pubkey,
+					pubkey: this.getPerpMarketAccount(index)?.pubkey ?? PublicKey.default,
 					isSigner: false,
 					isWritable: true,
 				};
@@ -12443,7 +12862,8 @@ export class DriftClient {
 			txVersion: txVersion ?? this.txVersion,
 			txParams: txParams ?? this.txParams,
 			connection: this.connection,
-			preFlightCommitment: this.opts.preflightCommitment,
+			preFlightCommitment:
+				this.opts?.preflightCommitment ?? DEFAULT_COMMITMENT_LEVEL,
 			fetchAllMarketLookupTableAccounts:
 				this.fetchAllLookupTableAccounts.bind(this),
 			lookupTables,
@@ -12460,17 +12880,20 @@ export class DriftClient {
 		lookupTables?: AddressLookupTableAccount[],
 		forceVersionedTransaction?: boolean
 	): Promise<(Transaction | VersionedTransaction)[]> {
-		return this.txHandler.buildBulkTransactions({
+		const txns = await this.txHandler.buildBulkTransactions({
 			instructions,
 			txVersion: txVersion ?? this.txVersion,
 			txParams: txParams ?? this.txParams,
 			connection: this.connection,
-			preFlightCommitment: this.opts.preflightCommitment,
+			preFlightCommitment:
+				this.opts?.preflightCommitment ?? DEFAULT_COMMITMENT_LEVEL,
 			fetchAllMarketLookupTableAccounts:
 				this.fetchAllLookupTableAccounts.bind(this),
 			lookupTables,
 			forceVersionedTransaction,
 		});
+
+		return txns.filter(Boolean) as (Transaction | VersionedTransaction)[];
 	}
 
 	async buildTransactionsMap(
@@ -12488,7 +12911,8 @@ export class DriftClient {
 			txVersion: txVersion ?? this.txVersion,
 			txParams: txParams ?? this.txParams,
 			connection: this.connection,
-			preFlightCommitment: this.opts.preflightCommitment,
+			preFlightCommitment:
+				this.opts?.preflightCommitment ?? DEFAULT_COMMITMENT_LEVEL,
 			fetchAllMarketLookupTableAccounts:
 				this.fetchAllLookupTableAccounts.bind(this),
 			lookupTables,
@@ -12511,7 +12935,8 @@ export class DriftClient {
 			txVersion: txVersion ?? this.txVersion,
 			txParams: txParams ?? this.txParams,
 			connection: this.connection,
-			preFlightCommitment: this.opts.preflightCommitment,
+			preFlightCommitment:
+				this.opts?.preflightCommitment ?? DEFAULT_COMMITMENT_LEVEL,
 			fetchAllMarketLookupTableAccounts:
 				this.fetchAllLookupTableAccounts.bind(this),
 			lookupTables,