Remove barrel imports from SDK (#1777)

ChesterSim · web-flow · commit debbe958deff · 2025-07-29T01:07:45.000+08:00
diff --git a/sdk/bun.lock b/sdk/bun.lock
diff --git a/sdk/package.json b/sdk/package.json
@@ -22,7 +22,8 @@
 		"patch-and-pub": "npm version patch --force && npm publish",
 		"prettify": "prettier --check './src/***/*.ts'",
 		"prettify:fix": "prettier --write './{src,tests}/***/*.ts'",
-		"version": "node ./scripts/updateVersion.js"
+		"version": "node ./scripts/updateVersion.js",
+		"circular-deps": "bunx madge --circular --circular --extensions ts src"
 	},
 	"keywords": [
 		"drift-labs",
@@ -78,6 +79,7 @@
 		"eslint-config-prettier": "8.3.0",
 		"eslint-plugin-prettier": "3.4.0",
 		"lodash": "4.17.21",
+		"madge": "^8.0.0",
 		"mocha": "10.7.3",
 		"object-sizeof": "2.6.5",
 		"prettier": "3.0.1",
@@ -94,4 +96,4 @@
 		"@solana/errors": "2.0.0-preview.4",
 		"@solana/codecs-data-structures": "2.0.0-preview.4"
 	}
-}
+}
diff --git a/sdk/src/accounts/types.ts b/sdk/src/accounts/types.ts
@@ -6,12 +6,14 @@ import {
 	UserAccount,
 	UserStatsAccount,
 	InsuranceFundStake,
+	HighLeverageModeConfig,
 } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
-import { HighLeverageModeConfig, OracleInfo, OraclePriceData, User } from '..';
+import { OracleInfo, OraclePriceData } from '../oracles/types';
+import { User } from '../user';
 import { ChannelOptions, CommitmentLevel } from '../isomorphic/grpc';
 
 export interface AccountSubscriber<T> {
diff --git a/sdk/src/addresses/pda.ts b/sdk/src/addresses/pda.ts
@@ -2,7 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 import * as anchor from '@coral-xyz/anchor';
 import { BN } from '@coral-xyz/anchor';
 import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
-import { SpotMarketAccount, TokenProgramFlag } from '..';
+import { SpotMarketAccount, TokenProgramFlag } from '../types';
 
 export async function getDriftStateAccountPublicKeyAndNonce(
 	programId: PublicKey
diff --git a/sdk/src/clock/clockSubscriber.ts b/sdk/src/clock/clockSubscriber.ts
@@ -1,7 +1,7 @@
 import { Commitment, Connection, SYSVAR_CLOCK_PUBKEY } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types/types/src';
-import { BN } from '..';
+import { BN } from '@coral-xyz/anchor';
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 type ClockSubscriberConfig = {
diff --git a/sdk/src/config.ts b/sdk/src/config.ts
@@ -1,5 +1,5 @@
-import { ConfirmOptions } from '@solana/web3.js';
-import { PerpMarketAccount, PublicKey, SpotMarketAccount } from '.';
+import { ConfirmOptions, PublicKey } from '@solana/web3.js';
+import { PerpMarketAccount, SpotMarketAccount } from './types';
 import {
 	DevnetPerpMarkets,
 	MainnetPerpMarkets,
diff --git a/sdk/src/constants/perpMarkets.ts b/sdk/src/constants/perpMarkets.ts
@@ -1,6 +1,6 @@
-import { OracleSource } from '../';
-import { DriftEnv } from '../';
 import { PublicKey } from '@solana/web3.js';
+import { OracleSource } from '../types';
+import { DriftEnv } from '../config';
 
 export type PerpMarketConfig = {
 	fullName?: string;
diff --git a/sdk/src/constants/spotMarkets.ts b/sdk/src/constants/spotMarkets.ts
@@ -1,5 +1,4 @@
 import { PublicKey } from '@solana/web3.js';
-import { BN, DriftEnv, OracleSource } from '../';
 import {
 	QUOTE_PRECISION,
 	QUOTE_PRECISION_EXP,
@@ -10,6 +9,9 @@ import {
 	NINE,
 	FIVE,
 } from './numericConstants';
+import { OracleSource } from '../types';
+import { BN } from '@coral-xyz/anchor';
+import { DriftEnv } from '../config';
 
 export type SpotMarketConfig = {
 	symbol: string;
diff --git a/sdk/src/decode/user.ts b/sdk/src/decode/user.ts
@@ -1,4 +1,6 @@
+import { BN } from '@coral-xyz/anchor';
 import {
+	MarginMode,
 	MarketType,
 	Order,
 	OrderStatus,
@@ -11,8 +13,7 @@ import {
 	UserAccount,
 } from '../types';
 import { PublicKey } from '@solana/web3.js';
-import { BN, MarginMode } from '../';
-import { ZERO } from '../';
+import { ZERO } from '../constants/numericConstants';
 
 function readUnsignedBigInt64LE(buffer: Buffer, offset: number): BN {
 	return new BN(buffer.subarray(offset, offset + 8), 10, 'le');
diff --git a/sdk/src/dlob/DLOB.ts b/sdk/src/dlob/DLOB.ts
@@ -1,40 +1,40 @@
 import { getOrderSignature, NodeList } from './NodeList';
+import { BN } from '@coral-xyz/anchor';
 import {
 	BASE_PRECISION,
-	BN,
 	BN_MAX,
-	convertToNumber,
-	decodeName,
-	DLOBNode,
-	DLOBNodeType,
-	DriftClient,
+	PRICE_PRECISION,
+	QUOTE_PRECISION,
+	ZERO,
+} from '../constants/numericConstants';
+import { decodeName } from '../userName';
+import { DLOBNode, DLOBNodeType, TriggerOrderNode } from './DLOBNode';
+import { DriftClient } from '../driftClient';
+import {
 	getLimitPrice,
-	getVariant,
-	isFallbackAvailableLiquiditySource,
-	isOneOfVariant,
 	isOrderExpired,
 	isRestingLimitOrder,
 	isTriggered,
-	isUserProtectedMaker,
+	mustBeTriggered,
+} from '../math/orders';
+import {
+	getVariant,
+	isOneOfVariant,
 	isVariant,
 	MarketType,
 	MarketTypeStr,
-	mustBeTriggered,
-	OraclePriceData,
 	Order,
 	PerpMarketAccount,
 	PositionDirection,
-	PRICE_PRECISION,
 	ProtectedMakerParams,
-	ProtectMakerParamsMap,
-	QUOTE_PRECISION,
-	SlotSubscriber,
 	SpotMarketAccount,
 	StateAccount,
-	TriggerOrderNode,
-	UserMap,
-	ZERO,
-} from '..';
+} from '../types';
+import { isUserProtectedMaker } from '../math/userStatus';
+import { OraclePriceData } from '../oracles/types';
+import { ProtectMakerParamsMap } from './types';
+import { SlotSubscriber } from '../slot/SlotSubscriber';
+import { UserMap } from '../userMap/userMap';
 import { PublicKey } from '@solana/web3.js';
 import { ammPaused, exchangePaused, fillPaused } from '../math/exchangeStatus';
 import {
@@ -46,6 +46,8 @@ import {
 	L3OrderBook,
 	mergeL2LevelGenerators,
 } from './orderBookLevels';
+import { isFallbackAvailableLiquiditySource } from '../math/auction';
+import { convertToNumber } from '../math/conversion';
 
 export type DLOBOrder = { user: PublicKey; order: Order };
 export type DLOBOrders = DLOBOrder[];
diff --git a/sdk/src/dlob/DLOBNode.ts b/sdk/src/dlob/DLOBNode.ts
@@ -1,15 +1,13 @@
+import { BN } from '@coral-xyz/anchor';
 import {
 	AMM_RESERVE_PRECISION,
-	BN,
-	convertToNumber,
-	getLimitPrice,
-	isVariant,
 	PRICE_PRECISION,
-	OraclePriceData,
-	Order,
 	ZERO,
-	ProtectedMakerParams,
-} from '..';
+} from '../constants/numericConstants';
+import { getLimitPrice } from '../math/orders';
+import { isVariant, Order, ProtectedMakerParams } from '../types';
+import { OraclePriceData } from '../oracles/types';
+import { convertToNumber } from '../math/conversion';
 import { getOrderSignature } from './NodeList';
 
 export interface DLOBNode {
diff --git a/sdk/src/dlob/NodeList.ts b/sdk/src/dlob/NodeList.ts
@@ -1,4 +1,9 @@
-import { isVariant, MarketTypeStr, Order, ProtectedMakerParams } from '..';
+import {
+	isVariant,
+	MarketTypeStr,
+	Order,
+	ProtectedMakerParams,
+} from '../types';
 import { createNode, DLOBNode, DLOBNodeMap } from './DLOBNode';
 
 export type SortDirection = 'asc' | 'desc';
diff --git a/sdk/src/dlob/orderBookLevels.ts b/sdk/src/dlob/orderBookLevels.ts
@@ -1,27 +1,30 @@
+import { BN } from '@coral-xyz/anchor';
 import {
 	BASE_PRECISION,
-	BN,
+	QUOTE_PRECISION,
+	ZERO,
+	PRICE_PRECISION,
+	AMM_TO_QUOTE_PRECISION_RATIO,
+} from '../constants/numericConstants';
+import {
 	calculateAmmReservesAfterSwap,
 	calculateMarketOpenBidAsk,
 	calculateQuoteAssetAmountSwapped,
 	calculateSpreadReserves,
 	calculateUpdatedAMM,
-	DLOBNode,
-	isOperationPaused,
+} from '../math/amm';
+import { DLOBNode } from './DLOBNode';
+import { isOperationPaused } from '../math/exchangeStatus';
+import {
 	isVariant,
-	OraclePriceData,
 	PerpMarketAccount,
 	PerpOperation,
 	PositionDirection,
-	QUOTE_PRECISION,
-	standardizePrice,
 	SwapDirection,
-	ZERO,
-	PRICE_PRECISION,
-	AMM_TO_QUOTE_PRECISION_RATIO,
-	standardizeBaseAssetAmount,
-} from '..';
+} from '../types';
+import { OraclePriceData } from '../oracles/types';
 import { PublicKey } from '@solana/web3.js';
+import { standardizeBaseAssetAmount, standardizePrice } from '../math/orders';
 
 type liquiditySource =
 	| 'serum'
diff --git a/sdk/src/indicative-quotes/indicativeQuotesSender.ts b/sdk/src/indicative-quotes/indicativeQuotesSender.ts
@@ -1,5 +1,5 @@
 import { Keypair } from '@solana/web3.js';
-import { BN } from '..';
+import { BN } from '@coral-xyz/anchor';
 import nacl from 'tweetnacl';
 import { decodeUTF8 } from 'tweetnacl-util';
 import WebSocket from 'ws';
diff --git a/sdk/src/math/amm.ts b/sdk/src/math/amm.ts
@@ -23,7 +23,8 @@ import {
 	isVariant,
 } from '../types';
 import { assert } from '../assert/assert';
-import { squareRootBN, sigNum, clampBN, standardizeBaseAssetAmount } from '..';
+import { squareRootBN, sigNum, clampBN } from './utils';
+import { standardizeBaseAssetAmount } from './orders';
 
 import { OraclePriceData } from '../oracles/types';
 import {
diff --git a/sdk/src/math/auction.ts b/sdk/src/math/auction.ts
@@ -1,15 +1,13 @@
 import { isOneOfVariant, isVariant, Order, PositionDirection } from '../types';
+import { BN } from '@coral-xyz/anchor';
 import {
-	BN,
-	getVariant,
 	ONE,
-	OrderBitFlag,
 	ZERO,
-	PerpMarketAccount,
-	getPerpMarketTierNumber,
 	QUOTE_PRECISION,
 	PRICE_PRECISION,
-} from '../.';
+} from '../constants/numericConstants';
+import { getVariant, OrderBitFlag, PerpMarketAccount } from '../types';
+import { getPerpMarketTierNumber } from './tiers';
 
 export function isAuctionComplete(order: Order, slot: number): boolean {
 	if (order.auctionDuration === 0) {
diff --git a/sdk/src/math/bankruptcy.ts b/sdk/src/math/bankruptcy.ts
@@ -1,4 +1,6 @@
-import { ZERO, hasOpenOrders, isVariant } from '..';
+import { ZERO } from '../constants/numericConstants';
+import { hasOpenOrders } from './position';
+import { isVariant } from '../types';
 import { User } from '../user';
 
 export function isUserBankrupt(user: User): boolean {
diff --git a/sdk/src/math/conversion.ts b/sdk/src/math/conversion.ts
@@ -1,4 +1,4 @@
-import { BN } from '../';
+import { BN } from '@coral-xyz/anchor';
 import { PRICE_PRECISION } from '../constants/numericConstants';
 
 export const convertToNumber = (
diff --git a/sdk/src/math/fuel.ts b/sdk/src/math/fuel.ts
@@ -1,5 +1,5 @@
 import { BN } from '@coral-xyz/anchor';
-import { SpotMarketAccount, PerpMarketAccount } from '..';
+import { SpotMarketAccount, PerpMarketAccount } from '../types';
 import {
 	QUOTE_PRECISION,
 	ZERO,
diff --git a/sdk/src/math/margin.ts b/sdk/src/math/margin.ts
@@ -13,18 +13,18 @@ import {
 } from '../constants/numericConstants';
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
+import { calculateMarketMarginRatio } from './market';
+import { calculateScaledInitialAssetWeight } from './spotBalance';
+import { DriftClient } from '../driftClient';
+import { OneShotUserAccountSubscriber } from '../accounts/oneShotUserAccountSubscriber';
 import {
-	calculateMarketMarginRatio,
-	calculateScaledInitialAssetWeight,
-	DriftClient,
-	OneShotUserAccountSubscriber,
 	PerpMarketAccount,
 	PerpPosition,
 	PositionDirection,
-	PublicKey,
-	User,
 	UserAccount,
-} from '..';
+} from '../types';
+import { PublicKey } from '@solana/web3.js';
+import { User } from '../user';
 import { isVariant } from '../types';
 import { assert } from '../assert/assert';
 
diff --git a/sdk/src/math/position.ts b/sdk/src/math/position.ts
@@ -1,4 +1,4 @@
-import { BN, SpotMarketAccount } from '../';
+import { BN } from '@coral-xyz/anchor';
 import {
 	AMM_RESERVE_PRECISION,
 	AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO,
@@ -9,7 +9,12 @@ import {
 	ZERO,
 } from '../constants/numericConstants';
 import { OraclePriceData } from '../oracles/types';
-import { PerpMarketAccount, PositionDirection, PerpPosition } from '../types';
+import {
+	PerpMarketAccount,
+	PositionDirection,
+	PerpPosition,
+	SpotMarketAccount,
+} from '../types';
 import {
 	calculateUpdatedAMM,
 	calculateUpdatedAMMSpreadReserves,
diff --git a/sdk/src/math/protectedMakerParams.ts b/sdk/src/math/protectedMakerParams.ts
@@ -1,4 +1,5 @@
-import { BN, ProtectMakerParamsMap } from '..';
+import { BN } from '@coral-xyz/anchor';
+import { ProtectMakerParamsMap } from '../dlob/types';
 import { PerpMarketAccount, ProtectedMakerParams } from '../types';
 
 export function getProtectedMakerParams(
diff --git a/sdk/src/math/state.ts b/sdk/src/math/state.ts
@@ -1,5 +1,10 @@
+import { BN } from '@coral-xyz/anchor';
+import {
+	LAMPORTS_PRECISION,
+	PERCENTAGE_PRECISION,
+	ZERO,
+} from '../constants/numericConstants';
 import { StateAccount } from '../types';
-import { BN, LAMPORTS_PRECISION, PERCENTAGE_PRECISION, ZERO } from '../';
 
 export function calculateInitUserFee(stateAccount: StateAccount): BN {
 	const maxInitFee = new BN(stateAccount.maxInitializeUserFee)
diff --git a/sdk/src/math/userStatus.ts b/sdk/src/math/userStatus.ts
@@ -1,4 +1,4 @@
-import { UserAccount, UserStatus } from '..';
+import { UserAccount, UserStatus } from '../types';
 
 export function isUserProtectedMaker(userAccount: UserAccount): boolean {
 	return (userAccount.status & UserStatus.PROTECTED_MAKER) > 0;
diff --git a/sdk/src/math/utils.ts b/sdk/src/math/utils.ts
@@ -1,4 +1,5 @@
-import { BN, ONE, ZERO } from '../';
+import { BN } from '@coral-xyz/anchor';
+import { ONE, ZERO } from '../constants/numericConstants';
 
 export function clampBN(x: BN, min: BN, max: BN): BN {
 	return BN.max(min, BN.min(x, max));
diff --git a/sdk/src/oracles/pythLazerClient.ts b/sdk/src/oracles/pythLazerClient.ts
@@ -7,7 +7,8 @@ import {
 	QUOTE_PRECISION,
 	TEN,
 } from '../constants/numericConstants';
-import { DRIFT_PROGRAM_ID, Wallet } from '..';
+import { DRIFT_PROGRAM_ID } from '../config';
+import { Wallet } from '../wallet';
 import driftIDL from '../idl/drift.json';
 
 export class PythLazerClient implements OracleClient {
diff --git a/sdk/src/oracles/pythPullClient.ts b/sdk/src/oracles/pythPullClient.ts
diff --git a/sdk/src/swift/swiftOrderSubscriber.ts b/sdk/src/swift/swiftOrderSubscriber.ts
diff --git a/sdk/src/tokenFaucet.ts b/sdk/src/tokenFaucet.ts
diff --git a/sdk/src/tx/txParamProcessor.ts b/sdk/src/tx/txParamProcessor.ts
diff --git a/sdk/src/types.ts b/sdk/src/types.ts
diff --git a/sdk/src/user.ts b/sdk/src/user.ts
diff --git a/sdk/src/userMap/userMap.ts b/sdk/src/userMap/userMap.ts
diff --git a/sdk/src/userMap/userStatsMap.ts b/sdk/src/userMap/userStatsMap.ts
diff --git a/sdk/src/util/TransactionConfirmationManager.ts b/sdk/src/util/TransactionConfirmationManager.ts
