@drift-labs/sdk 2.162.0-beta.2 → 2.163.0-beta.10

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -4,17 +4,17 @@ import {
 	TokenAccountEvents,
 	TokenAccountSubscriber,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { Account } from '@solana/spl-token';
 import { parseTokenAccount } from '../token';
+import { DriftProgram } from '../config';
 
 export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, TokenAccountEvents>;
 	publicKey: PublicKey;
 

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -75,7 +75,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 					return;
 				}
 
-				const account = this.decode('User', buffer);
+				const account = this.decode('user', buffer);
 				this.user = { data: account, slot };
 				this.eventEmitter.emit('userAccountUpdate', account);
 				this.eventEmitter.emit('update');
@@ -101,7 +101,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 			);
 			if (dataAndContext.context.slot > (this.user?.slot ?? 0)) {
 				this.user = {
-					data: this.decode('User', dataAndContext.value.data),
+					data: this.decode('user', dataAndContext.value.data),
 					slot: dataAndContext.context.slot,
 				};
 			}

package/src/accounts/pollingUserStatsAccountSubscriber.ts

@@ -4,7 +4,7 @@ import {
 	UserStatsAccountSubscriber,
 	UserStatsAccountEvents,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
@@ -15,7 +15,7 @@ export class PollingUserStatsAccountSubscriber
 	implements UserStatsAccountSubscriber
 {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
 	userStatsAccountPublicKey: PublicKey;
 
@@ -26,7 +26,7 @@ export class PollingUserStatsAccountSubscriber
 	userStats?: DataAndSlot<UserStatsAccount>;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		userStatsAccountPublicKey: PublicKey,
 		accountLoader: BulkAccountLoader
 	) {
@@ -74,11 +74,10 @@ export class PollingUserStatsAccountSubscriber
 					return;
 				}
 
-				const account =
-					this.program.account.userStats.coder.accounts.decodeUnchecked(
-						'UserStats',
-						buffer
-					);
+				const account = this.program.coder.accounts.decodeUnchecked(
+					'userStats',
+					buffer
+				);
 				this.userStats = { data: account, slot };
 				this.eventEmitter.emit('userStatsAccountUpdate', account);
 				this.eventEmitter.emit('update');
@@ -98,14 +97,15 @@ export class PollingUserStatsAccountSubscriber
 
 	async fetch(): Promise<void> {
 		try {
-			const dataAndContext =
-				await this.program.account.userStats.fetchAndContext(
-					this.userStatsAccountPublicKey,
-					this.accountLoader.commitment
-				);
+			const dataAndContext = await (
+				this.program.account as any
+			).userStats.fetchAndContext(
+				this.userStatsAccountPublicKey,
+				this.accountLoader.commitment
+			);
 			if (dataAndContext.context.slot > (this.userStats?.slot ?? 0)) {
 				this.userStats = {
-					data: dataAndContext.data as UserStatsAccount,
+					data: dataAndContext.data as unknown as UserStatsAccount,
 					slot: dataAndContext.context.slot,
 				};
 			}

package/src/accounts/testBulkAccountLoader.ts

@@ -6,28 +6,26 @@ export class TestBulkAccountLoader extends BulkAccountLoader {
 			return;
 		}
 
-		const accounts = [];
 		for (const accountsToLoadChunk of accountsToLoadChunks) {
 			for (const accountToLoad of accountsToLoadChunk) {
 				const account = await this.connection.getAccountInfoAndContext(
 					accountToLoad.publicKey,
 					this.commitment
 				);
-				accounts.push(account);
 				const newSlot = account.context.slot;
 				if (newSlot > this.mostRecentSlot) {
 					this.mostRecentSlot = newSlot;
 				}
 
 				if (accountToLoad.callbacks.size === 0) {
-					return;
+					continue;
 				}
 
 				const key = accountToLoad.publicKey.toBase58();
 				const prev = this.bufferAndSlotMap.get(key);
 
 				if (prev && newSlot < prev.slot) {
-					return;
+					continue;
 				}
 
 				let newBuffer: Buffer | undefined = undefined;
@@ -39,7 +37,7 @@ export class TestBulkAccountLoader extends BulkAccountLoader {
 				if (!prev) {
 					this.bufferAndSlotMap.set(key, { slot: newSlot, buffer: newBuffer });
 					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
-					return;
+					continue;
 				}
 
 				const oldBuffer = prev.buffer;

package/src/accounts/types.ts

@@ -1,3 +1,13 @@
+/**
+ * Account subscription interfaces and types.
+ *
+ * DriftClient uses a `DriftClientAccountSubscriber` (WebSocket or polling) to keep
+ * market, oracle, and state accounts cached in memory. `User` uses a `UserAccountSubscriber`
+ * for the individual User account. All subscribers implement the interfaces defined here.
+ *
+ * Implementations: `webSocketDriftClientAccountSubscriber.ts` (default),
+ * `pollingDriftClientAccountSubscriber.ts`, `bulkAccountLoader.ts` (batched RPC).
+ */
 import {
 	SpotMarketAccount,
 	PerpMarketAccount,
@@ -7,7 +17,6 @@ import {
 	UserStatsAccount,
 	InsuranceFundStake,
 	ConstituentAccount,
-	HighLeverageModeConfig,
 } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -248,30 +257,6 @@ export type LaserGrpcConfigs = BaseGrpcConfigs & {
 
 export type GrpcConfigs = YellowstoneGrpcConfigs | LaserGrpcConfigs;
 
-export interface HighLeverageModeConfigAccountSubscriber {
-	eventEmitter: StrictEventEmitter<
-		EventEmitter,
-		HighLeverageModeConfigAccountEvents
-	>;
-	isSubscribed: boolean;
-
-	subscribe(
-		highLeverageModeConfigAccount?: HighLeverageModeConfig
-	): Promise<boolean>;
-	fetch(): Promise<void>;
-	unsubscribe(): Promise<void>;
-
-	getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig>;
-}
-
-export interface HighLeverageModeConfigAccountEvents {
-	highLeverageModeConfigAccountUpdate: (
-		payload: HighLeverageModeConfig
-	) => void;
-	update: void;
-	error: (e: Error) => void;
-}
-
 export interface ConstituentAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, ConstituentAccountEvents>;
 	isSubscribed: boolean;

package/src/accounts/webSocketAccountSubscriber.ts

@@ -4,9 +4,9 @@ import {
 	AccountSubscriber,
 	ResubOpts,
 } from './types';
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
 import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';
-import { capitalize } from './utils';
+import { DriftProgram } from '../config';
 import * as Buffer from 'buffer';
 
 export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
@@ -14,7 +14,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	bufferAndSlot?: BufferAndSlot;
 	accountName: string;
 	logAccountName: string;
-	program: Program;
+	program: DriftProgram;
 	accountPublicKey: PublicKey;
 	decodeBufferFn: (buffer: Buffer) => T;
 	onChange: (data: T) => void;
@@ -31,7 +31,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 
 	public constructor(
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => T,
 		resubOpts?: ResubOpts,
@@ -199,7 +199,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			return this.decodeBufferFn(buffer);
 		} else {
 			return this.program.account[this.accountName].coder.accounts.decode(
-				capitalize(this.accountName),
+				this.accountName,
 				buffer
 			);
 		}

package/src/accounts/webSocketAccountSubscriberV2.ts

@@ -4,7 +4,8 @@ import {
 	ResubOpts,
 	BufferAndSlot,
 } from './types';
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import { capitalize } from './utils';
 import {
 	AccountInfoBase,
@@ -74,7 +75,7 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 	bufferAndSlot?: BufferAndSlot;
 	accountName: string;
 	logAccountName: string;
-	program: Program;
+	program: DriftProgram;
 	accountPublicKey: PublicKey;
 	decodeBufferFn: (buffer: Buffer) => T;
 	onChange: (data: T) => void;
@@ -112,7 +113,7 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 	 */
 	public constructor(
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => T,
 		resubOpts?: ResubOpts,

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -8,7 +8,6 @@ import {
 	ResubOpts,
 } from './types';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
-import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {
@@ -24,7 +23,7 @@ import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
 import * as Buffer from 'buffer';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
-import { findAllMarketAndOracles } from '../config';
+import { findAllMarketAndOracles, DriftProgram } from '../config';
 import { findDelistedPerpMarketsAndOracles } from './utils';
 import { getOracleId } from '../oracles/oracleId';
 import { OracleSource } from '../types';
@@ -39,7 +38,7 @@ export class WebSocketDriftClientAccountSubscriber
 	implements DriftClientAccountSubscriber
 {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	commitment?: Commitment;
 	perpMarketIndexes: number[];
 	spotMarketIndexes: number[];
@@ -71,7 +70,7 @@ export class WebSocketDriftClientAccountSubscriber
 	initialOraclePriceData: Map<string, OraclePriceData>;
 	customPerpMarketAccountSubscriber?: new (
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => any,
 		resubOpts?: ResubOpts,
@@ -79,7 +78,7 @@ export class WebSocketDriftClientAccountSubscriber
 	) => AccountSubscriber<any>;
 	customOracleAccountSubscriber?: new (
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => any,
 		resubOpts?: ResubOpts,
@@ -91,7 +90,7 @@ export class WebSocketDriftClientAccountSubscriber
 	protected subscriptionPromiseResolver: (val: boolean) => void;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],
@@ -101,7 +100,7 @@ export class WebSocketDriftClientAccountSubscriber
 		commitment?: Commitment,
 		customPerpMarketAccountSubscriber?: new (
 			accountName: string,
-			program: Program,
+			program: DriftProgram,
 			accountPublicKey: PublicKey,
 			decodeBuffer?: (buffer: Buffer) => any,
 			resubOpts?: ResubOpts,
@@ -109,7 +108,7 @@ export class WebSocketDriftClientAccountSubscriber
 		) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>,
 		customOracleAccountSubscriber?: new (
 			accountName: string,
-			program: Program,
+			program: DriftProgram,
 			accountPublicKey: PublicKey,
 			decodeBuffer?: (buffer: Buffer) => any,
 			resubOpts?: ResubOpts,
@@ -238,7 +237,7 @@ export class WebSocketDriftClientAccountSubscriber
 					.filter((accountInfo) => !!accountInfo)
 					.map((accountInfo) => {
 						const perpMarket = this.program.coder.accounts.decode(
-							'PerpMarket',
+							'perpMarket',
 							accountInfo.data
 						);
 						return [perpMarket.marketIndex, perpMarket];
@@ -263,7 +262,7 @@ export class WebSocketDriftClientAccountSubscriber
 					.filter((accountInfo) => !!accountInfo)
 					.map((accountInfo) => {
 						const spotMarket = this.program.coder.accounts.decode(
-							'SpotMarket',
+							'spotMarket',
 							accountInfo.data
 						);
 						return [spotMarket.marketIndex, spotMarket];

package/src/accounts/webSocketDriftClientAccountSubscriberV2.ts

@@ -13,7 +13,6 @@ import {
 	SpotMarketAccount,
 	StateAccount,
 } from '../types';
-import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {
@@ -32,7 +31,7 @@ import {
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
-import { findAllMarketAndOracles } from '../config';
+import { DriftProgram, findAllMarketAndOracles } from '../config';
 import { findDelistedPerpMarketsAndOracles } from './utils';
 import {
 	getOracleId,
@@ -54,7 +53,7 @@ export class WebSocketDriftClientAccountSubscriberV2
 	implements DriftClientAccountSubscriber
 {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	commitment?: Commitment;
 	perpMarketIndexes: number[];
 	spotMarketIndexes: number[];
@@ -97,7 +96,7 @@ export class WebSocketDriftClientAccountSubscriberV2
 		string;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],
@@ -203,10 +202,12 @@ export class WebSocketDriftClientAccountSubscriberV2
 			this.perpMarketAllAccountsSubscriber =
 				new WebSocketProgramAccountsSubscriberV2<PerpMarketAccount>(
 					'PerpMarketAccountsSubscriber',
-					'PerpMarket',
+					'perpMarket',
 					this.program,
-					this.program.account.perpMarket.coder.accounts.decodeUnchecked.bind(
-						this.program.account.perpMarket.coder.accounts
+					(
+						this.program.account as any
+					).perpMarket.coder.accounts.decodeUnchecked.bind(
+						(this.program.account as any).perpMarket.coder.accounts
 					),
 					{
 						filters: [getPerpMarketAccountsFilter()],
@@ -219,10 +220,12 @@ export class WebSocketDriftClientAccountSubscriberV2
 			this.spotMarketAllAccountsSubscriber =
 				new WebSocketProgramAccountsSubscriberV2<SpotMarketAccount>(
 					'SpotMarketAccountsSubscriber',
-					'SpotMarket',
+					'spotMarket',
 					this.program,
-					this.program.account.spotMarket.coder.accounts.decodeUnchecked.bind(
-						this.program.account.spotMarket.coder.accounts
+					(
+						this.program.account as any
+					).spotMarket.coder.accounts.decodeUnchecked.bind(
+						(this.program.account as any).spotMarket.coder.accounts
 					),
 					{
 						filters: [getSpotMarketAccountsFilter()],

package/src/accounts/webSocketInsuranceFundStakeAccountSubscriber.ts

@@ -5,12 +5,12 @@ import {
 	InsuranceFundStakeAccountEvents,
 	InsuranceFundStakeAccountSubscriber,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { InsuranceFundStake } from '../types';
+import { DriftProgram } from '../config';
 
 export class WebSocketInsuranceFundStakeAccountSubscriber
 	implements InsuranceFundStakeAccountSubscriber
@@ -18,7 +18,7 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 	isSubscribed: boolean;
 	resubTimeoutMs?: number;
 	commitment?: Commitment;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<
 		EventEmitter,
 		InsuranceFundStakeAccountEvents
@@ -28,7 +28,7 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 	insuranceFundStakeDataAccountSubscriber: AccountSubscriber<InsuranceFundStake>;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		insuranceFundStakeAccountPublicKey: PublicKey,
 		resubTimeoutMs?: number,
 		commitment?: Commitment

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -1,5 +1,5 @@
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
 import {
 	Commitment,
 	Context,
@@ -7,6 +7,7 @@ import {
 	MemcmpFilter,
 	PublicKey,
 } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 import * as Buffer from 'buffer';
 
 export class WebSocketProgramAccountSubscriber<T>
@@ -16,7 +17,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	accountDiscriminator: string;
 	bufferAndSlot?: BufferAndSlot;
 	bufferAndSlotMap: Map<string, BufferAndSlot> = new Map();
-	program: Program;
+	program: DriftProgram;
 	decodeBuffer: (accountName: string, ix: Buffer) => T;
 	onChange: (
 		accountId: PublicKey,
@@ -35,7 +36,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	public constructor(
 		subscriptionName: string,
 		accountDiscriminator: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBufferFn: (accountName: string, ix: Buffer) => T,
 		options: { filters: MemcmpFilter[]; commitment?: Commitment } = {
 			filters: [],

package/src/accounts/webSocketProgramAccountSubscriberV2.ts

@@ -1,5 +1,6 @@
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import {
 	AccountInfoBase,
@@ -98,7 +99,7 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	subscriptionName: string;
 	accountDiscriminator: string;
 	bufferAndSlotMap: Map<string, BufferAndSlot> = new Map();
-	program: Program;
+	program: DriftProgram;
 	decodeBuffer: (accountName: string, ix: Buffer) => T;
 	onChange: (
 		accountId: PublicKey,
@@ -142,7 +143,7 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	public constructor(
 		subscriptionName: string,
 		accountDiscriminator: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBufferFn: (accountName: string, ix: Buffer) => T,
 		options: { filters: MemcmpFilter[]; commitment?: Commitment } = {
 			filters: [],

package/src/accounts/webSocketProgramAccountsSubscriberV2.ts

@@ -1,5 +1,6 @@
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import {
 	AccountInfoBase,
@@ -98,7 +99,7 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	subscriptionName: string;
 	accountDiscriminator: string;
 	bufferAndSlotMap: Map<string, BufferAndSlot> = new Map();
-	program: Program;
+	program: DriftProgram;
 	decodeBuffer: (accountName: string, ix: Buffer) => T;
 	onChange: (
 		accountId: PublicKey,
@@ -142,7 +143,7 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	public constructor(
 		subscriptionName: string,
 		accountDiscriminator: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBufferFn: (accountName: string, ix: Buffer) => T,
 		options: { filters: MemcmpFilter[]; commitment?: Commitment } = {
 			filters: [],

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -6,7 +6,7 @@ import {
 	UserAccountSubscriber,
 	ResubOpts,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, PublicKey } from '@solana/web3.js';
@@ -17,14 +17,14 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
 	resubOpts?: ResubOpts;
 	commitment?: Commitment;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	userAccountPublicKey: PublicKey;
 
 	userDataAccountSubscriber: AccountSubscriber<UserAccount>;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		userAccountPublicKey: PublicKey,
 		resubOpts?: ResubOpts,
 		commitment?: Commitment

package/src/accounts/webSocketUserStatsAccountSubsriber.ts

@@ -6,7 +6,7 @@ import {
 	UserStatsAccountEvents,
 	ResubOpts,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, PublicKey } from '@solana/web3.js';
@@ -19,14 +19,14 @@ export class WebSocketUserStatsAccountSubscriber
 	isSubscribed: boolean;
 	resubOpts?: ResubOpts;
 	commitment?: Commitment;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
 	userStatsAccountPublicKey: PublicKey;
 
 	userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		userStatsAccountPublicKey: PublicKey,
 		resubOpts?: ResubOpts,
 		commitment?: Commitment

package/src/accounts/websocketProgramUserAccountSubscriber.ts

@@ -4,7 +4,7 @@ import {
 	UserAccountEvents,
 	UserAccountSubscriber,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
@@ -18,12 +18,12 @@ export class WebSocketProgramUserAccountSubscriber
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 
 	private userAccountPublicKey: PublicKey;
-	private program: Program;
+	private program: DriftProgram;
 	private programSubscriber: WebSocketProgramAccountSubscriber<UserAccount>;
 	private userAccountAndSlot?: DataAndSlot<UserAccount>;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		userAccountPublicKey: PublicKey,
 		programSubscriber: WebSocketProgramAccountSubscriber<UserAccount>
 	) {
@@ -66,7 +66,7 @@ export class WebSocketProgramUserAccountSubscriber
 			);
 		}
 
-		const account = await this.program.account.user.fetch(
+		const account = await (this.program.account as any).user.fetch(
 			this.userAccountPublicKey
 		);
 		this.updateData(account as UserAccount, 0);

package/src/addresses/pda.ts

@@ -1,3 +1,9 @@
+/**
+ * PDA derivation helpers for all Drift protocol accounts.
+ * Covers: User, UserStats, PerpMarket, SpotMarket, InsuranceFundStake,
+ * ProtectedMakerModeConfig, HighLeverageModeConfig, State, and vault PDAs.
+ * All functions are pure (no RPC calls).
+ */
 import { PublicKey } from '@solana/web3.js';
 import * as anchor from '@coral-xyz/anchor';
 import { BN } from '@coral-xyz/anchor';
@@ -323,19 +329,6 @@ export function getPrelaunchOraclePublicKey(
 	)[0];
 }
 
-export function getPythPullOraclePublicKey(
-	progarmId: PublicKey,
-	feedId: Uint8Array
-): PublicKey {
-	return PublicKey.findProgramAddressSync(
-		[
-			Buffer.from(anchor.utils.bytes.utf8.encode('pyth_pull')),
-			Buffer.from(feedId),
-		],
-		progarmId
-	)[0];
-}
-
 export function getPythLazerOraclePublicKey(
 	progarmId: PublicKey,
 	feedId: number
@@ -362,15 +355,6 @@ export function getTokenProgramForSpotMarket(
 	return TOKEN_PROGRAM_ID;
 }
 
-export function getHighLeverageModeConfigPublicKey(
-	programId: PublicKey
-): PublicKey {
-	return PublicKey.findProgramAddressSync(
-		[Buffer.from(anchor.utils.bytes.utf8.encode('high_leverage_mode_config'))],
-		programId
-	)[0];
-}
-
 export function getProtectedMakerModeConfigPublicKey(
 	programId: PublicKey
 ): PublicKey {