@drift-labs/sdk 0.2.0-master.37 → 0.2.0-master.39

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.2.0-master.37",
+	"version": "0.2.0-master.39",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkUserStatsSubscription.ts

@@ -1,4 +1,4 @@
-import { ClearingHouseUserStats } from '../clearingHouseUserStats';
+import { UserStats } from '../userStats';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { PollingUserStatsAccountSubscriber } from './pollingUserStatsAccountSubscriber';
 
@@ -7,7 +7,7 @@ import { PollingUserStatsAccountSubscriber } from './pollingUserStatsAccountSubs
  * @param accountLoader
  */
 export async function bulkPollingUserStatsSubscribe(
-	userStats: ClearingHouseUserStats[],
+	userStats: UserStats[],
 	accountLoader: BulkAccountLoader
 ): Promise<void> {
 	if (userStats.length === 0) {

package/src/accounts/bulkUserSubscription.ts

@@ -1,4 +1,4 @@
-import { ClearingHouseUser } from '../clearingHouseUser';
+import { User } from '../user';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { PollingUserAccountSubscriber } from './pollingUserAccountSubscriber';
 
@@ -7,7 +7,7 @@ import { PollingUserAccountSubscriber } from './pollingUserAccountSubscriber';
  * @param accountLoader
  */
 export async function bulkPollingUserSubscribe(
-	users: ClearingHouseUser[],
+	users: User[],
 	accountLoader: BulkAccountLoader
 ): Promise<void> {
 	if (users.length === 0) {

package/src/accounts/{pollingClearingHouseAccountSubscriber.ts → pollingDriftClientAccountSubscriber.ts}

@@ -1,8 +1,8 @@
 import {
 	DataAndSlot,
 	AccountToPoll,
-	ClearingHouseAccountEvents,
-	ClearingHouseAccountSubscriber,
+	DriftClientAccountEvents,
+	DriftClientAccountSubscriber,
 	NotSubscribedError,
 	OraclesToPoll,
 } from './types';
@@ -16,7 +16,7 @@ import {
 	UserAccount,
 } from '../types';
 import {
-	getClearingHouseStateAccountPublicKey,
+	getDriftStateAccountPublicKey,
 	getSpotMarketPublicKey,
 	getPerpMarketPublicKey,
 } from '../addresses/pda';
@@ -27,8 +27,8 @@ import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
 
-export class PollingClearingHouseAccountSubscriber
-	implements ClearingHouseAccountSubscriber
+export class PollingDriftClientAccountSubscriber
+	implements DriftClientAccountSubscriber
 {
 	isSubscribed: boolean;
 	program: Program;
@@ -37,7 +37,7 @@ export class PollingClearingHouseAccountSubscriber
 	oracleInfos: OracleInfo[];
 	oracleClientCache = new OracleClientCache();
 
-	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
 
 	accountLoader: BulkAccountLoader;
 	accountsToPoll = new Map<string, AccountToPoll>();
@@ -113,11 +113,13 @@ export class PollingClearingHouseAccountSubscriber
 			return;
 		}
 
-		const accounts = await this.getClearingHouseAccounts();
+		const statePublicKey = await getDriftStateAccountPublicKey(
+			this.program.programId
+		);
 
-		this.accountsToPoll.set(accounts.state.toString(), {
+		this.accountsToPoll.set(statePublicKey.toString(), {
 			key: 'state',
-			publicKey: accounts.state,
+			publicKey: statePublicKey,
 			eventType: 'stateAccountUpdate',
 		});
 
@@ -190,18 +192,6 @@ export class PollingClearingHouseAccountSubscriber
 		return true;
 	}
 
-	async getClearingHouseAccounts(): Promise<ClearingHouseAccounts> {
-		const statePublicKey = await getClearingHouseStateAccountPublicKey(
-			this.program.programId
-		);
-
-		const accounts = {
-			state: statePublicKey,
-		};
-
-		return accounts;
-	}
-
 	async addToAccountLoader(): Promise<void> {
 		for (const [_, accountToPoll] of this.accountsToPoll) {
 			this.addAccountToAccountLoader(accountToPoll);
@@ -427,7 +417,3 @@ export class PollingClearingHouseAccountSubscriber
 		return this.oracles.get(oraclePublicKey.toString());
 	}
 }
-
-type ClearingHouseAccounts = {
-	state: PublicKey;
-};

package/src/accounts/{pollingOracleSubscriber.ts → pollingOracleAccountSubscriber.ts}

@@ -2,7 +2,7 @@ import {
 	DataAndSlot,
 	NotSubscribedError,
 	OracleEvents,
-	OracleSubscriber,
+	OracleAccountSubscriber,
 } from './types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -11,7 +11,7 @@ import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { OracleClient, OraclePriceData } from '../oracles/types';
 
-export class PollingOracleSubscriber implements OracleSubscriber {
+export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 	isSubscribed: boolean;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;

package/src/accounts/types.ts

@@ -23,7 +23,7 @@ export class NotSubscribedError extends Error {
 	name = 'NotSubscribedError';
 }
 
-export interface ClearingHouseAccountEvents {
+export interface DriftClientAccountEvents {
 	stateAccountUpdate: (payload: StateAccount) => void;
 	perpMarketAccountUpdate: (payload: PerpMarketAccount) => void;
 	spotMarketAccountUpdate: (payload: SpotMarketAccount) => void;
@@ -33,8 +33,8 @@ export interface ClearingHouseAccountEvents {
 	error: (e: Error) => void;
 }
 
-export interface ClearingHouseAccountSubscriber {
-	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+export interface DriftClientAccountSubscriber {
+	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
 	isSubscribed: boolean;
 
 	subscribe(): Promise<boolean>;
@@ -99,7 +99,7 @@ export interface OracleEvents {
 	error: (e: Error) => void;
 }
 
-export interface OracleSubscriber {
+export interface OracleAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
 	isSubscribed: boolean;
 

package/src/accounts/{webSocketClearingHouseAccountSubscriber.ts → webSocketDriftClientAccountSubscriber.ts}

@@ -1,6 +1,6 @@
 import {
-	ClearingHouseAccountSubscriber,
-	ClearingHouseAccountEvents,
+	DriftClientAccountSubscriber,
+	DriftClientAccountEvents,
 	DataAndSlot,
 } from './types';
 import { AccountSubscriber, NotSubscribedError } from './types';
@@ -9,7 +9,7 @@ import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {
-	getClearingHouseStateAccountPublicKey,
+	getDriftStateAccountPublicKey,
 	getSpotMarketPublicKey,
 	getPerpMarketPublicKey,
 } from '../addresses/pda';
@@ -20,8 +20,8 @@ import { OracleClientCache } from '../oracles/oracleClientCache';
 import * as Buffer from 'buffer';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
 
-export class WebSocketClearingHouseAccountSubscriber
-	implements ClearingHouseAccountSubscriber
+export class WebSocketDriftClientAccountSubscriber
+	implements DriftClientAccountSubscriber
 {
 	isSubscribed: boolean;
 	program: Program;
@@ -30,7 +30,7 @@ export class WebSocketClearingHouseAccountSubscriber
 	oracleInfos: OracleInfo[];
 	oracleClientCache = new OracleClientCache();
 
-	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
 	stateAccountSubscriber?: AccountSubscriber<StateAccount>;
 	perpMarketAccountSubscribers = new Map<
 		number,
@@ -75,7 +75,7 @@ export class WebSocketClearingHouseAccountSubscriber
 			this.subscriptionPromiseResolver = res;
 		});
 
-		const statePublicKey = await getClearingHouseStateAccountPublicKey(
+		const statePublicKey = await getDriftStateAccountPublicKey(
 			this.program.programId
 		);
 

package/src/addresses/pda.ts

@@ -2,19 +2,19 @@ import { PublicKey } from '@solana/web3.js';
 import * as anchor from '@project-serum/anchor';
 import { BN } from '@project-serum/anchor';
 
-export async function getClearingHouseStateAccountPublicKeyAndNonce(
+export async function getDriftStateAccountPublicKeyAndNonce(
 	programId: PublicKey
 ): Promise<[PublicKey, number]> {
 	return PublicKey.findProgramAddress(
-		[Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))],
+		[Buffer.from(anchor.utils.bytes.utf8.encode('drift_state'))],
 		programId
 	);
 }
 
-export async function getClearingHouseStateAccountPublicKey(
+export async function getDriftStateAccountPublicKey(
 	programId: PublicKey
 ): Promise<PublicKey> {
-	return (await getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
+	return (await getDriftStateAccountPublicKeyAndNonce(programId))[0];
 }
 
 export async function getUserAccountPublicKeyAndNonce(
@@ -145,11 +145,9 @@ export function getInsuranceFundStakeAccountPublicKey(
 	)[0];
 }
 
-export function getClearingHouseSignerPublicKey(
-	programId: PublicKey
-): PublicKey {
+export function getDriftSignerPublicKey(programId: PublicKey): PublicKey {
 	return PublicKey.findProgramAddressSync(
-		[Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house_signer'))],
+		[Buffer.from(anchor.utils.bytes.utf8.encode('drift_signer'))],
 		programId
 	)[0];
 }

package/src/{admin.ts → adminClient.ts}

@@ -16,7 +16,7 @@ import { DEFAULT_MARKET_NAME, encodeName } from './userName';
 import { BN } from '@project-serum/anchor';
 import * as anchor from '@project-serum/anchor';
 import {
-	getClearingHouseStateAccountPublicKeyAndNonce,
+	getDriftStateAccountPublicKeyAndNonce,
 	getSpotMarketPublicKey,
 	getSpotMarketVaultPublicKey,
 	getPerpMarketPublicKey,
@@ -26,12 +26,12 @@ import {
 } from './addresses/pda';
 import { squareRootBN } from './math/utils';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
-import { ClearingHouse } from './clearingHouse';
+import { DriftClient } from './driftClient';
 import { PEG_PRECISION } from './constants/numericConstants';
 import { calculateTargetPriceTrade } from './math/trade';
 import { calculateAmmReservesAfterSwap, getSwapDirection } from './math/amm';
 
-export class Admin extends ClearingHouse {
+export class AdminClient extends DriftClient {
 	public async initialize(
 		usdcMint: PublicKey,
 		_adminControlsPrices: boolean
@@ -43,18 +43,17 @@ export class Admin extends ClearingHouse {
 			throw new Error('Clearing house already initialized');
 		}
 
-		const [clearingHouseStatePublicKey] =
-			await getClearingHouseStateAccountPublicKeyAndNonce(
-				this.program.programId
-			);
+		const [driftStatePublicKey] = await getDriftStateAccountPublicKeyAndNonce(
+			this.program.programId
+		);
 
 		const initializeTx = await this.program.transaction.initialize({
 			accounts: {
 				admin: this.wallet.publicKey,
-				state: clearingHouseStatePublicKey,
+				state: driftStatePublicKey,
 				quoteAssetMint: usdcMint,
 				rent: SYSVAR_RENT_PUBKEY,
-				clearingHouseSigner: this.getSignerPublicKey(),
+				driftSigner: this.getSignerPublicKey(),
 				systemProgram: anchor.web3.SystemProgram.programId,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
@@ -81,8 +80,9 @@ export class Admin extends ClearingHouse {
 		initialLiabilityWeight: number,
 		maintenanceLiabilityWeight: number,
 		imfFactor = 0,
-		liquidationFee = 0,
-		activeStatus = true
+		liquidatorFee = 0,
+		activeStatus = true,
+		name = DEFAULT_MARKET_NAME
 	): Promise<TransactionSignature> {
 		const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
 		const spotMarket = await getSpotMarketPublicKey(
@@ -100,6 +100,7 @@ export class Admin extends ClearingHouse {
 			spotMarketIndex
 		);
 
+		const nameBuffer = encodeName(name);
 		const initializeTx = await this.program.transaction.initializeSpotMarket(
 			optimalUtilization,
 			optimalRate,
@@ -110,8 +111,9 @@ export class Admin extends ClearingHouse {
 			initialLiabilityWeight,
 			maintenanceLiabilityWeight,
 			imfFactor,
-			liquidationFee,
+			liquidatorFee,
 			activeStatus,
+			nameBuffer,
 			{
 				accounts: {
 					admin: this.wallet.publicKey,
@@ -119,7 +121,7 @@ export class Admin extends ClearingHouse {
 					spotMarket,
 					spotMarketVault,
 					insuranceFundVault,
-					clearingHouseSigner: this.getSignerPublicKey(),
+					driftSigner: this.getSignerPublicKey(),
 					spotMarketMint: mint,
 					oracle,
 					rent: SYSVAR_RENT_PUBKEY,
@@ -163,7 +165,7 @@ export class Admin extends ClearingHouse {
 					state: await this.getStatePublicKey(),
 					baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
 					quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
-					clearingHouseSigner: this.getSignerPublicKey(),
+					driftSigner: this.getSignerPublicKey(),
 					serumProgram,
 					serumMarket,
 					serumOpenOrders,
@@ -184,7 +186,7 @@ export class Admin extends ClearingHouse {
 		oracleSource: OracleSource = OracleSource.PYTH,
 		marginRatioInitial = 2000,
 		marginRatioMaintenance = 500,
-		liquidationFee = 0,
+		liquidatorFee = 0,
 		activeStatus = true,
 		name = DEFAULT_MARKET_NAME
 	): Promise<TransactionSignature> {
@@ -203,7 +205,7 @@ export class Admin extends ClearingHouse {
 				oracleSource,
 				marginRatioInitial,
 				marginRatioMaintenance,
-				liquidationFee,
+				liquidatorFee,
 				activeStatus,
 				nameBuffer,
 				{
@@ -414,7 +416,7 @@ export class Admin extends ClearingHouse {
 					perpMarketIndex
 				),
 				sourceVault,
-				clearingHouseSigner: this.getSignerPublicKey(),
+				driftSigner: this.getSignerPublicKey(),
 				quoteSpotMarket: spotMarket.pubkey,
 				spotMarketVault: spotMarket.vault,
 				tokenProgram: TOKEN_PROGRAM_ID,
@@ -474,6 +476,27 @@ export class Admin extends ClearingHouse {
 		);
 	}
 
+	public async updatePerpMarketImfFactor(
+		perpMarketIndex: number,
+		imfFactor: number,
+		unrealizedPnlImfFactor: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updatePerpMarketImfFactor(
+			imfFactor,
+			unrealizedPnlImfFactor,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketBaseSpread(
 		perpMarketIndex: number,
 		baseSpread: number
@@ -524,6 +547,24 @@ export class Admin extends ClearingHouse {
 		});
 	}
 
+	public async updateSpotMarketName(
+		spotMarketIndex: number,
+		name: string
+	): Promise<TransactionSignature> {
+		const nameBuffer = encodeName(name);
+
+		return await this.program.rpc.updateSpotMarketName(nameBuffer, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updatePerpMarketMaxSpread(
 		perpMarketIndex: number,
 		maxSpread: number
@@ -753,6 +794,43 @@ export class Admin extends ClearingHouse {
 		});
 	}
 
+	public async updateSpotMarketStepSizeAndTickSize(
+		spotMarketIndex: number,
+		stepSize: BN,
+		tickSize: BN
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketStepSizeAndTickSize(
+			stepSize,
+			tickSize,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
+	public async updateSpotMarketMinOrderSize(
+		spotMarketIndex: number,
+		orderSize: BN
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketMinOrderSize(orderSize, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updatePerpMarketExpiry(
 		perpMarketIndex: number,
 		expiryTs: BN
@@ -852,6 +930,29 @@ export class Admin extends ClearingHouse {
 		);
 	}
 
+	public async updateSpotMarketBorrowRate(
+		spotMarketIndex: number,
+		optimalUtilization: number,
+		optimalBorrowRate: number,
+		optimalMaxRate: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketBorrowRate(
+			optimalUtilization,
+			optimalBorrowRate,
+			optimalMaxRate,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketAssetTier(
 		spotMarketIndex: number,
 		assetTier: AssetTier
@@ -965,7 +1066,10 @@ export class Admin extends ClearingHouse {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
 				},
 			}
 		);
@@ -984,6 +1088,27 @@ export class Admin extends ClearingHouse {
 		});
 	}
 
+	public async updatePerpMarketUnrealizedAssetWeight(
+		perpMarketIndex: number,
+		unrealizedInitialAssetWeight: number,
+		unrealizedMaintenanceAssetWeight: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updatePerpMarketUnrealizedAssetWeight(
+			unrealizedInitialAssetWeight,
+			unrealizedMaintenanceAssetWeight,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketMaxImbalances(
 		perpMarketIndex: number,
 		unrealizedMaxImbalance: BN,
@@ -1037,4 +1162,46 @@ export class Admin extends ClearingHouse {
 			},
 		});
 	}
+
+	public async updatePerpMarketLiquidationFee(
+		perpMarketIndex: number,
+		liquidatorFee: number,
+		ifLiquidationFee: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updatePerpMarketLiquidationFee(
+			liquidatorFee,
+			ifLiquidationFee,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
+	public async updateSpotMarketLiquidationFee(
+		spotMarketIndex: number,
+		liquidatorFee: number,
+		ifLiquidationFee: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketLiquidationFee(
+			liquidatorFee,
+			ifLiquidationFee,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
 }

package/src/config.ts

@@ -29,7 +29,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'jAEeKs9twxAJmXZHqS2p459xW7FMDjoyvuqthRo9qGS',
+		CLEARING_HOUSE_PROGRAM_ID: 'H4G1xzAoqSW8n1Edmeowqsgc895tSNCeDPafYjv4Md7i',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
 		V2_ALPHA_TICKET_MINT_ADDRESS:

package/src/constants/numericConstants.ts

@@ -18,6 +18,10 @@ export const TEN_MILLION = TEN_THOUSAND.mul(TEN_THOUSAND);
 
 export const MAX_LEVERAGE = new BN(5);
 
+export const PERCENTAGE_PRECISION_EXP = new BN(6);
+export const PERCENTAGE_PRECISION = new BN(10).pow(PERCENTAGE_PRECISION_EXP);
+export const CONCENTRATION_PRECISION = PERCENTAGE_PRECISION;
+
 export const QUOTE_PRECISION_EXP = new BN(6);
 export const FUNDING_RATE_BUFFER_PRECISION_EXP = new BN(3);
 export const PRICE_PRECISION_EXP = new BN(6);

package/src/dlob/DLOB.ts

@@ -4,7 +4,7 @@ import {
 	BN,
 	calculateAskPrice,
 	calculateBidPrice,
-	ClearingHouse,
+	DriftClient,
 	convertToNumber,
 	isAuctionComplete,
 	isOrderExpired,
@@ -1021,17 +1021,17 @@ export class DLOB {
 
 	public printTopOfOrderLists(
 		sdkConfig: any,
-		clearingHouse: ClearingHouse,
+		driftClient: DriftClient,
 		slotSubscriber: SlotSubscriber,
 		marketIndex: number,
 		marketType: MarketType
 	) {
 		if (isVariant(marketType, 'perp')) {
-			const market = clearingHouse.getPerpMarketAccount(marketIndex);
+			const market = driftClient.getPerpMarketAccount(marketIndex);
 
 			const slot = slotSubscriber.getSlot();
 			const oraclePriceData =
-				clearingHouse.getOracleDataForPerpMarket(marketIndex);
+				driftClient.getOracleDataForPerpMarket(marketIndex);
 			const fallbackAsk = calculateAskPrice(market, oraclePriceData);
 			const fallbackBid = calculateBidPrice(market, oraclePriceData);
 
@@ -1077,7 +1077,7 @@ export class DLOB {
 		} else if (isVariant(marketType, 'spot')) {
 			const slot = slotSubscriber.getSlot();
 			const oraclePriceData =
-				clearingHouse.getOracleDataForPerpMarket(marketIndex);
+				driftClient.getOracleDataForPerpMarket(marketIndex);
 
 			const bestAsk = this.getBestAsk(
 				marketIndex,