@drift-labs/sdk 2.136.0-beta.0 → 2.136.0-beta.2

package/src/accounts/websocketProgramUserAccountSubscriber.ts

@@ -0,0 +1,94 @@
+import {
+	DataAndSlot,
+	NotSubscribedError,
+	UserAccountEvents,
+	UserAccountSubscriber,
+} from './types';
+import { Program } from '@coral-xyz/anchor';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { Context, PublicKey } from '@solana/web3.js';
+import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
+import { UserAccount } from '../types';
+
+export class WebSocketProgramUserAccountSubscriber
+	implements UserAccountSubscriber
+{
+	isSubscribed: boolean;
+	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+
+	private userAccountPublicKey: PublicKey;
+	private program: Program;
+	private programSubscriber: WebSocketProgramAccountSubscriber<UserAccount>;
+	private userAccountAndSlot?: DataAndSlot<UserAccount>;
+
+	public constructor(
+		program: Program,
+		userAccountPublicKey: PublicKey,
+		programSubscriber: WebSocketProgramAccountSubscriber<UserAccount>
+	) {
+		this.isSubscribed = false;
+		this.program = program;
+		this.userAccountPublicKey = userAccountPublicKey;
+		this.eventEmitter = new EventEmitter();
+		this.programSubscriber = programSubscriber;
+	}
+
+	async subscribe(userAccount?: UserAccount): Promise<boolean> {
+		if (this.isSubscribed) {
+			return true;
+		}
+
+		if (userAccount) {
+			this.updateData(userAccount, 0);
+		}
+
+		this.programSubscriber.onChange = (
+			accountId: PublicKey,
+			data: UserAccount,
+			context: Context
+		) => {
+			if (accountId.equals(this.userAccountPublicKey)) {
+				this.updateData(data, context.slot);
+				this.eventEmitter.emit('userAccountUpdate', data);
+				this.eventEmitter.emit('update');
+			}
+		};
+
+		this.isSubscribed = true;
+		return true;
+	}
+
+	async fetch(): Promise<void> {
+		if (!this.isSubscribed) {
+			throw new NotSubscribedError(
+				'Must subscribe before fetching account updates'
+			);
+		}
+
+		const account = await this.program.account.user.fetch(
+			this.userAccountPublicKey
+		);
+		this.updateData(account as UserAccount, 0);
+	}
+
+	updateData(userAccount: UserAccount, slot: number): void {
+		this.userAccountAndSlot = {
+			data: userAccount,
+			slot,
+		};
+	}
+
+	async unsubscribe(): Promise<void> {
+		this.isSubscribed = false;
+	}
+
+	getUserAccountAndSlot(): DataAndSlot<UserAccount> {
+		if (!this.userAccountAndSlot) {
+			throw new NotSubscribedError(
+				'Must subscribe before getting user account data'
+			);
+		}
+		return this.userAccountAndSlot;
+	}
+}

package/src/driftClient.ts

@@ -137,7 +137,6 @@ import { decodeName, DEFAULT_USER_NAME, encodeName } from './userName';
 import { MMOraclePriceData, OraclePriceData } from './oracles/types';
 import { DriftClientConfig } from './driftClientConfig';
 import { PollingDriftClientAccountSubscriber } from './accounts/pollingDriftClientAccountSubscriber';
-import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDriftClientAccountSubscriber';
 import { RetryTxSender } from './tx/retryTxSender';
 import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
@@ -194,6 +193,8 @@ import { getOracleId } from './oracles/oracleId';
 import { SignedMsgOrderParams } from './types';
 import { sha256 } from '@noble/hashes/sha256';
 import { getOracleConfidenceFromMMOracleData } from './oracles/utils';
+import { Commitment } from 'gill';
+import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDriftClientAccountSubscriber';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -371,6 +372,8 @@ export class DriftClient {
 				resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
 				logResubMessages: config.accountSubscription?.logResubMessages,
 				commitment: config.accountSubscription?.commitment,
+				programUserAccountSubscriber:
+					config.accountSubscription?.programUserAccountSubscriber,
 			};
 			this.userStatsAccountSubscriptionConfig = {
 				type: 'websocket',
@@ -436,7 +439,10 @@ export class DriftClient {
 				}
 			);
 		} else {
-			this.accountSubscriber = new WebSocketDriftClientAccountSubscriber(
+			const accountSubscriberClass =
+				config.accountSubscription?.driftClientAccountSubscriber ??
+				WebSocketDriftClientAccountSubscriber;
+			this.accountSubscriber = new accountSubscriberClass(
 				this.program,
 				config.perpMarketIndexes ?? [],
 				config.spotMarketIndexes ?? [],
@@ -447,9 +453,7 @@ export class DriftClient {
 					resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
 					logResubMessages: config.accountSubscription?.logResubMessages,
 				},
-				config.accountSubscription?.commitment,
-				config.accountSubscription?.perpMarketAccountSubscriber,
-				config.accountSubscription?.oracleAccountSubscriber
+				config.accountSubscription?.commitment as Commitment
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
@@ -610,7 +614,8 @@ export class DriftClient {
 	public getSpotMarketAccount(
 		marketIndex: number
 	): SpotMarketAccount | undefined {
-		return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
+		return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex)
+			?.data;
 	}
 
 	/**
@@ -621,7 +626,8 @@ export class DriftClient {
 		marketIndex: number
 	): Promise<SpotMarketAccount | undefined> {
 		await this.accountSubscriber.fetch();
-		return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
+		return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex)
+			?.data;
 	}
 
 	public getSpotMarketAccounts(): SpotMarketAccount[] {

package/src/driftClientConfig.ts

@@ -5,7 +5,7 @@ import {
 	PublicKey,
 	TransactionVersion,
 } from '@solana/web3.js';
-import { IWallet, TxParams } from './types';
+import { IWallet, TxParams, UserAccount } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
@@ -19,6 +19,9 @@ import {
 import { Coder, Program } from '@coral-xyz/anchor';
 import { WebSocketAccountSubscriber } from './accounts/webSocketAccountSubscriber';
 import { WebSocketAccountSubscriberV2 } from './accounts/webSocketAccountSubscriberV2';
+import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
+import { WebSocketDriftClientAccountSubscriberV2 } from './accounts/webSocketDriftClientAccountSubscriberV2';
+import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDriftClientAccountSubscriber';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -63,6 +66,7 @@ export type DriftClientSubscriptionConfig =
 			resubTimeoutMs?: number;
 			logResubMessages?: boolean;
 			commitment?: Commitment;
+			programUserAccountSubscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
 			perpMarketAccountSubscriber?: new (
 				accountName: string,
 				program: Program,
@@ -71,14 +75,17 @@ export type DriftClientSubscriptionConfig =
 				resubOpts?: ResubOpts,
 				commitment?: Commitment
 			) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>;
-			oracleAccountSubscriber?: new (
-				accountName: string,
+			/** If you use V2 here, whatever you pass for perpMarketAccountSubscriber and oracleAccountSubscriber will be ignored and it will use v2 under the hood regardless */
+			driftClientAccountSubscriber?: new (
 				program: Program,
-				accountPublicKey: PublicKey,
-				decodeBuffer?: (buffer: Buffer) => any,
-				resubOpts?: ResubOpts,
-				commitment?: Commitment
-			) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>;
+				perpMarketIndexes: number[],
+				spotMarketIndexes: number[],
+				oracleInfos: OracleInfo[],
+				shouldFindAllMarketsAndOracles: boolean,
+				delistedMarketSetting: DelistedMarketSetting
+			) =>
+				| WebSocketDriftClientAccountSubscriber
+				| WebSocketDriftClientAccountSubscriberV2;
 	  }
 	| {
 			type: 'polling';

package/src/factory/bigNum.ts

@@ -250,7 +250,8 @@ export class BigNum {
 
 	public prettyPrint(
 		useTradePrecision?: boolean,
-		precisionOverride?: number
+		precisionOverride?: number,
+		decimalOverride?: number
 	): string {
 		const [leftSide, rightSide] = this.printShort(
 			useTradePrecision,
@@ -258,6 +259,21 @@ export class BigNum {
 		).split(BigNum.delim);
 
 		let formattedLeftSide = leftSide;
+		let formattedRightSide = rightSide;
+
+		// Apply decimal override if specified
+		if (decimalOverride !== undefined) {
+			if (decimalOverride === 0) {
+				formattedRightSide = undefined;
+			} else {
+				// If no decimal part exists, create one with zeros
+				const currentRightSide = rightSide || '';
+				// Pad with zeros if needed or truncate if too long
+				formattedRightSide = currentRightSide
+					.padEnd(decimalOverride, '0')
+					.substring(0, decimalOverride);
+			}
+		}
 
 		const isNeg = formattedLeftSide.includes('-');
 		if (isNeg) {
@@ -277,7 +293,7 @@ export class BigNum {
 		}
 
 		return `${isNeg ? '-' : ''}${formattedLeftSide}${
-			rightSide ? `${BigNum.delim}${rightSide}` : ''
+			formattedRightSide ? `${BigNum.delim}${formattedRightSide}` : ''
 		}`;
 	}
 
@@ -503,15 +519,16 @@ export class BigNum {
 	 */
 	public toNotional(
 		useTradePrecision?: boolean,
-		precisionOverride?: number
+		precisionOverride?: number,
+		decimalOverride?: number
 	): string {
 		const prefix = `${this.lt(BigNum.zero()) ? `-` : ``}$`;
 
 		const usingCustomPrecision =
-			true && (useTradePrecision || precisionOverride);
+			true && (useTradePrecision || precisionOverride || decimalOverride);
 
 		let val = usingCustomPrecision
-			? this.prettyPrint(useTradePrecision, precisionOverride)
+			? this.prettyPrint(useTradePrecision, precisionOverride, decimalOverride)
 			: BigNum.fromPrint(this.toFixed(2), new BN(2)).prettyPrint();
 
 		// Append trailing zeroes out to 2 decimal places if not using custom precision

package/src/index.ts

@@ -12,6 +12,10 @@ export * from './accounts/webSocketDriftClientAccountSubscriber';
 export * from './accounts/webSocketInsuranceFundStakeAccountSubscriber';
 export * from './accounts/webSocketHighLeverageModeConfigAccountSubscriber';
 export { WebSocketAccountSubscriberV2 } from './accounts/webSocketAccountSubscriberV2';
+export { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
+export { WebSocketProgramUserAccountSubscriber } from './accounts/websocketProgramUserAccountSubscriber';
+export { WebSocketProgramAccountsSubscriberV2 } from './accounts/webSocketProgramAccountsSubscriberV2';
+export { WebSocketDriftClientAccountSubscriberV2 } from './accounts/webSocketDriftClientAccountSubscriberV2';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';

package/src/memcmp.ts

@@ -112,3 +112,20 @@ export function getSignedMsgUserOrdersFilter(): MemcmpFilter {
 		},
 	};
 }
+
+export function getPerpMarketAccountsFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 0,
+			bytes: bs58.encode(BorshAccountsCoder.accountDiscriminator('PerpMarket')),
+		},
+	};
+}
+export function getSpotMarketAccountsFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 0,
+			bytes: bs58.encode(BorshAccountsCoder.accountDiscriminator('SpotMarket')),
+		},
+	};
+}

package/src/oracles/oracleId.ts

@@ -24,9 +24,43 @@ export function getOracleSourceNum(source: OracleSource): number {
 	throw new Error('Invalid oracle source');
 }
 
+export function getOracleSourceFromNum(sourceNum: number): OracleSource {
+	if (sourceNum === OracleSourceNum.PYTH) return 'pyth';
+	if (sourceNum === OracleSourceNum.PYTH_1K) return 'pyth1K';
+	if (sourceNum === OracleSourceNum.PYTH_1M) return 'pyth1M';
+	if (sourceNum === OracleSourceNum.PYTH_PULL) return 'pythPull';
+	if (sourceNum === OracleSourceNum.PYTH_1K_PULL) return 'pyth1KPull';
+	if (sourceNum === OracleSourceNum.PYTH_1M_PULL) return 'pyth1MPull';
+	if (sourceNum === OracleSourceNum.SWITCHBOARD) return 'switchboard';
+	if (sourceNum === OracleSourceNum.QUOTE_ASSET) return 'quoteAsset';
+	if (sourceNum === OracleSourceNum.PYTH_STABLE_COIN) return 'pythStableCoin';
+	if (sourceNum === OracleSourceNum.PYTH_STABLE_COIN_PULL)
+		return 'pythStableCoinPull';
+	if (sourceNum === OracleSourceNum.PRELAUNCH) return 'prelaunch';
+	if (sourceNum === OracleSourceNum.SWITCHBOARD_ON_DEMAND)
+		return 'switchboardOnDemand';
+	if (sourceNum === OracleSourceNum.PYTH_LAZER) return 'pythLazer';
+	if (sourceNum === OracleSourceNum.PYTH_LAZER_1K) return 'pythLazer1K';
+	if (sourceNum === OracleSourceNum.PYTH_LAZER_1M) return 'pythLazer1M';
+	if (sourceNum === OracleSourceNum.PYTH_LAZER_STABLE_COIN)
+		return 'pythLazerStableCoin';
+	throw new Error('Invalid oracle source');
+}
+
 export function getOracleId(
 	publicKey: PublicKey,
 	source: OracleSource
 ): string {
 	return `${publicKey.toBase58()}-${getOracleSourceNum(source)}`;
 }
+
+export function getPublicKeyAndSourceFromOracleId(oracleId: string): {
+	publicKey: PublicKey;
+	source: OracleSource;
+} {
+	const [publicKey, source] = oracleId.split('-');
+	return {
+		publicKey: new PublicKey(publicKey),
+		source: getOracleSourceFromNum(parseInt(source)),
+	};
+}

package/src/user.ts

@@ -75,6 +75,7 @@ import {
 } from './types';
 import { standardizeBaseAssetAmount } from './math/orders';
 import { UserStats } from './userStats';
+import { WebSocketProgramUserAccountSubscriber } from './accounts/websocketProgramUserAccountSubscriber';
 import {
 	calculateAssetWeight,
 	calculateLiabilityWeight,
@@ -149,15 +150,26 @@ export class User {
 				}
 			);
 		} else {
-			this.accountSubscriber = new WebSocketUserAccountSubscriber(
-				config.driftClient.program,
-				config.userAccountPublicKey,
-				{
-					resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-					logResubMessages: config.accountSubscription?.logResubMessages,
-				},
-				config.accountSubscription?.commitment
-			);
+			if (
+				config.accountSubscription?.type === 'websocket' &&
+				config.accountSubscription?.programUserAccountSubscriber
+			) {
+				this.accountSubscriber = new WebSocketProgramUserAccountSubscriber(
+					config.driftClient.program,
+					config.userAccountPublicKey,
+					config.accountSubscription.programUserAccountSubscriber
+				);
+			} else {
+				this.accountSubscriber = new WebSocketUserAccountSubscriber(
+					config.driftClient.program,
+					config.userAccountPublicKey,
+					{
+						resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
+						logResubMessages: config.accountSubscription?.logResubMessages,
+					},
+					config.accountSubscription?.commitment
+				);
+			}
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
 	}

package/src/userConfig.ts

@@ -2,6 +2,8 @@ import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
+import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
+import { UserAccount } from './types';
 
 export type UserConfig = {
 	accountSubscription?: UserSubscriptionConfig;
@@ -21,6 +23,7 @@ export type UserSubscriptionConfig =
 			resubTimeoutMs?: number;
 			logResubMessages?: boolean;
 			commitment?: Commitment;
+			programUserAccountSubscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
 	  }
 	| {
 			type: 'polling';

package/lib/browser/accounts/webSocketProgramAccountSubscriberV2.d.ts

@@ -1,53 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
-import { Program } from '@coral-xyz/anchor';
-import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
-import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData } from 'gill';
-export declare class WebSocketProgramAccountSubscriberV2<T> implements ProgramAccountSubscriber<T> {
-    subscriptionName: string;
-    accountDiscriminator: string;
-    bufferAndSlot?: BufferAndSlot;
-    bufferAndSlotMap: Map<string, BufferAndSlot>;
-    program: Program;
-    decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
-    listenerId?: number;
-    resubOpts?: ResubOpts;
-    isUnsubscribing: boolean;
-    timeoutId?: ReturnType<typeof setTimeout>;
-    options: {
-        filters: MemcmpFilter[];
-        commitment?: Commitment;
-    };
-    receivingData: boolean;
-    private rpc;
-    private rpcSubscriptions;
-    private abortController?;
-    private accountsToMonitor;
-    private pollingIntervalMs;
-    private pollingTimeouts;
-    private lastWsNotificationTime;
-    private accountsCurrentlyPolling;
-    private batchPollingTimeout?;
-    constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
-        filters: MemcmpFilter[];
-        commitment?: Commitment;
-    }, resubOpts?: ResubOpts, accountsToMonitor?: PublicKey[]);
-    subscribe(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
-    protected setTimeout(): void;
-    handleRpcResponse(context: {
-        slot: bigint;
-    }, accountInfo?: AccountInfoBase & (AccountInfoWithBase58EncodedData | AccountInfoWithBase64EncodedData)): void;
-    private startMonitoringForAccounts;
-    private startMonitoringForAccount;
-    private startPollingForAccount;
-    private startBatchPolling;
-    private pollAllAccounts;
-    private pollAccount;
-    private clearPollingTimeouts;
-    unsubscribe(onResub?: boolean): Promise<void>;
-    addAccountToMonitor(accountId: PublicKey): void;
-    removeAccountFromMonitor(accountId: PublicKey): void;
-    setPollingInterval(intervalMs: number): void;
-}