@drift-labs/sdk 0.1.19-master.2 → 0.1.21-master.4

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -0,0 +1,136 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollingUserAccountSubscriber = void 0;
+const types_1 = require("./types");
+const events_1 = require("events");
+const addresses_1 = require("../addresses");
+const utils_1 = require("./utils");
+class PollingUserAccountSubscriber {
+    constructor(program, authority, accountLoader) {
+        this.accountsToPoll = new Map();
+        this.type = 'polling';
+        this.isSubscribed = false;
+        this.program = program;
+        this.authority = authority;
+        this.accountLoader = accountLoader;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    subscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isSubscribed) {
+                return true;
+            }
+            yield this.addToAccountLoader();
+            yield this.fetchIfUnloaded();
+            this.eventEmitter.emit('update');
+            this.isSubscribed = true;
+            return true;
+        });
+    }
+    addToAccountLoader() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.accountsToPoll.size > 0) {
+                return;
+            }
+            const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
+            const userAccount = (yield this.program.account.user.fetch(userPublicKey));
+            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 = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
+            const userOrdersExist = (yield 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, (buffer) => {
+                    const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    this[accountToPoll.key] = account;
+                    // @ts-ignore
+                    this.eventEmitter.emit(accountToPoll.eventType, account);
+                    this.eventEmitter.emit('update');
+                });
+            }
+            this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
+                this.eventEmitter.emit('error', error);
+            });
+        });
+    }
+    fetchIfUnloaded() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let shouldFetch = false;
+            for (const [_, accountToPoll] of this.accountsToPoll) {
+                if (this[accountToPoll.key] === undefined) {
+                    shouldFetch = true;
+                    break;
+                }
+            }
+            if (shouldFetch) {
+                yield this.fetch();
+            }
+        });
+    }
+    fetch() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.accountLoader.load();
+            for (const [_, accountToPoll] of this.accountsToPoll) {
+                const buffer = this.accountLoader.getAccountData(accountToPoll.publicKey);
+                if (buffer) {
+                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                }
+            }
+        });
+    }
+    unsubscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            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');
+        }
+    }
+    getUserAccount() {
+        this.assertIsSubscribed();
+        return this.user;
+    }
+    getUserPositionsAccount() {
+        this.assertIsSubscribed();
+        return this.userPositions;
+    }
+    getUserOrdersAccount() {
+        this.assertIsSubscribed();
+        return this.userOrders;
+    }
+}
+exports.PollingUserAccountSubscriber = PollingUserAccountSubscriber;

package/lib/accounts/types.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="node" />
-import { DepositHistoryAccount, ExtendedCurveHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, StateAccount, TradeHistoryAccount, UserAccount, UserPositionsAccount } from '../types';
+import { DepositHistoryAccount, ExtendedCurveHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, OrderHistoryAccount, OrderStateAccount, 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 } from '..';
 export interface AccountSubscriber<T> {
     data?: T;
     subscribe(onChange: (data: T) => void): Promise<void>;
@@ -20,9 +23,12 @@ 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;
 }
-export declare type ClearingHouseAccountTypes = 'tradeHistoryAccount' | 'depositHistoryAccount' | 'fundingPaymentHistoryAccount' | 'fundingRateHistoryAccount' | 'curveHistoryAccount' | 'liquidationHistoryAccount';
+export declare type ClearingHouseAccountTypes = 'tradeHistoryAccount' | 'depositHistoryAccount' | 'fundingPaymentHistoryAccount' | 'fundingRateHistoryAccount' | 'curveHistoryAccount' | 'liquidationHistoryAccount' | 'orderHistoryAccount';
 export interface ClearingHouseAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
     isSubscribed: boolean;
@@ -38,11 +44,16 @@ export interface ClearingHouseAccountSubscriber {
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
     getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+    getOrderStateAccount(): OrderStateAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
+    type: ClearingHouseConfigType;
 }
 export interface UserAccountEvents {
     userAccountData: (payload: UserAccount) => void;
     userPositionsData: (payload: UserPositionsAccount) => void;
+    userOrdersData: (payload: UserOrdersAccount) => void;
     update: void;
+    error: (e: Error) => void;
 }
 export interface UserAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
@@ -52,5 +63,29 @@ export interface UserAccountSubscriber {
     unsubscribe(): Promise<void>;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
+    getUserOrdersAccount(): UserOrdersAccount;
+    type: ClearingHouseUserConfigType;
 }
-//# sourceMappingURL=types.d.ts.map
+export interface TokenAccountEvents {
+    tokenAccountUpdate: (payload: AccountInfo) => void;
+    update: void;
+    error: (e: Error) => void;
+}
+export interface TokenAccountSubscriber {
+    eventEmitter: StrictEventEmitter<EventEmitter, TokenAccountEvents>;
+    isSubscribed: boolean;
+    subscribe(): Promise<boolean>;
+    fetch(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    getTokenAccount(): AccountInfo;
+}
+export declare type AccountToPoll = {
+    key: string;
+    publicKey: PublicKey;
+    eventType: string;
+    callbackId?: string;
+};
+export declare type AccountData = {
+    slot: number;
+    buffer: Buffer | undefined;
+};

package/lib/accounts/utils.d.ts

@@ -0,0 +1 @@
+export declare function capitalize(value: string): string;

package/lib/accounts/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capitalize = void 0;
+function capitalize(value) {
+    return value[0].toUpperCase() + value.slice(1);
+}
+exports.capitalize = capitalize;

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -1,15 +1,18 @@
-import { AccountSubscriber } from './types';
+/// <reference types="node" />
+import { AccountData, AccountSubscriber } from './types';
 import { Program } from '@project-serum/anchor';
-import { PublicKey } from '@solana/web3.js';
+import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
 export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
     data?: T;
+    accountData?: AccountData;
     accountName: string;
     program: Program;
     accountPublicKey: PublicKey;
     onChange: (data: T) => void;
+    listenerId?: number;
     constructor(accountName: string, program: Program, accountPublicKey: PublicKey);
     subscribe(onChange: (data: T) => void): Promise<void>;
     fetch(): Promise<void>;
+    handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     unsubscribe(): Promise<void>;
 }
-//# sourceMappingURL=webSocketAccountSubscriber.d.ts.map

package/lib/accounts/webSocketAccountSubscriber.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
+const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
     constructor(accountName, program, accountPublicKey) {
         this.accountName = accountName;
@@ -18,28 +19,58 @@ class WebSocketAccountSubscriber {
     }
     subscribe(onChange) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.listenerId) {
+                return;
+            }
             this.onChange = onChange;
             yield this.fetch();
-            this.program.account[this.accountName]
-                .subscribe(this.accountPublicKey, this.program.provider.opts.commitment)
-                .on('change', (data) => __awaiter(this, void 0, void 0, function* () {
-                this.data = data;
-                this.onChange(data);
-            }));
+            this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
+                this.handleRpcResponse(context, accountInfo);
+            }, this.program.provider.opts.commitment);
         });
     }
     fetch() {
         return __awaiter(this, void 0, void 0, function* () {
-            const newData = (yield this.program.account[this.accountName].fetch(this.accountPublicKey));
-            // if data has changed trigger update
-            if (JSON.stringify(newData) !== JSON.stringify(this.data)) {
-                this.data = newData;
+            const rpcResponse = yield this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
+            this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);
+        });
+    }
+    handleRpcResponse(context, accountInfo) {
+        const newSlot = context.slot;
+        let newBuffer = undefined;
+        if (accountInfo) {
+            newBuffer = accountInfo.data;
+        }
+        if (!this.accountData) {
+            this.accountData = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            if (newBuffer) {
+                this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
                 this.onChange(this.data);
             }
-        });
+            return;
+        }
+        if (newSlot <= this.accountData.slot) {
+            return;
+        }
+        const oldBuffer = this.accountData.buffer;
+        if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+            this.accountData = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+            this.onChange(this.data);
+        }
     }
     unsubscribe() {
-        return this.program.account[this.accountName].unsubscribe(this.accountPublicKey);
+        if (this.listenerId) {
+            const promise = this.program.provider.connection.removeAccountChangeListener(this.listenerId);
+            this.listenerId = undefined;
+            return promise;
+        }
     }
 }
 exports.WebSocketAccountSubscriber = WebSocketAccountSubscriber;

package/lib/accounts/{defaultClearingHouseAccountSubscriber.d.ts → webSocketClearingHouseAccountSubscriber.d.ts}

@@ -1,11 +1,12 @@
 /// <reference types="node" />
 import { ClearingHouseAccountSubscriber, ClearingHouseAccountEvents, ClearingHouseAccountTypes } from './types';
 import { AccountSubscriber } from './types';
-import { DepositHistoryAccount, ExtendedCurveHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, StateAccount, TradeHistoryAccount } from '../types';
+import { DepositHistoryAccount, ExtendedCurveHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, OrderHistoryAccount, OrderStateAccount, StateAccount, TradeHistoryAccount } from '../types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-export declare class DefaultClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
+import { ClearingHouseConfigType } from '../factory/clearingHouse';
+export declare class WebSocketClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
@@ -17,7 +18,10 @@ export declare class DefaultClearingHouseAccountSubscriber implements ClearingHo
     fundingRateHistoryAccountSubscriber?: AccountSubscriber<FundingRateHistoryAccount>;
     curveHistoryAccountSubscriber?: AccountSubscriber<ExtendedCurveHistoryAccount>;
     liquidationHistoryAccountSubscriber?: AccountSubscriber<LiquidationHistoryAccount>;
+    orderStateAccountSubscriber?: AccountSubscriber<OrderStateAccount>;
+    orderHistoryAccountSubscriber?: AccountSubscriber<OrderHistoryAccount>;
     optionalExtraSubscriptions: ClearingHouseAccountTypes[];
+    type: ClearingHouseConfigType;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
@@ -35,5 +39,6 @@ export declare class DefaultClearingHouseAccountSubscriber implements ClearingHo
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
     getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
+    getOrderStateAccount(): OrderStateAccount;
 }
-//# sourceMappingURL=defaultClearingHouseAccountSubscriber.d.ts.map

package/lib/accounts/{defaultClearingHouseAccountSubscriber.js → webSocketClearingHouseAccountSubscriber.js}

@@ -9,14 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultClearingHouseAccountSubscriber = void 0;
+exports.WebSocketClearingHouseAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const addresses_1 = require("../addresses");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
-class DefaultClearingHouseAccountSubscriber {
+class WebSocketClearingHouseAccountSubscriber {
     constructor(program) {
         this.optionalExtraSubscriptions = [];
+        this.type = 'websocket';
         this.isSubscribing = false;
         this.isSubscribed = false;
         this.program = program;
@@ -34,7 +35,7 @@ class DefaultClearingHouseAccountSubscriber {
             this.subscriptionPromise = new Promise((res) => {
                 this.subscriptionPromiseResolver = res;
             });
-            const statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
+            const statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
             // create and activate main state account subscription
             this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey);
             yield this.stateAccountSubscriber.subscribe((data) => {
@@ -47,6 +48,12 @@ class DefaultClearingHouseAccountSubscriber {
                 this.eventEmitter.emit('marketsAccountUpdate', data);
                 this.eventEmitter.emit('update');
             });
+            this.orderStateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('orderState', this.program, state.orderState);
+            yield this.orderStateAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('orderStateAccountUpdate', data);
+                this.eventEmitter.emit('update');
+            });
+            const orderState = this.orderStateAccountSubscriber.data;
             // create subscribers for other state accounts
             this.tradeHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('tradeHistory', this.program, state.tradeHistory);
             this.depositHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('depositHistory', this.program, state.depositHistory);
@@ -55,6 +62,7 @@ class DefaultClearingHouseAccountSubscriber {
             this.fundingRateHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('fundingRateHistory', this.program, state.fundingRateHistory);
             this.liquidationHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('liquidationHistory', this.program, state.liquidationHistory);
             this.curveHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('extendedCurveHistory', this.program, state.extendedCurveHistory);
+            this.orderHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('orderHistory', this.program, orderState.orderHistory);
             const extraSusbcribersToUse = [];
             if (optionalSubscriptions === null || optionalSubscriptions === void 0 ? void 0 : optionalSubscriptions.includes('tradeHistoryAccount'))
                 extraSusbcribersToUse.push({
@@ -86,6 +94,11 @@ class DefaultClearingHouseAccountSubscriber {
                     subscriber: this.curveHistoryAccountSubscriber,
                     eventType: 'curveHistoryAccountUpdate',
                 });
+            if (optionalSubscriptions === null || optionalSubscriptions === void 0 ? void 0 : optionalSubscriptions.includes('orderHistoryAccount'))
+                extraSusbcribersToUse.push({
+                    subscriber: this.orderHistoryAccountSubscriber,
+                    eventType: 'orderHistoryAccountUpdate',
+                });
             this.optionalExtraSubscriptions = optionalSubscriptions !== null && optionalSubscriptions !== void 0 ? optionalSubscriptions : [];
             // await all subcriptions in parallel to boost performance
             //// the state account subscription above can't happen in here, because some of these susbcriptions are dependent on clearing house state being available
@@ -124,6 +137,7 @@ class DefaultClearingHouseAccountSubscriber {
             }
             yield this.stateAccountSubscriber.unsubscribe();
             yield this.marketsAccountSubscriber.unsubscribe();
+            yield this.orderStateAccountSubscriber.unsubscribe();
             if (this.optionalExtraSubscriptions.includes('tradeHistoryAccount')) {
                 yield this.tradeHistoryAccountSubscriber.unsubscribe();
             }
@@ -142,6 +156,9 @@ class DefaultClearingHouseAccountSubscriber {
             if (this.optionalExtraSubscriptions.includes('liquidationHistoryAccount')) {
                 yield this.liquidationHistoryAccountSubscriber.unsubscribe();
             }
+            if (this.optionalExtraSubscriptions.includes('orderHistoryAccount')) {
+                yield this.orderHistoryAccountSubscriber.unsubscribe();
+            }
             this.isSubscribed = false;
         });
     }
@@ -196,5 +213,14 @@ class DefaultClearingHouseAccountSubscriber {
         this.assertOptionalIsSubscribed('liquidationHistoryAccount');
         return this.liquidationHistoryAccountSubscriber.data;
     }
+    getOrderHistoryAccount() {
+        this.assertIsSubscribed();
+        this.assertOptionalIsSubscribed('orderHistoryAccount');
+        return this.orderHistoryAccountSubscriber.data;
+    }
+    getOrderStateAccount() {
+        this.assertIsSubscribed();
+        return this.orderStateAccountSubscriber.data;
+    }
 }
-exports.DefaultClearingHouseAccountSubscriber = DefaultClearingHouseAccountSubscriber;
+exports.WebSocketClearingHouseAccountSubscriber = WebSocketClearingHouseAccountSubscriber;

package/lib/accounts/{defaultUserAccountSubscriber.d.ts → webSocketUserAccountSubscriber.d.ts}

@@ -4,14 +4,17 @@ import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { UserAccount, UserPositionsAccount } from '../types';
-export declare class DefaultUserAccountSubscriber implements UserAccountSubscriber {
+import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
+import { ClearingHouseConfigType } from '../factory/clearingHouse';
+export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     authority: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
     userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
+    userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
+    type: ClearingHouseConfigType;
     constructor(program: Program, authority: PublicKey);
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;
@@ -19,5 +22,5 @@ export declare class DefaultUserAccountSubscriber implements UserAccountSubscrib
     assertIsSubscribed(): void;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
+    getUserOrdersAccount(): UserOrdersAccount;
 }
-//# sourceMappingURL=defaultUserAccountSubscriber.d.ts.map

package/lib/accounts/{defaultUserAccountSubscriber.js → webSocketUserAccountSubscriber.js}

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultUserAccountSubscriber = void 0;
+exports.WebSocketUserAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const addresses_1 = require("../addresses");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
-class DefaultUserAccountSubscriber {
+class WebSocketUserAccountSubscriber {
     constructor(program, authority) {
+        this.type = 'websocket';
         this.isSubscribed = false;
         this.program = program;
         this.authority = authority;
@@ -26,7 +27,7 @@ class DefaultUserAccountSubscriber {
             if (this.isSubscribed) {
                 return true;
             }
-            const userPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
+            const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
             this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, userPublicKey);
             yield this.userDataAccountSubscriber.subscribe((data) => {
                 this.eventEmitter.emit('userAccountData', data);
@@ -38,6 +39,12 @@ class DefaultUserAccountSubscriber {
                 this.eventEmitter.emit('userPositionsData', data);
                 this.eventEmitter.emit('update');
             });
+            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
+            this.userOrdersAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userOrders', this.program, userOrdersPublicKey);
+            yield this.userOrdersAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('userOrdersData', data);
+                this.eventEmitter.emit('update');
+            });
             this.eventEmitter.emit('update');
             this.isSubscribed = true;
             return true;
@@ -48,6 +55,7 @@ class DefaultUserAccountSubscriber {
             yield Promise.all([
                 this.userDataAccountSubscriber.fetch(),
                 this.userPositionsAccountSubscriber.fetch(),
+                this.userOrdersAccountSubscriber.fetch(),
             ]);
         });
     }
@@ -59,6 +67,7 @@ class DefaultUserAccountSubscriber {
             yield Promise.all([
                 this.userDataAccountSubscriber.unsubscribe(),
                 this.userPositionsAccountSubscriber.unsubscribe(),
+                yield this.userOrdersAccountSubscriber.unsubscribe(),
             ]);
             this.isSubscribed = false;
         });
@@ -76,5 +85,8 @@ class DefaultUserAccountSubscriber {
         this.assertIsSubscribed();
         return this.userPositionsAccountSubscriber.data;
     }
+    getUserOrdersAccount() {
+        return this.userOrdersAccountSubscriber.data;
+    }
 }
-exports.DefaultUserAccountSubscriber = DefaultUserAccountSubscriber;
+exports.WebSocketUserAccountSubscriber = WebSocketUserAccountSubscriber;

package/lib/addresses.d.ts

@@ -1,6 +1,9 @@
 import { PublicKey } from '@solana/web3.js';
 export declare function getClearingHouseStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
+export declare function getOrderStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
+export declare function getOrderStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
 export declare function getClearingHouseStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
 export declare function getUserAccountPublicKeyAndNonce(programId: PublicKey, authority: PublicKey): Promise<[PublicKey, number]>;
 export declare function getUserAccountPublicKey(programId: PublicKey, authority: PublicKey): Promise<PublicKey>;
-//# sourceMappingURL=addresses.d.ts.map
+export declare function getUserOrdersAccountPublicKeyAndNonce(programId: PublicKey, userAccount: PublicKey): Promise<[PublicKey, number]>;
+export declare function getUserOrdersAccountPublicKey(programId: PublicKey, userAccount: PublicKey): Promise<PublicKey>;

package/lib/addresses.js

@@ -28,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+exports.getUserOrdersAccountPublicKey = exports.getUserOrdersAccountPublicKeyAndNonce = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getOrderStateAccountPublicKeyAndNonce = exports.getOrderStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
 const anchor = __importStar(require("@project-serum/anchor"));
 function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -36,6 +36,18 @@ function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     });
 }
 exports.getClearingHouseStateAccountPublicKeyAndNonce = getClearingHouseStateAccountPublicKeyAndNonce;
+function getOrderStateAccountPublicKey(programId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield getOrderStateAccountPublicKeyAndNonce(programId))[0];
+    });
+}
+exports.getOrderStateAccountPublicKey = getOrderStateAccountPublicKey;
+function getOrderStateAccountPublicKeyAndNonce(programId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('order_state'))], programId);
+    });
+}
+exports.getOrderStateAccountPublicKeyAndNonce = getOrderStateAccountPublicKeyAndNonce;
 function getClearingHouseStateAccountPublicKey(programId) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
@@ -54,3 +66,18 @@ function getUserAccountPublicKey(programId, authority) {
     });
 }
 exports.getUserAccountPublicKey = getUserAccountPublicKey;
+function getUserOrdersAccountPublicKeyAndNonce(programId, userAccount) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('user_orders')),
+            userAccount.toBuffer(),
+        ], programId);
+    });
+}
+exports.getUserOrdersAccountPublicKeyAndNonce = getUserOrdersAccountPublicKeyAndNonce;
+function getUserOrdersAccountPublicKey(programId, userAccount) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield getUserOrdersAccountPublicKeyAndNonce(programId, userAccount))[0];
+    });
+}
+exports.getUserOrdersAccountPublicKey = getUserOrdersAccountPublicKey;

package/lib/admin.d.ts

@@ -1,11 +1,16 @@
 /// <reference types="bn.js" />
 import { ConfirmOptions, Connection, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { FeeStructure, IWallet, OracleGuardRails, OracleSource } from './types';
+import { FeeStructure, IWallet, OracleGuardRails, OracleSource, OrderFillerRewardStructure } from './types';
 import { BN } from '@project-serum/anchor';
 import { ClearingHouse } from './clearingHouse';
 export declare class Admin extends ClearingHouse {
     static from(connection: Connection, wallet: IWallet, clearingHouseProgramId: PublicKey, opts?: ConfirmOptions): Admin;
-    initialize(usdcMint: PublicKey, adminControlsPrices: boolean): Promise<[TransactionSignature, TransactionSignature]>;
+    initialize(usdcMint: PublicKey, adminControlsPrices: boolean): Promise<[
+        TransactionSignature,
+        TransactionSignature,
+        TransactionSignature
+    ]>;
+    initializeOrderState(): Promise<TransactionSignature>;
     initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN): Promise<TransactionSignature>;
     moveAmmPrice(baseAssetReserve: BN, quoteAssetReserve: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
@@ -24,10 +29,12 @@ export declare class Admin extends ClearingHouse {
     updateFullLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updatePartialLiquidationShareDenominator(denominator: BN): Promise<TransactionSignature>;
     updateFullLiquidationShareDenominator(denominator: BN): Promise<TransactionSignature>;
+    updateOrderFillerRewardStructure(orderFillerRewardStructure: OrderFillerRewardStructure): Promise<TransactionSignature>;
     updateFee(fees: FeeStructure): Promise<TransactionSignature>;
     updateOracleGuardRails(oracleGuardRails: OracleGuardRails): Promise<TransactionSignature>;
     updateMarketOracle(marketIndex: BN, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
-    updateMarketMinimumTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
+    updateMarketMinimumQuoteAssetTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
+    updateMarketMinimumBaseAssetTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
     updateWhitelistMint(whitelistMint?: PublicKey): Promise<TransactionSignature>;
     updateDiscountMint(discountMint: PublicKey): Promise<TransactionSignature>;
     updateMaxDeposit(maxDeposit: BN): Promise<TransactionSignature>;
@@ -35,4 +42,3 @@ export declare class Admin extends ClearingHouse {
     updateExchangePaused(exchangePaused: boolean): Promise<TransactionSignature>;
     disableAdminControlsPrices(): Promise<TransactionSignature>;
 }
-//# sourceMappingURL=admin.d.ts.map