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

package/lib/node/userStats.d.ts

@@ -1,4 +1,9 @@
 /// <reference types="bn.js" />
+/**
+ * UserStats — abstraction over the on-chain `UserStats` account.
+ * Tracks referral links, 30-day maker/taker volume, fuel rewards, and IF staking stats.
+ * One `UserStats` account exists per authority (shared across all subaccounts).
+ */
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { DataAndSlot, UserStatsAccountSubscriber } from './accounts/types';

package/lib/node/userStats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userStats.d.ts","sourceRoot":"","sources":["../../src/userStats.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAqB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAY5E,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAGvC,qBAAa,SAAS;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,yBAAyB,EAAE,SAAS,CAAC;IACrC,iBAAiB,EAAE,0BAA0B,CAAC;IAC9C,YAAY,EAAE,OAAO,CAAC;gBAEH,MAAM,EAAE,eAAe;IAyC7B,SAAS,CACrB,gBAAgB,CAAC,EAAE,gBAAgB,GACjC,OAAO,CAAC,OAAO,CAAC;IAON,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,iBAAiB,IAAI,WAAW,CAAC,gBAAgB,CAAC;IAIlD,UAAU,IAAI,gBAAgB;IAI9B,qBAAqB,CAC3B,GAAG,EAAE,EAAE,EACP,cAAc,UAAO,EACrB,gBAAgB,UAAO,GACrB,EAAE;IAuDE,eAAe,IAAI,YAAY,GAAG,SAAS;WAkBpC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;CAOlE"}
+{"version":3,"file":"userStats.d.ts","sourceRoot":"","sources":["../../src/userStats.ts"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAqB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAY5E,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAGvC,qBAAa,SAAS;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,yBAAyB,EAAE,SAAS,CAAC;IACrC,iBAAiB,EAAE,0BAA0B,CAAC;IAC9C,YAAY,EAAE,OAAO,CAAC;gBAEH,MAAM,EAAE,eAAe;IAyC7B,SAAS,CACrB,gBAAgB,CAAC,EAAE,gBAAgB,GACjC,OAAO,CAAC,OAAO,CAAC;IAON,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,iBAAiB,IAAI,WAAW,CAAC,gBAAgB,CAAC;IAIlD,UAAU,IAAI,gBAAgB;IAI9B,qBAAqB,CAC3B,GAAG,EAAE,EAAE,EACP,cAAc,UAAO,EACrB,gBAAgB,UAAO,GACrB,EAAE;IAuDE,eAAe,IAAI,YAAY,GAAG,SAAS;WAkBpC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;CAOlE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/sdk-browser",
-  "version": "2.162.0-beta.2",
+  "version": "2.163.0-beta.9",
   "main": "lib/node/index.js",
   "types": "lib/node/index.d.ts",
   "module": "./lib/browser/index.js",
@@ -42,8 +42,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "0.29.0",
-    "@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
+    "@coral-xyz/anchor": "npm:@coral-xyz/anchor@0.32.1",
+    "@coral-xyz/anchor-29": "npm:@coral-xyz/anchor@0.29.0",
     "@ellipsis-labs/phoenix-sdk": "1.4.5",
     "@msgpack/msgpack": "^3.1.2",
     "@openbook-dex/openbook-v2": "0.2.10",
@@ -53,14 +53,12 @@
     "@pythnetwork/pyth-lazer-sdk": "6.0.0",
     "@solana/spl-token": "0.4.13",
     "@solana/web3.js": "1.98.0",
-    "@switchboard-xyz/common": "3.0.14",
-    "@switchboard-xyz/on-demand": "2.4.1",
     "@triton-one/yellowstone-grpc": "5.0.5",
-    "anchor-bankrun": "0.3.0",
+    "anchor-bankrun": "0.5.0",
     "gill": "^0.10.2",
     "nanoid": "3.3.4",
     "node-cache": "5.1.2",
-    "solana-bankrun": "0.3.1",
+    "solana-bankrun": "0.4.0",
     "strict-event-emitter-types": "2.0.0",
     "tweetnacl": "1.0.3",
     "tweetnacl-util": "0.15.1",

package/src/accounts/fetch.ts

@@ -11,11 +11,11 @@ import {
 	getUserAccountPublicKey,
 	getUserStatsAccountPublicKey,
 } from '../addresses/pda';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 
 export async function fetchUserAccounts(
 	connection: Connection,
-	program: Program,
+	program: DriftProgram,
 	authority: PublicKey,
 	limit = 8
 ): Promise<(UserAccount | undefined)[]> {
@@ -31,7 +31,7 @@ export async function fetchUserAccounts(
 
 export async function fetchUserAccountsUsingKeys(
 	connection: Connection,
-	program: Program,
+	program: DriftProgram,
 	userAccountPublicKeys: PublicKey[]
 ): Promise<(UserAccount | undefined)[]> {
 	const accountInfos = await connection.getMultipleAccountsInfo(
@@ -43,8 +43,8 @@ export async function fetchUserAccountsUsingKeys(
 		if (!accountInfo) {
 			return undefined;
 		}
-		return program.account.user.coder.accounts.decodeUnchecked(
-			'User',
+		return (program.account as any).user.coder.accounts.decodeUnchecked(
+			'user',
 			accountInfo.data
 		) as UserAccount;
 	});
@@ -52,7 +52,7 @@ export async function fetchUserAccountsUsingKeys(
 
 export async function fetchUserStatsAccount(
 	connection: Connection,
-	program: Program,
+	program: DriftProgram,
 	authority: PublicKey
 ): Promise<UserStatsAccount | undefined> {
 	const userStatsPublicKey = getUserStatsAccountPublicKey(
@@ -65,8 +65,8 @@ export async function fetchUserStatsAccount(
 	);
 
 	return accountInfo
-		? (program.account.user.coder.accounts.decodeUnchecked(
-				'UserStats',
+		? ((program.account as any).user.coder.accounts.decodeUnchecked(
+				'userStats',
 				accountInfo.data
 		  ) as UserStatsAccount)
 		: undefined;
@@ -74,7 +74,7 @@ export async function fetchUserStatsAccount(
 
 export async function fetchRevenueShareAccount(
 	connection: Connection,
-	program: Program,
+	program: DriftProgram,
 	authority: PublicKey
 ): Promise<RevenueShareAccount | null> {
 	const revenueShareAccountPublicKey = getRevenueShareAccountPublicKey(
@@ -85,15 +85,15 @@ export async function fetchRevenueShareAccount(
 		revenueShareAccountPublicKey
 	);
 	if (!accountInfo) return null;
-	return program.account.revenueShare.coder.accounts.decode(
-		'RevenueShare',
+	return (program.account as any).revenueShare.coder.accounts.decode(
+		'revenueShare',
 		accountInfo.data
 	) as RevenueShareAccount;
 }
 
 export async function fetchRevenueShareEscrowAccount(
 	connection: Connection,
-	program: Program,
+	program: DriftProgram,
 	authority: PublicKey
 ): Promise<RevenueShareEscrowAccount | null> {
 	const revenueShareEscrowPubKey = getRevenueShareEscrowAccountPublicKey(
@@ -105,11 +105,12 @@ export async function fetchRevenueShareEscrowAccount(
 
 	if (!escrow) return null;
 
-	const escrowAccount =
-		program.account.revenueShareEscrow.coder.accounts.decode(
-			'RevenueShareEscrow',
-			escrow.data
-		) as RevenueShareEscrowAccount;
+	const escrowAccount = (
+		program.account as any
+	).revenueShareEscrow.coder.accounts.decode(
+		'revenueShareEscrow',
+		escrow.data
+	) as RevenueShareEscrowAccount;
 
 	return escrowAccount;
 }

package/src/accounts/grpcAccountSubscriber.ts

@@ -1,6 +1,6 @@
 import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 import * as Buffer from 'buffer';
 
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
@@ -23,7 +23,7 @@ export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 		client: Client,
 		commitmentLevel: CommitmentLevel,
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => T,
 		resubOpts?: ResubOpts
@@ -36,7 +36,7 @@ export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 	public static async create<U>(
 		grpcConfigs: GrpcConfigs,
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => U,
 		resubOpts?: ResubOpts,

package/src/accounts/grpcDriftClientAccountSubscriber.ts

@@ -1,7 +1,6 @@
 import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
-import { Program } from '@coral-xyz/anchor';
-import { findAllMarketAndOracles } from '../config';
+import { findAllMarketAndOracles, DriftProgram } from '../config';
 import {
 	getDriftStateAccountPublicKey,
 	getPerpMarketPublicKey,
@@ -17,7 +16,7 @@ export class grpcDriftClientAccountSubscriber extends WebSocketDriftClientAccoun
 
 	constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: DriftProgram,
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],

package/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -1,9 +1,8 @@
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
-import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { findAllMarketAndOracles } from '../config';
+import { findAllMarketAndOracles, DriftProgram } from '../config';
 import {
 	getDriftStateAccountPublicKey,
 	getPerpMarketPublicKey,
@@ -51,7 +50,7 @@ export class grpcDriftClientAccountSubscriberV2
 	>;
 	public isSubscribed: boolean;
 	public isSubscribing: boolean;
-	public program: Program;
+	public program: DriftProgram;
 	public perpMarketIndexes: number[];
 	public spotMarketIndexes: number[];
 	public shouldFindAllMarketsAndOracles: boolean;
@@ -76,7 +75,7 @@ export class grpcDriftClientAccountSubscriberV2
 
 	constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: DriftProgram,
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],
@@ -134,7 +133,7 @@ export class grpcDriftClientAccountSubscriberV2
 					.filter((accountInfo) => !!accountInfo)
 					.map((accountInfo) => {
 						const perpMarket = this.program.coder.accounts.decode(
-							'PerpMarket',
+							'perpMarket',
 							accountInfo.data
 						);
 						return [perpMarket.marketIndex, perpMarket];
@@ -162,7 +161,7 @@ export class grpcDriftClientAccountSubscriberV2
 					.filter((accountInfo) => !!accountInfo)
 					.map((accountInfo) => {
 						const spotMarket = this.program.coder.accounts.decode(
-							'SpotMarket',
+							'spotMarket',
 							accountInfo.data
 						);
 						return [spotMarket.marketIndex, spotMarket];

package/src/accounts/grpcInsuranceFundStakeAccountSubscriber.ts

@@ -1,16 +1,16 @@
 import { GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { InsuranceFundStake } from '../types';
 import { WebSocketInsuranceFundStakeAccountSubscriber } from './webSocketInsuranceFundStakeAccountSubscriber';
 import { grpcAccountSubscriber } from './grpcAccountSubscriber';
+import { DriftProgram } from '../config';
 
 export class grpcInsuranceFundStakeAccountSubscriber extends WebSocketInsuranceFundStakeAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
 
 	public constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: DriftProgram,
 		insuranceFundStakeAccountPublicKey: PublicKey,
 		resubTimeoutMs?: number
 	) {

package/src/accounts/grpcMultiAccountSubscriber.ts

@@ -1,5 +1,5 @@
-import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, PublicKey } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 import * as Buffer from 'buffer';
 import bs58 from 'bs58';
 
@@ -40,7 +40,7 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 	private client: Client;
 	private stream: ClientDuplexStream;
 	private commitmentLevel: CommitmentLevel;
-	private program: Program;
+	private program: DriftProgram;
 	private accountName: string;
 	private decodeBufferFn?: (
 		buffer: Buffer,
@@ -69,7 +69,7 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 		client: Client,
 		commitmentLevel: CommitmentLevel,
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBuffer?: (buffer: Buffer, pubkey?: string) => T,
 		resubOpts?: ResubOpts,
 		onUnsubscribe?: () => Promise<void>,
@@ -88,7 +88,7 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 	public static async create<T, U = undefined>(
 		grpcConfigs: GrpcConfigs,
 		accountName: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBuffer?: (buffer: Buffer, pubkey?: string, accountProps?: U) => T,
 		resubOpts?: ResubOpts,
 		clientProp?: Client,

package/src/accounts/grpcMultiUserAccountSubscriber.ts

@@ -9,12 +9,12 @@ import {
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
-import { Program } from '@coral-xyz/anchor';
 import { UserAccount } from '../types';
+import { DriftProgram } from '../config';
 import { grpcMultiAccountSubscriber } from './grpcMultiAccountSubscriber';
 
 export class grpcMultiUserAccountSubscriber {
-	private program: Program;
+	private program: DriftProgram;
 	private multiSubscriber: grpcMultiAccountSubscriber<UserAccount>;
 
 	private userData = new Map<string, DataAndSlot<UserAccount>>();
@@ -50,7 +50,7 @@ export class grpcMultiUserAccountSubscriber {
 	};
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		grpcConfigs: GrpcConfigs,
 		resubOpts?: ResubOpts,
 		multiSubscriber?: grpcMultiAccountSubscriber<UserAccount>
@@ -157,7 +157,7 @@ export class grpcMultiUserAccountSubscriber {
 						'Must subscribe before fetching account updates'
 					);
 				}
-				const account = (await parent.program.account.user.fetch(
+				const account = (await (parent.program.account as any).user.fetch(
 					userAccountPublicKey
 				)) as UserAccount;
 				this.updateData(account, 0);

package/src/accounts/grpcProgramAccountSubscriber.ts

@@ -1,6 +1,6 @@
 import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 import * as Buffer from 'buffer';
 import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
 import {
@@ -24,7 +24,7 @@ export class grpcProgramAccountSubscriber<
 		commitmentLevel: CommitmentLevel,
 		subscriptionName: string,
 		accountDiscriminator: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBufferFn: (accountName: string, ix: Buffer) => T,
 		options: { filters: MemcmpFilter[] } = {
 			filters: [],
@@ -47,7 +47,7 @@ export class grpcProgramAccountSubscriber<
 		grpcConfigs: GrpcConfigs,
 		subscriptionName: string,
 		accountDiscriminator: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBufferFn: (accountName: string, ix: Buffer) => U,
 		options: { filters: MemcmpFilter[] } = {
 			filters: [],

package/src/accounts/grpcUserAccountSubscriber.ts

@@ -1,16 +1,16 @@
 import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 import { WebSocketUserAccountSubscriber } from './webSocketUserAccountSubscriber';
 import { grpcAccountSubscriber } from './grpcAccountSubscriber';
+import { DriftProgram } from '../config';
 
 export class grpcUserAccountSubscriber extends WebSocketUserAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
 
 	public constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: DriftProgram,
 		userAccountPublicKey: PublicKey,
 		resubOpts?: ResubOpts
 	) {

package/src/accounts/grpcUserStatsAccountSubscriber.ts

@@ -1,16 +1,16 @@
 import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 import { WebSocketUserStatsAccountSubscriber } from './webSocketUserStatsAccountSubsriber';
 import { grpcAccountSubscriber } from './grpcAccountSubscriber';
+import { DriftProgram } from '../config';
 
 export class grpcUserStatsAccountSubscriber extends WebSocketUserStatsAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
 
 	public constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: DriftProgram,
 		userStatsAccountPublicKey: PublicKey,
 		resubOpts?: ResubOpts
 	) {

package/src/accounts/laserProgramAccountSubscriber.ts

@@ -1,6 +1,6 @@
 import { LaserGrpcConfigs, ResubOpts } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 import * as Buffer from 'buffer';
 import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
 
@@ -41,7 +41,7 @@ export class LaserstreamProgramAccountSubscriber<
 		laserCommitmentLevel: typeof LaserCommitmentLevel,
 		subscriptionName: string,
 		accountDiscriminator: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBufferFn: (accountName: string, ix: Buffer) => T,
 		options: { filters: MemcmpFilter[] } = { filters: [] },
 		resubOpts?: ResubOpts
@@ -63,7 +63,7 @@ export class LaserstreamProgramAccountSubscriber<
 		grpcConfigs: LaserGrpcConfigs,
 		subscriptionName: string,
 		accountDiscriminator: string,
-		program: Program,
+		program: DriftProgram,
 		decodeBufferFn: (accountName: string, ix: Buffer) => U,
 		options: { filters: MemcmpFilter[] } = {
 			filters: [],

package/src/accounts/oneShotUserAccountSubscriber.ts

@@ -1,8 +1,8 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 import { BasicUserAccountSubscriber } from './basicUserAccountSubscriber';
-import { Program } from '@coral-xyz/anchor';
 import { UserAccountSubscriber } from './types';
+import { DriftProgram } from '../config';
 
 /**
  * Simple implementation of UserAccountSubscriber. It will fetch the UserAccount
@@ -13,11 +13,11 @@ export class OneShotUserAccountSubscriber
 	extends BasicUserAccountSubscriber
 	implements UserAccountSubscriber
 {
-	program: Program;
+	program: DriftProgram;
 	commitment: Commitment;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		userAccountPublicKey: PublicKey,
 		data?: UserAccount,
 		slot?: number,
@@ -49,10 +49,9 @@ export class OneShotUserAccountSubscriber
 
 	async fetch(): Promise<void> {
 		try {
-			const dataAndContext = await this.program.account.user.fetchAndContext(
-				this.userAccountPublicKey,
-				this.commitment
-			);
+			const dataAndContext = await (
+				this.program.account as any
+			).user.fetchAndContext(this.userAccountPublicKey, this.commitment);
 			if (dataAndContext.context.slot > (this.user?.slot ?? 0)) {
 				this.user = {
 					data: dataAndContext.data as UserAccount,

package/src/accounts/oneShotUserStatsAccountSubscriber.ts

@@ -1,8 +1,8 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 import { BasicUserStatsAccountSubscriber } from './basicUserStatsAccountSubscriber';
-import { Program } from '@coral-xyz/anchor';
 import { UserStatsAccountSubscriber } from './types';
+import { DriftProgram } from '../config';
 
 /**
  * Simple implementation of UserStatsAccountSubscriber. It will fetch the UserStatsAccount
@@ -13,11 +13,11 @@ export class OneShotUserStatsAccountSubscriber
 	extends BasicUserStatsAccountSubscriber
 	implements UserStatsAccountSubscriber
 {
-	program: Program;
+	program: DriftProgram;
 	commitment: Commitment;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		userStatsAccountPublicKey: PublicKey,
 		data?: UserStatsAccount,
 		slot?: number,
@@ -49,14 +49,15 @@ export class OneShotUserStatsAccountSubscriber
 
 	async fetch(): Promise<void> {
 		try {
-			const dataAndContext =
-				await this.program.account.userStats.fetchAndContext(
-					this.userStatsAccountPublicKey,
-					this.commitment
-				);
+			const dataAndContext = await (
+				this.program.account as any
+			).userStats.fetchAndContext(
+				this.userStatsAccountPublicKey,
+				this.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/pollingDriftClientAccountSubscriber.ts

@@ -7,7 +7,6 @@ import {
 	NotSubscribedError,
 	OraclesToPoll,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {
@@ -23,12 +22,12 @@ import {
 	getSpotMarketPublicKey,
 } from '../addresses/pda';
 import { BulkAccountLoader } from './bulkAccountLoader';
-import { capitalize, findDelistedPerpMarketsAndOracles } from './utils';
+import { findDelistedPerpMarketsAndOracles } from './utils';
 import { PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
-import { findAllMarketAndOracles } from '../config';
+import { findAllMarketAndOracles, DriftProgram } from '../config';
 import { getOracleId } from '../oracles/oracleId';
 
 const ORACLE_DEFAULT_ID = getOracleId(
@@ -40,7 +39,7 @@ export class PollingDriftClientAccountSubscriber
 	implements DriftClientAccountSubscriber
 {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	perpMarketIndexes: number[];
 	spotMarketIndexes: number[];
 	oracleInfos: OracleInfo[];
@@ -71,7 +70,7 @@ export class PollingDriftClientAccountSubscriber
 	private subscriptionPromiseResolver: (val: boolean) => void;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		accountLoader: BulkAccountLoader,
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
@@ -256,9 +255,10 @@ export class PollingDriftClientAccountSubscriber
 			(buffer: Buffer, slot: number) => {
 				if (!buffer) return;
 
-				const account = this.program.account[
-					accountToPoll.key
-				].coder.accounts.decodeUnchecked(capitalize(accountToPoll.key), buffer);
+				const account = this.program.coder.accounts.decodeUnchecked(
+					accountToPoll.key,
+					buffer
+				);
 				const dataAndSlot = {
 					data: account,
 					slot,
@@ -328,9 +328,10 @@ export class PollingDriftClientAccountSubscriber
 			const { buffer, slot } = bufferAndSlot;
 
 			if (buffer) {
-				const account = this.program.account[
-					accountToPoll.key
-				].coder.accounts.decodeUnchecked(capitalize(accountToPoll.key), buffer);
+				const account = this.program.coder.accounts.decodeUnchecked(
+					accountToPoll.key,
+					buffer
+				);
 				if (accountToPoll.mapKey != undefined) {
 					this[accountToPoll.key].set(accountToPoll.mapKey, {
 						data: account,

package/src/accounts/pollingInsuranceFundStakeAccountSubscriber.ts

@@ -4,7 +4,7 @@ import {
 	InsuranceFundStakeAccountEvents,
 	InsuranceFundStakeAccountSubscriber,
 } 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 PollingInsuranceFundStakeAccountSubscriber
 	implements InsuranceFundStakeAccountSubscriber
 {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<
 		EventEmitter,
 		InsuranceFundStakeAccountEvents
@@ -29,7 +29,7 @@ export class PollingInsuranceFundStakeAccountSubscriber
 	insuranceFundStakeAccountAndSlot?: DataAndSlot<InsuranceFundStake>;
 
 	public constructor(
-		program: Program,
+		program: DriftProgram,
 		publicKey: PublicKey,
 		accountLoader: BulkAccountLoader
 	) {
@@ -81,8 +81,8 @@ export class PollingInsuranceFundStakeAccountSubscriber
 					return;
 				}
 
-				const account = this.program.account.user.coder.accounts.decode(
-					'InsuranceFundStake',
+				const account = this.program.coder.accounts.decode(
+					'insuranceFundStake',
 					buffer
 				);
 				this.insuranceFundStakeAccountAndSlot = { data: account, slot };
@@ -104,11 +104,12 @@ export class PollingInsuranceFundStakeAccountSubscriber
 
 	async fetch(): Promise<void> {
 		try {
-			const dataAndContext =
-				await this.program.account.insuranceFundStake.fetchAndContext(
-					this.insuranceFundStakeAccountPublicKey,
-					this.accountLoader.commitment
-				);
+			const dataAndContext = await (
+				this.program.account as any
+			).insuranceFundStake.fetchAndContext(
+				this.insuranceFundStakeAccountPublicKey,
+				this.accountLoader.commitment
+			);
 			if (
 				dataAndContext.context.slot >
 				(this.insuranceFundStakeAccountAndSlot?.slot ?? 0)

package/src/accounts/pollingOracleAccountSubscriber.ts

@@ -4,16 +4,16 @@ import {
 	OracleEvents,
 	OracleAccountSubscriber,
 } 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 { OracleClient, OraclePriceData } from '../oracles/types';
+import { DriftProgram } from '../config';
 
 export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
 	publicKey: PublicKey;