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

package/src/index.ts

@@ -9,23 +9,23 @@ export * from './oracles/switchboardClient';
 export * from './types';
 export * from './constants/perpMarkets';
 export * from './accounts/fetch';
-export * from './accounts/webSocketClearingHouseAccountSubscriber';
+export * from './accounts/webSocketDriftClientAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
-export * from './accounts/pollingClearingHouseAccountSubscriber';
-export * from './accounts/pollingOracleSubscriber';
+export * from './accounts/pollingDriftClientAccountSubscriber';
+export * from './accounts/pollingOracleAccountSubscriber';
 export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
-export * from './admin';
-export * from './clearingHouseUser';
-export * from './clearingHouseUserConfig';
-export * from './clearingHouseUserStats';
-export * from './clearingHouseUserStatsConfig';
-export * from './clearingHouse';
+export * from './adminClient';
+export * from './user';
+export * from './userConfig';
+export * from './userStats';
+export * from './userStatsConfig';
+export * from './driftClient';
 export * from './factory/oracleClient';
 export * from './factory/bigNum';
 export * from './events/types';
@@ -60,7 +60,7 @@ export * from './util/tps';
 export * from './util/promiseTimeout';
 export * from './math/spotBalance';
 export * from './constants/spotMarkets';
-export * from './clearingHouseConfig';
+export * from './driftClientConfig';
 export * from './dlob/DLOB';
 export * from './dlob/DLOBNode';
 export * from './dlob/NodeList';

package/src/math/orders.ts

@@ -1,4 +1,4 @@
-import { ClearingHouseUser } from '../clearingHouseUser';
+import { User } from '../user';
 import {
 	isOneOfVariant,
 	isVariant,
@@ -15,16 +15,13 @@ import {
 	calculateMaxBaseAssetAmountToTrade,
 } from './amm';
 
-export function isOrderRiskIncreasing(
-	user: ClearingHouseUser,
-	order: Order
-): boolean {
+export function isOrderRiskIncreasing(user: User, order: Order): boolean {
 	if (isVariant(order.status, 'init')) {
 		return false;
 	}
 
 	const position =
-		user.getUserPosition(order.marketIndex) ||
+		user.getPerpPosition(order.marketIndex) ||
 		user.getEmptyPosition(order.marketIndex);
 
 	// if no position exists, it's risk increasing
@@ -57,7 +54,7 @@ export function isOrderRiskIncreasing(
 }
 
 export function isOrderRiskIncreasingInSameDirection(
-	user: ClearingHouseUser,
+	user: User,
 	order: Order
 ): boolean {
 	if (isVariant(order.status, 'init')) {
@@ -65,7 +62,7 @@ export function isOrderRiskIncreasingInSameDirection(
 	}
 
 	const position =
-		user.getUserPosition(order.marketIndex) ||
+		user.getPerpPosition(order.marketIndex) ||
 		user.getEmptyPosition(order.marketIndex);
 
 	// if no position exists, it's risk increasing
@@ -89,16 +86,13 @@ export function isOrderRiskIncreasingInSameDirection(
 	return false;
 }
 
-export function isOrderReduceOnly(
-	user: ClearingHouseUser,
-	order: Order
-): boolean {
+export function isOrderReduceOnly(user: User, order: Order): boolean {
 	if (isVariant(order.status, 'init')) {
 		return false;
 	}
 
 	const position =
-		user.getUserPosition(order.marketIndex) ||
+		user.getPerpPosition(order.marketIndex) ||
 		user.getEmptyPosition(order.marketIndex);
 
 	// if position is long and order is long

package/src/serum/serumFulfillmentConfigMap.ts

@@ -1,20 +1,20 @@
 import { PublicKey } from '@solana/web3.js';
 import { SerumV3FulfillmentConfigAccount } from '../types';
-import { ClearingHouse } from '../clearingHouse';
+import { DriftClient } from '../driftClient';
 
 export class SerumFulfillmentConfigMap {
-	clearingHouse: ClearingHouse;
+	driftClient: DriftClient;
 	map = new Map<number, SerumV3FulfillmentConfigAccount>();
 
-	public constructor(clearingHouse: ClearingHouse) {
-		this.clearingHouse = clearingHouse;
+	public constructor(driftClient: DriftClient) {
+		this.driftClient = driftClient;
 	}
 
 	public async add(
 		marketIndex: number,
 		serumMarketAddress: PublicKey
 	): Promise<void> {
-		const account = await this.clearingHouse.getSerumV3FulfillmentConfig(
+		const account = await this.driftClient.getSerumV3FulfillmentConfig(
 			serumMarketAddress
 		);
 		this.map.set(marketIndex, account);

package/src/types.ts

@@ -34,7 +34,8 @@ export class ContractTier {
 	static readonly A = { a: {} };
 	static readonly B = { b: {} };
 	static readonly C = { c: {} };
-	static readonly Speculative = { speculative: {} };
+	static readonly SPECULATIVE = { speculative: {} };
+	static readonly ISOLATED = { isolated: {} };
 }
 
 export class AssetTier {
@@ -189,6 +190,7 @@ export type DepositRecord = {
 	marketWithdrawBalance: BN;
 	marketCumulativeDepositInterest: BN;
 	marketCumulativeBorrowInterest: BN;
+	depositRecordId: BN;
 	transferUser?: PublicKey;
 };
 
@@ -359,6 +361,9 @@ export type LiquidatePerpPnlForDepositRecord = {
 export type PerpBankruptcyRecord = {
 	marketIndex: number;
 	pnl: BN;
+	ifPayment: BN;
+	clawbackUser: PublicKey | null;
+	clawbackUserPayment: BN | null;
 	cumulativeFundingRateDelta: BN;
 };
 
@@ -440,6 +445,7 @@ export type StateAccount = {
 export type PerpMarketAccount = {
 	status: MarketStatus;
 	contractType: ContractType;
+	contractTier: ContractTier;
 	expiryTs: BN;
 	expiryPrice: BN;
 	marketIndex: number;
@@ -451,6 +457,8 @@ export type PerpMarketAccount = {
 	marginRatioInitial: number;
 	marginRatioMaintenance: number;
 	nextFillRecordId: BN;
+	nextFundingRateRecordId: BN;
+	nextCurveRecordId: BN;
 	pnlPool: PoolBalance;
 	liquidatorFee: number;
 	ifLiquidationFee: number;
@@ -538,12 +546,15 @@ export type SpotMarketAccount = {
 	depositTokenTwap: BN;
 	borrowTokenTwap: BN;
 	utilizationTwap: BN;
+	nextDepositRecordId: BN;
 
 	orderStepSize: BN;
 	orderTickSize: BN;
 	nextFillRecordId: BN;
 	spotFeePool: PoolBalance;
 	totalSpotFee: BN;
+
+	ordersEnabled: boolean;
 };
 
 export type PoolBalance = {
@@ -560,6 +571,7 @@ export type AMM = {
 	lastMarkPriceTwap: BN;
 	lastMarkPriceTwap5min: BN;
 	lastMarkPriceTwapTs: BN;
+	lastTradeTs: BN;
 
 	oracle: PublicKey;
 	oracleSource: OracleSource;
@@ -573,7 +585,11 @@ export type AMM = {
 	pegMultiplier: BN;
 	cumulativeFundingRateLong: BN;
 	cumulativeFundingRateShort: BN;
-	cumulativeFundingRateLp: BN;
+	last24hAvgFundingRate: BN;
+	lastFundingRateShort: BN;
+	lastFundingRateLong: BN;
+
+	totalLiquidationFee: BN;
 	totalFeeMinusDistributions: BN;
 	totalFeeWithdrawn: BN;
 	totalFee: BN;
@@ -590,11 +606,13 @@ export type AMM = {
 	baseAssetAmountShort: BN;
 	quoteAssetAmount: BN;
 	terminalQuoteAssetReserve: BN;
+	concentrationCoef: BN;
 	feePool: PoolBalance;
 	totalExchangeFee: BN;
 	totalMmFee: BN;
 	netRevenueSinceLastFunding: BN;
 	lastUpdateSlot: BN;
+	lastOracleNormalisedPrice: BN;
 	lastOracleValid: boolean;
 	lastBidPriceTwap: BN;
 	lastAskPriceTwap: BN;
@@ -606,9 +624,29 @@ export type AMM = {
 	quoteAssetAmountPerLp: BN;
 
 	ammJitIntensity: number;
+	maxOpenInterest: BN;
 	maxBaseAssetReserve: BN;
 	minBaseAssetReserve: BN;
 	cumulativeSocialLoss: BN;
+
+	quoteBreakEvenAmountLong: BN;
+	quoteBreakEvenAmountShort: BN;
+	quoteEntryAmountLong: BN;
+	quoteEntryAmountShort: BN;
+
+	markStd: BN;
+	longIntensityCount: number;
+	longIntensityVolume: BN;
+	shortIntensityCount: number;
+	shortIntensityVolume: BN;
+	volume24h: BN;
+	minOrderSize: BN;
+	maxPositionSize: BN;
+
+	bidBaseAssetReserve: BN;
+	bidQuoteAssetReserve: BN;
+	askBaseAssetReserve: BN;
+	askQuoteAssetReserve: BN;
 };
 
 // # User Account Types
@@ -669,6 +707,7 @@ export type UserAccount = {
 	settledPerpPnl: BN;
 	totalDeposits: BN;
 	totalWithdraws: BN;
+	cumulativePerpFunding: BN;
 };
 
 export type SpotPosition = {

package/src/{clearingHouseUser.ts → user.ts}

@@ -1,13 +1,14 @@
 import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
-import { ClearingHouse } from './clearingHouse';
+import { DriftClient } from './driftClient';
 import {
 	isVariant,
 	MarginCategory,
 	Order,
 	UserAccount,
 	PerpPosition,
+	SpotPosition,
 } from './types';
 import { calculateEntryPrice } from './math/position';
 import {
@@ -55,15 +56,15 @@ import {
 	calculateWorstCaseBaseAssetAmount,
 } from './math/margin';
 import { OraclePriceData } from './oracles/types';
-import { ClearingHouseUserConfig } from './clearingHouseUserConfig';
+import { UserConfig } from './userConfig';
 import { PollingUserAccountSubscriber } from './accounts/pollingUserAccountSubscriber';
 import { WebSocketUserAccountSubscriber } from './accounts/webSocketUserAccountSubscriber';
 import {
 	getWorstCaseTokenAmounts,
 	isSpotPositionAvailable,
 } from './math/spotPosition';
-export class ClearingHouseUser {
-	clearingHouse: ClearingHouse;
+export class User {
+	driftClient: DriftClient;
 	userAccountPublicKey: PublicKey;
 	accountSubscriber: UserAccountSubscriber;
 	_isSubscribed = false;
@@ -77,18 +78,18 @@ export class ClearingHouseUser {
 		this._isSubscribed = val;
 	}
 
-	public constructor(config: ClearingHouseUserConfig) {
-		this.clearingHouse = config.clearingHouse;
+	public constructor(config: UserConfig) {
+		this.driftClient = config.driftClient;
 		this.userAccountPublicKey = config.userAccountPublicKey;
 		if (config.accountSubscription?.type === 'polling') {
 			this.accountSubscriber = new PollingUserAccountSubscriber(
-				config.clearingHouse.program,
+				config.driftClient.program,
 				config.userAccountPublicKey,
 				config.accountSubscription.accountLoader
 			);
 		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
-				config.clearingHouse.program,
+				config.driftClient.program,
 				config.userAccountPublicKey
 			);
 		}
@@ -96,7 +97,7 @@ export class ClearingHouseUser {
 	}
 
 	/**
-	 * Subscribe to ClearingHouseUser state accounts
+	 * Subscribe to User state accounts
 	 * @returns SusbcriptionSuccess result
 	 */
 	public async subscribe(): Promise<boolean> {
@@ -125,16 +126,27 @@ export class ClearingHouseUser {
 	}
 
 	/**
-	 * Gets the user's current position for a given market. If the user has no position returns undefined
+	 * Gets the user's current position for a given perp market. If the user has no position returns undefined
 	 * @param marketIndex
-	 * @returns userPosition
+	 * @returns userPerpPosition
 	 */
-	public getUserPosition(marketIndex: number): PerpPosition | undefined {
+	public getPerpPosition(marketIndex: number): PerpPosition | undefined {
 		return this.getUserAccount().perpPositions.find(
 			(position) => position.marketIndex === marketIndex
 		);
 	}
 
+	/**
+	 * Gets the user's current position for a given spot market. If the user has no position returns undefined
+	 * @param marketIndex
+	 * @returns userSpotPosition
+	 */
+	public getSpotPosition(marketIndex: number): SpotPosition | undefined {
+		return this.getUserAccount().spotPositions.find(
+			(position) => position.marketIndex === marketIndex
+		);
+	}
+
 	public getEmptyPosition(marketIndex: number): PerpPosition {
 		return {
 			baseAssetAmount: ZERO,
@@ -185,7 +197,7 @@ export class ClearingHouseUser {
 
 	public async exists(): Promise<boolean> {
 		const userAccountRPCResponse =
-			await this.clearingHouse.connection.getParsedAccountInfo(
+			await this.driftClient.connection.getParsedAccountInfo(
 				this.userAccountPublicKey
 			);
 		return userAccountRPCResponse.value !== null;
@@ -197,7 +209,7 @@ export class ClearingHouseUser {
 	 * @returns : open asks
 	 */
 	public getPerpBidAsks(marketIndex: number): [BN, BN] {
-		const position = this.getUserPosition(marketIndex);
+		const position = this.getPerpPosition(marketIndex);
 
 		const [lpOpenBids, lpOpenAsks] = this.getLPBidAsks(marketIndex);
 
@@ -213,12 +225,12 @@ export class ClearingHouseUser {
 	 * @returns : lp open asks
 	 */
 	public getLPBidAsks(marketIndex: number): [BN, BN] {
-		const position = this.getUserPosition(marketIndex);
+		const position = this.getPerpPosition(marketIndex);
 		if (position === undefined || position.lpShares.eq(ZERO)) {
 			return [ZERO, ZERO];
 		}
 
-		const market = this.clearingHouse.getPerpMarketAccount(marketIndex);
+		const market = this.driftClient.getPerpMarketAccount(marketIndex);
 		const [marketOpenBids, marketOpenAsks] = calculateMarketOpenBidAsk(
 			market.amm.baseAssetReserve,
 			market.amm.minBaseAssetReserve,
@@ -242,16 +254,14 @@ export class ClearingHouseUser {
 	 * @returns : pnl from settle
 	 */
 	public getSettledLPPosition(marketIndex: number): [PerpPosition, BN, BN] {
-		const _position = this.getUserPosition(marketIndex);
+		const _position = this.getPerpPosition(marketIndex);
 		const position = this.getClonedPosition(_position);
 
 		if (position.lpShares.eq(ZERO)) {
 			return [position, ZERO, ZERO];
 		}
 
-		const market = this.clearingHouse.getPerpMarketAccount(
-			position.marketIndex
-		);
+		const market = this.driftClient.getPerpMarketAccount(position.marketIndex);
 		const nShares = position.lpShares;
 
 		const deltaBaa = market.amm.baseAssetAmountPerLp
@@ -408,13 +418,13 @@ export class ClearingHouseUser {
 		marketIndex?: number,
 		withWeightMarginCategory?: MarginCategory
 	): BN {
-		const quoteSpotMarket = this.clearingHouse.getQuoteSpotMarketAccount();
+		const quoteSpotMarket = this.driftClient.getQuoteSpotMarketAccount();
 		return this.getUserAccount()
 			.perpPositions.filter((pos) =>
 				marketIndex ? pos.marketIndex === marketIndex : true
 			)
 			.reduce((unrealizedPnl, perpPosition) => {
-				const market = this.clearingHouse.getPerpMarketAccount(
+				const market = this.driftClient.getPerpMarketAccount(
 					perpPosition.marketIndex
 				);
 				const oraclePriceData = this.getOracleDataForPerpMarket(
@@ -458,7 +468,7 @@ export class ClearingHouseUser {
 				marketIndex ? pos.marketIndex === marketIndex : true
 			)
 			.reduce((pnl, perpPosition) => {
-				const market = this.clearingHouse.getPerpMarketAccount(
+				const market = this.driftClient.getPerpMarketAccount(
 					perpPosition.marketIndex
 				);
 				return pnl.add(calculatePositionFundingPNL(market, perpPosition));
@@ -482,7 +492,7 @@ export class ClearingHouseUser {
 				}
 
 				const spotMarketAccount: SpotMarketAccount =
-					this.clearingHouse.getSpotMarketAccount(spotPosition.marketIndex);
+					this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
 
 				if (spotPosition.marketIndex === QUOTE_SPOT_MARKET_INDEX) {
 					if (isVariant(spotPosition.balanceType, 'borrow')) {
@@ -632,7 +642,7 @@ export class ClearingHouseUser {
 
 				// Todo this needs to account for whether it's based on initial or maintenance requirements
 				const spotMarketAccount: SpotMarketAccount =
-					this.clearingHouse.getSpotMarketAccount(spotPosition.marketIndex);
+					this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
 
 				if (spotPosition.marketIndex === QUOTE_SPOT_MARKET_INDEX) {
 					if (isVariant(spotPosition.balanceType, 'deposit')) {
@@ -757,7 +767,7 @@ export class ClearingHouseUser {
 	): BN {
 		return this.getUserAccount().perpPositions.reduce(
 			(totalPerpValue, perpPosition) => {
-				const market = this.clearingHouse.getPerpMarketAccount(
+				const market = this.driftClient.getPerpMarketAccount(
 					perpPosition.marketIndex
 				);
 
@@ -843,8 +853,8 @@ export class ClearingHouseUser {
 		oraclePriceData: OraclePriceData
 	): BN {
 		const userPosition =
-			this.getUserPosition(marketIndex) || this.getEmptyPosition(marketIndex);
-		const market = this.clearingHouse.getPerpMarketAccount(
+			this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
+		const market = this.driftClient.getPerpMarketAccount(
 			userPosition.marketIndex
 		);
 		return calculateBaseAssetValueWithOracle(
@@ -875,9 +885,7 @@ export class ClearingHouseUser {
 		amountToClose?: BN,
 		useAMMClose = false
 	): [BN, BN] {
-		const market = this.clearingHouse.getPerpMarketAccount(
-			position.marketIndex
-		);
+		const market = this.driftClient.getPerpMarketAccount(position.marketIndex);
 
 		const entryPrice = calculateEntryPrice(position);
 
@@ -967,7 +975,7 @@ export class ClearingHouseUser {
 		marketIndex: number,
 		category: MarginCategory = 'Initial'
 	): BN {
-		const market = this.clearingHouse.getPerpMarketAccount(marketIndex);
+		const market = this.driftClient.getPerpMarketAccount(marketIndex);
 
 		const totalAssetValue = this.getTotalAssetValue();
 		if (totalAssetValue.eq(ZERO)) {
@@ -1018,7 +1026,7 @@ export class ClearingHouseUser {
 		let liquidationBuffer = undefined;
 		if (this.getUserAccount().isBeingLiquidated) {
 			liquidationBuffer = new BN(
-				this.clearingHouse.getStateAccount().liquidationMarginBufferRatio
+				this.driftClient.getStateAccount().liquidationMarginBufferRatio
 			);
 		}
 		const maintenanceRequirement =
@@ -1036,7 +1044,7 @@ export class ClearingHouseUser {
 				continue;
 			}
 
-			const market = this.clearingHouse.getPerpMarketAccount(
+			const market = this.driftClient.getPerpMarketAccount(
 				userPosition.marketIndex
 			);
 			if (
@@ -1085,7 +1093,7 @@ export class ClearingHouseUser {
 			this.getTotalPerpPositionValueExcludingMarket(perpPosition.marketIndex);
 
 		const currentPerpPosition =
-			this.getUserPosition(perpPosition.marketIndex) ||
+			this.getPerpPosition(perpPosition.marketIndex) ||
 			this.getEmptyPosition(perpPosition.marketIndex);
 
 		const currentPerpPositionBaseSize = currentPerpPosition.baseAssetAmount;
@@ -1114,7 +1122,7 @@ export class ClearingHouseUser {
 
 		if (proposedBaseAssetAmount.eq(ZERO)) return new BN(-1);
 
-		const market = this.clearingHouse.getPerpMarketAccount(
+		const market = this.driftClient.getPerpMarketAccount(
 			proposedPerpPosition.marketIndex
 		);
 
@@ -1132,7 +1140,7 @@ export class ClearingHouseUser {
 			this.getUserAccount().perpPositions.reduce(
 				(totalMarginRequirement, position) => {
 					if (position.marketIndex !== perpPosition.marketIndex) {
-						const market = this.clearingHouse.getPerpMarketAccount(
+						const market = this.driftClient.getPerpMarketAccount(
 							position.marketIndex
 						);
 						const positionValue = calculateBaseAssetValueWithOracle(
@@ -1215,7 +1223,7 @@ export class ClearingHouseUser {
 		let markPriceAfterTrade;
 		if (positionBaseSizeChange.eq(ZERO)) {
 			markPriceAfterTrade = calculateReservePrice(
-				this.clearingHouse.getPerpMarketAccount(perpPosition.marketIndex),
+				this.driftClient.getPerpMarketAccount(perpPosition.marketIndex),
 				this.getOracleDataForPerpMarket(perpPosition.marketIndex)
 			);
 		} else {
@@ -1225,7 +1233,7 @@ export class ClearingHouseUser {
 			markPriceAfterTrade = calculateTradeSlippage(
 				direction,
 				positionBaseSizeChange.abs(),
-				this.clearingHouse.getPerpMarketAccount(perpPosition.marketIndex),
+				this.driftClient.getPerpMarketAccount(perpPosition.marketIndex),
 				'base',
 				this.getOracleDataForPerpMarket(perpPosition.marketIndex)
 			)[3]; // newPrice after swap
@@ -1249,7 +1257,7 @@ export class ClearingHouseUser {
 		closeQuoteAmount: BN
 	): BN {
 		const currentPosition =
-			this.getUserPosition(positionMarketIndex) ||
+			this.getPerpPosition(positionMarketIndex) ||
 			this.getEmptyPosition(positionMarketIndex);
 
 		const closeBaseAmount = currentPosition.baseAssetAmount
@@ -1296,7 +1304,7 @@ export class ClearingHouseUser {
 		tradeSide: PositionDirection
 	): BN {
 		const currentPosition =
-			this.getUserPosition(targetMarketIndex) ||
+			this.getPerpPosition(targetMarketIndex) ||
 			this.getEmptyPosition(targetMarketIndex);
 
 		const targetSide = isVariant(tradeSide, 'short') ? 'short' : 'long';
@@ -1331,8 +1339,7 @@ export class ClearingHouseUser {
 			// current leverage is greater than max leverage - can only reduce position size
 
 			if (!targetingSameSide) {
-				const market =
-					this.clearingHouse.getPerpMarketAccount(targetMarketIndex);
+				const market = this.driftClient.getPerpMarketAccount(targetMarketIndex);
 				const perpPositionValue = this.getPerpPositionValue(
 					targetMarketIndex,
 					oracleData
@@ -1383,7 +1390,7 @@ export class ClearingHouseUser {
 		includeOpenOrders = true
 	): BN {
 		const currentPosition =
-			this.getUserPosition(targetMarketIndex) ||
+			this.getPerpPosition(targetMarketIndex) ||
 			this.getEmptyPosition(targetMarketIndex);
 
 		const oracleData = this.getOracleDataForPerpMarket(targetMarketIndex);
@@ -1444,7 +1451,7 @@ export class ClearingHouseUser {
 	 */
 	public calculateFeeForQuoteAmount(quoteAmount: BN): BN {
 		const feeTier =
-			this.clearingHouse.getStateAccount().perpFeeStructure.feeTiers[0];
+			this.driftClient.getStateAccount().perpFeeStructure.feeTiers[0];
 		return quoteAmount
 			.mul(new BN(feeTier.feeNumerator))
 			.div(new BN(feeTier.feeDenominator));
@@ -1458,7 +1465,7 @@ export class ClearingHouseUser {
 	 */
 	public getWithdrawalLimit(marketIndex: number, reduceOnly?: boolean): BN {
 		const nowTs = new BN(Math.floor(Date.now() / 1000));
-		const spotMarket = this.clearingHouse.getSpotMarketAccount(marketIndex);
+		const spotMarket = this.driftClient.getSpotMarketAccount(marketIndex);
 
 		const { borrowLimit, withdrawLimit } = calculateWithdrawLimit(
 			spotMarket,
@@ -1485,7 +1492,7 @@ export class ClearingHouseUser {
 		const userSpotBalance = userSpotPosition
 			? getTokenAmount(
 					userSpotPosition.scaledBalance,
-					this.clearingHouse.getSpotMarketAccount(marketIndex),
+					this.driftClient.getSpotMarketAccount(marketIndex),
 					SpotBalanceType.DEPOSIT
 			  )
 			: ZERO;
@@ -1536,7 +1543,7 @@ export class ClearingHouseUser {
 		includeOpenOrders?: boolean
 	): BN {
 		const currentPerpPosition =
-			this.getUserPosition(marketToIgnore) ||
+			this.getPerpPosition(marketToIgnore) ||
 			this.getEmptyPosition(marketToIgnore);
 
 		const oracleData = this.getOracleDataForPerpMarket(marketToIgnore);
@@ -1558,18 +1565,17 @@ export class ClearingHouseUser {
 
 	private getOracleDataForPerpMarket(marketIndex: number): OraclePriceData {
 		const oracleKey =
-			this.clearingHouse.getPerpMarketAccount(marketIndex).amm.oracle;
+			this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
 		const oracleData =
-			this.clearingHouse.getOraclePriceDataAndSlot(oracleKey).data;
+			this.driftClient.getOraclePriceDataAndSlot(oracleKey).data;
 
 		return oracleData;
 	}
 	private getOracleDataForSpotMarket(marketIndex: number): OraclePriceData {
-		const oracleKey =
-			this.clearingHouse.getSpotMarketAccount(marketIndex).oracle;
+		const oracleKey = this.driftClient.getSpotMarketAccount(marketIndex).oracle;
 
 		const oracleData =
-			this.clearingHouse.getOraclePriceDataAndSlot(oracleKey).data;
+			this.driftClient.getOraclePriceDataAndSlot(oracleKey).data;
 
 		return oracleData;
 	}

package/src/{clearingHouseUserConfig.ts → userConfig.ts}

@@ -1,14 +1,14 @@
-import { ClearingHouse } from './clearingHouse';
+import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 
-export type ClearingHouseUserConfig = {
-	accountSubscription?: ClearingHouseUserAccountSubscriptionConfig;
-	clearingHouse: ClearingHouse;
+export type UserConfig = {
+	accountSubscription?: UserSubscriptionConfig;
+	driftClient: DriftClient;
 	userAccountPublicKey: PublicKey;
 };
 
-export type ClearingHouseUserAccountSubscriptionConfig =
+export type UserSubscriptionConfig =
 	| {
 			type: 'websocket';
 	  }