@drift-labs/sdk 0.1.11 → 0.1.15

package/src/accounts/defaultClearingHouseAccountSubscriber.ts

@@ -194,6 +194,24 @@ export class DefaultClearingHouseAccountSubscriber
 		return true;
 	}
 
+	public async fetch(): Promise<void> {
+		if (!this.isSubscribed) {
+			return;
+		}
+
+		const promises = this.optionalExtraSubscriptions
+			.map((optionalSubscription) => {
+				const subscriber = `${optionalSubscription}Subscriber`;
+				return this[subscriber].fetch();
+			})
+			.concat([
+				this.stateAccountSubscriber.fetch(),
+				this.marketsAccountSubscriber.fetch(),
+			]);
+
+		await Promise.all(promises);
+	}
+
 	public async unsubscribe(): Promise<void> {
 		if (!this.isSubscribed) {
 			return;

package/src/accounts/defaultUserAccountSubscriber.ts

@@ -1,5 +1,6 @@
 import {
 	AccountSubscriber,
+	NotSubscribedError,
 	UserAccountEvents,
 	UserAccountSubscriber,
 } from './types';
@@ -65,6 +66,13 @@ export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 		return true;
 	}
 
+	async fetch(): Promise<void> {
+		await Promise.all([
+			this.userDataAccountSubscriber.fetch(),
+			this.userPositionsAccountSubscriber.fetch(),
+		]);
+	}
+
 	async unsubscribe(): Promise<void> {
 		if (!this.isSubscribed) {
 			return;
@@ -76,11 +84,21 @@ export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 		this.isSubscribed = false;
 	}
 
+	assertIsSubscribed(): void {
+		if (!this.isSubscribed) {
+			throw new NotSubscribedError(
+				'You must call `subscribe` before using this function'
+			);
+		}
+	}
+
 	public getUserAccount(): UserAccount {
+		this.assertIsSubscribed();
 		return this.userDataAccountSubscriber.data;
 	}
 
 	public getUserPositionsAccount(): UserPositionsAccount {
+		this.assertIsSubscribed();
 		return this.userPositionsAccountSubscriber.data;
 	}
 }

package/src/accounts/types.ts

@@ -16,6 +16,7 @@ import { EventEmitter } from 'events';
 export interface AccountSubscriber<T> {
 	data?: T;
 	subscribe(onChange: (data: T) => void): Promise<void>;
+	fetch(): Promise<void>;
 	unsubscribe(): void;
 }
 
@@ -54,7 +55,7 @@ export interface ClearingHouseAccountSubscriber {
 	subscribe(
 		optionalSubscriptions?: ClearingHouseAccountTypes[]
 	): Promise<boolean>;
-
+	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
 	getStateAccount(): StateAccount;
@@ -67,33 +68,6 @@ export interface ClearingHouseAccountSubscriber {
 	getLiquidationHistoryAccount(): LiquidationHistoryAccount;
 }
 
-export interface HistoryAccountEvents {
-	fundingPaymentHistoryAccountUpdate: (
-		payload: FundingPaymentHistoryAccount
-	) => void;
-	fundingRateHistoryAccountUpdate: (payload: FundingRateHistoryAccount) => void;
-	tradeHistoryAccountUpdate: (payload: TradeHistoryAccount) => void;
-	liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
-	depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
-	curveHistoryAccountUpdate: (payload: CurveHistoryAccount) => void;
-	update: void;
-}
-
-export interface HistoryAccountSubscriber {
-	eventEmitter: StrictEventEmitter<EventEmitter, HistoryAccountEvents>;
-	isSubscribed: boolean;
-
-	subscribe(): Promise<boolean>;
-	unsubscribe(): Promise<void>;
-
-	getTradeHistoryAccount(): TradeHistoryAccount;
-	getDepositHistoryAccount(): DepositHistoryAccount;
-	getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
-	getFundingRateHistoryAccount(): FundingRateHistoryAccount;
-	getCurveHistoryAccount(): CurveHistoryAccount;
-	getLiquidationHistoryAccount(): LiquidationHistoryAccount;
-}
-
 export interface UserAccountEvents {
 	userAccountData: (payload: UserAccount) => void;
 	userPositionsData: (payload: UserPositionsAccount) => void;
@@ -105,6 +79,7 @@ export interface UserAccountSubscriber {
 	isSubscribed: boolean;
 
 	subscribe(): Promise<boolean>;
+	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
 	getUserAccount(): UserAccount;

package/src/accounts/webSocketAccountSubscriber.ts

@@ -7,6 +7,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	accountName: string;
 	program: Program;
 	accountPublicKey: PublicKey;
+	onChange: (data: T) => void;
 
 	public constructor(
 		accountName: string,
@@ -19,20 +20,29 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	}
 
 	async subscribe(onChange: (data: T) => void): Promise<void> {
-		this.data = (await this.program.account[this.accountName].fetch(
-			this.accountPublicKey
-		)) as T;
-
-		onChange(this.data);
+		this.onChange = onChange;
+		await this.fetch();
 
 		this.program.account[this.accountName]
 			.subscribe(this.accountPublicKey, this.program.provider.opts.commitment)
 			.on('change', async (data: T) => {
 				this.data = data;
-				onChange(data);
+				this.onChange(data);
 			});
 	}
 
+	async fetch(): Promise<void> {
+		const newData = (await this.program.account[this.accountName].fetch(
+			this.accountPublicKey
+		)) as T;
+
+		// if data has changed trigger update
+		if (JSON.stringify(newData) !== JSON.stringify(this.data)) {
+			this.data = newData;
+			this.onChange(this.data);
+		}
+	}
+
 	unsubscribe(): Promise<void> {
 		return this.program.account[this.accountName].unsubscribe(
 			this.accountPublicKey

package/src/clearingHouse.ts

@@ -16,7 +16,6 @@ import {
 	PositionDirection,
 	TradeHistoryAccount,
 	UserAccount,
-	UserPositionsAccount,
 	Market,
 } from './types';
 import * as anchor from '@project-serum/anchor';
@@ -140,6 +139,13 @@ export class ClearingHouse {
 		]);
 	}
 
+	/**
+	 *	Forces the accountSubscriber to fetch account updates from rpc
+	 */
+	public async fetchAccounts(): Promise<void> {
+		await this.accountSubscriber.fetch();
+	}
+
 	/**
 	 * Unsubscribe from all currently subscribed state accounts
 	 */
@@ -454,7 +460,7 @@ export class ClearingHouse {
 		collateralAccountPublicKey: PublicKey
 	): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await this.getUserAccountPublicKey();
-		const user: UserAccount = await this.program.account.user.fetch(
+		const user: any = await this.program.account.user.fetch(
 			userAccountPublicKey
 		);
 
@@ -659,7 +665,7 @@ export class ClearingHouse {
 		const liquidateeUserAccount: any = await this.program.account.user.fetch(
 			liquidateeUserAccountPublicKey
 		);
-		const liquidateePositions: UserPositionsAccount =
+		const liquidateePositions: any =
 			await this.program.account.userPositions.fetch(
 				liquidateeUserAccount.positions
 			);