Improve Circular Dependencies 2 (#1778)

Author: ChesterSim

bun.lock

@@ -9,7 +9,7 @@ import {
 	ZERO,
 } from '../constants/numericConstants';
 import { decodeName } from '../userName';
-import { DLOBNode, DLOBNodeType, TriggerOrderNode } from './DLOBNode';
+import { DLOBNode, DLOBNodeType } from './DLOBNode';
 import { DriftClient } from '../driftClient';
 import {
 	getLimitPrice,
@@ -33,9 +33,18 @@ import {
 } from '../types';
 import { isUserProtectedMaker } from '../math/userStatus';
 import { OraclePriceData } from '../oracles/types';
-import { ProtectMakerParamsMap } from './types';
+import {
+	DLOBFilterFcn,
+	DLOBOrders,
+	IDLOB,
+	MarketNodeLists,
+	NodeToFill,
+	NodeToTrigger,
+	OrderBookCallback,
+	ProtectMakerParamsMap,
+} from './types';
 import { SlotSubscriber } from '../slot/SlotSubscriber';
-import { UserMap } from '../userMap/userMap';
+import { IUserMap } from '../userMap/types';
 import { PublicKey } from '@solana/web3.js';
 import { ammPaused, exchangePaused, fillPaused } from '../math/exchangeStatus';
 import {
@@ -50,59 +59,6 @@ import {
 import { isFallbackAvailableLiquiditySource } from '../math/auction';
 import { convertToNumber } from '../math/conversion';
 
-export type DLOBOrder = { user: PublicKey; order: Order };
-export type DLOBOrders = DLOBOrder[];
-
-export type MarketNodeLists = {
-	restingLimit: {
-		ask: NodeList<'restingLimit'>;
-		bid: NodeList<'restingLimit'>;
-	};
-	floatingLimit: {
-		ask: NodeList<'floatingLimit'>;
-		bid: NodeList<'floatingLimit'>;
-	};
-	protectedFloatingLimit: {
-		ask: NodeList<'protectedFloatingLimit'>;
-		bid: NodeList<'protectedFloatingLimit'>;
-	};
-	takingLimit: {
-		ask: NodeList<'takingLimit'>;
-		bid: NodeList<'takingLimit'>;
-	};
-	market: {
-		ask: NodeList<'market'>;
-		bid: NodeList<'market'>;
-	};
-	trigger: {
-		above: NodeList<'trigger'>;
-		below: NodeList<'trigger'>;
-	};
-	signedMsg: {
-		ask: NodeList<'signedMsg'>;
-		bid: NodeList<'signedMsg'>;
-	};
-};
-
-type OrderBookCallback = () => void;
-
-/**
- *  Receives a DLOBNode and is expected to return true if the node should
- *  be taken into account when generating, or false otherwise.
- *
- * Currently used in functions that rely on getBestNode
- */
-export type DLOBFilterFcn = (node: DLOBNode) => boolean;
-
-export type NodeToFill = {
-	node: DLOBNode;
-	makerNodes: DLOBNode[];
-};
-
-export type NodeToTrigger = {
-	node: TriggerOrderNode;
-};
-
 const SUPPORTED_ORDER_TYPES = [
 	'market',
 	'limit',
@@ -111,7 +67,7 @@ const SUPPORTED_ORDER_TYPES = [
 	'oracle',
 ];
 
-export class DLOB {
+export class DLOB implements IDLOB {
 	openOrders = new Map<MarketTypeStr, Set<string>>();
 	orderLists = new Map<MarketTypeStr, Map<number, MarketNodeLists>>();
 	maxSlotForRestingLimitOrders = 0;
@@ -166,7 +122,7 @@ export class DLOB {
 	 * @returns a promise that resolves when the DLOB is initialized
 	 */
 	public async initFromUserMap(
-		userMap: UserMap,
+		userMap: IUserMap,
 		slot: number
 	): Promise<boolean> {
 		if (this.initialized) {

sdk/src/dlob/DLOB.ts

@@ -5,10 +5,10 @@ import {
 	DLOBSource,
 	DLOBSubscriberEvents,
 	DLOBSubscriptionConfig,
+	IDLOB,
 	ProtectMakerParamsMap,
 	SlotSource,
 } from './types';
-import { DriftClient } from '../driftClient';
 import { isVariant, MarketType } from '../types';
 import {
 	DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS,
@@ -19,14 +19,15 @@ import {
 	L3OrderBook,
 } from './orderBookLevels';
 import { getProtectedMakerParamsMap } from '../math/protectedMakerParams';
+import { IDriftClient } from '../driftClient/types';
 
 export class DLOBSubscriber {
-	driftClient: DriftClient;
+	driftClient: IDriftClient;
 	dlobSource: DLOBSource;
 	slotSource: SlotSource;
 	updateFrequency: number;
 	intervalId?: ReturnType<typeof setTimeout>;
-	dlob: DLOB;
+	dlob: IDLOB;
 	public eventEmitter: StrictEventEmitter<EventEmitter, DLOBSubscriberEvents>;
 	protectedMakerView: boolean;
 	constructor(config: DLOBSubscriptionConfig) {
@@ -69,7 +70,7 @@ export class DLOBSubscriber {
 		);
 	}
 
-	public getDLOB(): DLOB {
+	public getDLOB(): IDLOB {
 		return this.dlob;
 	}
 

sdk/src/dlob/DLOBSubscriber.ts

@@ -24,7 +24,8 @@ import {
 } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import { PublicKey } from '@solana/web3.js';
-import { standardizeBaseAssetAmount, standardizePrice } from '../math/orders';
+import { standardizePrice } from '../math/orders';
+import { standardizeBaseAssetAmount } from '../math/utils';
 
 type liquiditySource =
 	| 'serum'