@drift-labs/sdk 0.1.21-master.0 → 0.1.21-master.3

package/lib/accounts/bulkAccountLoader.d.ts

@@ -29,4 +29,3 @@ export declare class BulkAccountLoader {
     stopPolling(): void;
 }
 export {};
-//# sourceMappingURL=bulkAccountLoader.d.ts.map

package/lib/accounts/bulkAccountLoader.js

@@ -91,8 +91,10 @@ class BulkAccountLoader {
                     callback(e);
                 }
             }
-            this.loadPromiseResolver();
-            this.loadPromise = undefined;
+            finally {
+                this.loadPromiseResolver();
+                this.loadPromise = undefined;
+            }
         });
     }
     loadChunk(accountsToLoad) {

package/lib/accounts/bulkUserSubscription.d.ts

@@ -5,4 +5,3 @@ import { BulkAccountLoader } from './bulkAccountLoader';
  * @param accountLoader
  */
 export declare function bulkPollingUserSubscribe(users: ClearingHouseUser[], accountLoader: BulkAccountLoader): Promise<void>;
-//# sourceMappingURL=bulkUserSubscription.d.ts.map

package/lib/accounts/pollingClearingHouseAccountSubscriber.d.ts

@@ -3,7 +3,7 @@ import { AccountToPoll, ClearingHouseAccountEvents, ClearingHouseAccountSubscrib
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-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 { BulkAccountLoader } from './bulkAccountLoader';
 import { ClearingHouseConfigType } from '../factory/clearingHouse';
 export declare class PollingClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
@@ -15,12 +15,14 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     errorCallbackId?: string;
     state?: StateAccount;
     markets?: MarketsAccount;
+    orderState?: OrderStateAccount;
     tradeHistory?: TradeHistoryAccount;
     depositHistory?: DepositHistoryAccount;
     fundingPaymentHistory?: FundingPaymentHistoryAccount;
     fundingRateHistory?: FundingRateHistoryAccount;
     liquidationHistory?: LiquidationHistoryAccount;
     extendedCurveHistory: ExtendedCurveHistoryAccount;
+    orderHistory?: OrderHistoryAccount;
     optionalExtraSubscriptions: ClearingHouseAccountTypes[];
     type: ClearingHouseConfigType;
     private isSubscribing;
@@ -36,11 +38,12 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     assertOptionalIsSubscribed(optionalSubscription: ClearingHouseAccountTypes): void;
     getStateAccount(): StateAccount;
     getMarketsAccount(): MarketsAccount;
+    getOrderStateAccount(): OrderStateAccount;
     getTradeHistoryAccount(): TradeHistoryAccount;
     getDepositHistoryAccount(): DepositHistoryAccount;
     getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
     getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
 }
-//# sourceMappingURL=pollingClearingHouseAccountSubscriber.d.ts.map

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -49,7 +49,7 @@ class PollingClearingHouseAccountSubscriber {
         });
     }
     updateAccountsToPoll() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.accountsToPoll.size > 0) {
                 return;
@@ -66,6 +66,11 @@ class PollingClearingHouseAccountSubscriber {
                 publicKey: state.markets,
                 eventType: 'marketsAccountUpdate',
             });
+            this.accountsToPoll.set(state.orderState.toString(), {
+                key: 'orderState',
+                publicKey: state.orderState,
+                eventType: 'orderStateAccountUpdate',
+            });
             if ((_a = this.optionalExtraSubscriptions) === null || _a === void 0 ? void 0 : _a.includes('tradeHistoryAccount')) {
                 this.accountsToPoll.set(state.tradeHistory.toString(), {
                     key: 'tradeHistory',
@@ -108,6 +113,14 @@ class PollingClearingHouseAccountSubscriber {
                     eventType: 'liquidationHistoryAccountUpdate',
                 });
             }
+            if ((_g = this.optionalExtraSubscriptions) === null || _g === void 0 ? void 0 : _g.includes('orderHistoryAccount')) {
+                const orderState = (yield this.program.account.orderState.fetch(state.orderState));
+                this.accountsToPoll.set(orderState.orderHistory.toString(), {
+                    key: 'orderHistory',
+                    publicKey: orderState.orderHistory,
+                    eventType: 'orderHistoryAccountUpdate',
+                });
+            }
         });
     }
     addToAccountLoader() {
@@ -172,6 +185,10 @@ class PollingClearingHouseAccountSubscriber {
         this.assertIsSubscribed();
         return this.markets;
     }
+    getOrderStateAccount() {
+        this.assertIsSubscribed();
+        return this.orderState;
+    }
     getTradeHistoryAccount() {
         this.assertIsSubscribed();
         this.assertOptionalIsSubscribed('tradeHistoryAccount');
@@ -202,5 +219,10 @@ class PollingClearingHouseAccountSubscriber {
         this.assertOptionalIsSubscribed('liquidationHistoryAccount');
         return this.liquidationHistory;
     }
+    getOrderHistoryAccount() {
+        this.assertIsSubscribed();
+        this.assertOptionalIsSubscribed('orderHistoryAccount');
+        return this.orderHistory;
+    }
 }
 exports.PollingClearingHouseAccountSubscriber = PollingClearingHouseAccountSubscriber;

package/lib/accounts/pollingTokenAccountSubscriber.d.ts

@@ -23,4 +23,3 @@ export declare class PollingTokenAccountSubscriber implements TokenAccountSubscr
     assertIsSubscribed(): void;
     getTokenAccount(): AccountInfo;
 }
-//# sourceMappingURL=pollingTokenAccountSubscriber.d.ts.map

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -4,7 +4,7 @@ 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';
+import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { ClearingHouseConfigType } from '../factory/clearingHouse';
 export declare class PollingUserAccountSubscriber implements UserAccountSubscriber {
@@ -17,6 +17,7 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     errorCallbackId?: string;
     user?: UserAccount;
     userPositions?: UserPositionsAccount;
+    userOrders?: UserOrdersAccount;
     type: ClearingHouseConfigType;
     constructor(program: Program, authority: PublicKey, accountLoader: BulkAccountLoader);
     subscribe(): Promise<boolean>;
@@ -27,5 +28,5 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     assertIsSubscribed(): void;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
+    getUserOrdersAccount(): UserOrdersAccount;
 }
-//# sourceMappingURL=pollingUserAccountSubscriber.d.ts.map

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -53,6 +53,15 @@ class PollingUserAccountSubscriber {
                 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);
@@ -119,5 +128,9 @@ class PollingUserAccountSubscriber {
         this.assertIsSubscribed();
         return this.userPositions;
     }
+    getUserOrdersAccount() {
+        this.assertIsSubscribed();
+        return this.userOrders;
+    }
 }
 exports.PollingUserAccountSubscriber = PollingUserAccountSubscriber;

package/lib/accounts/types.d.ts

@@ -1,5 +1,5 @@
 /// <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';
@@ -23,10 +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;
@@ -42,11 +44,14 @@ 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;
 }
@@ -58,6 +63,7 @@ export interface UserAccountSubscriber {
     unsubscribe(): Promise<void>;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
+    getUserOrdersAccount(): UserOrdersAccount;
     type: ClearingHouseUserConfigType;
 }
 export interface TokenAccountEvents {
@@ -83,4 +89,3 @@ export declare type AccountData = {
     slot: number;
     buffer: Buffer | undefined;
 };
-//# sourceMappingURL=types.d.ts.map

package/lib/accounts/utils.d.ts

@@ -1,2 +1 @@
 export declare function capitalize(value: string): string;
-//# sourceMappingURL=utils.d.ts.map

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -16,4 +16,3 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     unsubscribe(): Promise<void>;
 }
-//# sourceMappingURL=webSocketAccountSubscriber.d.ts.map

package/lib/accounts/webSocketClearingHouseAccountSubscriber.d.ts

@@ -1,7 +1,7 @@
 /// <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';
@@ -18,6 +18,8 @@ export declare class WebSocketClearingHouseAccountSubscriber implements Clearing
     fundingRateHistoryAccountSubscriber?: AccountSubscriber<FundingRateHistoryAccount>;
     curveHistoryAccountSubscriber?: AccountSubscriber<ExtendedCurveHistoryAccount>;
     liquidationHistoryAccountSubscriber?: AccountSubscriber<LiquidationHistoryAccount>;
+    orderStateAccountSubscriber?: AccountSubscriber<OrderStateAccount>;
+    orderHistoryAccountSubscriber?: AccountSubscriber<OrderHistoryAccount>;
     optionalExtraSubscriptions: ClearingHouseAccountTypes[];
     type: ClearingHouseConfigType;
     private isSubscribing;
@@ -37,5 +39,6 @@ export declare class WebSocketClearingHouseAccountSubscriber implements Clearing
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
     getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
+    getOrderStateAccount(): OrderStateAccount;
 }
-//# sourceMappingURL=webSocketClearingHouseAccountSubscriber.d.ts.map

package/lib/accounts/webSocketClearingHouseAccountSubscriber.js

@@ -48,6 +48,12 @@ class WebSocketClearingHouseAccountSubscriber {
                 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);
@@ -56,6 +62,7 @@ class WebSocketClearingHouseAccountSubscriber {
             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({
@@ -87,6 +94,11 @@ class WebSocketClearingHouseAccountSubscriber {
                     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
@@ -125,6 +137,7 @@ class WebSocketClearingHouseAccountSubscriber {
             }
             yield this.stateAccountSubscriber.unsubscribe();
             yield this.marketsAccountSubscriber.unsubscribe();
+            yield this.orderStateAccountSubscriber.unsubscribe();
             if (this.optionalExtraSubscriptions.includes('tradeHistoryAccount')) {
                 yield this.tradeHistoryAccountSubscriber.unsubscribe();
             }
@@ -143,6 +156,9 @@ class WebSocketClearingHouseAccountSubscriber {
             if (this.optionalExtraSubscriptions.includes('liquidationHistoryAccount')) {
                 yield this.liquidationHistoryAccountSubscriber.unsubscribe();
             }
+            if (this.optionalExtraSubscriptions.includes('orderHistoryAccount')) {
+                yield this.orderHistoryAccountSubscriber.unsubscribe();
+            }
             this.isSubscribed = false;
         });
     }
@@ -197,5 +213,14 @@ class WebSocketClearingHouseAccountSubscriber {
         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.WebSocketClearingHouseAccountSubscriber = WebSocketClearingHouseAccountSubscriber;

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

@@ -4,7 +4,7 @@ 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';
+import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
 import { ClearingHouseConfigType } from '../factory/clearingHouse';
 export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
@@ -13,6 +13,7 @@ export declare class WebSocketUserAccountSubscriber implements UserAccountSubscr
     authority: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
     userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
+    userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
     type: ClearingHouseConfigType;
     constructor(program: Program, authority: PublicKey);
     subscribe(): Promise<boolean>;
@@ -21,5 +22,5 @@ export declare class WebSocketUserAccountSubscriber implements UserAccountSubscr
     assertIsSubscribed(): void;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
+    getUserOrdersAccount(): UserOrdersAccount;
 }
-//# sourceMappingURL=webSocketUserAccountSubscriber.d.ts.map

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -39,6 +39,12 @@ class WebSocketUserAccountSubscriber {
                 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;
@@ -49,6 +55,7 @@ class WebSocketUserAccountSubscriber {
             yield Promise.all([
                 this.userDataAccountSubscriber.fetch(),
                 this.userPositionsAccountSubscriber.fetch(),
+                this.userOrdersAccountSubscriber.fetch(),
             ]);
         });
     }
@@ -60,6 +67,7 @@ class WebSocketUserAccountSubscriber {
             yield Promise.all([
                 this.userDataAccountSubscriber.unsubscribe(),
                 this.userPositionsAccountSubscriber.unsubscribe(),
+                yield this.userOrdersAccountSubscriber.unsubscribe(),
             ]);
             this.isSubscribed = false;
         });
@@ -77,5 +85,8 @@ class WebSocketUserAccountSubscriber {
         this.assertIsSubscribed();
         return this.userPositionsAccountSubscriber.data;
     }
+    getUserOrdersAccount() {
+        return this.userOrdersAccountSubscriber.data;
+    }
 }
 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

package/lib/admin.js

@@ -111,7 +111,29 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 fundingRateHistory,
                 curveHistory,
             ], this.opts);
-            return [initializeTxSig, initializeHistoryTxSig];
+            const initializeOrderStateTxSig = yield this.initializeOrderState();
+            return [initializeTxSig, initializeHistoryTxSig, initializeOrderStateTxSig];
+        });
+    }
+    initializeOrderState() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orderHistory = anchor.web3.Keypair.generate();
+            const [orderStatePublicKey, orderStateNonce] = yield addresses_1.getOrderStateAccountPublicKeyAndNonce(this.program.programId);
+            const clearingHouseStatePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const initializeOrderStateTx = yield this.program.transaction.initializeOrderState(orderStateNonce, {
+                accounts: {
+                    admin: this.wallet.publicKey,
+                    state: clearingHouseStatePublicKey,
+                    orderHistory: orderHistory.publicKey,
+                    orderState: orderStatePublicKey,
+                    rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                    systemProgram: anchor.web3.SystemProgram.programId,
+                },
+                instructions: [
+                    yield this.program.account.orderHistory.createInstruction(orderHistory),
+                ],
+            });
+            return yield this.txSender.send(initializeOrderStateTx, [orderHistory], this.opts);
         });
     }
     initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION) {
@@ -360,6 +382,17 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
+    updateOrderFillerRewardStructure(orderFillerRewardStructure) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.program.rpc.updateOrderFillerRewardStructure(orderFillerRewardStructure, {
+                accounts: {
+                    admin: this.wallet.publicKey,
+                    state: yield this.getStatePublicKey(),
+                    orderState: yield this.getOrderStatePublicKey(),
+                },
+            });
+        });
+    }
     updateFee(fees) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.program.rpc.updateFee(fees, {
@@ -392,10 +425,22 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
-    updateMarketMinimumTradeSize(marketIndex, minimumTradeSize) {
+    updateMarketMinimumQuoteAssetTradeSize(marketIndex, minimumTradeSize) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const state = this.getStateAccount();
+            return yield this.program.rpc.updateMarketMinimumQuoteAssetTradeSize(marketIndex, minimumTradeSize, {
+                accounts: {
+                    admin: this.wallet.publicKey,
+                    state: yield this.getStatePublicKey(),
+                    markets: state.markets,
+                },
+            });
+        });
+    }
+    updateMarketMinimumBaseAssetTradeSize(marketIndex, minimumTradeSize) {
         return __awaiter(this, void 0, void 0, function* () {
             const state = this.getStateAccount();
-            return yield this.program.rpc.updateMarketMinimumTradeSize(marketIndex, minimumTradeSize, {
+            return yield this.program.rpc.updateMarketMinimumBaseAssetTradeSize(marketIndex, minimumTradeSize, {
                 accounts: {
                     admin: this.wallet.publicKey,
                     state: yield this.getStatePublicKey(),

package/lib/assert/assert.d.ts

@@ -1,2 +1 @@
 export declare function assert(condition: boolean, error?: string): void;
-//# sourceMappingURL=assert.d.ts.map

package/lib/clearingHouse.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
 import { BN, Program, Provider } from '@project-serum/anchor';
-import { MarketsAccount, StateAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market, ExtendedCurveHistoryAccount } from './types';
+import { MarketsAccount, StateAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market, OrderHistoryAccount, OrderStateAccount, OrderParams, Order, ExtendedCurveHistoryAccount } from './types';
 import { Connection, PublicKey, TransactionSignature, Keypair, ConfirmOptions, TransactionInstruction } from '@solana/web3.js';
 import { MockUSDCFaucet } from './mockUSDCFaucet';
 import { EventEmitter } from 'events';
@@ -67,6 +67,10 @@ export declare class ClearingHouse {
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
     getDepositHistoryAccount(): DepositHistoryAccount;
     getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
+    orderStatePublicKey?: PublicKey;
+    getOrderStatePublicKey(): Promise<PublicKey>;
+    getOrderStateAccount(): OrderStateAccount;
     /**
      * Update the wallet to use for clearing house transactions and linked user account
      * @param newWallet
@@ -79,8 +83,10 @@ export declare class ClearingHouse {
     getInitializeUserInstructions(): Promise<[
         Keypair,
         PublicKey,
+        TransactionInstruction,
         TransactionInstruction
     ]>;
+    getInitializeUserOrdersInstruction(userAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
     userAccountPublicKey?: PublicKey;
     /**
      * Get the address for the Clearing House User's account. NOT the user's wallet address.
@@ -89,6 +95,14 @@ export declare class ClearingHouse {
     getUserAccountPublicKey(): Promise<PublicKey>;
     userAccount?: UserAccount;
     getUserAccount(): Promise<UserAccount>;
+    userOrdersAccountPublicKey?: PublicKey;
+    /**
+     * Get the address for the Clearing House User Order's account. NOT the user's wallet address.
+     * @returns
+     */
+    getUserOrdersAccountPublicKey(): Promise<PublicKey>;
+    userOrdersExist?: boolean;
+    userOrdersAccountExists(): Promise<boolean>;
     depositCollateral(amount: BN, collateralAccountPublicKey: PublicKey, userPositionsAccountPublicKey?: PublicKey): Promise<TransactionSignature>;
     getDepositCollateralInstruction(amount: BN, collateralAccountPublicKey: PublicKey, userPositionsAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
     /**
@@ -104,6 +118,18 @@ export declare class ClearingHouse {
     getWithdrawCollateralIx(amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     openPosition(direction: PositionDirection, amount: BN, marketIndex: BN, limitPrice?: BN, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
     getOpenPositionIx(direction: PositionDirection, amount: BN, marketIndex: BN, limitPrice?: BN, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionInstruction>;
+    initializeUserOrdersThenPlaceOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
+    placeOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
+    getPlaceOrderIx(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionInstruction>;
+    cancelOrder(orderId: BN): Promise<TransactionSignature>;
+    getCancelOrderIx(orderId: BN): Promise<TransactionInstruction>;
+    cancelOrderByUserId(userOrderId: number): Promise<TransactionSignature>;
+    getCancelOrderByUserIdIx(userOrderId: number): Promise<TransactionInstruction>;
+    fillOrder(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionSignature>;
+    getFillOrderIx(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionInstruction>;
+    initializeUserOrdersThenPlaceAndFillOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
+    placeAndFillOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
+    getPlaceAndFillOrderIx(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionInstruction>;
     /**
      * Close an entire position. If you want to reduce a position, use the {@link openPosition} method in the opposite direction of the current position.
      * @param marketIndex
@@ -121,4 +147,3 @@ export declare class ClearingHouse {
     getSettleFundingPaymentIx(userAccount: PublicKey, userPositionsAccount: PublicKey): Promise<TransactionInstruction>;
     triggerEvent(eventName: keyof ClearingHouseAccountEvents, data?: any): void;
 }
-//# sourceMappingURL=clearingHouse.d.ts.map