@drift-labs/sdk 2.163.0-beta.0 → 2.163.0-beta.11

package/src/driftClient.ts

@@ -1,12 +1,19 @@
+/**
+ * DriftClient — main SDK entry point for all trading and keeper operations.
+ *
+ * Responsibilities:
+ *   - Builds and sends all on-chain instructions (place/cancel/fill orders, deposits, withdrawals,
+ *     settle PnL, update funding rate, liquidations).
+ *   - Manages the program account subscription lifecycle (markets, oracles, user accounts).
+ *   - Provides oracle price reads, market config lookups, and PDA derivation helpers.
+ *
+ * Admin operations (market init, fee updates, oracle config) live in {@link AdminClient} (adminClient.ts).
+ * Read-only user account queries (margin, positions, PnL) live in {@link User} (user.ts).
+ *
+ * Instruction → on-chain handler mapping: see ARCHITECTURE.md § SDK↔Instruction Mapping.
+ */
 import * as anchor from '@coral-xyz/anchor';
-import {
-	AnchorProvider,
-	BN,
-	Idl,
-	Program,
-	ProgramAccount,
-} from '@coral-xyz/anchor';
-import { Idl as Idl30, Program as Program30 } from '@coral-xyz/anchor-30';
+import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import bs58 from 'bs58';
 import {
 	ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -26,7 +33,6 @@ import {
 } from '@solana/spl-token';
 import {
 	DriftClientMetricsEvents,
-	HighLeverageModeConfig,
 	isVariant,
 	IWallet,
 	MakerInfo,
@@ -72,6 +78,10 @@ import {
 } from './types';
 import driftIDL from './idl/drift.json';
 
+/** Client-side guardrail; mirrors on-chain `ErrorCode::SpotDlobTradingDisabled`. */
+const SPOT_DLOB_TRADING_DISABLED_MSG =
+	'Spot DLOB trading is disabled; spot balances, deposits, and swaps remain available.';
+
 import {
 	AccountMeta,
 	AddressLookupTableAccount,
@@ -99,14 +109,12 @@ import {
 	getDriftSignerPublicKey,
 	getDriftStateAccountPublicKey,
 	getFuelOverflowAccountPublicKey,
-	getHighLeverageModeConfigPublicKey,
 	getInsuranceFundStakeAccountPublicKey,
 	getOpenbookV2FulfillmentConfigPublicKey,
 	getPerpMarketPublicKey,
 	getPhoenixFulfillmentConfigPublicKey,
 	getProtectedMakerModeConfigPublicKey,
 	getPythLazerOraclePublicKey,
-	getPythPullOraclePublicKey,
 	getReferrerNamePublicKeySync,
 	getSerumFulfillmentConfigPublicKey,
 	getSerumSignerPublicKey,
@@ -164,12 +172,12 @@ import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
 import {
 	configs,
-	DRIFT_ORACLE_RECEIVER_ID,
 	DEFAULT_CONFIRMATION_OPTS,
-	DRIFT_PROGRAM_ID,
 	DriftEnv,
+	DriftProgram,
 	PYTH_LAZER_STORAGE_ACCOUNT_KEY,
 } from './config';
+import { Drift } from './idl/drift';
 import { WRAPPED_SOL_MINT } from './constants/spotMarkets';
 import { UserStats } from './userStats';
 import { isSpotPositionAvailable } from './math/spotPosition';
@@ -181,28 +189,19 @@ import { SwapMode, UnifiedQuoteResponse } from './swap/UnifiedSwapClient';
 import { getNonIdleUserFilter } from './memcmp';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { getMarinadeDepositIx, getMarinadeFinanceProgram } from './marinade';
-import { getOrderParams, isUpdateHighLeverageMode } from './orderParams';
+import { getOrderParams } from './orderParams';
 import { numberToSafeBN } from './math/utils';
 import { TransactionParamProcessor } from './tx/txParamProcessor';
-import {
-	isOracleTooDivergent,
-	isOracleValid,
-	trimVaaSignatures,
-} from './math/oracles';
+import { isOracleTooDivergent, isOracleValid } from './math/oracles';
 import { TxHandler } from './tx/txHandler';
-import { parseAccumulatorUpdateData } from '@pythnetwork/price-service-sdk';
-import { getFeedIdUint8Array, trimFeedId } from './util/pythOracleUtils';
 import { createMinimalEd25519VerifyIx } from './util/ed25519Utils';
 import {
 	createNativeInstructionDiscriminatorBuffer,
 	isVersionedTransaction,
 	MAX_TX_BYTE_SIZE,
 } from './tx/utils';
-import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
-import { asV0Tx, PullFeed, AnchorUtils } from '@switchboard-xyz/on-demand';
 import { grpcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 import nacl from 'tweetnacl';
-import { Slothash } from './slot/SlothashSubscriber';
 import { getOracleId } from './oracles/oracleId';
 import { SignedMsgOrderParams } from './types';
 import { TakerInfo } from './types';
@@ -218,15 +217,6 @@ import {
 } from './math/builder';
 import { TitanClient, SwapMode as TitanSwapMode } from './titan/titanClient';
 import { UnifiedSwapClient } from './swap/UnifiedSwapClient';
-import {
-	DEFAULT_RECEIVER_PROGRAM_ID,
-	WORMHOLE_CORE_BRIDGE_SOLANA_IDL,
-	DEFAULT_WORMHOLE_PROGRAM_ID,
-	getGuardianSetPda,
-	WormholeCoreBridgeSolana,
-	PythSolanaReceiver,
-} from './pyth';
-
 /**
  * Union type for swap clients (Titan and Jupiter) - Legacy type
  * @deprecated Use UnifiedSwapClient class instead
@@ -249,7 +239,7 @@ type RemainingAccountParams = {
 export class DriftClient {
 	connection: Connection;
 	wallet: IWallet;
-	public program: Program;
+	public program: DriftProgram;
 	provider: AnchorProvider;
 	env: DriftEnv;
 	opts?: ConfirmOptions;
@@ -290,12 +280,6 @@ export class DriftClient {
 
 	txHandler: TxHandler;
 
-	receiverProgram?: Program<PythSolanaReceiver>;
-	wormholeProgram?: Program<WormholeCoreBridgeSolana>;
-	sbOnDemandProgramdId: PublicKey;
-	sbOnDemandProgram?: Program30<Idl30>;
-	sbProgramFeedConfigs?: Map<string, any>;
-
 	public get isSubscribed() {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
 	}
@@ -363,9 +347,8 @@ export class DriftClient {
 			config.wallet,
 			this.opts
 		);
-		this.program = new Program(
-			driftIDL as Idl,
-			config.programID ?? new PublicKey(DRIFT_PROGRAM_ID),
+		this.program = new Program<Drift>(
+			driftIDL as Drift,
 			this.provider,
 			config.coder
 		);
@@ -504,12 +487,12 @@ export class DriftClient {
 				delistedMarketSetting
 			);
 		} else if (config.accountSubscription?.type === 'grpc') {
-			const accountSubscriberClass =
+			const accountSubscriberClass: any =
 				config.accountSubscription?.driftClientAccountSubscriber ??
 				grpcDriftClientAccountSubscriber;
 			this.accountSubscriber = new accountSubscriberClass(
 				config.accountSubscription.grpcConfigs,
-				this.program,
+				this.program as any,
 				config.perpMarketIndexes ?? [],
 				config.spotMarketIndexes ?? [],
 				config.oracleInfos ?? [],
@@ -521,11 +504,11 @@ export class DriftClient {
 				}
 			);
 		} else {
-			const accountSubscriberClass =
+			const accountSubscriberClass: any =
 				config.accountSubscription?.driftClientAccountSubscriber ??
 				WebSocketDriftClientAccountSubscriber;
 			this.accountSubscriber = new accountSubscriberClass(
-				this.program,
+				this.program as any,
 				config.perpMarketIndexes ?? [],
 				config.spotMarketIndexes ?? [],
 				config.oracleInfos ?? [],
@@ -554,8 +537,6 @@ export class DriftClient {
 				opts: this.opts,
 				txHandler: this.txHandler,
 			});
-
-		this.sbOnDemandProgramdId = configs[this.env].SB_ON_DEMAND_PID;
 	}
 
 	public getUserMapKey(subAccountId: number, authority: PublicKey): string {
@@ -739,7 +720,7 @@ export class DriftClient {
 			this.program.programId,
 			serumMarket
 		);
-		return (await this.program.account.serumV3FulfillmentConfig.fetch(
+		return (await (this.program.account as any).serumV3FulfillmentConfig.fetch(
 			address
 		)) as SerumV3FulfillmentConfigAccount;
 	}
@@ -747,7 +728,9 @@ export class DriftClient {
 	public async getSerumV3FulfillmentConfigs(): Promise<
 		SerumV3FulfillmentConfigAccount[]
 	> {
-		const accounts = await this.program.account.serumV3FulfillmentConfig.all();
+		const accounts = await (
+			this.program.account as any
+		).serumV3FulfillmentConfig.all();
 		return accounts.map(
 			(account) => account.account
 		) as SerumV3FulfillmentConfigAccount[];
@@ -760,7 +743,9 @@ export class DriftClient {
 			this.program.programId,
 			phoenixMarket
 		);
-		return (await this.program.account.phoenixV1FulfillmentConfig.fetch(
+		return (await (
+			this.program.account as any
+		).phoenixV1FulfillmentConfig.fetch(
 			address
 		)) as PhoenixV1FulfillmentConfigAccount;
 	}
@@ -768,8 +753,9 @@ export class DriftClient {
 	public async getPhoenixV1FulfillmentConfigs(): Promise<
 		PhoenixV1FulfillmentConfigAccount[]
 	> {
-		const accounts =
-			await this.program.account.phoenixV1FulfillmentConfig.all();
+		const accounts = await (
+			this.program.account as any
+		).phoenixV1FulfillmentConfig.all();
 		return accounts.map(
 			(account) => account.account
 		) as PhoenixV1FulfillmentConfigAccount[];
@@ -782,7 +768,9 @@ export class DriftClient {
 			this.program.programId,
 			openbookMarket
 		);
-		return (await this.program.account.openbookV2FulfillmentConfig.fetch(
+		return (await (
+			this.program.account as any
+		).openbookV2FulfillmentConfig.fetch(
 			address
 		)) as OpenbookV2FulfillmentConfigAccount;
 	}
@@ -790,8 +778,9 @@ export class DriftClient {
 	public async getOpenbookV2FulfillmentConfigs(): Promise<
 		OpenbookV2FulfillmentConfigAccount[]
 	> {
-		const accounts =
-			await this.program.account.openbookV2FulfillmentConfig.all();
+		const accounts = await (
+			this.program.account as any
+		).openbookV2FulfillmentConfig.all();
 		return accounts.map(
 			(account) => account.account
 		) as OpenbookV2FulfillmentConfigAccount[];
@@ -870,11 +859,7 @@ export class DriftClient {
 			newWallet,
 			this.opts
 		);
-		const newProgram = new Program(
-			driftIDL as Idl,
-			this.program.programId,
-			newProvider
-		);
+		const newProgram = new Program<Drift>(driftIDL as Drift, newProvider);
 
 		this.skipLoadUsers = false;
 		// Update provider for txSender with new wallet details
@@ -1419,7 +1404,7 @@ export class DriftClient {
 			this.program.programId,
 			authority
 		);
-		return this.program.instruction.migrateReferrer({
+		return (this.program.instruction as any).migrateReferrer({
 			accounts: {
 				escrow,
 				authority,
@@ -1884,21 +1869,14 @@ export class DriftClient {
 		perpMarketIndex: number,
 		marginRatio: number,
 		subAccountId = 0,
-		txParams?: TxParams,
-		enterHighLeverageMode?: boolean
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const ixs = [];
-		if (enterHighLeverageMode) {
-			const enableIx = await this.getEnableHighLeverageModeIx(subAccountId);
-			ixs.push(enableIx);
-		}
 		const updateIx = await this.getUpdateUserPerpPositionCustomMarginRatioIx(
 			perpMarketIndex,
 			marginRatio,
 			subAccountId
 		);
-		ixs.push(updateIx);
-		const tx = await this.buildTransaction(ixs, txParams ?? this.txParams);
+		const tx = await this.buildTransaction(updateIx, txParams ?? this.txParams);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
@@ -2021,7 +1999,7 @@ export class DriftClient {
 		advancedLp: boolean,
 		subAccountId: number
 	) {
-		const ix = await this.program.instruction.updateUserAdvancedLp(
+		const ix = await (this.program.instruction as any).updateUserAdvancedLp(
 			subAccountId,
 			advancedLp,
 			{
@@ -2117,7 +2095,7 @@ export class DriftClient {
 		if (!includeIdle) {
 			filters = [getNonIdleUserFilter()];
 		}
-		return (await this.program.account.user.all(
+		return (await (this.program.account as any).user.all(
 			filters
 		)) as ProgramAccount<UserAccount>[];
 	}
@@ -2125,7 +2103,7 @@ export class DriftClient {
 	public async getUserAccountsForDelegate(
 		delegate: PublicKey
 	): Promise<UserAccount[]> {
-		const programAccounts = await this.program.account.user.all([
+		const programAccounts = await (this.program.account as any).user.all([
 			{
 				memcmp: {
 					offset: 40,
@@ -2143,7 +2121,7 @@ export class DriftClient {
 	public async getUserAccountsAndAddressesForAuthority(
 		authority: PublicKey
 	): Promise<ProgramAccount<UserAccount>[]> {
-		const programAccounts = await this.program.account.user.all([
+		const programAccounts = await (this.program.account as any).user.all([
 			{
 				memcmp: {
 					offset: 8,
@@ -2161,7 +2139,7 @@ export class DriftClient {
 	public async getUserAccountsForAuthority(
 		authority: PublicKey
 	): Promise<UserAccount[]> {
-		const programAccounts = await this.program.account.user.all([
+		const programAccounts = await (this.program.account as any).user.all([
 			{
 				memcmp: {
 					offset: 8,
@@ -2179,7 +2157,7 @@ export class DriftClient {
 	public async getReferredUserStatsAccountsByReferrer(
 		referrer: PublicKey
 	): Promise<UserStatsAccount[]> {
-		const programAccounts = await this.program.account.userStats.all([
+		const programAccounts = await (this.program.account as any).userStats.all([
 			{
 				memcmp: {
 					offset: 40,
@@ -2190,14 +2168,16 @@ export class DriftClient {
 		]);
 
 		return programAccounts.map(
-			(programAccount) => programAccount.account as UserStatsAccount
+			(programAccount) => programAccount.account as unknown as UserStatsAccount
 		);
 	}
 
 	public async getReferrerNameAccountsForAuthority(
 		authority: PublicKey
 	): Promise<ReferrerNameAccount[]> {
-		const programAccounts = await this.program.account.referrerName.all([
+		const programAccounts = await (
+			this.program.account as any
+		).referrerName.all([
 			{
 				memcmp: {
 					offset: 8,
@@ -2366,7 +2346,9 @@ export class DriftClient {
 	}
 
 	public async getSignedMsgUserOrdersDeletionIx(authority: PublicKey) {
-		const ix = await this.program.instruction.deleteSignedMsgUserOrders({
+		const ix = await (
+			this.program.instruction as any
+		).deleteSignedMsgUserOrders({
 			accounts: {
 				user: authority,
 				signedMsgUserOrders: getSignedMsgUserAccountPublicKey(
@@ -2475,7 +2457,7 @@ export class DriftClient {
 			this.program.programId,
 			nameBuffer
 		);
-		return (await this.program.account.referrerName.fetch(
+		return (await (this.program.account as any).referrerName.fetch(
 			referrerNameAccountPublicKey
 		)) as ReferrerNameAccount;
 	}
@@ -3191,7 +3173,7 @@ export class DriftClient {
 
 		const authority = overrides?.authority ?? this.wallet.publicKey;
 		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
-		return await this.program.instruction.deposit(
+		return await (this.program.instruction as any).deposit(
 			marketIndex,
 			amount,
 			reduceOnly,
@@ -3894,7 +3876,7 @@ export class DriftClient {
 
 		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
 
-		return await this.program.instruction.withdraw(
+		return await (this.program.instruction as any).withdraw(
 			marketIndex,
 			amount,
 			reduceOnly,
@@ -3988,7 +3970,7 @@ export class DriftClient {
 				fromSubAccountId
 			);
 
-			const fromUserAccount = (await this.program.account.user.fetch(
+			const fromUserAccount = (await (this.program.account as any).user.fetch(
 				userAccountPublicKey
 			)) as UserAccount;
 			remainingAccounts = this.getRemainingAccounts({
@@ -4210,6 +4192,46 @@ export class DriftClient {
 		);
 	}
 
+	public async specialTransferPerpPositionToVamm(
+		userAccountPublicKey: PublicKey,
+		marketIndex: number,
+		amount?: BN,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const ix = await this.getSpecialTransferPerpPositionToVammIx(
+			userAccountPublicKey,
+			marketIndex,
+			amount
+		);
+		const tx = await this.buildTransaction(ix, txParams);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
+	public async getSpecialTransferPerpPositionToVammIx(
+		userAccountPublicKey: PublicKey,
+		marketIndex: number,
+		amount?: BN
+	): Promise<TransactionInstruction> {
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [],
+			writablePerpMarketIndexes: [marketIndex],
+		});
+
+		return this.program.instruction.specialTransferPerpPositionToVamm(
+			marketIndex,
+			amount ?? null,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user: userAccountPublicKey,
+					authority: this.wallet.publicKey,
+				},
+				remainingAccounts,
+			}
+		);
+	}
+
 	async depositIntoIsolatedPerpPosition(
 		amount: BN,
 		perpMarketIndex: number,
@@ -4538,7 +4560,7 @@ export class DriftClient {
 		settleeUserAccountPublicKey: PublicKey,
 		marketIndex: number
 	): Promise<TransactionInstruction> {
-		const settleeUserAccount = (await this.program.account.user.fetch(
+		const settleeUserAccount = (await (this.program.account as any).user.fetch(
 			settleeUserAccountPublicKey
 		)) as UserAccount;
 
@@ -4547,7 +4569,7 @@ export class DriftClient {
 			writablePerpMarketIndexes: [marketIndex],
 		});
 
-		return this.program.instruction.settleLp(marketIndex, {
+		return (this.program.instruction as any).settleLp(marketIndex, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user: settleeUserAccountPublicKey,
@@ -4603,7 +4625,7 @@ export class DriftClient {
 		userAccountPublicKey: PublicKey,
 		sharesToBurn?: BN
 	): Promise<TransactionInstruction> {
-		const userAccount = (await this.program.account.user.fetch(
+		const userAccount = (await (this.program.account as any).user.fetch(
 			userAccountPublicKey
 		)) as UserAccount;
 
@@ -4620,7 +4642,7 @@ export class DriftClient {
 			console.log('burning lp shares:', sharesToBurn.toString());
 		}
 
-		return this.program.instruction.removePerpLpSharesInExpiringMarket(
+		return (this.program.instruction as any).removePerpLpSharesInExpiringMarket(
 			sharesToBurn,
 			marketIndex,
 			{
@@ -4654,7 +4676,7 @@ export class DriftClient {
 			console.log('burning lp shares:', sharesToBurn.toString());
 		}
 
-		return this.program.instruction.removePerpLpShares(
+		return (this.program.instruction as any).removePerpLpShares(
 			sharesToBurn,
 			marketIndex,
 			{
@@ -4698,14 +4720,18 @@ export class DriftClient {
 			writablePerpMarketIndexes: [marketIndex],
 		});
 
-		return this.program.instruction.addPerpLpShares(amount, marketIndex, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user,
-				authority: this.wallet.publicKey,
-			},
-			remainingAccounts: remainingAccounts,
-		});
+		return (this.program.instruction as any).addPerpLpShares(
+			amount,
+			marketIndex,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user,
+					authority: this.wallet.publicKey,
+				},
+				remainingAccounts: remainingAccounts,
+			}
+		);
 	}
 
 	public getQuoteValuePerLpShare(marketIndex: number): BN {
@@ -5018,15 +5044,7 @@ export class DriftClient {
 				: undefined,
 		});
 
-		if (isUpdateHighLeverageMode(orderParams.bitFlags)) {
-			remainingAccounts.push({
-				pubkey: getHighLeverageModeConfigPublicKey(this.program.programId),
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
-		return await this.program.instruction.placePerpOrder(orderParams, {
+		return await (this.program.instruction as any).placePerpOrder(orderParams, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user,
@@ -5248,15 +5266,18 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-		return await this.program.instruction.cancelOrderByUserId(userOrderId, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user,
-				authority: this.wallet.publicKey,
-				oracle,
-			},
-			remainingAccounts,
-		});
+		return await (this.program.instruction as any).cancelOrderByUserId(
+			userOrderId,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user,
+					authority: this.wallet.publicKey,
+					oracle,
+				},
+				remainingAccounts,
+			}
+		);
 	}
 
 	/**
@@ -5514,28 +5535,21 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-		for (const param of params) {
-			if (isUpdateHighLeverageMode(param.bitFlags)) {
-				remainingAccounts.push({
-					pubkey: getHighLeverageModeConfigPublicKey(this.program.programId),
-					isWritable: true,
-					isSigner: false,
-				});
-			}
-		}
-
 		const formattedParams = params.map((item) => getOrderParams(item));
 		const authority = overrides?.authority ?? this.wallet.publicKey;
 
-		return await this.program.instruction.placeOrders(formattedParams, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user,
-				userStats: this.getUserStatsAccountPublicKey(),
-				authority,
-			},
-			remainingAccounts,
-		});
+		return await (this.program.instruction as any).placeOrders(
+			formattedParams,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user,
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority,
+				},
+				remainingAccounts,
+			}
+		);
 	}
 
 	public async getPlaceOrdersAndSetPositionMaxLevIx(
@@ -5565,19 +5579,9 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-		for (const param of params) {
-			if (isUpdateHighLeverageMode(param.bitFlags)) {
-				remainingAccounts.push({
-					pubkey: getHighLeverageModeConfigPublicKey(this.program.programId),
-					isWritable: true,
-					isSigner: false,
-				});
-			}
-		}
-
 		const formattedParams = params.map((item) => getOrderParams(item));
 
-		const placeOrdersIxs = await this.program.instruction.placeOrders(
+		const placeOrdersIxs = await (this.program.instruction as any).placeOrders(
 			formattedParams,
 			{
 				accounts: {
@@ -5660,14 +5664,6 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-		if (isUpdateHighLeverageMode(params.bitFlags)) {
-			remainingAccounts.push({
-				pubkey: getHighLeverageModeConfigPublicKey(this.program.programId),
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
 		const formattedParams = {
 			marketType: params.marketType,
 			direction: params.direction,
@@ -5683,15 +5679,18 @@ export class DriftClient {
 			maxTs: params.maxTs,
 		};
 
-		return await this.program.instruction.placeScaleOrders(formattedParams, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user,
-				userStats: this.getUserStatsAccountPublicKey(),
-				authority: this.wallet.publicKey,
-			},
-			remainingAccounts,
-		});
+		return await (this.program.instruction as any).placeScaleOrders(
+			formattedParams,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user,
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority: this.wallet.publicKey,
+				},
+				remainingAccounts,
+			}
+		);
 	}
 
 	public async fillPerpOrder(
@@ -5878,179 +5877,60 @@ export class DriftClient {
 	}
 
 	public async placeSpotOrder(
-		orderParams: OptionalOrderParams,
-		txParams?: TxParams,
-		subAccountId?: number
+		_orderParams: OptionalOrderParams,
+		_txParams?: TxParams,
+		_subAccountId?: number
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.sendTransaction(
-			(await this.preparePlaceSpotOrderTx(orderParams, txParams, subAccountId))
-				.placeSpotOrderTx,
-			[],
-			this.opts,
-			false
-		);
-		this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
-		this.spotMarketLastSlotCache.set(QUOTE_SPOT_MARKET_INDEX, slot);
-		return txSig;
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	public async preparePlaceSpotOrderTx(
-		orderParams: OptionalOrderParams,
-		txParams?: TxParams,
-		subAccountId?: number
+		_orderParams: OptionalOrderParams,
+		_txParams?: TxParams,
+		_subAccountId?: number
 	) {
-		const tx = await this.buildTransaction(
-			await this.getPlaceSpotOrderIx(orderParams, subAccountId),
-			txParams
-		);
-
-		return {
-			placeSpotOrderTx: tx,
-		};
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	public async getPlaceSpotOrderIx(
-		orderParams: OptionalOrderParams,
-		subAccountId?: number,
-		overrides?: {
+		_orderParams: OptionalOrderParams,
+		_subAccountId?: number,
+		_overrides?: {
 			authority?: PublicKey;
 		}
 	): Promise<TransactionInstruction> {
-		orderParams = getOrderParams(orderParams, { marketType: MarketType.SPOT });
-		const userAccountPublicKey = await this.getUserAccountPublicKey(
-			subAccountId
-		);
-		const authority = overrides?.authority ?? this.wallet.publicKey;
-
-		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(subAccountId)],
-			useMarketLastSlotCache: true,
-			readableSpotMarketIndexes: [
-				orderParams.marketIndex,
-				QUOTE_SPOT_MARKET_INDEX,
-			],
-		});
-
-		return await this.program.instruction.placeSpotOrder(orderParams, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user: userAccountPublicKey,
-				userStats: this.getUserStatsAccountPublicKey(),
-				authority,
-			},
-			remainingAccounts,
-		});
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	public async fillSpotOrder(
-		userAccountPublicKey: PublicKey,
-		user: UserAccount,
-		order?: Pick<Order, 'marketIndex' | 'orderId'>,
-		fulfillmentConfig?:
+		_userAccountPublicKey: PublicKey,
+		_user: UserAccount,
+		_order?: Pick<Order, 'marketIndex' | 'orderId'>,
+		_fulfillmentConfig?:
 			| SerumV3FulfillmentConfigAccount
 			| PhoenixV1FulfillmentConfigAccount
 			| OpenbookV2FulfillmentConfigAccount,
-		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
-		txParams?: TxParams
+		_makerInfo?: MakerInfo | MakerInfo[],
+		_referrerInfo?: ReferrerInfo,
+		_txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.sendTransaction(
-			await this.buildTransaction(
-				await this.getFillSpotOrderIx(
-					userAccountPublicKey,
-					user,
-					order,
-					fulfillmentConfig,
-					makerInfo,
-					referrerInfo
-				),
-				txParams
-			),
-			[],
-			this.opts
-		);
-		return txSig;
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	public async getFillSpotOrderIx(
-		userAccountPublicKey: PublicKey,
-		userAccount: UserAccount,
-		order?: Pick<Order, 'marketIndex' | 'orderId'>,
-		fulfillmentConfig?:
+		_userAccountPublicKey: PublicKey,
+		_userAccount: UserAccount,
+		_order?: Pick<Order, 'marketIndex' | 'orderId'>,
+		_fulfillmentConfig?:
 			| SerumV3FulfillmentConfigAccount
 			| PhoenixV1FulfillmentConfigAccount
 			| OpenbookV2FulfillmentConfigAccount,
-		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
-		fillerPublicKey?: PublicKey
+		_makerInfo?: MakerInfo | MakerInfo[],
+		_referrerInfo?: ReferrerInfo,
+		_fillerPublicKey?: PublicKey
 	): Promise<TransactionInstruction> {
-		const userStatsPublicKey = getUserStatsAccountPublicKey(
-			this.program.programId,
-			userAccount.authority
-		);
-
-		const filler = fillerPublicKey ?? (await this.getUserAccountPublicKey());
-		const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
-
-		const marketIndex = order
-			? order.marketIndex
-			: userAccount.orders.find(
-					(order) => order.orderId === userAccount.nextOrderId - 1
-			  ).marketIndex;
-
-		makerInfo = Array.isArray(makerInfo)
-			? makerInfo
-			: makerInfo
-			? [makerInfo]
-			: [];
-
-		const userAccounts = [userAccount];
-		for (const maker of makerInfo) {
-			userAccounts.push(maker.makerUserAccount);
-		}
-		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts,
-			writableSpotMarketIndexes: [marketIndex, QUOTE_SPOT_MARKET_INDEX],
-		});
-
-		for (const maker of makerInfo) {
-			remainingAccounts.push({
-				pubkey: maker.maker,
-				isWritable: true,
-				isSigner: false,
-			});
-			remainingAccounts.push({
-				pubkey: maker.makerStats,
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
-		const orderId = order.orderId;
-
-		this.addSpotFulfillmentAccounts(
-			marketIndex,
-			remainingAccounts,
-			fulfillmentConfig
-		);
-
-		return await this.program.instruction.fillSpotOrder(
-			orderId,
-			fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null,
-			null,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					filler,
-					fillerStats: fillerStatsPublicKey,
-					user: userAccountPublicKey,
-					userStats: userStatsPublicKey,
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
-	}
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
+	}
 
 	addSpotFulfillmentAccounts(
 		marketIndex: number,
@@ -7238,7 +7118,7 @@ export class DriftClient {
 	public async getLogUserBalancesIx(
 		userAccountPublicKey: PublicKey
 	): Promise<TransactionInstruction> {
-		const userAccount = (await this.program.account.user.fetch(
+		const userAccount = (await (this.program.account as any).user.fetch(
 			userAccountPublicKey
 		)) as UserAccount;
 		const remainingAccounts = this.getRemainingAccounts({
@@ -7292,7 +7172,7 @@ export class DriftClient {
 			userAccounts: [userAccount],
 		});
 
-		return await this.program.instruction.updateUserFuelBonus({
+		return await (this.program.instruction as any).updateUserFuelBonus({
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user: userAccountPublicKey,
@@ -7367,7 +7247,7 @@ export class DriftClient {
 			userAccounts: [userAccount],
 		});
 
-		return await this.program.instruction.updateUserOpenOrdersCount({
+		return await (this.program.instruction as any).updateUserOpenOrdersCount({
 			accounts: {
 				state: await this.getStatePublicKey(),
 				filler,
@@ -7721,14 +7601,6 @@ export class DriftClient {
 			}
 		}
 
-		if (isUpdateHighLeverageMode(orderParams.bitFlags)) {
-			remainingAccounts.push({
-				pubkey: getHighLeverageModeConfigPublicKey(this.program.programId),
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
 		let optionalParams = null;
 		if (auctionDurationPercentage || successCondition) {
 			optionalParams =
@@ -7926,11 +7798,11 @@ export class DriftClient {
 			prefix,
 			delegateSigner
 				? this.program.coder.types.encode(
-						'SignedMsgOrderParamsDelegateMessage',
+						'signedMsgOrderParamsDelegateMessage',
 						withBuilderDefaults as SignedMsgOrderParamsDelegateMessage
 				  )
 				: this.program.coder.types.encode(
-						'SignedMsgOrderParamsMessage',
+						'signedMsgOrderParamsMessage',
 						withBuilderDefaults as SignedMsgOrderParamsMessage
 				  ),
 		]);
@@ -7948,8 +7820,8 @@ export class DriftClient {
 		delegateSigner?: boolean
 	): SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage {
 		const decodeStr = delegateSigner
-			? 'SignedMsgOrderParamsDelegateMessage'
-			: 'SignedMsgOrderParamsMessage';
+			? 'signedMsgOrderParamsDelegateMessage'
+			: 'signedMsgOrderParamsMessage';
 		return this.program.coder.types.decode(
 			decodeStr,
 			Buffer.concat([
@@ -8033,13 +7905,6 @@ export class DriftClient {
 			writableSpotMarketIndexes,
 		});
 
-		if (isUpdateHighLeverageMode(signedMessage.signedMsgOrderParams.bitFlags)) {
-			remainingAccounts.push({
-				pubkey: getHighLeverageModeConfigPublicKey(this.program.programId),
-				isWritable: true,
-				isSigner: false,
-			});
-		}
 		if (
 			signedMessage.builderFeeTenthBps !== null &&
 			signedMessage.builderIdx !== null
@@ -8237,216 +8102,55 @@ export class DriftClient {
 	}
 
 	public async preparePlaceAndTakeSpotOrder(
-		orderParams: OptionalOrderParams,
-		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
-		makerInfo?: MakerInfo,
-		referrerInfo?: ReferrerInfo,
-		txParams?: TxParams,
-		subAccountId?: number
+		_orderParams: OptionalOrderParams,
+		_fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
+		_makerInfo?: MakerInfo,
+		_referrerInfo?: ReferrerInfo,
+		_txParams?: TxParams,
+		_subAccountId?: number
 	) {
-		const tx = await this.buildTransaction(
-			await this.getPlaceAndTakeSpotOrderIx(
-				orderParams,
-				fulfillmentConfig,
-				makerInfo,
-				referrerInfo,
-				subAccountId
-			),
-			txParams
-		);
-
-		return {
-			placeAndTakeSpotOrderTx: tx,
-		};
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	public async placeAndTakeSpotOrder(
-		orderParams: OptionalOrderParams,
-		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
-		makerInfo?: MakerInfo,
-		referrerInfo?: ReferrerInfo,
-		txParams?: TxParams,
-		subAccountId?: number
+		_orderParams: OptionalOrderParams,
+		_fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
+		_makerInfo?: MakerInfo,
+		_referrerInfo?: ReferrerInfo,
+		_txParams?: TxParams,
+		_subAccountId?: number
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.sendTransaction(
-			(
-				await this.preparePlaceAndTakeSpotOrder(
-					orderParams,
-					fulfillmentConfig,
-					makerInfo,
-					referrerInfo,
-					txParams,
-					subAccountId
-				)
-			).placeAndTakeSpotOrderTx,
-			[],
-			this.opts,
-			false
-		);
-		this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
-		this.spotMarketLastSlotCache.set(QUOTE_SPOT_MARKET_INDEX, slot);
-		return txSig;
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 	public async getPlaceAndTakeSpotOrderIx(
-		orderParams: OptionalOrderParams,
-		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
-		makerInfo?: MakerInfo,
-		referrerInfo?: ReferrerInfo,
-		subAccountId?: number
+		_orderParams: OptionalOrderParams,
+		_fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
+		_makerInfo?: MakerInfo,
+		_referrerInfo?: ReferrerInfo,
+		_subAccountId?: number
 	): Promise<TransactionInstruction> {
-		orderParams = getOrderParams(orderParams, { marketType: MarketType.SPOT });
-		const userStatsPublicKey = this.getUserStatsAccountPublicKey();
-		const user = await this.getUserAccountPublicKey(subAccountId);
-
-		const userAccounts = [this.getUserAccount(subAccountId)];
-		if (makerInfo !== undefined) {
-			userAccounts.push(makerInfo.makerUserAccount);
-		}
-		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts,
-			useMarketLastSlotCache: true,
-			writableSpotMarketIndexes: [
-				orderParams.marketIndex,
-				QUOTE_SPOT_MARKET_INDEX,
-			],
-		});
-
-		let makerOrderId = null;
-		if (makerInfo) {
-			makerOrderId = makerInfo.order.orderId;
-			remainingAccounts.push({
-				pubkey: makerInfo.maker,
-				isSigner: false,
-				isWritable: true,
-			});
-			remainingAccounts.push({
-				pubkey: makerInfo.makerStats,
-				isSigner: false,
-				isWritable: true,
-			});
-		}
-
-		if (referrerInfo) {
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrer,
-				isWritable: true,
-				isSigner: false,
-			});
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrerStats,
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
-		this.addSpotFulfillmentAccounts(
-			orderParams.marketIndex,
-			remainingAccounts,
-			fulfillmentConfig
-		);
-
-		return await this.program.instruction.placeAndTakeSpotOrder(
-			orderParams,
-			fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null,
-			makerOrderId,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					userStats: userStatsPublicKey,
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	public async placeAndMakeSpotOrder(
-		orderParams: OptionalOrderParams,
-		takerInfo: TakerInfo,
-		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
-		referrerInfo?: ReferrerInfo,
-		txParams?: TxParams,
-		subAccountId?: number
+		_orderParams: OptionalOrderParams,
+		_takerInfo: TakerInfo,
+		_fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
+		_referrerInfo?: ReferrerInfo,
+		_txParams?: TxParams,
+		_subAccountId?: number
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.sendTransaction(
-			await this.buildTransaction(
-				await this.getPlaceAndMakeSpotOrderIx(
-					orderParams,
-					takerInfo,
-					fulfillmentConfig,
-					referrerInfo,
-					subAccountId
-				),
-				txParams
-			),
-			[],
-			this.opts
-		);
-		this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
-		this.spotMarketLastSlotCache.set(QUOTE_SPOT_MARKET_INDEX, slot);
-		return txSig;
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	public async getPlaceAndMakeSpotOrderIx(
-		orderParams: OptionalOrderParams,
-		takerInfo: TakerInfo,
-		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
-		referrerInfo?: ReferrerInfo,
-		subAccountId?: number
+		_orderParams: OptionalOrderParams,
+		_takerInfo: TakerInfo,
+		_fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
+		_referrerInfo?: ReferrerInfo,
+		_subAccountId?: number
 	): Promise<TransactionInstruction> {
-		orderParams = getOrderParams(orderParams, { marketType: MarketType.SPOT });
-		const userStatsPublicKey = this.getUserStatsAccountPublicKey();
-		const user = await this.getUserAccountPublicKey(subAccountId);
-
-		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [
-				this.getUserAccount(subAccountId),
-				takerInfo.takerUserAccount,
-			],
-			useMarketLastSlotCache: true,
-			writableSpotMarketIndexes: [
-				orderParams.marketIndex,
-				QUOTE_SPOT_MARKET_INDEX,
-			],
-		});
-
-		if (referrerInfo) {
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrer,
-				isWritable: true,
-				isSigner: false,
-			});
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrerStats,
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
-		this.addSpotFulfillmentAccounts(
-			orderParams.marketIndex,
-			remainingAccounts,
-			fulfillmentConfig
-		);
-
-		const takerOrderId = takerInfo.order.orderId;
-		return await this.program.instruction.placeAndMakeSpotOrder(
-			orderParams,
-			takerOrderId,
-			fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					userStats: userStatsPublicKey,
-					taker: takerInfo.taker,
-					takerStats: takerInfo.takerStats,
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
+		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	/**
@@ -8655,15 +8359,19 @@ export class DriftClient {
 			overrides?.authority ??
 			overrides?.user?.getUserAccount().authority ??
 			this.wallet.publicKey;
-		return await this.program.instruction.modifyOrder(orderId, orderParams, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user: userPubKey,
-				userStats: this.getUserStatsAccountPublicKey(),
-				authority,
-			},
-			remainingAccounts,
-		});
+		return await (this.program.instruction as any).modifyOrder(
+			orderId,
+			orderParams,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user: userPubKey,
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority,
+				},
+				remainingAccounts,
+			}
+		);
 	}
 
 	/**
@@ -8776,7 +8484,7 @@ export class DriftClient {
 			maxTs: maxTs || null,
 		};
 
-		return await this.program.instruction.modifyOrderByUserId(
+		return await (this.program.instruction as any).modifyOrderByUserId(
 			userOrderId,
 			orderParams,
 			{
@@ -10268,7 +9976,7 @@ export class DriftClient {
 	public async getSettleFundingPaymentIx(
 		userAccountPublicKey: PublicKey
 	): Promise<TransactionInstruction> {
-		const userAccount = (await this.program.account.user.fetch(
+		const userAccount = (await (this.program.account as any).user.fetch(
 			userAccountPublicKey
 		)) as UserAccount;
 
@@ -10651,23 +10359,21 @@ export class DriftClient {
 			marketIndex
 		);
 
-		const ix = await this.program.instruction.requestRemoveInsuranceFundStake(
-			marketIndex,
-			amount,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					spotMarket: spotMarketAccount.pubkey,
-					insuranceFundStake: ifStakeAccountPublicKey,
-					userStats: getUserStatsAccountPublicKey(
-						this.program.programId,
-						this.wallet.publicKey // only allow payer to request remove own insurance fund stake account
-					),
-					authority: this.wallet.publicKey,
-					insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-				},
-			}
-		);
+		const ix = await (
+			this.program.instruction as any
+		).requestRemoveInsuranceFundStake(marketIndex, amount, {
+			accounts: {
+				state: await this.getStatePublicKey(),
+				spotMarket: spotMarketAccount.pubkey,
+				insuranceFundStake: ifStakeAccountPublicKey,
+				userStats: getUserStatsAccountPublicKey(
+					this.program.programId,
+					this.wallet.publicKey // only allow payer to request remove own insurance fund stake account
+				),
+				authority: this.wallet.publicKey,
+				insuranceFundVault: spotMarketAccount.insuranceFund.vault,
+			},
+		});
 
 		const tx = await this.buildTransaction(ix, txParams);
 
@@ -10686,23 +10392,21 @@ export class DriftClient {
 			marketIndex
 		);
 
-		const ix =
-			await this.program.instruction.cancelRequestRemoveInsuranceFundStake(
-				marketIndex,
-				{
-					accounts: {
-						state: await this.getStatePublicKey(),
-						spotMarket: spotMarketAccount.pubkey,
-						insuranceFundStake: ifStakeAccountPublicKey,
-						userStats: getUserStatsAccountPublicKey(
-							this.program.programId,
-							this.wallet.publicKey // only allow payer to request remove own insurance fund stake account
-						),
-						authority: this.wallet.publicKey,
-						insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-					},
-				}
-			);
+		const ix = await (
+			this.program.instruction as any
+		).cancelRequestRemoveInsuranceFundStake(marketIndex, {
+			accounts: {
+				state: await this.getStatePublicKey(),
+				spotMarket: spotMarketAccount.pubkey,
+				insuranceFundStake: ifStakeAccountPublicKey,
+				userStats: getUserStatsAccountPublicKey(
+					this.program.programId,
+					this.wallet.publicKey // only allow payer to request remove own insurance fund stake account
+				),
+				authority: this.wallet.publicKey,
+				insuranceFundVault: spotMarketAccount.insuranceFund.vault,
+			},
+		});
 
 		const tx = await this.buildTransaction(ix, txParams);
 
@@ -11069,14 +10773,10 @@ export class DriftClient {
 	public getMarketFees(
 		marketType: MarketType,
 		marketIndex?: number,
-		user?: User,
-		enteringHighLeverageMode?: boolean
+		user?: User
 	) {
 		let feeTier;
-		const userHLM =
-			(user?.isHighLeverageMode('Initial') ?? false) ||
-			enteringHighLeverageMode;
-		if (user && !userHLM) {
+		if (user) {
 			feeTier = user.getUserFeeTier(marketType);
 		} else {
 			const state = this.getStateAccount();
@@ -11098,9 +10798,6 @@ export class DriftClient {
 			}
 
 			takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
-			if (userHLM) {
-				takerFee *= 2;
-			}
 			makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
 		}
 
@@ -11141,240 +10838,6 @@ export class DriftClient {
 		return undefined;
 	}
 
-	public getReceiverProgram(): Program<PythSolanaReceiver> {
-		if (this.receiverProgram === undefined) {
-			this.receiverProgram = new Program(
-				pythSolanaReceiverIdl as PythSolanaReceiver,
-				DEFAULT_RECEIVER_PROGRAM_ID,
-				this.provider
-			);
-		}
-		return this.receiverProgram;
-	}
-
-	public async getSwitchboardOnDemandProgram(): Promise<Program30<Idl30>> {
-		if (this.sbOnDemandProgram === undefined) {
-			this.sbOnDemandProgram = await AnchorUtils.loadProgramFromConnection(
-				this.connection
-			);
-		}
-		return this.sbOnDemandProgram;
-	}
-
-	public async postPythPullOracleUpdateAtomic(
-		vaaString: string,
-		feedId: string
-	): Promise<TransactionSignature> {
-		const postIxs = await this.getPostPythPullOracleUpdateAtomicIxs(
-			vaaString,
-			feedId
-		);
-		const tx = await this.buildTransaction(postIxs);
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
-	}
-
-	public async postMultiPythPullOracleUpdatesAtomic(
-		vaaString: string,
-		feedIds: string[]
-	): Promise<TransactionSignature> {
-		const postIxs = await this.getPostPythPullOracleUpdateAtomicIxs(
-			vaaString,
-			feedIds
-		);
-		const tx = await this.buildTransaction(postIxs);
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
-	}
-
-	public async getPostPythPullOracleUpdateAtomicIxs(
-		vaaString: string,
-		feedIds: string | string[],
-		numSignatures = 2
-	): Promise<TransactionInstruction[]> {
-		const accumulatorUpdateData = parseAccumulatorUpdateData(
-			Buffer.from(vaaString, 'base64')
-		);
-		const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
-		const guardianSet = getGuardianSetPda(
-			guardianSetIndex,
-			DEFAULT_WORMHOLE_PROGRAM_ID
-		);
-
-		const trimmedVaa = trimVaaSignatures(
-			accumulatorUpdateData.vaa,
-			numSignatures
-		);
-
-		const postIxs: TransactionInstruction[] = [];
-		if (accumulatorUpdateData.updates.length > 1) {
-			const encodedParams = this.getReceiverProgram().coder.types.encode(
-				'PostMultiUpdatesAtomicParams',
-				{
-					vaa: trimmedVaa,
-					merklePriceUpdates: accumulatorUpdateData.updates,
-				}
-			);
-			const feedIdsToUse: string[] =
-				typeof feedIds === 'string' ? [feedIds] : feedIds;
-			const pubkeys = feedIdsToUse.map((feedId) => {
-				return getPythPullOraclePublicKey(
-					this.program.programId,
-					getFeedIdUint8Array(feedId)
-				);
-			});
-
-			const remainingAccounts: Array<AccountMeta> = pubkeys.map((pubkey) => {
-				return {
-					pubkey,
-					isSigner: false,
-					isWritable: true,
-				};
-			});
-			postIxs.push(
-				this.program.instruction.postMultiPythPullOracleUpdatesAtomic(
-					encodedParams,
-					{
-						accounts: {
-							keeper: this.wallet.publicKey,
-							pythSolanaReceiver: DRIFT_ORACLE_RECEIVER_ID,
-							guardianSet,
-						},
-						remainingAccounts,
-					}
-				)
-			);
-		} else {
-			let feedIdToUse = typeof feedIds === 'string' ? feedIds : feedIds[0];
-			feedIdToUse = trimFeedId(feedIdToUse);
-			postIxs.push(
-				await this.getSinglePostPythPullOracleAtomicIx(
-					{
-						vaa: trimmedVaa,
-						merklePriceUpdate: accumulatorUpdateData.updates[0],
-					},
-					feedIdToUse,
-					guardianSet
-				)
-			);
-		}
-		return postIxs;
-	}
-
-	private async getSinglePostPythPullOracleAtomicIx(
-		params: {
-			vaa: Buffer;
-			merklePriceUpdate: {
-				message: Buffer;
-				proof: number[][];
-			};
-		},
-		feedId: string,
-		guardianSet: PublicKey
-	): Promise<TransactionInstruction> {
-		const feedIdBuffer = getFeedIdUint8Array(feedId);
-		const receiverProgram = this.getReceiverProgram();
-
-		const encodedParams = receiverProgram.coder.types.encode(
-			'PostUpdateAtomicParams',
-			params
-		);
-
-		return this.program.instruction.postPythPullOracleUpdateAtomic(
-			feedIdBuffer,
-			encodedParams,
-			{
-				accounts: {
-					keeper: this.wallet.publicKey,
-					pythSolanaReceiver: DRIFT_ORACLE_RECEIVER_ID,
-					guardianSet,
-					priceFeed: getPythPullOraclePublicKey(
-						this.program.programId,
-						feedIdBuffer
-					),
-				},
-			}
-		);
-	}
-
-	public async updatePythPullOracle(
-		vaaString: string,
-		feedId: string
-	): Promise<TransactionSignature> {
-		feedId = trimFeedId(feedId);
-		const accumulatorUpdateData = parseAccumulatorUpdateData(
-			Buffer.from(vaaString, 'base64')
-		);
-		const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
-		const guardianSet = getGuardianSetPda(
-			guardianSetIndex,
-			DEFAULT_WORMHOLE_PROGRAM_ID
-		);
-
-		const [postIxs, encodedVaaAddress] = await this.getBuildEncodedVaaIxs(
-			accumulatorUpdateData.vaa,
-			guardianSet
-		);
-
-		for (const update of accumulatorUpdateData.updates) {
-			postIxs.push(
-				await this.getUpdatePythPullOracleIxs(
-					{
-						merklePriceUpdate: update,
-					},
-					feedId,
-					encodedVaaAddress.publicKey
-				)
-			);
-		}
-
-		const tx = await this.buildTransaction(postIxs);
-		const { txSig } = await this.sendTransaction(
-			tx,
-			[encodedVaaAddress],
-			this.opts
-		);
-
-		return txSig;
-	}
-
-	public async getUpdatePythPullOracleIxs(
-		params: {
-			merklePriceUpdate: {
-				message: Buffer;
-				proof: number[][];
-			};
-		},
-		feedId: string,
-		encodedVaaAddress: PublicKey
-	): Promise<TransactionInstruction> {
-		const feedIdBuffer = getFeedIdUint8Array(feedId);
-		const receiverProgram = this.getReceiverProgram();
-
-		const encodedParams = receiverProgram.coder.types.encode(
-			'PostUpdateParams',
-			params
-		);
-
-		return this.program.instruction.updatePythPullOracle(
-			feedIdBuffer,
-			encodedParams,
-			{
-				accounts: {
-					keeper: this.wallet.publicKey,
-					pythSolanaReceiver: DRIFT_ORACLE_RECEIVER_ID,
-					encodedVaa: encodedVaaAddress,
-					priceFeed: getPythPullOraclePublicKey(
-						this.program.programId,
-						feedIdBuffer
-					),
-				},
-			}
-		);
-	}
-
 	public async postPythLazerOracleUpdate(
 		feedIds: number[],
 		pythMessageHex: string
@@ -11426,282 +10889,13 @@ export class DriftClient {
 		return [verifyIx, ix];
 	}
 
-	public async getPostManySwitchboardOnDemandUpdatesAtomicIxs(
-		feeds: PublicKey[],
-		recentSlothash?: Slothash,
-		numSignatures = 3
-	): Promise<TransactionInstruction[] | undefined> {
-		const program = await this.getSwitchboardOnDemandProgram();
-		const [pullIxs, _luts, _rawResponse] =
-			await PullFeed.fetchUpdateManyLightIx(program, {
-				feeds,
-				numSignatures,
-				recentSlothashes: recentSlothash
-					? [[new BN(recentSlothash.slot), recentSlothash.hash]]
-					: undefined,
-				chain: 'solana',
-				network: this.env,
-			});
-		if (!pullIxs) {
-			return undefined;
-		}
-		return pullIxs;
-	}
-
-	// @deprecated use getPostManySwitchboardOnDemandUpdatesAtomicIxs instead. This function no longer returns the required ixs due to upstream sdk changes.
-	public async getPostSwitchboardOnDemandUpdateAtomicIx(
-		feed: PublicKey,
-		recentSlothash?: Slothash,
-		numSignatures = 3
-	): Promise<TransactionInstruction | undefined> {
-		const program = await this.getSwitchboardOnDemandProgram();
-		const feedAccount = new PullFeed(program, feed);
-		if (!this.sbProgramFeedConfigs) {
-			this.sbProgramFeedConfigs = new Map();
-		}
-		if (!this.sbProgramFeedConfigs.has(feedAccount.pubkey.toString())) {
-			const feedConfig = await feedAccount.loadConfigs();
-			this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
-		}
-		const [pullIx, _responses, success] = await PullFeed.fetchUpdateManyIx(
-			program,
-			{
-				feeds: [feed],
-				numSignatures,
-				recentSlothashes: recentSlothash
-					? [[new BN(recentSlothash.slot), recentSlothash.hash]]
-					: undefined,
-			}
-		);
-		if (!success) {
-			return undefined;
-		}
-		return pullIx[0];
-	}
-
-	public async postSwitchboardOnDemandUpdate(
-		feed: PublicKey,
-		recentSlothash?: Slothash,
-		numSignatures = 3
-	): Promise<TransactionSignature> {
-		const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(
-			feed,
-			recentSlothash,
-			numSignatures
-		);
-		if (!pullIx) {
-			return undefined;
-		}
-		const tx = await asV0Tx({
-			connection: this.connection,
-			ixs: [pullIx],
-			payer: this.wallet.publicKey,
-			computeUnitLimitMultiple: 1.3,
-			lookupTables: await this.fetchAllLookupTableAccounts(),
-		});
-		const { txSig } = await this.sendTransaction(tx, [], {
-			commitment: 'processed',
-			skipPreflight: true,
-			maxRetries: 0,
-		});
-		return txSig;
-	}
-
-	private async getBuildEncodedVaaIxs(
-		vaa: Buffer,
-		guardianSet: PublicKey
-	): Promise<[TransactionInstruction[], Keypair]> {
-		const postIxs: TransactionInstruction[] = [];
-
-		if (this.wormholeProgram === undefined) {
-			this.wormholeProgram = new Program(
-				WORMHOLE_CORE_BRIDGE_SOLANA_IDL,
-				DEFAULT_WORMHOLE_PROGRAM_ID,
-				this.provider
-			);
-		}
-
-		const encodedVaaKeypair = new Keypair();
-		postIxs.push(
-			await this.wormholeProgram.account.encodedVaa.createInstruction(
-				encodedVaaKeypair,
-				vaa.length + 46
-			)
-		);
-
-		// Why do we need this too?
-		postIxs.push(
-			await this.wormholeProgram.methods
-				.initEncodedVaa()
-				.accounts({
-					encodedVaa: encodedVaaKeypair.publicKey,
-				})
-				.instruction()
-		);
-
-		// Split the write into two ixs
-		postIxs.push(
-			await this.wormholeProgram.methods
-				.writeEncodedVaa({
-					index: 0,
-					data: vaa.subarray(0, 755),
-				})
-				.accounts({
-					draftVaa: encodedVaaKeypair.publicKey,
-				})
-				.instruction()
-		);
-
-		postIxs.push(
-			await this.wormholeProgram.methods
-				.writeEncodedVaa({
-					index: 755,
-					data: vaa.subarray(755),
-				})
-				.accounts({
-					draftVaa: encodedVaaKeypair.publicKey,
-				})
-				.instruction()
-		);
-
-		// Verify
-		postIxs.push(
-			await this.wormholeProgram.methods
-				.verifyEncodedVaaV1()
-				.accounts({
-					guardianSet,
-					draftVaa: encodedVaaKeypair.publicKey,
-				})
-				.instruction()
-		);
-
-		return [postIxs, encodedVaaKeypair];
-	}
-
-	public async enableUserHighLeverageMode(
-		subAccountId: number,
-		txParams?: TxParams
-	): Promise<TransactionSignature> {
-		const { txSig } = await this.sendTransaction(
-			await this.buildTransaction(
-				await this.getEnableHighLeverageModeIx(subAccountId),
-				txParams
-			),
-			[],
-			this.opts
-		);
-		return txSig;
-	}
-
-	public async getEnableHighLeverageModeIx(
-		subAccountId: number,
-		depositToTradeArgs?: {
-			isMakingNewAccount: boolean;
-			depositMarketIndex: number;
-			orderMarketIndex: number;
-		},
-		overrides?: {
-			user?: User;
-			signingAuthority?: PublicKey;
-		}
-	): Promise<TransactionInstruction> {
-		const isDepositToTradeTx = depositToTradeArgs !== undefined;
-		const userAccountPublicKey =
-			overrides?.user?.getUserAccountPublicKey() ??
-			getUserAccountPublicKeySync(
-				this.program.programId,
-				this.wallet.publicKey,
-				subAccountId
-			);
-		const signingAuthority =
-			overrides?.signingAuthority ?? this.wallet.publicKey;
-		const userAccount =
-			overrides?.user.getUserAccount() ?? this.getUserAccount(subAccountId);
-
-		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: depositToTradeArgs?.isMakingNewAccount ? [] : [userAccount],
-			useMarketLastSlotCache: false,
-			readablePerpMarketIndex: depositToTradeArgs?.orderMarketIndex,
-			readableSpotMarketIndexes: isDepositToTradeTx
-				? [depositToTradeArgs?.depositMarketIndex]
-				: undefined,
-		});
-
-		const ix = await this.program.instruction.enableUserHighLeverageMode(
-			subAccountId,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user: userAccountPublicKey,
-					authority: signingAuthority,
-					highLeverageModeConfig: getHighLeverageModeConfigPublicKey(
-						this.program.programId
-					),
-				},
-				remainingAccounts,
-			}
-		);
-
-		return ix;
-	}
-
-	public async disableUserHighLeverageMode(
-		user: PublicKey,
-		userAccount?: UserAccount,
-		txParams?: TxParams
-	): Promise<TransactionSignature> {
-		const { txSig } = await this.sendTransaction(
-			await this.buildTransaction(
-				await this.getDisableHighLeverageModeIx(user, userAccount),
-				txParams
-			),
-			[],
-			this.opts
-		);
-		return txSig;
-	}
-
-	public async getDisableHighLeverageModeIx(
-		user: PublicKey,
-		userAccount?: UserAccount,
-		maintenance = false
-	): Promise<TransactionInstruction> {
-		const remainingAccounts = userAccount
-			? this.getRemainingAccounts({
-					userAccounts: [userAccount],
-			  })
-			: undefined;
-
-		const ix = await this.program.instruction.disableUserHighLeverageMode(
-			maintenance,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					authority: this.wallet.publicKey,
-					highLeverageModeConfig: getHighLeverageModeConfigPublicKey(
-						this.program.programId
-					),
-				},
-				remainingAccounts,
-			}
-		);
-
-		return ix;
-	}
-
-	public async fetchHighLeverageModeConfig(): Promise<HighLeverageModeConfig> {
-		const config = await this.program.account.highLeverageModeConfig.fetch(
-			getHighLeverageModeConfigPublicKey(this.program.programId)
-		);
-		return config as HighLeverageModeConfig;
-	}
-
 	public async fetchProtectedMakerModeConfig(): Promise<ProtectedMakerModeConfig> {
-		const config = await this.program.account.protectedMakerModeConfig.fetch(
+		const config = await (
+			this.program.account as any
+		).protectedMakerModeConfig.fetch(
 			getProtectedMakerModeConfigPublicKey(this.program.programId)
 		);
-		return config as ProtectedMakerModeConfig;
+		return config as unknown as ProtectedMakerModeConfig;
 	}
 	public async updateUserProtectedMakerOrders(
 		subAccountId: number,
@@ -11887,15 +11081,15 @@ export class DriftClient {
 	}
 
 	public async getLpPoolAccount(lpPoolId: number): Promise<LPPoolAccount> {
-		return (await this.program.account.lpPool.fetch(
+		return (await (this.program.account as any).lpPool.fetch(
 			getLpPoolPublicKey(this.program.programId, lpPoolId)
-		)) as LPPoolAccount;
+		)) as unknown as LPPoolAccount;
 	}
 
 	public async getConstituentTargetBaseAccount(
 		lpPoolId: number
 	): Promise<ConstituentTargetBaseAccount> {
-		return (await this.program.account.constituentTargetBase.fetch(
+		return (await (this.program.account as any).constituentTargetBase.fetch(
 			getConstituentTargetBasePublicKey(
 				this.program.programId,
 				getLpPoolPublicKey(this.program.programId, lpPoolId)
@@ -11904,7 +11098,7 @@ export class DriftClient {
 	}
 
 	public async getAmmCache(): Promise<AmmCache> {
-		return (await this.program.account.ammCache.fetch(
+		return (await (this.program.account as any).ammCache.fetch(
 			getAmmCachePublicKey(this.program.programId)
 		)) as AmmCache;
 	}