@drift-labs/sdk 0.1.20 → 0.1.21-master.5

package/lib/tx/defaultTxSender.d.ts

@@ -6,4 +6,3 @@ export declare class DefaultTxSender implements TxSender {
     constructor(provider: Provider);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TransactionSignature>;
 }
-//# sourceMappingURL=defaultTxSender.d.ts.map

package/lib/tx/types.d.ts

@@ -2,4 +2,3 @@ import { ConfirmOptions, Signer, Transaction, TransactionSignature } from '@sola
 export interface TxSender {
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TransactionSignature>;
 }
-//# sourceMappingURL=types.d.ts.map

package/lib/tx/utils.d.ts

@@ -1,3 +1,2 @@
 import { Transaction, TransactionInstruction } from '@solana/web3.js';
 export declare function wrapInTx(instruction: TransactionInstruction): Transaction;
-//# sourceMappingURL=utils.d.ts.map

package/lib/types.d.ts

@@ -25,6 +25,65 @@ export declare class OracleSource {
         switchboard: {};
     };
 }
+export declare class OrderType {
+    static readonly LIMIT: {
+        limit: {};
+    };
+    static readonly TRIGGER_MARKET: {
+        triggerMarket: {};
+    };
+    static readonly TRIGGER_LIMIT: {
+        triggerLimit: {};
+    };
+    static readonly MARKET: {
+        market: {};
+    };
+}
+export declare class OrderStatus {
+    static readonly INIT: {
+        init: {};
+    };
+    static readonly OPEN: {
+        open: {};
+    };
+}
+export declare class OrderDiscountTier {
+    static readonly NONE: {
+        none: {};
+    };
+    static readonly FIRST: {
+        first: {};
+    };
+    static readonly SECOND: {
+        second: {};
+    };
+    static readonly THIRD: {
+        third: {};
+    };
+    static readonly FOURTH: {
+        fourth: {};
+    };
+}
+export declare class OrderAction {
+    static readonly PLACE: {
+        place: {};
+    };
+    static readonly CANCEL: {
+        cancel: {};
+    };
+    static readonly FILL: {
+        fill: {};
+    };
+}
+export declare class OrderTriggerCondition {
+    static readonly ABOVE: {
+        above: {};
+    };
+    static readonly BELOW: {
+        below: {};
+    };
+}
+export declare function isVariant(object: unknown, type: string): boolean;
 export declare enum TradeSide {
     None = 0,
     Buy = 1,
@@ -55,6 +114,11 @@ export declare type LiquidationHistoryAccount = {
     head: BN;
     liquidationRecords: LiquidationRecord[];
 };
+export declare type OrderHistoryAccount = {
+    head: BN;
+    lastOrderId: BN;
+    orderRecords: OrderRecord[];
+};
 export declare type DepositRecord = {
     ts: BN;
     recordId: BN;
@@ -148,6 +212,20 @@ export declare type LiquidationRecord = {
     unrealizedPnl: BN;
     marginRatio: BN;
 };
+export declare type OrderRecord = {
+    ts: BN;
+    recordId: BN;
+    order: Order;
+    user: PublicKey;
+    authority: PublicKey;
+    action: OrderAction;
+    filler: PublicKey;
+    baseAssetAmountFilled: BN;
+    quoteAssetAmountFilled: BN;
+    fee: BN;
+    fillerReward: BN;
+    tradeRecordId: BN;
+};
 export declare type StateAccount = {
     admin: PublicKey;
     fundingPaused: boolean;
@@ -185,8 +263,14 @@ export declare type StateAccount = {
     discountMint: PublicKey;
     oracleGuardRails: OracleGuardRails;
     maxDeposit: BN;
+    orderState: PublicKey;
     extendedCurveHistory: PublicKey;
 };
+export declare type OrderStateAccount = {
+    orderHistory: PublicKey;
+    orderFillerRewardStructure: OrderFillerRewardStructure;
+    minOrderQuoteAssetAmount: BN;
+};
 export declare type MarketsAccount = {
     accountIndex: BN;
     markets: Market[];
@@ -221,7 +305,8 @@ export declare type AMM = {
     totalFeeMinusDistributions: BN;
     totalFeeWithdrawn: BN;
     totalFee: BN;
-    minimumTradeSize: BN;
+    minimumQuoteAssetTradeSize: BN;
+    minimumBaseAssetTradeSize: BN;
     lastOraclePrice: BN;
 };
 export declare type UserPosition = {
@@ -229,6 +314,7 @@ export declare type UserPosition = {
     lastCumulativeFundingRate: BN;
     marketIndex: BN;
     quoteAssetAmount: BN;
+    openOrders: BN;
 };
 export declare type UserPositionsAccount = {
     positions: UserPosition[];
@@ -240,6 +326,59 @@ export declare type UserAccount = {
     cumulativeDeposits: BN;
     positions: PublicKey;
     totalFeePaid: BN;
+    totalTokenDiscount: BN;
+    totalReferralReward: BN;
+    totalRefereeDiscount: BN;
+};
+export declare type UserOrdersAccount = {
+    orders: Order[];
+    user: PublicKey;
+};
+export declare type Order = {
+    status: OrderStatus;
+    orderType: OrderType;
+    ts: BN;
+    orderId: BN;
+    userOrderId: number;
+    marketIndex: BN;
+    price: BN;
+    userBaseAssetAmount: BN;
+    baseAssetAmount: BN;
+    baseAssetAmountFilled: BN;
+    quoteAssetAmount: BN;
+    quoteAssetAmountFilled: BN;
+    fee: BN;
+    direction: PositionDirection;
+    reduceOnly: boolean;
+    triggerPrice: BN;
+    triggerCondition: OrderTriggerCondition;
+    discountTier: OrderDiscountTier;
+    referrer: PublicKey;
+    postOnly: boolean;
+    immediateOrCancel: boolean;
+    oraclePriceOffset: BN;
+};
+export declare type OrderParams = {
+    orderType: OrderType;
+    userOrderId: number;
+    direction: PositionDirection;
+    quoteAssetAmount: BN;
+    baseAssetAmount: BN;
+    price: BN;
+    marketIndex: BN;
+    reduceOnly: boolean;
+    postOnly: boolean;
+    immediateOrCancel: boolean;
+    triggerPrice: BN;
+    triggerCondition: OrderTriggerCondition;
+    positionLimit: BN;
+    oraclePriceOffset: BN;
+    padding0: boolean;
+    padding1: BN;
+    optionalAccounts: {
+        discountToken: boolean;
+        referrer: boolean;
+    };
 };
 export interface IWallet {
     signTransaction(tx: Transaction): Promise<Transaction>;
@@ -290,4 +429,8 @@ export declare type OracleGuardRails = {
     };
     useForLiquidations: boolean;
 };
-//# sourceMappingURL=types.d.ts.map
+export declare type OrderFillerRewardStructure = {
+    rewardNumerator: BN;
+    rewardDenominator: BN;
+    timeBasedRewardLowerBound: BN;
+};

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TradeSide = exports.OracleSource = exports.PositionDirection = exports.SwapDirection = void 0;
+exports.TradeSide = exports.isVariant = exports.OrderTriggerCondition = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.PositionDirection = exports.SwapDirection = void 0;
 // # Utility Types / Enums / Constants
 class SwapDirection {
 }
@@ -17,6 +17,41 @@ class OracleSource {
 exports.OracleSource = OracleSource;
 OracleSource.PYTH = { pyth: {} };
 OracleSource.SWITCHBOARD = { switchboard: {} };
+class OrderType {
+}
+exports.OrderType = OrderType;
+OrderType.LIMIT = { limit: {} };
+OrderType.TRIGGER_MARKET = { triggerMarket: {} };
+OrderType.TRIGGER_LIMIT = { triggerLimit: {} };
+OrderType.MARKET = { market: {} };
+class OrderStatus {
+}
+exports.OrderStatus = OrderStatus;
+OrderStatus.INIT = { init: {} };
+OrderStatus.OPEN = { open: {} };
+class OrderDiscountTier {
+}
+exports.OrderDiscountTier = OrderDiscountTier;
+OrderDiscountTier.NONE = { none: {} };
+OrderDiscountTier.FIRST = { first: {} };
+OrderDiscountTier.SECOND = { second: {} };
+OrderDiscountTier.THIRD = { third: {} };
+OrderDiscountTier.FOURTH = { fourth: {} };
+class OrderAction {
+}
+exports.OrderAction = OrderAction;
+OrderAction.PLACE = { place: {} };
+OrderAction.CANCEL = { cancel: {} };
+OrderAction.FILL = { fill: {} };
+class OrderTriggerCondition {
+}
+exports.OrderTriggerCondition = OrderTriggerCondition;
+OrderTriggerCondition.ABOVE = { above: {} };
+OrderTriggerCondition.BELOW = { below: {} };
+function isVariant(object, type) {
+    return object.hasOwnProperty(type);
+}
+exports.isVariant = isVariant;
 var TradeSide;
 (function (TradeSide) {
     TradeSide[TradeSide["None"] = 0] = "None";

package/lib/util/computeUnits.d.ts

@@ -1,3 +1,2 @@
 import { Connection, Finality, PublicKey } from '@solana/web3.js';
 export declare function findComputeUnitConsumption(programId: PublicKey, connection: Connection, txSignature: string, commitment?: Finality): Promise<number[]>;
-//# sourceMappingURL=computeUnits.d.ts.map

package/lib/util/tps.d.ts

@@ -1,3 +1,2 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 export declare function estimateTps(programId: PublicKey, connection: Connection, failed: boolean): Promise<number>;
-//# sourceMappingURL=tps.d.ts.map

package/lib/wallet.d.ts

@@ -7,4 +7,3 @@ export declare class Wallet implements IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     get publicKey(): PublicKey;
 }
-//# sourceMappingURL=wallet.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.20",
+	"version": "0.1.21-master.5",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -100,19 +100,27 @@ export class BulkAccountLoader {
 			this.loadPromiseResolver = resolver;
 		});
 
-		const chunks = this.chunks(
-			Array.from(this.accountsToLoad.values()),
-			GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
-		);
-
-		await Promise.all(
-			chunks.map((chunk) => {
-				return this.loadChunk(chunk);
-			})
-		);
-
-		this.loadPromiseResolver();
-		this.loadPromise = undefined;
+		try {
+			const chunks = this.chunks(
+				Array.from(this.accountsToLoad.values()),
+				GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
+			);
+
+			await Promise.all(
+				chunks.map((chunk) => {
+					return this.loadChunk(chunk);
+				})
+			);
+		} catch (e) {
+			console.error(`Error in bulkAccountLoader.load()`);
+			console.error(e);
+			for (const [_, callback] of this.errorCallbacks) {
+				callback(e);
+			}
+		} finally {
+			this.loadPromiseResolver();
+			this.loadPromise = undefined;
+		}
 	}
 
 	async loadChunk(accountsToLoad: AccountToLoad[]): Promise<void> {

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -15,6 +15,8 @@ import {
 	FundingRateHistoryAccount,
 	LiquidationHistoryAccount,
 	MarketsAccount,
+	OrderHistoryAccount,
+	OrderStateAccount,
 	StateAccount,
 	TradeHistoryAccount,
 } from '../types';
@@ -36,12 +38,14 @@ export class PollingClearingHouseAccountSubscriber
 
 	state?: StateAccount;
 	markets?: MarketsAccount;
+	orderState?: OrderStateAccount;
 	tradeHistory?: TradeHistoryAccount;
 	depositHistory?: DepositHistoryAccount;
 	fundingPaymentHistory?: FundingPaymentHistoryAccount;
 	fundingRateHistory?: FundingRateHistoryAccount;
 	liquidationHistory?: LiquidationHistoryAccount;
 	extendedCurveHistory: ExtendedCurveHistoryAccount;
+	orderHistory?: OrderHistoryAccount;
 
 	optionalExtraSubscriptions: ClearingHouseAccountTypes[] = [];
 
@@ -114,6 +118,12 @@ export class PollingClearingHouseAccountSubscriber
 			eventType: 'marketsAccountUpdate',
 		});
 
+		this.accountsToPoll.set(state.orderState.toString(), {
+			key: 'orderState',
+			publicKey: state.orderState,
+			eventType: 'orderStateAccountUpdate',
+		});
+
 		if (this.optionalExtraSubscriptions?.includes('tradeHistoryAccount')) {
 			this.accountsToPoll.set(state.tradeHistory.toString(), {
 				key: 'tradeHistory',
@@ -167,6 +177,18 @@ export class PollingClearingHouseAccountSubscriber
 				eventType: 'liquidationHistoryAccountUpdate',
 			});
 		}
+
+		if (this.optionalExtraSubscriptions?.includes('orderHistoryAccount')) {
+			const orderState = (await this.program.account.orderState.fetch(
+				state.orderState
+			)) as OrderStateAccount;
+
+			this.accountsToPoll.set(orderState.orderHistory.toString(), {
+				key: 'orderHistory',
+				publicKey: orderState.orderHistory,
+				eventType: 'orderHistoryAccountUpdate',
+			});
+		}
 	}
 
 	async addToAccountLoader(): Promise<void> {
@@ -255,6 +277,11 @@ export class PollingClearingHouseAccountSubscriber
 		return this.markets;
 	}
 
+	public getOrderStateAccount(): OrderStateAccount {
+		this.assertIsSubscribed();
+		return this.orderState;
+	}
+
 	public getTradeHistoryAccount(): TradeHistoryAccount {
 		this.assertIsSubscribed();
 		this.assertOptionalIsSubscribed('tradeHistoryAccount');
@@ -290,4 +317,10 @@ export class PollingClearingHouseAccountSubscriber
 		this.assertOptionalIsSubscribed('liquidationHistoryAccount');
 		return this.liquidationHistory;
 	}
+
+	public getOrderHistoryAccount(): OrderHistoryAccount {
+		this.assertIsSubscribed();
+		this.assertOptionalIsSubscribed('orderHistoryAccount');
+		return this.orderHistory;
+	}
 }

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -8,8 +8,11 @@ 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 } from '../addresses';
-import { UserAccount, UserPositionsAccount } from '../types';
+import {
+	getUserAccountPublicKey,
+	getUserOrdersAccountPublicKey,
+} from '../addresses';
+import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { capitalize } from './utils';
 import { ClearingHouseConfigType } from '../factory/clearingHouse';
@@ -26,6 +29,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 
 	user?: UserAccount;
 	userPositions?: UserPositionsAccount;
+	userOrders?: UserOrdersAccount;
 
 	type: ClearingHouseConfigType = 'polling';
 
@@ -80,6 +84,25 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 			eventType: 'userPositionsData',
 		});
 
+		const userOrdersPublicKey = await getUserOrdersAccountPublicKey(
+			this.program.programId,
+			userPublicKey
+		);
+
+		const userOrdersExist =
+			(
+				await this.program.provider.connection.getParsedAccountInfo(
+					userOrdersPublicKey
+				)
+			).value !== null;
+		if (userOrdersExist) {
+			this.accountsToPoll.set(userOrdersPublicKey.toString(), {
+				key: 'userOrders',
+				publicKey: userOrdersPublicKey,
+				eventType: 'userOrdersData',
+			});
+		}
+
 		for (const [_, accountToPoll] of this.accountsToPoll) {
 			accountToPoll.callbackId = this.accountLoader.addAccount(
 				accountToPoll.publicKey,
@@ -163,4 +186,9 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		this.assertIsSubscribed();
 		return this.userPositions;
 	}
+
+	public getUserOrdersAccount(): UserOrdersAccount {
+		this.assertIsSubscribed();
+		return this.userOrders;
+	}
 }

package/src/accounts/types.ts

@@ -5,9 +5,12 @@ import {
 	FundingRateHistoryAccount,
 	LiquidationHistoryAccount,
 	MarketsAccount,
+	OrderHistoryAccount,
+	OrderStateAccount,
 	StateAccount,
 	TradeHistoryAccount,
 	UserAccount,
+	UserOrdersAccount,
 	UserPositionsAccount,
 } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -38,6 +41,8 @@ export interface ClearingHouseAccountEvents {
 	liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
 	depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
 	curveHistoryAccountUpdate: (payload: ExtendedCurveHistoryAccount) => void;
+	orderHistoryAccountUpdate: (payload: OrderHistoryAccount) => void;
+	orderStateAccountUpdate: (payload: OrderStateAccount) => void;
 	update: void;
 	error: (e: Error) => void;
 }
@@ -48,7 +53,8 @@ export type ClearingHouseAccountTypes =
 	| 'fundingPaymentHistoryAccount'
 	| 'fundingRateHistoryAccount'
 	| 'curveHistoryAccount'
-	| 'liquidationHistoryAccount';
+	| 'liquidationHistoryAccount'
+	| 'orderHistoryAccount';
 
 export interface ClearingHouseAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
@@ -70,6 +76,8 @@ export interface ClearingHouseAccountSubscriber {
 	getFundingRateHistoryAccount(): FundingRateHistoryAccount;
 	getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
 	getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+	getOrderStateAccount(): OrderStateAccount;
+	getOrderHistoryAccount(): OrderHistoryAccount;
 
 	type: ClearingHouseConfigType;
 }
@@ -77,6 +85,7 @@ export interface ClearingHouseAccountSubscriber {
 export interface UserAccountEvents {
 	userAccountData: (payload: UserAccount) => void;
 	userPositionsData: (payload: UserPositionsAccount) => void;
+	userOrdersData: (payload: UserOrdersAccount) => void;
 	update: void;
 	error: (e: Error) => void;
 }
@@ -91,7 +100,7 @@ export interface UserAccountSubscriber {
 
 	getUserAccount(): UserAccount;
 	getUserPositionsAccount(): UserPositionsAccount;
-
+	getUserOrdersAccount(): UserOrdersAccount;
 	type: ClearingHouseUserConfigType;
 }
 

package/src/accounts/webSocketClearingHouseAccountSubscriber.ts

@@ -11,6 +11,8 @@ import {
 	FundingRateHistoryAccount,
 	LiquidationHistoryAccount,
 	MarketsAccount,
+	OrderHistoryAccount,
+	OrderStateAccount,
 	StateAccount,
 	TradeHistoryAccount,
 } from '../types';
@@ -35,6 +37,8 @@ export class WebSocketClearingHouseAccountSubscriber
 	fundingRateHistoryAccountSubscriber?: AccountSubscriber<FundingRateHistoryAccount>;
 	curveHistoryAccountSubscriber?: AccountSubscriber<ExtendedCurveHistoryAccount>;
 	liquidationHistoryAccountSubscriber?: AccountSubscriber<LiquidationHistoryAccount>;
+	orderStateAccountSubscriber?: AccountSubscriber<OrderStateAccount>;
+	orderHistoryAccountSubscriber?: AccountSubscriber<OrderHistoryAccount>;
 
 	optionalExtraSubscriptions: ClearingHouseAccountTypes[] = [];
 
@@ -95,6 +99,21 @@ export class WebSocketClearingHouseAccountSubscriber
 			this.eventEmitter.emit('update');
 		});
 
+		this.orderStateAccountSubscriber = new WebSocketAccountSubscriber(
+			'orderState',
+			this.program,
+			state.orderState
+		);
+
+		await this.orderStateAccountSubscriber.subscribe(
+			(data: OrderStateAccount) => {
+				this.eventEmitter.emit('orderStateAccountUpdate', data);
+				this.eventEmitter.emit('update');
+			}
+		);
+
+		const orderState = this.orderStateAccountSubscriber.data;
+
 		// create subscribers for other state accounts
 
 		this.tradeHistoryAccountSubscriber = new WebSocketAccountSubscriber(
@@ -134,6 +153,12 @@ export class WebSocketClearingHouseAccountSubscriber
 			state.extendedCurveHistory
 		);
 
+		this.orderHistoryAccountSubscriber = new WebSocketAccountSubscriber(
+			'orderHistory',
+			this.program,
+			orderState.orderHistory
+		);
+
 		const extraSusbcribersToUse: {
 			subscriber: AccountSubscriber<any>;
 			eventType: keyof ClearingHouseAccountEvents;
@@ -175,6 +200,12 @@ export class WebSocketClearingHouseAccountSubscriber
 				eventType: 'curveHistoryAccountUpdate',
 			});
 
+		if (optionalSubscriptions?.includes('orderHistoryAccount'))
+			extraSusbcribersToUse.push({
+				subscriber: this.orderHistoryAccountSubscriber,
+				eventType: 'orderHistoryAccountUpdate',
+			});
+
 		this.optionalExtraSubscriptions = optionalSubscriptions ?? [];
 
 		// await all subcriptions in parallel to boost performance
@@ -222,6 +253,7 @@ export class WebSocketClearingHouseAccountSubscriber
 
 		await this.stateAccountSubscriber.unsubscribe();
 		await this.marketsAccountSubscriber.unsubscribe();
+		await this.orderStateAccountSubscriber.unsubscribe();
 
 		if (this.optionalExtraSubscriptions.includes('tradeHistoryAccount')) {
 			await this.tradeHistoryAccountSubscriber.unsubscribe();
@@ -249,6 +281,10 @@ export class WebSocketClearingHouseAccountSubscriber
 			await this.liquidationHistoryAccountSubscriber.unsubscribe();
 		}
 
+		if (this.optionalExtraSubscriptions.includes('orderHistoryAccount')) {
+			await this.orderHistoryAccountSubscriber.unsubscribe();
+		}
+
 		this.isSubscribed = false;
 	}
 
@@ -321,4 +357,15 @@ export class WebSocketClearingHouseAccountSubscriber
 		this.assertOptionalIsSubscribed('liquidationHistoryAccount');
 		return this.liquidationHistoryAccountSubscriber.data;
 	}
+
+	public getOrderHistoryAccount(): OrderHistoryAccount {
+		this.assertIsSubscribed();
+		this.assertOptionalIsSubscribed('orderHistoryAccount');
+		return this.orderHistoryAccountSubscriber.data;
+	}
+
+	public getOrderStateAccount(): OrderStateAccount {
+		this.assertIsSubscribed();
+		return this.orderStateAccountSubscriber.data;
+	}
 }

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -8,9 +8,12 @@ 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 } from '../addresses';
+import {
+	getUserAccountPublicKey,
+	getUserOrdersAccountPublicKey,
+} from '../addresses';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
-import { UserAccount, UserPositionsAccount } from '../types';
+import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
 import { ClearingHouseConfigType } from '../factory/clearingHouse';
 
 export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
@@ -21,6 +24,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 
 	userDataAccountSubscriber: AccountSubscriber<UserAccount>;
 	userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
+	userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
 
 	type: ClearingHouseConfigType = 'websocket';
 
@@ -64,6 +68,23 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 			}
 		);
 
+		const userOrdersPublicKey = await getUserOrdersAccountPublicKey(
+			this.program.programId,
+			userPublicKey
+		);
+
+		this.userOrdersAccountSubscriber = new WebSocketAccountSubscriber(
+			'userOrders',
+			this.program,
+			userOrdersPublicKey
+		);
+		await this.userOrdersAccountSubscriber.subscribe(
+			(data: UserOrdersAccount) => {
+				this.eventEmitter.emit('userOrdersData', data);
+				this.eventEmitter.emit('update');
+			}
+		);
+
 		this.eventEmitter.emit('update');
 		this.isSubscribed = true;
 		return true;
@@ -73,6 +94,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 		await Promise.all([
 			this.userDataAccountSubscriber.fetch(),
 			this.userPositionsAccountSubscriber.fetch(),
+			this.userOrdersAccountSubscriber.fetch(),
 		]);
 	}
 
@@ -84,6 +106,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 		await Promise.all([
 			this.userDataAccountSubscriber.unsubscribe(),
 			this.userPositionsAccountSubscriber.unsubscribe(),
+			await this.userOrdersAccountSubscriber.unsubscribe(),
 		]);
 
 		this.isSubscribed = false;
@@ -106,4 +129,8 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 		this.assertIsSubscribed();
 		return this.userPositionsAccountSubscriber.data;
 	}
+
+	public getUserOrdersAccount(): UserOrdersAccount {
+		return this.userOrdersAccountSubscriber.data;
+	}
 }