@drift-labs/sdk 2.130.0-beta.9 → 2.130.0

package/src/math/amm.ts

@@ -157,11 +157,6 @@ export function calculateUpdatedAMM(
 	amm: AMM,
 	oraclePriceData: OraclePriceData
 ): AMM {
-	if (!oraclePriceData?.fetchedWithMMOracle) {
-		console.log(
-			'Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing'
-		);
-	}
 	if (amm.curveUpdateIntensity == 0 || oraclePriceData === undefined) {
 		return amm;
 	}
@@ -204,9 +199,12 @@ export function calculateUpdatedAMMSpreadReserves(
 	oraclePriceData: OraclePriceData,
 	isPrediction = false
 ): { baseAssetReserve: BN; quoteAssetReserve: BN; sqrtK: BN; newPeg: BN } {
-	if (!oraclePriceData?.fetchedWithMMOracle) {
+	if (
+		!oraclePriceData?.fetchedWithMMOracle &&
+		oraclePriceData?.isMMOracleActive
+	) {
 		console.log(
-			'Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing'
+			'Use driftClient method getMMOracleDataForPerpMarket for accurate updated AMM in calculateUpdatedAMMSpreadReserves'
 		);
 	}
 	const newAmm = calculateUpdatedAMM(amm, oraclePriceData);
@@ -231,15 +229,18 @@ export function calculateUpdatedAMMSpreadReserves(
 	return result;
 }
 
-export function calculateBidAskPrice(
+export function calculateAMMBidAskPrice(
 	amm: AMM,
 	oraclePriceData: OraclePriceData,
 	withUpdate = true,
 	isPrediction = false
 ): [BN, BN] {
-	if (!oraclePriceData?.fetchedWithMMOracle) {
+	if (
+		!oraclePriceData?.fetchedWithMMOracle &&
+		oraclePriceData?.isMMOracleActive
+	) {
 		console.log(
-			'Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing'
+			'Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing in calculateAMMBidAskPrice'
 		);
 	}
 	let newAmm: AMM;
@@ -271,6 +272,44 @@ export function calculateBidAskPrice(
 	return [bidPrice, askPrice];
 }
 
+/**
+ * @deprecated Use calculateAMMBidAskPrice instead
+ */
+export function calculateBidAskPrice(
+	amm: AMM,
+	oraclePriceData: OraclePriceData,
+	withUpdate = true,
+	isPrediction = false
+): [BN, BN] {
+	let newAmm: AMM;
+	if (withUpdate) {
+		newAmm = calculateUpdatedAMM(amm, oraclePriceData);
+	} else {
+		newAmm = amm;
+	}
+
+	const [bidReserves, askReserves] = calculateSpreadReserves(
+		newAmm,
+		oraclePriceData,
+		undefined,
+		isPrediction
+	);
+
+	const askPrice = calculatePrice(
+		askReserves.baseAssetReserve,
+		askReserves.quoteAssetReserve,
+		newAmm.pegMultiplier
+	);
+
+	const bidPrice = calculatePrice(
+		bidReserves.baseAssetReserve,
+		bidReserves.quoteAssetReserve,
+		newAmm.pegMultiplier
+	);
+
+	return [bidPrice, askPrice];
+}
+
 /**
  * Calculates a price given an arbitrary base and quote amount (they must have the same precision)
  *

package/src/math/margin.ts

@@ -16,7 +16,7 @@ import { OraclePriceData } from '../oracles/types';
 import { calculateMarketMarginRatio } from './market';
 import { calculateScaledInitialAssetWeight } from './spotBalance';
 import { DriftClient } from '../driftClient';
-import { OneShotUserAccountSubscriber } from '../accounts/userAccount/oneShotUserAccountSubscriber';
+import { OneShotUserAccountSubscriber } from '../accounts/oneShotUserAccountSubscriber';
 import {
 	PerpMarketAccount,
 	PerpPosition,

package/src/math/market.ts

@@ -6,6 +6,7 @@ import {
 	SpotMarketAccount,
 	SpotBalanceType,
 	MarketType,
+	isVariant,
 } from '../types';
 import {
 	calculateAmmReservesAfterSwap,
@@ -26,6 +27,9 @@ import {
 	PRICE_TO_QUOTE_PRECISION,
 	ZERO,
 	QUOTE_SPOT_MARKET_INDEX,
+	PRICE_PRECISION,
+	PERCENTAGE_PRECISION,
+	FUNDING_RATE_PRECISION,
 } from '../constants/numericConstants';
 import { getTokenAmount } from './spotBalance';
 import { DLOB } from '../dlob/DLOB';
@@ -350,3 +354,104 @@ export function calculatePerpMarketBaseLiquidatorFee(
 		return market.liquidatorFee;
 	}
 }
+
+/**
+ * Calculates trigger price for a perp market based on oracle price and current time
+ * Implements the same logic as the Rust get_trigger_price function
+ *
+ * @param market - The perp market account
+ * @param oraclePrice - Current oracle price (precision: PRICE_PRECISION)
+ * @param now - Current timestamp in seconds
+ * @returns trigger price (precision: PRICE_PRECISION)
+ */
+export function getTriggerPrice(
+	market: PerpMarketAccount,
+	oraclePrice: BN,
+	now: BN,
+	useMedianPrice: boolean
+): BN {
+	if (!useMedianPrice) {
+		return oraclePrice.abs();
+	}
+
+	const lastFillPrice = market.lastFillPrice;
+
+	// Calculate 5-minute basis
+	const markPrice5minTwap = market.amm.lastMarkPriceTwap5Min;
+	const lastOraclePriceTwap5min =
+		market.amm.historicalOracleData.lastOraclePriceTwap5Min;
+	const basis5min = markPrice5minTwap.sub(lastOraclePriceTwap5min);
+
+	const oraclePlusBasis5min = oraclePrice.add(basis5min);
+
+	// Calculate funding basis
+	const lastFundingBasis = getLastFundingBasis(market, oraclePrice, now);
+	const oraclePlusFundingBasis = oraclePrice.add(lastFundingBasis);
+
+	const prices = [
+		lastFillPrice.gt(ZERO) ? lastFillPrice : oraclePrice,
+		oraclePlusFundingBasis,
+		oraclePlusBasis5min,
+	].sort((a, b) => a.cmp(b));
+	const medianPrice = prices[1];
+
+	return clampTriggerPrice(market, oraclePrice.abs(), medianPrice);
+}
+
+/**
+ * Calculates the last funding basis for trigger price calculation
+ * Implements the same logic as the Rust get_last_funding_basis function
+ */
+function getLastFundingBasis(
+	market: PerpMarketAccount,
+	oraclePrice: BN,
+	now: BN
+): BN {
+	if (market.amm.lastFundingOracleTwap.gt(ZERO)) {
+		const lastFundingRate = market.amm.lastFundingRate
+			.mul(PRICE_PRECISION)
+			.div(market.amm.lastFundingOracleTwap)
+			.muln(24);
+		const lastFundingRatePreAdj = lastFundingRate.sub(
+			FUNDING_RATE_PRECISION.div(new BN(5000)) // FUNDING_RATE_OFFSET_PERCENTAGE
+		);
+		const timeLeftUntilFundingUpdate = BN.min(
+			BN.max(now.sub(market.amm.lastFundingRateTs), ZERO),
+			market.amm.fundingPeriod
+		);
+		const lastFundingBasis = oraclePrice
+			.mul(lastFundingRatePreAdj)
+			.div(PERCENTAGE_PRECISION)
+			.mul(market.amm.fundingPeriod.sub(timeLeftUntilFundingUpdate))
+			.div(market.amm.fundingPeriod)
+			.div(new BN(1000)); // FUNDING_RATE_BUFFER
+		return lastFundingBasis;
+	} else {
+		return ZERO;
+	}
+}
+
+/**
+ * Clamps trigger price based on contract tier
+ * Implements the same logic as the Rust clamp_trigger_price function
+ */
+function clampTriggerPrice(
+	market: PerpMarketAccount,
+	oraclePrice: BN,
+	medianPrice: BN
+): BN {
+	let maxBpsDiff: BN;
+	const tier = market.contractTier;
+	if (isVariant(tier, 'a') || isVariant(tier, 'b')) {
+		maxBpsDiff = new BN(500); // 20 BPS
+	} else if (isVariant(tier, 'c')) {
+		maxBpsDiff = new BN(100); // 100 BPS
+	} else {
+		maxBpsDiff = new BN(40); // 250 BPS
+	}
+	const maxOracleDiff = oraclePrice.div(maxBpsDiff);
+	return BN.min(
+		BN.max(medianPrice, oraclePrice.sub(maxOracleDiff)),
+		oraclePrice.add(maxOracleDiff)
+	);
+}

package/src/math/orders.ts

@@ -387,3 +387,21 @@ const FLAG_IS_SIGNED_MSG = 0x01;
 export function isSignedMsgOrder(order: Order): boolean {
 	return (order.bitFlags & FLAG_IS_SIGNED_MSG) !== 0;
 }
+
+export function calculateOrderBaseAssetAmount(
+	order: Order,
+	existingBaseAssetAmount: BN
+): BN {
+	if (!order.reduceOnly) {
+		return order.baseAssetAmount;
+	}
+
+	if (isVariant(order.direction, 'long')) {
+		return BN.min(
+			BN.min(existingBaseAssetAmount, ZERO).abs(),
+			order.baseAssetAmount
+		);
+	} else {
+		return BN.min(BN.max(existingBaseAssetAmount, ZERO), order.baseAssetAmount);
+	}
+}

package/src/math/state.ts

@@ -4,7 +4,7 @@ import {
 	PERCENTAGE_PRECISION,
 	ZERO,
 } from '../constants/numericConstants';
-import { StateAccount } from '../types';
+import { FeatureBitFlags, StateAccount } from '../types';
 
 export function calculateInitUserFee(stateAccount: StateAccount): BN {
 	const maxInitFee = new BN(stateAccount.maxInitializeUserFee)
@@ -32,3 +32,9 @@ export function getMaxNumberOfSubAccounts(stateAccount: StateAccount): BN {
 	}
 	return new BN(stateAccount.maxNumberOfSubAccounts).muln(100);
 }
+
+export function useMedianTriggerPrice(stateAccount: StateAccount): boolean {
+	return (
+		(stateAccount.featureBitFlags & FeatureBitFlags.MEDIAN_TRIGGER_PRICE) > 0
+	);
+}

package/src/openbook/openbookV2Subscriber.ts

@@ -1,5 +1,5 @@
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { PRICE_PRECISION } from '../constants/numericConstants';
 import { AnchorProvider, BN, Idl, Program, Wallet } from '@coral-xyz/anchor';
 import { L2Level, L2OrderBookGenerator } from '../dlob/orderBookLevels';

package/src/oracles/types.ts

@@ -17,6 +17,7 @@ export type OraclePriceData = {
 	twapConfidence?: BN;
 	maxPrice?: BN; // pre-launch markets only
 	fetchedWithMMOracle?: boolean;
+	isMMOracleActive?: boolean;
 };
 
 export type OracleInfo = {

package/src/oracles/utils.ts

@@ -1,13 +1,11 @@
 import { BN } from '@coral-xyz/anchor';
 import { MMOraclePriceData } from './types';
-import { FIVE } from '../constants/numericConstants';
 
 export function getOracleConfidenceFromMMOracleData(
 	mmOracleData: MMOraclePriceData
 ): BN {
 	const mmOracleDiffPremium = mmOracleData.mmOraclePrice
 		.sub(mmOracleData.oraclePriceData.price)
-		.abs()
-		.div(FIVE);
+		.abs();
 	return mmOracleData.oraclePriceData.confidence.add(mmOracleDiffPremium);
 }

package/src/orderSubscriber/OrderSubscriber.ts

@@ -13,7 +13,9 @@ import { PollingSubscription } from './PollingSubscription';
 import { WebsocketSubscription } from './WebsocketSubscription';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { BN, ProtectMakerParamsMap } from '../index';
+import { calculateOrderBaseAssetAmount, ZERO } from '../index';
+import { BN } from '@coral-xyz/anchor';
+import { ProtectMakerParamsMap } from '../dlob/types';
 import { decodeUser } from '../decode/user';
 import { grpcSubscription } from './grpcSubscription';
 import { isUserProtectedMaker } from '../math/userStatus';
@@ -246,7 +248,19 @@ export class OrderSubscriber {
 		for (const [key, { userAccount }] of this.usersAccounts.entries()) {
 			const protectedMaker = isUserProtectedMaker(userAccount);
 			for (const order of userAccount.orders) {
-				dlob.insertOrder(order, key, slot, protectedMaker);
+				let baseAssetAmount = order.baseAssetAmount;
+				if (order.reduceOnly) {
+					const existingBaseAmount =
+						userAccount.perpPositions.find(
+							(pos) =>
+								pos.marketIndex === order.marketIndex && pos.openOrders > 0
+						)?.baseAssetAmount || ZERO;
+					baseAssetAmount = calculateOrderBaseAssetAmount(
+						order,
+						existingBaseAmount
+					);
+				}
+				dlob.insertOrder(order, key, slot, protectedMaker, baseAssetAmount);
 			}
 		}
 		return dlob;

package/src/orderSubscriber/WebsocketSubscription.ts

@@ -1,6 +1,6 @@
 import { OrderSubscriber } from './OrderSubscriber';
 import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
-import { WebSocketProgramAccountSubscriber } from '../accounts/programAccount/webSocketProgramAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from '../types';
 import { Commitment, Context, PublicKey } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';

package/src/orderSubscriber/grpcSubscription.ts

@@ -1,6 +1,6 @@
 import { Context, PublicKey } from '@solana/web3.js';
 import { Buffer } from 'buffer';
-import { grpcProgramAccountSubscriber } from '../accounts/programAccount/grpcProgramAccountSubscriber';
+import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
 import { OrderSubscriber } from './OrderSubscriber';
 import { GrpcConfigs, ResubOpts } from '../accounts/types';
 import { UserAccount } from '../types';

package/src/phoenix/phoenixSubscriber.ts

@@ -1,5 +1,5 @@
 import { Connection, PublicKey, SYSVAR_CLOCK_PUBKEY } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import {
 	Client,
 	deserializeClockData,

package/src/serum/serumSubscriber.ts

@@ -1,5 +1,5 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Market, Orderbook } from '@project-serum/serum';
 import { SerumMarketSubscriberConfig } from './types';
 import { BN } from '@coral-xyz/anchor';

package/src/serum/types.ts

@@ -1,5 +1,5 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 
 export type SerumMarketSubscriberConfig = {
 	connection: Connection;

package/src/swift/grpcSignedMsgUserAccountSubscriber.ts

@@ -1,5 +1,5 @@
 import { Commitment, Context, PublicKey } from '@solana/web3.js';
-import { grpcProgramAccountSubscriber } from '../accounts/programAccount/grpcProgramAccountSubscriber';
+import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
 import { GrpcConfigs, ResubOpts } from '../accounts/types';
 import { SignedMsgUserOrdersAccount } from '../types';
 import { getSignedMsgUserOrdersFilter } from '../memcmp';

package/src/swift/signedMsgUserAccountSubscriber.ts

@@ -1,5 +1,5 @@
 import { getSignedMsgUserOrdersFilter } from '../memcmp';
-import { WebSocketProgramAccountSubscriber } from '../accounts/programAccount/webSocketProgramAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { SignedMsgOrderId, SignedMsgUserOrdersAccount } from '../types';
 import { Commitment, Context, PublicKey } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';

package/src/swift/swiftOrderSubscriber.ts

@@ -3,7 +3,7 @@ import {
 	MainnetPerpMarkets,
 } from '../constants/perpMarkets';
 import { DriftClient } from '../driftClient';
-import { DriftEnv } from '../config/types';
+import { DriftEnv } from '../config';
 import {
 	getUserAccountPublicKey,
 	getUserStatsAccountPublicKey,

package/src/testClient.ts

@@ -1,7 +1,7 @@
 import { AdminClient } from './adminClient';
 import { ConfirmOptions, Signer, Transaction } from '@solana/web3.js';
 import { TxSigAndSlot } from './tx/types';
-import { PollingDriftClientAccountSubscriber } from './accounts/driftClientAccount/pollingDriftClientAccountSubscriber';
+import { PollingDriftClientAccountSubscriber } from './accounts/pollingDriftClientAccountSubscriber';
 import { DriftClientConfig } from './driftClientConfig';
 
 export class TestClient extends AdminClient {

package/src/types.ts

@@ -28,6 +28,11 @@ export enum ExchangeStatus {
 	PAUSED = 255,
 }
 
+export enum FeatureBitFlags {
+	MM_ORACLE_UPDATE = 1,
+	MEDIAN_TRIGGER_PRICE = 2,
+}
+
 export class MarketStatus {
 	static readonly INITIALIZED = { initialized: {} };
 	static readonly ACTIVE = { active: {} };
@@ -760,6 +765,7 @@ export type StateAccount = {
 	initialPctToLiquidate: number;
 	liquidationDuration: number;
 	maxInitializeUserFee: number;
+	featureBitFlags: number;
 };
 
 export type PerpMarketAccount = {
@@ -806,6 +812,7 @@ export type PerpMarketAccount = {
 	highLeverageMarginRatioMaintenance: number;
 	protectedMakerLimitPriceDivisor: number;
 	protectedMakerDynamicDivisor: number;
+	lastFillPrice: BN;
 };
 
 export type HistoricalOracleData = {
@@ -1017,6 +1024,8 @@ export type AMM = {
 	takerSpeedBumpOverride: number;
 	ammSpreadAdjustment: number;
 	ammInventorySpreadAdjustment: number;
+
+	lastFundingOracleTwap: BN;
 };
 
 // # User Account Types

package/src/user.ts

@@ -92,8 +92,8 @@ import {
 } from './math/margin';
 import { OraclePriceData } from './oracles/types';
 import { UserConfig } from './userConfig';
-import { PollingUserAccountSubscriber } from './accounts/userAccount/pollingUserAccountSubscriber';
-import { WebSocketUserAccountSubscriber } from './accounts/userAccount/webSocketUserAccountSubscriber';
+import { PollingUserAccountSubscriber } from './accounts/pollingUserAccountSubscriber';
+import { WebSocketUserAccountSubscriber } from './accounts/webSocketUserAccountSubscriber';
 import {
 	calculateWeightedTokenValue,
 	getWorstCaseTokenAmounts,
@@ -107,7 +107,7 @@ import { getPerpMarketTierNumber, getSpotMarketTierNumber } from './math/tiers';
 import { StrictOraclePrice } from './oracles/strictOraclePrice';
 
 import { calculateSpotFuelBonus, calculatePerpFuelBonus } from './math/fuel';
-import { grpcUserAccountSubscriber } from './accounts/userAccount/grpcUserAccountSubscriber';
+import { grpcUserAccountSubscriber } from './accounts/grpcUserAccountSubscriber';
 
 export class User {
 	driftClient: DriftClient;

package/src/userConfig.ts

@@ -1,6 +1,6 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from './accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
 
 export type UserConfig = {

package/src/userMap/PollingSubscription.ts

@@ -1,7 +1,7 @@
-import { UserMapInterface } from './types';
+import { UserMap } from './userMap';
 
 export class PollingSubscription {
-	private userMap: UserMapInterface;
+	private userMap: UserMap;
 	private frequency: number;
 	private skipInitialLoad: boolean;
 
@@ -12,7 +12,7 @@ export class PollingSubscription {
 		frequency,
 		skipInitialLoad = false,
 	}: {
-		userMap: UserMapInterface;
+		userMap: UserMap;
 		frequency: number;
 		skipInitialLoad?: boolean;
 		includeIdle?: boolean;

package/src/userMap/WebsocketSubscription.ts

@@ -1,12 +1,12 @@
+import { UserMap } from './userMap';
 import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
-import { WebSocketProgramAccountSubscriber } from '../accounts/programAccount/webSocketProgramAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from '../types';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';
-import { UserMapInterface } from './types';
 
 export class WebsocketSubscription {
-	private userMap: UserMapInterface;
+	private userMap: UserMap;
 	private commitment: Commitment;
 	private skipInitialLoad: boolean;
 	private resubOpts?: ResubOpts;
@@ -25,7 +25,7 @@ export class WebsocketSubscription {
 		decodeFn,
 		additionalFilters = undefined,
 	}: {
-		userMap: UserMapInterface;
+		userMap: UserMap;
 		commitment: Commitment;
 		skipInitialLoad?: boolean;
 		resubOpts?: ResubOpts;

package/src/userMap/grpcSubscription.ts

@@ -1,14 +1,14 @@
+import { UserMap } from './userMap';
 import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
-import { WebSocketProgramAccountSubscriber } from '../accounts/programAccount/webSocketProgramAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from '../types';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import { GrpcConfigs, ResubOpts } from '../accounts/types';
-import { grpcProgramAccountSubscriber } from '../accounts/programAccount/grpcProgramAccountSubscriber';
-import { UserMapInterface } from './types';
+import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
 
 export class grpcSubscription {
 	private grpcConfigs: GrpcConfigs;
-	private userMap: UserMapInterface;
+	private userMap: UserMap;
 	private skipInitialLoad: boolean;
 	private resubOpts?: ResubOpts;
 	private includeIdle?: boolean;
@@ -27,7 +27,7 @@ export class grpcSubscription {
 		additionalFilters = undefined,
 	}: {
 		grpcConfigs: GrpcConfigs;
-		userMap: UserMapInterface;
+		userMap: UserMap;
 		skipInitialLoad?: boolean;
 		resubOpts?: ResubOpts;
 		includeIdle?: boolean;

package/src/userMap/userMap.ts

@@ -16,8 +16,8 @@ import {
 import { WrappedEvent } from '../events/types';
 import { DLOB } from '../dlob/DLOB';
 import { UserSubscriptionConfig } from '../userConfig';
-import { DataAndSlot } from '../accounts/types';
-import { OneShotUserAccountSubscriber } from '../accounts/userAccount/oneShotUserAccountSubscriber';
+import { DataAndSlot, UserEvents } from '../accounts/types';
+import { OneShotUserAccountSubscriber } from '../accounts/oneShotUserAccountSubscriber';
 import { ProtectMakerParamsMap } from '../dlob/types';
 
 import {
@@ -45,11 +45,38 @@ import { decodeUser } from '../decode/user';
 import { grpcSubscription } from './grpcSubscription';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { UserEvents } from './events';
-import { UserMapInterface } from './types';
 
 const MAX_USER_ACCOUNT_SIZE_BYTES = 4376;
 
+export interface UserMapInterface {
+	eventEmitter: StrictEventEmitter<EventEmitter, UserEvents>;
+	subscribe(): Promise<void>;
+	unsubscribe(): Promise<void>;
+	addPubkey(
+		userAccountPublicKey: PublicKey,
+		userAccount?: UserAccount,
+		slot?: number,
+		accountSubscription?: UserSubscriptionConfig
+	): Promise<void>;
+	has(key: string): boolean;
+	get(key: string): User | undefined;
+	getWithSlot(key: string): DataAndSlot<User> | undefined;
+	mustGet(
+		key: string,
+		accountSubscription?: UserSubscriptionConfig
+	): Promise<User>;
+	mustGetWithSlot(
+		key: string,
+		accountSubscription?: UserSubscriptionConfig
+	): Promise<DataAndSlot<User>>;
+	getUserAuthority(key: string): PublicKey | undefined;
+	updateWithOrderRecord(record: OrderRecord): Promise<void>;
+	values(): IterableIterator<User>;
+	valuesWithSlot(): IterableIterator<DataAndSlot<User>>;
+	entries(): IterableIterator<[string, User]>;
+	entriesWithSlot(): IterableIterator<[string, DataAndSlot<User>]>;
+}
+
 export class UserMap implements UserMapInterface {
 	private userMap = new Map<string, DataAndSlot<User>>();
 	driftClient: DriftClient;

package/src/userMap/userStatsMap.ts

@@ -14,8 +14,8 @@ import {
 } from '../types';
 import { UserStats } from '../userStats';
 import { WrappedEvent } from '../events/types';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
-import { PollingUserStatsAccountSubscriber } from '../accounts/userStatsAccount/pollingUserStatsAccountSubscriber';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { PollingUserStatsAccountSubscriber } from '../accounts/pollingUserStatsAccountSubscriber';
 import { SyncConfig } from './userMapConfig';
 import { getUserStatsFilter } from '../memcmp';
 import { PublicKey } from '@solana/web3.js';

package/src/userStats.ts

@@ -2,14 +2,14 @@ import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { DataAndSlot, UserStatsAccountSubscriber } from './accounts/types';
 import { UserStatsConfig } from './userStatsConfig';
-import { PollingUserStatsAccountSubscriber } from './accounts/userStatsAccount/pollingUserStatsAccountSubscriber';
-import { WebSocketUserStatsAccountSubscriber } from './accounts/userStatsAccount/webSocketUserStatsAccountSubsriber';
+import { PollingUserStatsAccountSubscriber } from './accounts/pollingUserStatsAccountSubscriber';
+import { WebSocketUserStatsAccountSubscriber } from './accounts/webSocketUserStatsAccountSubsriber';
 import { ReferrerInfo, SpotMarketAccount, UserStatsAccount } from './types';
 import {
 	getUserAccountPublicKeySync,
 	getUserStatsAccountPublicKey,
 } from './addresses/pda';
-import { grpcUserStatsAccountSubscriber } from './accounts/userStatsAccount/grpcUserStatsAccountSubscriber';
+import { grpcUserStatsAccountSubscriber } from './accounts/grpcUserStatsAccountSubscriber';
 import { FUEL_START_TS } from './constants/numericConstants';
 import { ZERO } from './constants/numericConstants';
 import {

package/src/userStatsConfig.ts

@@ -1,6 +1,6 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from './accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs } from './accounts/types';
 
 export type UserStatsConfig = {

package/tests/accounts/customizedCadenceBulkAccountLoader.test.ts

@@ -1,5 +1,5 @@
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-import { CustomizedCadenceBulkAccountLoader } from '../../src/accounts/bulkAccountLoader/customizedCadenceBulkAccountLoader';
+import { CustomizedCadenceBulkAccountLoader } from '../../src/accounts/customizedCadenceBulkAccountLoader';
 import { expect } from 'chai';
 
 describe('CustomizedCadenceBulkAccountLoader', () => {

package/lib/browser/config/types.d.ts

@@ -1 +0,0 @@
-export type DriftEnv = 'devnet' | 'mainnet-beta';

package/lib/browser/config/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });