@drift-labs/sdk 0.1.36-master.7 → 0.2.0-master.2

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -1,4 +1,5 @@
 import {
+	DataAndSlot,
 	NotSubscribedError,
 	TokenAccountEvents,
 	TokenAccountSubscriber,
@@ -21,7 +22,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 	callbackId?: string;
 	errorCallbackId?: string;
 
-	tokenAccount?: AccountInfo;
+	tokenAccountAndSlot?: DataAndSlot<AccountInfo>;
 
 	public constructor(publicKey: PublicKey, accountLoader: BulkAccountLoader) {
 		this.isSubscribed = false;
@@ -59,9 +60,9 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 
 		this.callbackId = this.accountLoader.addAccount(
 			this.publicKey,
-			(buffer) => {
+			(buffer, slot: number) => {
 				const tokenAccount = parseTokenAccount(buffer);
-				this.tokenAccount = tokenAccount;
+				this.tokenAccountAndSlot = { data: tokenAccount, slot };
 				// @ts-ignore
 				this.eventEmitter.emit('tokenAccountUpdate', tokenAccount);
 				this.eventEmitter.emit('update');
@@ -75,8 +76,10 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 
 	async fetch(): Promise<void> {
 		await this.accountLoader.load();
-		const buffer = this.accountLoader.getAccountData(this.publicKey);
-		this.tokenAccount = parseTokenAccount(buffer);
+		const { buffer, slot } = this.accountLoader.getBufferAndSlot(
+			this.publicKey
+		);
+		this.tokenAccountAndSlot = { data: parseTokenAccount(buffer), slot };
 	}
 
 	async unsubscribe(): Promise<void> {
@@ -101,12 +104,12 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		}
 	}
 
-	public getTokenAccount(): AccountInfo {
+	public getTokenAccountAndSlot(): DataAndSlot<AccountInfo> {
 		this.assertIsSubscribed();
-		return this.tokenAccount;
+		return this.tokenAccountAndSlot;
 	}
 
 	didSubscriptionSucceed(): boolean {
-		return !!this.tokenAccount;
+		return !!this.tokenAccountAndSlot;
 	}
 }

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -1,49 +1,40 @@
 import {
+	DataAndSlot,
 	AccountToPoll,
 	NotSubscribedError,
 	UserAccountEvents,
 	UserAccountSubscriber,
-	UserPublicKeys,
 } 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 {
-	getUserAccountPublicKey,
-	getUserOrdersAccountPublicKey,
-} from '../addresses';
-import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
+import { UserAccount } from '../types';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { capitalize } from './utils';
-import { ClearingHouseConfigType } from '../factory/clearingHouse';
 
 export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
-	authority: PublicKey;
+	userAccountPublicKey: PublicKey;
 
 	accountLoader: BulkAccountLoader;
 	accountsToPoll = new Map<string, AccountToPoll>();
 	errorCallbackId?: string;
 
-	user?: UserAccount;
-	userPositions?: UserPositionsAccount;
-	userOrders?: UserOrdersAccount;
-
-	type: ClearingHouseConfigType = 'polling';
+	user?: DataAndSlot<UserAccount>;
 
 	public constructor(
 		program: Program,
-		authority: PublicKey,
+		userAccountPublicKey: PublicKey,
 		accountLoader: BulkAccountLoader
 	) {
 		this.isSubscribed = false;
 		this.program = program;
-		this.authority = authority;
 		this.accountLoader = accountLoader;
 		this.eventEmitter = new EventEmitter();
+		this.userAccountPublicKey = userAccountPublicKey;
 	}
 
 	async subscribe(): Promise<boolean> {
@@ -69,69 +60,21 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		return subscriptionSucceeded;
 	}
 
-	async addToAccountLoader(userPublicKeys?: UserPublicKeys): Promise<void> {
+	async addToAccountLoader(): Promise<void> {
 		if (this.accountsToPoll.size > 0) {
 			return;
 		}
 
-		if (!userPublicKeys) {
-			const userPublicKey = await getUserAccountPublicKey(
-				this.program.programId,
-				this.authority
-			);
-
-			const userAccount = (await this.program.account.user.fetch(
-				userPublicKey
-			)) as UserAccount;
-
-			this.accountsToPoll.set(userPublicKey.toString(), {
-				key: 'user',
-				publicKey: userPublicKey,
-				eventType: 'userAccountData',
-			});
-
-			this.accountsToPoll.set(userAccount.positions.toString(), {
-				key: 'userPositions',
-				publicKey: userAccount.positions,
-				eventType: 'userPositionsData',
-			});
-
-			const userOrdersPublicKey = await getUserOrdersAccountPublicKey(
-				this.program.programId,
-				userPublicKey
-			);
-
-			this.accountsToPoll.set(userOrdersPublicKey.toString(), {
-				key: 'userOrders',
-				publicKey: userOrdersPublicKey,
-				eventType: 'userOrdersData',
-			});
-		} else {
-			this.accountsToPoll.set(userPublicKeys.user.toString(), {
-				key: 'user',
-				publicKey: userPublicKeys.user,
-				eventType: 'userAccountData',
-			});
-
-			this.accountsToPoll.set(userPublicKeys.userPositions.toString(), {
-				key: 'userPositions',
-				publicKey: userPublicKeys.userPositions,
-				eventType: 'userPositionsData',
-			});
-
-			if (userPublicKeys.userOrders) {
-				this.accountsToPoll.set(userPublicKeys.userOrders.toString(), {
-					key: 'userOrders',
-					publicKey: userPublicKeys.userOrders,
-					eventType: 'userOrdersData',
-				});
-			}
-		}
+		this.accountsToPoll.set(this.userAccountPublicKey.toString(), {
+			key: 'user',
+			publicKey: this.userAccountPublicKey,
+			eventType: 'userAccountUpdate',
+		});
 
 		for (const [_, accountToPoll] of this.accountsToPoll) {
 			accountToPoll.callbackId = this.accountLoader.addAccount(
 				accountToPoll.publicKey,
-				(buffer) => {
+				(buffer, slot) => {
 					if (!buffer) {
 						return;
 					}
@@ -139,7 +82,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 					const account = this.program.account[
 						accountToPoll.key
 					].coder.accounts.decode(capitalize(accountToPoll.key), buffer);
-					this[accountToPoll.key] = account;
+					this[accountToPoll.key] = { data: account, slot };
 					// @ts-ignore
 					this.eventEmitter.emit(accountToPoll.eventType, account);
 					this.eventEmitter.emit('update');
@@ -169,11 +112,14 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	async fetch(): Promise<void> {
 		await this.accountLoader.load();
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			const buffer = this.accountLoader.getAccountData(accountToPoll.publicKey);
+			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
+				accountToPoll.publicKey
+			);
 			if (buffer) {
-				this[accountToPoll.key] = this.program.account[
+				const account = this.program.account[
 					accountToPoll.key
 				].coder.accounts.decode(capitalize(accountToPoll.key), buffer);
+				this[accountToPoll.key] = { data: account, slot };
 			}
 		}
 	}
@@ -181,8 +127,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	didSubscriptionSucceed(): boolean {
 		let success = true;
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			// userOrders may not exist
-			if (accountToPoll.key !== 'userOrders' && !this[accountToPoll.key]) {
+			if (!this[accountToPoll.key]) {
 				success = false;
 				break;
 			}
@@ -218,18 +163,8 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		}
 	}
 
-	public getUserAccount(): UserAccount {
+	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
 		this.assertIsSubscribed();
 		return this.user;
 	}
-
-	public getUserPositionsAccount(): UserPositionsAccount {
-		this.assertIsSubscribed();
-		return this.userPositions;
-	}
-
-	public getUserOrdersAccount(): UserOrdersAccount {
-		this.assertIsSubscribed();
-		return this.userOrders;
-	}
 }

package/src/accounts/types.ts

@@ -1,30 +1,19 @@
 import {
-	DepositHistoryAccount,
-	ExtendedCurveHistoryAccount,
-	FundingPaymentHistoryAccount,
-	FundingRateHistoryAccount,
-	LiquidationHistoryAccount,
-	MarketsAccount,
-	OrderHistoryAccount,
-	OrderStateAccount,
+	BankAccount,
+	MarketAccount,
+	OracleSource,
 	StateAccount,
-	TradeHistoryAccount,
 	UserAccount,
-	UserOrdersAccount,
-	UserPositionsAccount,
 } 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 {
-	ClearingHouseConfigType,
-	ClearingHouseUserConfigType,
-	OraclePriceData,
-} from '..';
+import { OracleInfo, OraclePriceData } from '..';
+import { BN } from '@project-serum/anchor';
 
 export interface AccountSubscriber<T> {
-	data?: T;
+	dataAndSlot?: DataAndSlot<T>;
 	subscribe(onChange: (data: T) => void): Promise<void>;
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
@@ -36,66 +25,39 @@ export class NotSubscribedError extends Error {
 
 export interface ClearingHouseAccountEvents {
 	stateAccountUpdate: (payload: StateAccount) => void;
-	marketsAccountUpdate: (payload: MarketsAccount) => void;
-	fundingPaymentHistoryAccountUpdate: (
-		payload: FundingPaymentHistoryAccount
-	) => void;
-	fundingRateHistoryAccountUpdate: (payload: FundingRateHistoryAccount) => void;
-	tradeHistoryAccountUpdate: (payload: TradeHistoryAccount) => void;
-	liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
-	depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
-	curveHistoryAccountUpdate: (payload: ExtendedCurveHistoryAccount) => void;
-	orderHistoryAccountUpdate: (payload: OrderHistoryAccount) => void;
-	orderStateAccountUpdate: (payload: OrderStateAccount) => void;
+	marketAccountUpdate: (payload: MarketAccount) => void;
+	bankAccountUpdate: (payload: BankAccount) => void;
+	oraclePriceUpdate: (publicKey: PublicKey, data: OraclePriceData) => void;
+	userAccountUpdate: (payload: UserAccount) => void;
 	update: void;
 	error: (e: Error) => void;
 }
 
-export type ClearingHouseAccountTypes =
-	| 'tradeHistoryAccount'
-	| 'depositHistoryAccount'
-	| 'fundingPaymentHistoryAccount'
-	| 'fundingRateHistoryAccount'
-	| 'curveHistoryAccount'
-	| 'liquidationHistoryAccount'
-	| 'orderHistoryAccount';
-
 export interface ClearingHouseAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
 	isSubscribed: boolean;
 
-	optionalExtraSubscriptions: ClearingHouseAccountTypes[];
-
-	subscribe(
-		optionalSubscriptions?: ClearingHouseAccountTypes[]
-	): Promise<boolean>;
+	subscribe(): Promise<boolean>;
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getStateAccount(): StateAccount;
-	getMarketsAccount(): MarketsAccount;
-	getTradeHistoryAccount(): TradeHistoryAccount;
-	getDepositHistoryAccount(): DepositHistoryAccount;
-	getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
-	getFundingRateHistoryAccount(): FundingRateHistoryAccount;
-	getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
-	getLiquidationHistoryAccount(): LiquidationHistoryAccount;
-	getOrderStateAccount(): OrderStateAccount;
-	getOrderHistoryAccount(): OrderHistoryAccount;
-
-	type: ClearingHouseConfigType;
+	addMarket(marketIndex: BN): Promise<boolean>;
+	addBank(bankIndex: BN): 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;
+	getOraclePriceDataAndSlot(
+		oraclePublicKey: PublicKey
+	): DataAndSlot<OraclePriceData> | undefined;
 }
 
-export type UserPublicKeys = {
-	user: PublicKey;
-	userPositions: PublicKey;
-	userOrders: PublicKey | undefined;
-};
-
 export interface UserAccountEvents {
-	userAccountData: (payload: UserAccount) => void;
-	userPositionsData: (payload: UserPositionsAccount) => void;
-	userOrdersData: (payload: UserOrdersAccount) => void;
+	userAccountUpdate: (payload: UserAccount) => void;
 	update: void;
 	error: (e: Error) => void;
 }
@@ -108,10 +70,7 @@ export interface UserAccountSubscriber {
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getUserAccount(): UserAccount;
-	getUserPositionsAccount(): UserPositionsAccount;
-	getUserOrdersAccount(): UserOrdersAccount;
-	type: ClearingHouseUserConfigType;
+	getUserAccountAndSlot(): DataAndSlot<UserAccount>;
 }
 
 export interface TokenAccountEvents {
@@ -128,7 +87,7 @@ export interface TokenAccountSubscriber {
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getTokenAccount(): AccountInfo;
+	getTokenAccountAndSlot(): DataAndSlot<AccountInfo>;
 }
 
 export interface OracleEvents {
@@ -145,7 +104,7 @@ export interface OracleSubscriber {
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getOraclePriceData(): OraclePriceData;
+	getOraclePriceData(): DataAndSlot<OraclePriceData>;
 }
 
 export type AccountToPoll = {
@@ -153,9 +112,21 @@ export type AccountToPoll = {
 	publicKey: PublicKey;
 	eventType: string;
 	callbackId?: string;
+	mapKey?: number;
 };
 
-export type AccountData = {
+export type OraclesToPoll = {
+	publicKey: PublicKey;
+	source: OracleSource;
+	callbackId?: string;
+};
+
+export type BufferAndSlot = {
 	slot: number;
 	buffer: Buffer | undefined;
 };
+
+export type DataAndSlot<T> = {
+	data: T;
+	slot: number;
+};

package/src/accounts/webSocketAccountSubscriber.ts

@@ -1,26 +1,29 @@
-import { AccountData, AccountSubscriber } from './types';
+import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
 import { AnchorProvider, Program } from '@project-serum/anchor';
 import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
 import { capitalize } from './utils';
 import * as Buffer from 'buffer';
 
 export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
-	data?: T;
-	accountData?: AccountData;
+	dataAndSlot?: DataAndSlot<T>;
+	bufferAndSlot?: BufferAndSlot;
 	accountName: string;
 	program: Program;
 	accountPublicKey: PublicKey;
+	decodeBufferFn: (buffer: Buffer) => T;
 	onChange: (data: T) => void;
 	listenerId?: number;
 
 	public constructor(
 		accountName: string,
 		program: Program,
-		accountPublicKey: PublicKey
+		accountPublicKey: PublicKey,
+		decodeBuffer?: (buffer: Buffer) => T
 	) {
 		this.accountName = accountName;
 		this.program = program;
 		this.accountPublicKey = accountPublicKey;
+		this.decodeBufferFn = decodeBuffer;
 	}
 
 	async subscribe(onChange: (data: T) => void): Promise<void> {
@@ -56,35 +59,49 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			newBuffer = accountInfo.data;
 		}
 
-		if (!this.accountData) {
-			this.accountData = {
+		if (!this.bufferAndSlot) {
+			this.bufferAndSlot = {
 				buffer: newBuffer,
 				slot: newSlot,
 			};
 			if (newBuffer) {
-				this.data = this.program.account[
-					this.accountName
-				].coder.accounts.decode(capitalize(this.accountName), newBuffer);
-				this.onChange(this.data);
+				const account = this.decodeBuffer(newBuffer);
+				this.dataAndSlot = {
+					data: account,
+					slot: newSlot,
+				};
+				this.onChange(account);
 			}
 			return;
 		}
 
-		if (newSlot <= this.accountData.slot) {
+		if (newSlot <= this.bufferAndSlot.slot) {
 			return;
 		}
 
-		const oldBuffer = this.accountData.buffer;
+		const oldBuffer = this.bufferAndSlot.buffer;
 		if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
-			this.accountData = {
+			this.bufferAndSlot = {
 				buffer: newBuffer,
 				slot: newSlot,
 			};
-			this.data = this.program.account[this.accountName].coder.accounts.decode(
+			const account = this.decodeBuffer(newBuffer);
+			this.dataAndSlot = {
+				data: account,
+				slot: newSlot,
+			};
+			this.onChange(account);
+		}
+	}
+
+	decodeBuffer(buffer: Buffer): T {
+		if (this.decodeBufferFn) {
+			return this.decodeBufferFn(buffer);
+		} else {
+			return this.program.account[this.accountName].coder.accounts.decode(
 				capitalize(this.accountName),
-				newBuffer
+				buffer
 			);
-			this.onChange(this.data);
 		}
 	}