@drift-labs/sdk 2.153.0-beta.0 → 2.153.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.153.0-beta.0
+2.153.0-beta.1

package/lib/browser/constants/txConstants.d.ts

@@ -1,4 +1,3 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const NOT_CONFIRMED_ERROR_CODE = -1001;
 export declare const FUEL_RESET_LOG_ACCOUNT: PublicKey;
-export declare const DEFAULT_COMMITMENT_LEVEL = "confirmed";

package/lib/browser/constants/txConstants.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_COMMITMENT_LEVEL = exports.FUEL_RESET_LOG_ACCOUNT = exports.NOT_CONFIRMED_ERROR_CODE = void 0;
+exports.FUEL_RESET_LOG_ACCOUNT = exports.NOT_CONFIRMED_ERROR_CODE = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.NOT_CONFIRMED_ERROR_CODE = -1001;
 exports.FUEL_RESET_LOG_ACCOUNT = new web3_js_1.PublicKey('FuE1gqp2fzw2sDNLrbZqKsqpphJcoSW6HPaSJjGd4RZ4');
-exports.DEFAULT_COMMITMENT_LEVEL = 'confirmed';

package/lib/browser/driftClient.d.ts

@@ -998,9 +998,9 @@ export declare class DriftClient {
     settleFundingPayment(userAccountPublicKey: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
     getSettleFundingPaymentIx(userAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     triggerEvent(eventName: keyof DriftClientAccountEvents, data?: any): void;
-    getOracleDataForPerpMarket(marketIndex: number): OraclePriceData | undefined;
-    getMMOracleDataForPerpMarket(marketIndex: number): MMOraclePriceData | undefined;
-    getOracleDataForSpotMarket(marketIndex: number): OraclePriceData | undefined;
+    getOracleDataForPerpMarket(marketIndex: number): OraclePriceData;
+    getMMOracleDataForPerpMarket(marketIndex: number): MMOraclePriceData;
+    getOracleDataForSpotMarket(marketIndex: number): OraclePriceData;
     initializeInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getInitializeInsuranceFundStakeIx(marketIndex: number): Promise<TransactionInstruction>;
     getAddInsuranceFundStakeIx(marketIndex: number, amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
@@ -1069,7 +1069,7 @@ export declare class DriftClient {
      * @returns
      */
     depositIntoSpotMarketRevenuePool(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionSignature>;
-    getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo | undefined;
+    getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
     /**
      * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
      * @param marketType
@@ -1091,7 +1091,7 @@ export declare class DriftClient {
         marketType: MarketType;
     } | undefined;
     getReceiverProgram(): Program<PythSolanaReceiver>;
-    getSwitchboardOnDemandProgram(): Promise<Program30<Idl30> | undefined>;
+    getSwitchboardOnDemandProgram(): Promise<Program30<Idl30>>;
     postPythPullOracleUpdateAtomic(vaaString: string, feedId: string): Promise<TransactionSignature>;
     postMultiPythPullOracleUpdatesAtomic(vaaString: string, feedIds: string[]): Promise<TransactionSignature>;
     getPostPythPullOracleUpdateAtomicIxs(vaaString: string, feedIds: string | string[], numSignatures?: number): Promise<TransactionInstruction[]>;
@@ -1107,7 +1107,7 @@ export declare class DriftClient {
     getPostPythLazerOracleUpdateIxs(feedIds: number[], pythMessageHex: string, precedingIxs?: TransactionInstruction[], overrideCustomIxIndex?: number): Promise<TransactionInstruction[]>;
     getPostManySwitchboardOnDemandUpdatesAtomicIxs(feeds: PublicKey[], recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionInstruction[] | undefined>;
     getPostSwitchboardOnDemandUpdateAtomicIx(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionInstruction | undefined>;
-    postSwitchboardOnDemandUpdate(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionSignature | undefined>;
+    postSwitchboardOnDemandUpdate(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionSignature>;
     private getBuildEncodedVaaIxs;
     enableUserHighLeverageMode(subAccountId: number, txParams?: TxParams): Promise<TransactionSignature>;
     getEnableHighLeverageModeIx(subAccountId: number, depositToTradeArgs?: {

package/lib/browser/driftClient.js

@@ -77,7 +77,6 @@ const orders_1 = require("./math/orders");
 const builder_1 = require("./math/builder");
 const titanClient_1 = require("./titan/titanClient");
 const UnifiedSwapClient_1 = require("./swap/UnifiedSwapClient");
-const constants_1 = require("./constants");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -197,12 +196,14 @@ class DriftClient {
                 accountSubscription: this.userAccountSubscriptionConfig,
             });
         }
-        this.marketLookupTable = config.marketLookupTable
-            ? config.marketLookupTable
-            : (this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[this.env].MARKET_LOOKUP_TABLE));
-        this.marketLookupTables = config.marketLookupTables
-            ? config.marketLookupTables
-            : config_1.configs[this.env].MARKET_LOOKUP_TABLES.map((tableAddr) => new web3_js_1.PublicKey(tableAddr));
+        this.marketLookupTable = config.marketLookupTable;
+        if (!this.marketLookupTable) {
+            this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[this.env].MARKET_LOOKUP_TABLE);
+        }
+        this.marketLookupTables = config.marketLookupTables;
+        if (!this.marketLookupTables) {
+            this.marketLookupTables = config_1.configs[this.env].MARKET_LOOKUP_TABLES.map((tableAddr) => new web3_js_1.PublicKey(tableAddr));
+        }
         const delistedMarketSetting = config.delistedMarketSetting || types_2.DelistedMarketSetting.Unsubscribe;
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
@@ -4746,12 +4747,8 @@ class DriftClient {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidator = await this.getUserAccountPublicKey(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: [liquidatorUser, userAccount],
+            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
         });
@@ -4769,13 +4766,7 @@ class DriftClient {
     }
     async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, maxAccounts, }) {
         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({
                 inputMint: assetMarket.mint,
@@ -4857,13 +4848,7 @@ class DriftClient {
             readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
         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);
         const assetTokenProgram = this.getTokenProgramForSpotMarket(assetSpotMarket);
         if (!liabilityTokenProgram.equals(assetTokenProgram)) {
@@ -4936,13 +4921,7 @@ class DriftClient {
             writableSpotMarketIndexes: [inMarketIndex, outMarketIndex],
         });
         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({
                 pubkey: inSpotMarket.mint,
@@ -5004,12 +4983,8 @@ class DriftClient {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidator = await this.getUserAccountPublicKey(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: [liquidatorUser, userAccount],
+            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [liabilityMarketIndex],
         });
@@ -5035,12 +5010,8 @@ class DriftClient {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidator = await this.getUserAccountPublicKey(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: [liquidatorUser, userAccount],
+            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [assetMarketIndex],
         });
@@ -5064,12 +5035,8 @@ class DriftClient {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidator = await this.getUserAccountPublicKey(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: [liquidatorUser, userAccount],
+            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
             writablePerpMarketIndexes: [marketIndex],
             writableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
@@ -5098,18 +5065,11 @@ class DriftClient {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidator = await this.getUserAccountPublicKey(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: [liquidatorUser, userAccount],
+            userAccounts: [this.getUserAccount(liquidatorSubAccountId), 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);
         if (this.isTransferHook(spotMarket)) {
@@ -5151,9 +5111,6 @@ class DriftClient {
     }
     async getUpdatePrelaunchOracleIx(perpMarketIndex) {
         const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
-        if (!perpMarket) {
-            throw new Error(`Perp market account not found for index ${perpMarketIndex}`);
-        }
         if (!(0, types_1.isVariant)(perpMarket.amm.oracleSource, 'prelaunch')) {
             throw new Error(`Wrong oracle source ${perpMarket.amm.oracleSource}`);
         }
@@ -5171,9 +5128,6 @@ class DriftClient {
     }
     async getUpdatePerpBidAskTwapIx(perpMarketIndex, makers) {
         const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
-        if (!perpMarket) {
-            throw new Error(`Perp market account not found for index ${perpMarketIndex}`);
-        }
         const remainingAccounts = [];
         for (const [maker, makerStats] of makers) {
             remainingAccounts.push({
@@ -5226,19 +5180,11 @@ class DriftClient {
         this.eventEmitter.emit(eventName, data);
     }
     getOracleDataForPerpMarket(marketIndex) {
-        var _a;
-        return (_a = this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
+        return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data;
     }
     getMMOracleDataForPerpMarket(marketIndex) {
-        var _a;
         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(numericConstants_1.ZERO);
         const pctDiff = perpMarket.amm.mmOraclePrice
@@ -5261,7 +5207,7 @@ class DriftClient {
             isExchangeOracleMoreRecent = false;
         }
         else if (!doSlotCheckForRecency &&
-            ((_a = oracleData.sequenceId) !== null && _a !== void 0 ? _a : numericConstants_1.ZERO) < mmOracleSequenceId) {
+            oracleData.sequenceId < mmOracleSequenceId) {
             isExchangeOracleMoreRecent = false;
         }
         const conf = (0, utils_3.getOracleConfidenceFromMMOracleData)(perpMarket.amm.mmOraclePrice, oracleData);
@@ -5288,8 +5234,7 @@ class DriftClient {
         }
     }
     getOracleDataForSpotMarket(marketIndex) {
-        var _a;
-        return (_a = this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
+        return this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(marketIndex).data;
     }
     async initializeInsuranceFundStake(marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getInitializeInsuranceFundStakeIx(marketIndex), txParams), [], this.opts);
@@ -5297,13 +5242,9 @@ class DriftClient {
     }
     async getInitializeInsuranceFundStakeIx(marketIndex) {
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarket) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const accounts = {
             insuranceFundStake: ifStakeAccountPublicKey,
-            spotMarket: spotMarket.pubkey,
+            spotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
             userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey // only allow payer to initialize own insurance fund stake account
             ),
             authority: this.wallet.publicKey,
@@ -5318,9 +5259,6 @@ class DriftClient {
     }
     async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarket) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
@@ -5368,9 +5306,6 @@ class DriftClient {
     async getAddInsuranceFundStakeIxs({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }) {
         const addIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarketAccount) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
         const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarketAccount);
@@ -5409,9 +5344,6 @@ class DriftClient {
     }
     async requestRemoveInsuranceFundStake(marketIndex, amount, txParams) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarketAccount) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const ix = await this.program.instruction.requestRemoveInsuranceFundStake(marketIndex, amount, {
             accounts: {
@@ -5430,9 +5362,6 @@ class DriftClient {
     }
     async cancelRequestRemoveInsuranceFundStake(marketIndex, txParams) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarketAccount) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const ix = await this.program.instruction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
             accounts: {
@@ -5452,9 +5381,6 @@ class DriftClient {
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, txParams) {
         const removeIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarketAccount) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const additionalSigners = [];
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -5514,9 +5440,6 @@ class DriftClient {
     async getUpdateUserQuoteAssetInsuranceStakeIx(authority) {
         const marketIndex = numericConstants_1.QUOTE_SPOT_MARKET_INDEX;
         const spotMarket = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarket) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, authority, marketIndex);
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
         const ix = this.program.instruction.updateUserQuoteAssetInsuranceStake({
@@ -5540,9 +5463,6 @@ class DriftClient {
     async getUpdateUserGovTokenInsuranceStakeIx(authority) {
         const marketIndex = numericConstants_1.GOV_SPOT_MARKET_INDEX;
         const spotMarket = this.getSpotMarketAccount(marketIndex);
-        if (!spotMarket) {
-            throw new Error(`Spot market account not found for index ${marketIndex}`);
-        }
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, authority, marketIndex);
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
         const ix = this.program.instruction.updateUserGovTokenInsuranceStake({
@@ -5564,9 +5484,6 @@ class DriftClient {
     }
     async getSettleRevenueToInsuranceFundIx(spotMarketIndex) {
         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 = [];
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
@@ -5591,19 +5508,12 @@ class DriftClient {
         return txSig;
     }
     async getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex) {
-        const userAccount = this.getUserAccount();
-        if (!userAccount) {
-            throw new Error(`User account not found. Something is wrong with driftClient config`);
-        }
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [userAccount],
+            userAccounts: [this.getUserAccount()],
             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(spotMarketIndex, perpMarketIndex, {
             accounts: {
@@ -5619,9 +5529,6 @@ class DriftClient {
     }
     async getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey) {
         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);
         if (this.isTransferHook(spotMarket)) {
@@ -5656,13 +5563,7 @@ class DriftClient {
     getPerpMarketExtendedInfo(marketIndex) {
         var _a, _b;
         const marketAccount = this.getPerpMarketAccount(marketIndex);
-        if (!marketAccount) {
-            return undefined;
-        }
         const quoteAccount = this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-        if (!quoteAccount) {
-            throw new Error(`Quote spot market account not found. Something is wrong with driftClient config`);
-        }
         const extendedInfo = {
             marketIndex,
             minOrderSize: (_a = marketAccount.amm) === null || _a === void 0 ? void 0 : _a.minOrderSize,
@@ -5680,7 +5581,7 @@ class DriftClient {
      * @returns : {takerFee: number, makerFee: number} Precision None
      */
     getMarketFees(marketType, marketIndex, user, enteringHighLeverageMode) {
-        var _a, _b;
+        var _a;
         let feeTier;
         const userHLM = ((_a = user === null || user === void 0 ? void 0 : user.isHighLeverageMode('Initial')) !== null && _a !== void 0 ? _a : false) ||
             enteringHighLeverageMode;
@@ -5697,19 +5598,17 @@ class DriftClient {
         let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
         if (marketIndex !== undefined) {
             let marketAccount = null;
-            let feeAdjustment = 1;
             if ((0, types_1.isVariant)(marketType, 'perp')) {
                 marketAccount = this.getPerpMarketAccount(marketIndex);
-                feeAdjustment = (_b = marketAccount === null || marketAccount === void 0 ? void 0 : marketAccount.feeAdjustment) !== null && _b !== void 0 ? _b : 0;
             }
             else {
                 marketAccount = this.getSpotMarketAccount(marketIndex);
             }
-            takerFee += (takerFee * feeAdjustment) / 100;
+            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
             if (userHLM) {
                 takerFee *= 2;
             }
-            makerFee += (makerFee * feeAdjustment) / 100;
+            makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
         }
         return {
             takerFee,
@@ -5893,9 +5792,6 @@ class DriftClient {
     // @deprecated use getPostManySwitchboardOnDemandUpdatesAtomicIxs instead. This function no longer returns the required ixs due to upstream sdk changes.
     async getPostSwitchboardOnDemandUpdateAtomicIx(feed, recentSlothash, numSignatures = 3) {
         const program = await this.getSwitchboardOnDemandProgram();
-        if (!program) {
-            return undefined;
-        }
         const feedAccount = new on_demand_1.PullFeed(program, feed);
         if (!this.sbProgramFeedConfigs) {
             this.sbProgramFeedConfigs = new Map();
@@ -5983,14 +5879,11 @@ class DriftClient {
         return txSig;
     }
     async getEnableHighLeverageModeIx(subAccountId, depositToTradeArgs, overrides) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const isDepositToTradeTx = depositToTradeArgs !== undefined;
         const userAccountPublicKey = (_b = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.user) === null || _a === void 0 ? void 0 : _a.getUserAccountPublicKey()) !== null && _b !== void 0 ? _b : (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
         const signingAuthority = (_c = overrides === null || overrides === void 0 ? void 0 : overrides.signingAuthority) !== null && _c !== void 0 ? _c : this.wallet.publicKey;
-        const userAccount = (_e = (_d = overrides === null || overrides === void 0 ? void 0 : overrides.user) === null || _d === void 0 ? void 0 : _d.getUserAccount()) !== null && _e !== void 0 ? _e : this.getUserAccount(subAccountId);
-        if (!userAccount) {
-            throw new Error(`User account not found for subAccountId ${subAccountId}`);
-        }
+        const userAccount = (_d = overrides === null || overrides === void 0 ? void 0 : overrides.user.getUserAccount()) !== null && _d !== void 0 ? _d : this.getUserAccount(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: (depositToTradeArgs === null || depositToTradeArgs === void 0 ? void 0 : depositToTradeArgs.isMakingNewAccount) ? [] : [userAccount],
             useMarketLastSlotCache: false,
@@ -6056,9 +5949,6 @@ class DriftClient {
     }
     async getPauseSpotMarketDepositWithdrawIx(spotMarketIndex) {
         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(),
@@ -6087,16 +5977,12 @@ class DriftClient {
         data.set(discriminatorBuffer, 0);
         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 web3_js_1.TransactionInstruction({
             programId: this.program.programId,
             keys: [
                 {
-                    pubkey: perpMarket.pubkey,
+                    pubkey: this.getPerpMarketAccount(marketIndex).pubkey,
                     isWritable: true,
                     isSigner: false,
                 },
@@ -6134,16 +6020,12 @@ class DriftClient {
         const data = Buffer.alloc(discriminatorBuffer.length + 4);
         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 web3_js_1.TransactionInstruction({
             programId: this.program.programId,
             keys: [
                 {
-                    pubkey: perpMarket.pubkey,
+                    pubkey: this.getPerpMarketAccount(marketIndex).pubkey,
                     isWritable: true,
                     isSigner: false,
                 },
@@ -6232,16 +6114,12 @@ class DriftClient {
             userAccounts: [],
             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: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
-                quoteMarket: quoteMarket.pubkey,
+                quoteMarket: this.getSpotMarketAccount(0).pubkey,
             },
             remainingAccounts,
         });
@@ -6252,9 +6130,6 @@ class DriftClient {
     }
     async getUpdateConstituentOracleInfoIx(constituent) {
         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,
@@ -6276,20 +6151,12 @@ class DriftClient {
         });
         const constituentInTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool, inMarketIndex);
         const constituentOutTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, 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 (0, spl_token_1.getAssociatedTokenAddress)(inSpotMarket.mint, userAuthority);
-        const userOutTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(outSpotMarket.mint, userAuthority);
+        const userInTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccount(inMarketIndex).mint, userAuthority);
+        const userOutTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccount(outMarketIndex).mint, userAuthority);
         const inConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, inMarketIndex);
         const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, outMarketIndex);
-        const inMarketMint = inSpotMarket.mint;
-        const outMarketMint = outSpotMarket.mint;
+        const inMarketMint = this.getSpotMarketAccount(inMarketIndex).mint;
+        const outMarketMint = this.getSpotMarketAccount(outMarketIndex).mint;
         const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool);
         return this.program.instruction.lpPoolSwap(inMarketIndex, outMarketIndex, inAmount, minOutAmount, {
             remainingAccounts,
@@ -6362,9 +6229,6 @@ class DriftClient {
             writableSpotMarketIndexes: [inMarketIndex],
         });
         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(spotMarkets_1.WRAPPED_SOL_MINT);
         let wSolTokenAccount;
@@ -6460,9 +6324,6 @@ class DriftClient {
             writableSpotMarketIndexes: [outMarketIndex],
         });
         const spotMarket = this.getSpotMarketAccount(outMarketIndex);
-        if (!spotMarket) {
-            throw new Error(`Spot market account not found for index ${outMarketIndex}`);
-        }
         const outMarketMint = spotMarket.mint;
         const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, outMarketIndex);
         if (outMarketMint.equals(spotMarkets_1.WRAPPED_SOL_MINT)) {
@@ -6509,9 +6370,6 @@ class DriftClient {
             writableSpotMarketIndexes: [outMarketIndex],
         });
         const spotMarket = this.getSpotMarketAccount(outMarketIndex);
-        if (!spotMarket) {
-            throw new Error(`Spot market account not found for index ${outMarketIndex}`);
-        }
         const outMarketMint = spotMarket.mint;
         const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, outMarketIndex);
         const lpMint = lpPool.mint;
@@ -6610,9 +6468,8 @@ class DriftClient {
     async getSettlePerpToLpPoolIx(lpPoolId, perpMarketIndexes) {
         const remainingAccounts = [];
         remainingAccounts.push(...perpMarketIndexes.map((index) => {
-            var _a, _b;
             return {
-                pubkey: (_b = (_a = this.getPerpMarketAccount(index)) === null || _a === void 0 ? void 0 : _a.pubkey) !== null && _b !== void 0 ? _b : web3_js_1.PublicKey.default,
+                pubkey: this.getPerpMarketAccount(index).pubkey,
                 isSigner: false,
                 isWritable: true,
             };
@@ -6676,13 +6533,12 @@ class DriftClient {
         }
     }
     async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockhash, optionalIxs) {
-        var _a, _b;
         return this.txHandler.buildTransaction({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
             txParams: txParams !== null && txParams !== void 0 ? txParams : this.txParams,
             connection: this.connection,
-            preFlightCommitment: (_b = (_a = this.opts) === null || _a === void 0 ? void 0 : _a.preflightCommitment) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_COMMITMENT_LEVEL,
+            preFlightCommitment: this.opts.preflightCommitment,
             fetchAllMarketLookupTableAccounts: this.fetchAllLookupTableAccounts.bind(this),
             lookupTables,
             forceVersionedTransaction,
@@ -6691,40 +6547,36 @@ class DriftClient {
         });
     }
     async buildBulkTransactions(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction) {
-        var _a, _b;
-        const txns = await this.txHandler.buildBulkTransactions({
+        return this.txHandler.buildBulkTransactions({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
             txParams: txParams !== null && txParams !== void 0 ? txParams : this.txParams,
             connection: this.connection,
-            preFlightCommitment: (_b = (_a = this.opts) === null || _a === void 0 ? void 0 : _a.preflightCommitment) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_COMMITMENT_LEVEL,
+            preFlightCommitment: this.opts.preflightCommitment,
             fetchAllMarketLookupTableAccounts: this.fetchAllLookupTableAccounts.bind(this),
             lookupTables,
             forceVersionedTransaction,
         });
-        return txns.filter(Boolean);
     }
     async buildTransactionsMap(instructionsMap, txParams, txVersion, lookupTables, forceVersionedTransaction) {
-        var _a, _b;
         return this.txHandler.buildTransactionsMap({
             instructionsMap,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
             txParams: txParams !== null && txParams !== void 0 ? txParams : this.txParams,
             connection: this.connection,
-            preFlightCommitment: (_b = (_a = this.opts) === null || _a === void 0 ? void 0 : _a.preflightCommitment) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_COMMITMENT_LEVEL,
+            preFlightCommitment: this.opts.preflightCommitment,
             fetchAllMarketLookupTableAccounts: this.fetchAllLookupTableAccounts.bind(this),
             lookupTables,
             forceVersionedTransaction,
         });
     }
     async buildAndSignTransactionsMap(instructionsMap, txParams, txVersion, lookupTables, forceVersionedTransaction) {
-        var _a, _b;
         return this.txHandler.buildAndSignTransactionMap({
             instructionsMap,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
             txParams: txParams !== null && txParams !== void 0 ? txParams : this.txParams,
             connection: this.connection,
-            preFlightCommitment: (_b = (_a = this.opts) === null || _a === void 0 ? void 0 : _a.preflightCommitment) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_COMMITMENT_LEVEL,
+            preFlightCommitment: this.opts.preflightCommitment,
             fetchAllMarketLookupTableAccounts: this.fetchAllLookupTableAccounts.bind(this),
             lookupTables,
             forceVersionedTransaction,