@drift-labs/sdk 0.2.0-master.3 → 0.2.0-master.30

package/README.md

@@ -54,13 +54,13 @@ a BigNum: 10,500,000, with precision 10^6, is equal to 10.5 because 10,500,000 /
 
 The Drift SDK uses some common precisions, which are available as constants to import from the SDK.
 
-| Precision Name            | Value |
-| ------------------------- | ----- |
-| QUOTE_PRECISION           | 10^6  |
-| MARK_PRICE_PRECISION      | 10^10 |
-| AMM_RESERVE_PRECISION     | 10^13 |
-| FUNDING_PAYMENT_PRECISION | 10^4  |
-| PEG_PRECISION             | 10^3  |
+| Precision Name        | Value |
+| --------------------- | ----- |
+| FUNDING_RATE_BUFFER   | 10^3  |
+| QUOTE_PRECISION       | 10^6  |
+| PEG_PRECISION         | 10^6  |
+| PRICE_PRECISION       | 10^6  |
+| AMM_RESERVE_PRECISION | 10^9  |
 
 **Important Note for BigNum division**
 
@@ -88,7 +88,7 @@ import { BN, Provider } from '@project-serum/anchor';
 import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import {
-	calculateMarkPrice,
+	calculateReservePrice,
 	ClearingHouse,
 	ClearingHouseUser,
 	initialize,
@@ -96,9 +96,9 @@ import {
 	PositionDirection,
 	convertToNumber,
 	calculateTradeSlippage,
-	MARK_PRICE_PRECISION,
+	PRICE_PRECISION,
 	QUOTE_PRECISION,
-	Wallet
+	Wallet,
 } from '@drift-labs/sdk';
 
 export const getTokenAddress = (
@@ -177,11 +177,11 @@ const main = async () => {
 		(market) => market.baseAssetSymbol === 'SOL'
 	);
 
-	const currentMarketPrice = calculateMarkPrice(
+	const currentMarketPrice = calculateReservePrice(
 		clearingHouse.getMarket(solMarketInfo.marketIndex)
 	);
 
-	const formattedPrice = convertToNumber(currentMarketPrice, MARK_PRICE_PRECISION);
+	const formattedPrice = convertToNumber(currentMarketPrice, PRICE_PRECISION);
 
 	console.log(`Current Market Price is $${formattedPrice}`);
 
@@ -194,7 +194,7 @@ const main = async () => {
 			new BN(5000).mul(QUOTE_PRECISION),
 			solMarketAccount
 		)[0],
-		MARK_PRICE_PRECISION
+		PRICE_PRECISION
 	);
 
 	console.log(

package/lib/accounts/bulkUserStatsSubscription.d.ts

@@ -0,0 +1,7 @@
+import { ClearingHouseUserStats } from '../clearingHouseUserStats';
+import { BulkAccountLoader } from './bulkAccountLoader';
+/**
+ * @param userStats
+ * @param accountLoader
+ */
+export declare function bulkPollingUserStatsSubscribe(userStats: ClearingHouseUserStats[], accountLoader: BulkAccountLoader): Promise<void>;

package/lib/accounts/bulkUserStatsSubscription.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bulkPollingUserStatsSubscribe = void 0;
+/**
+ * @param userStats
+ * @param accountLoader
+ */
+async function bulkPollingUserStatsSubscribe(userStats, accountLoader) {
+    if (userStats.length === 0) {
+        await accountLoader.load();
+        return;
+    }
+    await Promise.all(userStats.map((userStat) => {
+        return userStat.accountSubscriber.addToAccountLoader();
+    }));
+    await accountLoader.load();
+    await Promise.all(userStats.map(async (userStat) => {
+        return userStat.subscribe();
+    }));
+}
+exports.bulkPollingUserStatsSubscribe = bulkPollingUserStatsSubscribe;

package/lib/accounts/bulkUserSubscription.js

@@ -11,7 +11,6 @@ async function bulkPollingUserSubscribe(users, accountLoader) {
         return;
     }
     await Promise.all(users.map((user) => {
-        // Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
         return user.accountSubscriber.addToAccountLoader();
     }));
     await accountLoader.load();

package/lib/accounts/fetch.d.ts

@@ -1,4 +1,5 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { UserAccount } from '../types';
+import { UserAccount, UserStatsAccount } from '../types';
 import { Program } from '@project-serum/anchor';
 export declare function fetchUserAccounts(connection: Connection, program: Program, authority: PublicKey, limit?: number): Promise<(UserAccount | undefined)[]>;
+export declare function fetchUserStatsAccount(connection: Connection, program: Program, authority: PublicKey): Promise<UserStatsAccount | undefined>;

package/lib/accounts/fetch.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchUserAccounts = void 0;
+exports.fetchUserStatsAccount = exports.fetchUserAccounts = void 0;
 const pda_1 = require("../addresses/pda");
 async function fetchUserAccounts(connection, program, authority, limit = 8) {
     const userAccountPublicKeys = new Array();
@@ -16,3 +16,11 @@ async function fetchUserAccounts(connection, program, authority, limit = 8) {
     });
 }
 exports.fetchUserAccounts = fetchUserAccounts;
+async function fetchUserStatsAccount(connection, program, authority) {
+    const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(program.programId, authority);
+    const accountInfo = await connection.getAccountInfo(userStatsPublicKey, 'confirmed');
+    return accountInfo
+        ? program.account.user.coder.accounts.decode('UserStats', accountInfo.data)
+        : undefined;
+}
+exports.fetchUserStatsAccount = fetchUserStatsAccount;

package/lib/accounts/pollingClearingHouseAccountSubscriber.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="bn.js" />
 /// <reference types="node" />
 import { DataAndSlot, AccountToPoll, ClearingHouseAccountEvents, ClearingHouseAccountSubscriber, OraclesToPoll } from './types';
-import { BN, Program } from '@project-serum/anchor';
+import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { BankAccount, MarketAccount, StateAccount, UserAccount } from '../types';
+import { SpotMarketAccount, PerpMarketAccount, StateAccount, UserAccount } from '../types';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
@@ -12,8 +11,8 @@ import { OracleClientCache } from '../oracles/oracleClientCache';
 export declare class PollingClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
-    marketIndexes: BN[];
-    bankIndexes: BN[];
+    perpMarketIndexes: number[];
+    spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
     eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
@@ -22,20 +21,20 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     oraclesToPoll: Map<string, OraclesToPoll>;
     errorCallbackId?: string;
     state?: DataAndSlot<StateAccount>;
-    market: Map<number, DataAndSlot<MarketAccount>>;
-    bank: Map<number, DataAndSlot<BankAccount>>;
+    perpMarket: Map<number, DataAndSlot<PerpMarketAccount>>;
+    spotMarket: Map<number, DataAndSlot<SpotMarketAccount>>;
     oracles: Map<string, DataAndSlot<OraclePriceData>>;
     user?: DataAndSlot<UserAccount>;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, accountLoader: BulkAccountLoader, marketIndexes: BN[], bankIndexes: BN[], oracleInfos: OracleInfo[]);
+    constructor(program: Program, accountLoader: BulkAccountLoader, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[]);
     subscribe(): Promise<boolean>;
     updateAccountsToPoll(): Promise<void>;
     updateMarketAccountsToPoll(): Promise<boolean>;
-    addMarketAccountToPoll(marketIndex: BN): Promise<boolean>;
-    updateBankAccountsToPoll(): Promise<boolean>;
-    addBankAccountToPoll(bankIndex: BN): Promise<boolean>;
+    addMarketAccountToPoll(marketIndex: number): Promise<boolean>;
+    updateSpotMarketAccountsToPoll(): Promise<boolean>;
+    addSpotMarketAccountToPoll(marketIndex: number): Promise<boolean>;
     updateOraclesToPoll(): boolean;
     addOracleToPoll(oracleInfo: OracleInfo): boolean;
     getClearingHouseAccounts(): Promise<ClearingHouseAccounts>;
@@ -45,14 +44,15 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     fetch(): Promise<void>;
     didSubscriptionSucceed(): boolean;
     unsubscribe(): Promise<void>;
-    addBank(bankIndex: BN): Promise<boolean>;
-    addMarket(marketIndex: BN): Promise<boolean>;
+    addSpotMarket(marketIndex: number): Promise<boolean>;
+    addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
-    getMarketAccountAndSlot(marketIndex: BN): DataAndSlot<MarketAccount> | undefined;
-    getMarketAccountsAndSlots(): DataAndSlot<MarketAccount>[];
-    getBankAccountAndSlot(bankIndex: BN): DataAndSlot<BankAccount> | undefined;
+    getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
+    getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
+    getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
 }
 declare type ClearingHouseAccounts = {

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -9,20 +9,20 @@ const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 class PollingClearingHouseAccountSubscriber {
-    constructor(program, accountLoader, marketIndexes, bankIndexes, oracleInfos) {
+    constructor(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.accountsToPoll = new Map();
         this.oraclesToPoll = new Map();
-        this.market = new Map();
-        this.bank = new Map();
+        this.perpMarket = new Map();
+        this.spotMarket = new Map();
         this.oracles = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
         this.program = program;
         this.eventEmitter = new events_1.EventEmitter();
         this.accountLoader = accountLoader;
-        this.marketIndexes = marketIndexes;
-        this.bankIndexes = bankIndexes;
+        this.perpMarketIndexes = perpMarketIndexes;
+        this.spotMarketIndexes = spotMarketIndexes;
         this.oracleInfos = oracleInfos;
     }
     async subscribe() {
@@ -65,10 +65,10 @@ class PollingClearingHouseAccountSubscriber {
             eventType: 'stateAccountUpdate',
         });
         await this.updateMarketAccountsToPoll();
-        await this.updateBankAccountsToPoll();
+        await this.updateSpotMarketAccountsToPoll();
     }
     async updateMarketAccountsToPoll() {
-        for (const marketIndex of this.marketIndexes) {
+        for (const marketIndex of this.perpMarketIndexes) {
             await this.addMarketAccountToPoll(marketIndex);
         }
         return true;
@@ -76,26 +76,26 @@ class PollingClearingHouseAccountSubscriber {
     async addMarketAccountToPoll(marketIndex) {
         const marketPublicKey = await (0, pda_1.getMarketPublicKey)(this.program.programId, marketIndex);
         this.accountsToPoll.set(marketPublicKey.toString(), {
-            key: 'market',
+            key: 'perpMarket',
             publicKey: marketPublicKey,
-            eventType: 'marketAccountUpdate',
-            mapKey: marketIndex.toNumber(),
+            eventType: 'perpMarketAccountUpdate',
+            mapKey: marketIndex,
         });
         return true;
     }
-    async updateBankAccountsToPoll() {
-        for (const bankIndex of this.bankIndexes) {
-            await this.addBankAccountToPoll(bankIndex);
+    async updateSpotMarketAccountsToPoll() {
+        for (const marketIndex of this.spotMarketIndexes) {
+            await this.addSpotMarketAccountToPoll(marketIndex);
         }
         return true;
     }
-    async addBankAccountToPoll(bankIndex) {
-        const bankPublicKey = await (0, pda_1.getBankPublicKey)(this.program.programId, bankIndex);
-        this.accountsToPoll.set(bankPublicKey.toString(), {
-            key: 'bank',
-            publicKey: bankPublicKey,
-            eventType: 'bankAccountUpdate',
-            mapKey: bankIndex.toNumber(),
+    async addSpotMarketAccountToPoll(marketIndex) {
+        const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
+        this.accountsToPoll.set(marketPublicKey.toString(), {
+            key: 'spotMarket',
+            publicKey: marketPublicKey,
+            eventType: 'spotMarketAccountUpdate',
+            mapKey: marketIndex,
         });
         return true;
     }
@@ -223,13 +223,13 @@ class PollingClearingHouseAccountSubscriber {
         this.oraclesToPoll.clear();
         this.isSubscribed = false;
     }
-    async addBank(bankIndex) {
-        await this.addBankAccountToPoll(bankIndex);
-        const accountToPoll = this.accountsToPoll.get(bankIndex.toString());
+    async addSpotMarket(marketIndex) {
+        await this.addSpotMarketAccountToPoll(marketIndex);
+        const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
         this.addAccountToAccountLoader(accountToPoll);
         return true;
     }
-    async addMarket(marketIndex) {
+    async addPerpMarket(marketIndex) {
         await this.addMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
         this.addAccountToAccountLoader(accountToPoll);
@@ -254,13 +254,16 @@ class PollingClearingHouseAccountSubscriber {
         return this.state;
     }
     getMarketAccountAndSlot(marketIndex) {
-        return this.market.get(marketIndex.toNumber());
+        return this.perpMarket.get(marketIndex);
     }
     getMarketAccountsAndSlots() {
-        return Array.from(this.market.values());
+        return Array.from(this.perpMarket.values());
+    }
+    getSpotMarketAccountAndSlot(marketIndex) {
+        return this.spotMarket.get(marketIndex);
     }
-    getBankAccountAndSlot(bankIndex) {
-        return this.bank.get(bankIndex.toNumber());
+    getSpotMarketAccountsAndSlots() {
+        return Array.from(this.spotMarket.values());
     }
     getOraclePriceDataAndSlot(oraclePublicKey) {
         this.assertIsSubscribed();

package/lib/accounts/pollingUserStatsAccountSubscriber.d.ts

@@ -0,0 +1,27 @@
+/// <reference types="node" />
+import { DataAndSlot, AccountToPoll, UserStatsAccountSubscriber, UserStatsAccountEvents } from './types';
+import { Program } from '@project-serum/anchor';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { PublicKey } from '@solana/web3.js';
+import { UserStatsAccount } from '../types';
+import { BulkAccountLoader } from './bulkAccountLoader';
+export declare class PollingUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
+    isSubscribed: boolean;
+    program: Program;
+    eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
+    userStatsAccountPublicKey: PublicKey;
+    accountLoader: BulkAccountLoader;
+    accountsToPoll: Map<string, AccountToPoll>;
+    errorCallbackId?: string;
+    userStats?: DataAndSlot<UserStatsAccount>;
+    constructor(program: Program, userStatsAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader);
+    subscribe(): Promise<boolean>;
+    addToAccountLoader(): Promise<void>;
+    fetchIfUnloaded(): Promise<void>;
+    fetch(): Promise<void>;
+    didSubscriptionSucceed(): boolean;
+    unsubscribe(): Promise<void>;
+    assertIsSubscribed(): void;
+    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+}

package/lib/accounts/pollingUserStatsAccountSubscriber.js

@@ -0,0 +1,113 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollingUserStatsAccountSubscriber = void 0;
+const types_1 = require("./types");
+const events_1 = require("events");
+const utils_1 = require("./utils");
+class PollingUserStatsAccountSubscriber {
+    constructor(program, userStatsAccountPublicKey, accountLoader) {
+        this.accountsToPoll = new Map();
+        this.isSubscribed = false;
+        this.program = program;
+        this.accountLoader = accountLoader;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.userStatsAccountPublicKey = userStatsAccountPublicKey;
+    }
+    async subscribe() {
+        if (this.isSubscribed) {
+            return true;
+        }
+        await this.addToAccountLoader();
+        let subscriptionSucceeded = false;
+        let retries = 0;
+        while (!subscriptionSucceeded && retries < 5) {
+            await this.fetchIfUnloaded();
+            subscriptionSucceeded = this.didSubscriptionSucceed();
+            retries++;
+        }
+        if (subscriptionSucceeded) {
+            this.eventEmitter.emit('update');
+        }
+        this.isSubscribed = subscriptionSucceeded;
+        return subscriptionSucceeded;
+    }
+    async addToAccountLoader() {
+        if (this.accountsToPoll.size > 0) {
+            return;
+        }
+        this.accountsToPoll.set(this.userStatsAccountPublicKey.toString(), {
+            key: 'userStats',
+            publicKey: this.userStatsAccountPublicKey,
+            eventType: 'userStatsAccountUpdate',
+        });
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
+                if (!buffer) {
+                    return;
+                }
+                const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                this[accountToPoll.key] = { data: account, slot };
+                // @ts-ignore
+                this.eventEmitter.emit(accountToPoll.eventType, account);
+                this.eventEmitter.emit('update');
+            });
+        }
+        this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
+            this.eventEmitter.emit('error', error);
+        });
+    }
+    async fetchIfUnloaded() {
+        let shouldFetch = false;
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            if (this[accountToPoll.key] === undefined) {
+                shouldFetch = true;
+                break;
+            }
+        }
+        if (shouldFetch) {
+            await this.fetch();
+        }
+    }
+    async fetch() {
+        await this.accountLoader.load();
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            const { buffer, slot } = this.accountLoader.getBufferAndSlot(accountToPoll.publicKey);
+            if (buffer) {
+                const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                this[accountToPoll.key] = { data: account, slot };
+            }
+        }
+    }
+    didSubscriptionSucceed() {
+        let success = true;
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            if (!this[accountToPoll.key]) {
+                success = false;
+                break;
+            }
+        }
+        return success;
+    }
+    async unsubscribe() {
+        if (!this.isSubscribed) {
+            return;
+        }
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            this.accountLoader.removeAccount(accountToPoll.publicKey, accountToPoll.callbackId);
+        }
+        this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+        this.errorCallbackId = undefined;
+        this.accountsToPoll.clear();
+        this.isSubscribed = false;
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getUserStatsAccountAndSlot() {
+        this.assertIsSubscribed();
+        return this.userStats;
+    }
+}
+exports.PollingUserStatsAccountSubscriber = PollingUserStatsAccountSubscriber;

package/lib/accounts/types.d.ts

@@ -1,13 +1,10 @@
 /// <reference types="node" />
-/// <reference types="bn.js" />
-/// <reference types="node" />
-import { BankAccount, MarketAccount, OracleSource, StateAccount, UserAccount } from '../types';
+import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { AccountInfo } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
-import { BN } from '@project-serum/anchor';
 export interface AccountSubscriber<T> {
     dataAndSlot?: DataAndSlot<T>;
     subscribe(onChange: (data: T) => void): Promise<void>;
@@ -19,8 +16,8 @@ export declare class NotSubscribedError extends Error {
 }
 export interface ClearingHouseAccountEvents {
     stateAccountUpdate: (payload: StateAccount) => void;
-    marketAccountUpdate: (payload: MarketAccount) => void;
-    bankAccountUpdate: (payload: BankAccount) => void;
+    perpMarketAccountUpdate: (payload: PerpMarketAccount) => void;
+    spotMarketAccountUpdate: (payload: SpotMarketAccount) => void;
     oraclePriceUpdate: (publicKey: PublicKey, data: OraclePriceData) => void;
     userAccountUpdate: (payload: UserAccount) => void;
     update: void;
@@ -32,13 +29,14 @@ export interface ClearingHouseAccountSubscriber {
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
-    addMarket(marketIndex: BN): Promise<boolean>;
-    addBank(bankIndex: BN): Promise<boolean>;
+    addPerpMarket(marketIndex: number): Promise<boolean>;
+    addSpotMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
-    getMarketAccountAndSlot(marketIndex: BN): DataAndSlot<MarketAccount> | undefined;
-    getMarketAccountsAndSlots(): DataAndSlot<MarketAccount>[];
-    getBankAccountAndSlot(bankIndex: BN): DataAndSlot<BankAccount> | undefined;
+    getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
+    getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
+    getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
 }
 export interface UserAccountEvents {
@@ -100,3 +98,16 @@ export declare type DataAndSlot<T> = {
     data: T;
     slot: number;
 };
+export interface UserStatsAccountEvents {
+    userStatsAccountUpdate: (payload: UserStatsAccount) => void;
+    update: void;
+    error: (e: Error) => void;
+}
+export interface UserStatsAccountSubscriber {
+    eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
+    isSubscribed: boolean;
+    subscribe(): Promise<boolean>;
+    fetch(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+}

package/lib/accounts/webSocketClearingHouseAccountSubscriber.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="bn.js" />
 /// <reference types="node" />
 import { ClearingHouseAccountSubscriber, ClearingHouseAccountEvents, DataAndSlot } from './types';
 import { AccountSubscriber } from './types';
-import { BankAccount, MarketAccount, StateAccount } from '../types';
-import { BN, Program } from '@project-serum/anchor';
+import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
+import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
@@ -12,38 +11,39 @@ import { OracleClientCache } from '../oracles/oracleClientCache';
 export declare class WebSocketClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
-    marketIndexes: BN[];
-    bankIndexes: BN[];
+    perpMarketIndexes: number[];
+    spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
     eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
-    marketAccountSubscribers: Map<number, AccountSubscriber<MarketAccount>>;
-    bankAccountSubscribers: Map<number, AccountSubscriber<BankAccount>>;
+    perpMarketAccountSubscribers: Map<number, AccountSubscriber<PerpMarketAccount>>;
+    spotMarketAccountSubscribers: Map<number, AccountSubscriber<SpotMarketAccount>>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, marketIndexes: BN[], bankIndexes: BN[], oracleInfos: OracleInfo[]);
+    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[]);
     subscribe(): Promise<boolean>;
     subscribeToMarketAccounts(): Promise<boolean>;
-    subscribeToMarketAccount(marketIndex: BN): Promise<boolean>;
-    subscribeToBankAccounts(): Promise<boolean>;
-    subscribeToBankAccount(bankIndex: BN): Promise<boolean>;
+    subscribeToMarketAccount(marketIndex: number): Promise<boolean>;
+    subscribeToSpotMarketAccounts(): Promise<boolean>;
+    subscribeToSpotMarketAccount(marketIndex: number): Promise<boolean>;
     subscribeToOracles(): Promise<boolean>;
     subscribeToOracle(oracleInfo: OracleInfo): Promise<boolean>;
     unsubscribeFromMarketAccounts(): Promise<void>;
-    unsubscribeFromBankAccounts(): Promise<void>;
+    unsubscribeFromSpotMarketAccounts(): Promise<void>;
     unsubscribeFromOracles(): Promise<void>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
-    addBank(bankIndex: BN): Promise<boolean>;
-    addMarket(marketIndex: BN): Promise<boolean>;
+    addSpotMarket(marketIndex: number): Promise<boolean>;
+    addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
-    getMarketAccountAndSlot(marketIndex: BN): DataAndSlot<MarketAccount> | undefined;
-    getMarketAccountsAndSlots(): DataAndSlot<MarketAccount>[];
-    getBankAccountAndSlot(bankIndex: BN): DataAndSlot<BankAccount> | undefined;
+    getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
+    getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
+    getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
 }