@drift-labs/sdk 0.1.17 → 0.1.18-orders.0

package/lib/accounts/defaultClearingHouseAccountSubscriber.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { ClearingHouseAccountSubscriber, ClearingHouseAccountEvents, ClearingHouseAccountTypes } from './types';
 import { AccountSubscriber } from './types';
-import { CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, StateAccount, TradeHistoryAccount } from '../types';
+import { CurveHistoryAccount, DepositHistoryAccount, 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';
@@ -17,6 +17,8 @@ export declare class DefaultClearingHouseAccountSubscriber implements ClearingHo
     fundingRateHistoryAccountSubscriber?: AccountSubscriber<FundingRateHistoryAccount>;
     curveHistoryAccountSubscriber?: AccountSubscriber<CurveHistoryAccount>;
     liquidationHistoryAccountSubscriber?: AccountSubscriber<LiquidationHistoryAccount>;
+    orderStateAccountSubscriber?: AccountSubscriber<OrderStateAccount>;
+    orderHistoryAccountSubscriber?: AccountSubscriber<OrderHistoryAccount>;
     optionalExtraSubscriptions: ClearingHouseAccountTypes[];
     private isSubscribing;
     private subscriptionPromise;
@@ -35,5 +37,6 @@ export declare class DefaultClearingHouseAccountSubscriber implements ClearingHo
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
     getCurveHistoryAccount(): CurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
+    getOrderStateAccount(): OrderStateAccount;
 }
-//# sourceMappingURL=defaultClearingHouseAccountSubscriber.d.ts.map

package/lib/accounts/defaultClearingHouseAccountSubscriber.js

@@ -47,6 +47,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 +61,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('curveHistory', this.program, state.curveHistory);
+            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 +93,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 +136,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 +155,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 +212,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;

package/lib/accounts/defaultHistoryAccountSubscriber.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="node" />
+import { ClearingHouseAccountEvents, HistoryAccountSubscriber } from './types';
+import { AccountSubscriber } from './types';
+import { CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, TradeHistoryAccount } from '../types';
+import { Program } from '@project-serum/anchor';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+export declare class DefaultHistoryAccountSubscriber implements HistoryAccountSubscriber {
+    isSubscribed: boolean;
+    program: Program;
+    eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+    tradeHistoryAccountSubscriber?: AccountSubscriber<TradeHistoryAccount>;
+    depositHistoryAccountSubscriber?: AccountSubscriber<DepositHistoryAccount>;
+    fundingPaymentHistoryAccountSubscriber?: AccountSubscriber<FundingPaymentHistoryAccount>;
+    fundingRateHistoryAccountSubscriber?: AccountSubscriber<FundingRateHistoryAccount>;
+    curveHistoryAccountSubscriber?: AccountSubscriber<CurveHistoryAccount>;
+    liquidationHistoryAccountSubscriber?: AccountSubscriber<LiquidationHistoryAccount>;
+    constructor(program: Program);
+    subscribe(): Promise<boolean>;
+    unsubscribe(): Promise<void>;
+    assertIsSubscribed(): void;
+    getTradeHistoryAccount(): TradeHistoryAccount;
+    getDepositHistoryAccount(): DepositHistoryAccount;
+    getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
+    getFundingRateHistoryAccount(): FundingRateHistoryAccount;
+    getCurveHistoryAccount(): CurveHistoryAccount;
+    getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+}

package/lib/accounts/defaultHistoryAccountSubscriber.js

@@ -0,0 +1,110 @@
+"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.DefaultHistoryAccountSubscriber = void 0;
+const types_1 = require("./types");
+const events_1 = require("events");
+const addresses_1 = require("../addresses");
+const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
+class DefaultHistoryAccountSubscriber {
+    constructor(program) {
+        this.isSubscribed = false;
+        this.program = program;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    subscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isSubscribed) {
+                return true;
+            }
+            const statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const state = yield this.program.account.state.fetch(statePublicKey);
+            this.tradeHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('tradeHistory', this.program, state.tradeHistory);
+            yield this.tradeHistoryAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('tradeHistoryAccountUpdate', data);
+                this.eventEmitter.emit('update');
+            });
+            this.depositHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('depositHistory', this.program, state.depositHistory);
+            yield this.depositHistoryAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('depositHistoryAccountUpdate', data);
+                this.eventEmitter.emit('update');
+            });
+            this.fundingPaymentHistoryAccountSubscriber =
+                new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('fundingPaymentHistory', this.program, state.fundingPaymentHistory);
+            yield this.fundingPaymentHistoryAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('fundingPaymentHistoryAccountUpdate', data);
+                this.eventEmitter.emit('update');
+            });
+            this.fundingRateHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('fundingRateHistory', this.program, state.fundingRateHistory);
+            yield this.fundingRateHistoryAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('fundingRateHistoryAccountUpdate', data);
+                this.eventEmitter.emit('update');
+            });
+            this.liquidationHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('liquidationHistory', this.program, state.liquidationHistory);
+            yield this.liquidationHistoryAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('liquidationHistoryAccountUpdate', data);
+                this.eventEmitter.emit('update');
+            });
+            this.curveHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('curveHistory', this.program, state.curveHistory);
+            yield this.curveHistoryAccountSubscriber.subscribe((data) => {
+                this.eventEmitter.emit('curveHistoryAccountUpdate', data);
+                this.eventEmitter.emit('update');
+            });
+            this.eventEmitter.emit('update');
+            this.isSubscribed = true;
+            return true;
+        });
+    }
+    unsubscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isSubscribed) {
+                return;
+            }
+            yield this.tradeHistoryAccountSubscriber.unsubscribe();
+            yield this.fundingRateHistoryAccountSubscriber.unsubscribe();
+            yield this.fundingPaymentHistoryAccountSubscriber.unsubscribe();
+            yield this.depositHistoryAccountSubscriber.unsubscribe();
+            yield this.curveHistoryAccountSubscriber.unsubscribe();
+            yield this.liquidationHistoryAccountSubscriber.unsubscribe();
+            this.isSubscribed = false;
+        });
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getTradeHistoryAccount() {
+        this.assertIsSubscribed();
+        return this.tradeHistoryAccountSubscriber.data;
+    }
+    getDepositHistoryAccount() {
+        this.assertIsSubscribed();
+        return this.depositHistoryAccountSubscriber.data;
+    }
+    getFundingPaymentHistoryAccount() {
+        this.assertIsSubscribed();
+        return this.fundingPaymentHistoryAccountSubscriber.data;
+    }
+    getFundingRateHistoryAccount() {
+        this.assertIsSubscribed();
+        return this.fundingRateHistoryAccountSubscriber.data;
+    }
+    getCurveHistoryAccount() {
+        this.assertIsSubscribed();
+        return this.curveHistoryAccountSubscriber.data;
+    }
+    getLiquidationHistoryAccount() {
+        this.assertIsSubscribed();
+        return this.liquidationHistoryAccountSubscriber.data;
+    }
+}
+exports.DefaultHistoryAccountSubscriber = DefaultHistoryAccountSubscriber;

package/lib/accounts/defaultUserAccountSubscriber.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';
 export declare class DefaultUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
@@ -12,6 +12,7 @@ export declare class DefaultUserAccountSubscriber implements UserAccountSubscrib
     authority: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
     userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
+    userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
     constructor(program: Program, authority: PublicKey);
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;
@@ -19,5 +20,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

@@ -38,6 +38,12 @@ class DefaultUserAccountSubscriber {
                 this.eventEmitter.emit('userPositionsData', data);
                 this.eventEmitter.emit('update');
             });
+            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, this.authority);
+            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 +54,7 @@ class DefaultUserAccountSubscriber {
             yield Promise.all([
                 this.userDataAccountSubscriber.fetch(),
                 this.userPositionsAccountSubscriber.fetch(),
+                this.userOrdersAccountSubscriber.fetch(),
             ]);
         });
     }
@@ -58,6 +65,7 @@ class DefaultUserAccountSubscriber {
             }
             this.userDataAccountSubscriber.unsubscribe();
             this.userPositionsAccountSubscriber.unsubscribe();
+            this.userOrdersAccountSubscriber.unsubscribe();
             this.isSubscribed = false;
         });
     }
@@ -74,5 +82,8 @@ class DefaultUserAccountSubscriber {
         this.assertIsSubscribed();
         return this.userPositionsAccountSubscriber.data;
     }
+    getUserOrdersAccount() {
+        return this.userOrdersAccountSubscriber.data;
+    }
 }
 exports.DefaultUserAccountSubscriber = DefaultUserAccountSubscriber;

package/lib/accounts/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, StateAccount, TradeHistoryAccount, UserAccount, UserPositionsAccount } from '../types';
+import { CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, OrderHistoryAccount, OrderStateAccount, StateAccount, TradeHistoryAccount, UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 export interface AccountSubscriber<T> {
@@ -20,9 +20,11 @@ export interface ClearingHouseAccountEvents {
     liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
     depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
     curveHistoryAccountUpdate: (payload: CurveHistoryAccount) => void;
+    orderHistoryAccountUpdate: (payload: OrderHistoryAccount) => void;
+    orderStateAccountUpdate: (payload: OrderStateAccount) => void;
     update: 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,10 +40,34 @@ export interface ClearingHouseAccountSubscriber {
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
     getCurveHistoryAccount(): CurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+    getOrderStateAccount(): OrderStateAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
+}
+export interface HistoryAccountEvents {
+    fundingPaymentHistoryAccountUpdate: (payload: FundingPaymentHistoryAccount) => void;
+    fundingRateHistoryAccountUpdate: (payload: FundingRateHistoryAccount) => void;
+    tradeHistoryAccountUpdate: (payload: TradeHistoryAccount) => void;
+    liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
+    depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
+    curveHistoryAccountUpdate: (payload: CurveHistoryAccount) => void;
+    update: void;
+}
+export interface HistoryAccountSubscriber {
+    eventEmitter: StrictEventEmitter<EventEmitter, HistoryAccountEvents>;
+    isSubscribed: boolean;
+    subscribe(): Promise<boolean>;
+    unsubscribe(): Promise<void>;
+    getTradeHistoryAccount(): TradeHistoryAccount;
+    getDepositHistoryAccount(): DepositHistoryAccount;
+    getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
+    getFundingRateHistoryAccount(): FundingRateHistoryAccount;
+    getCurveHistoryAccount(): CurveHistoryAccount;
+    getLiquidationHistoryAccount(): LiquidationHistoryAccount;
 }
 export interface UserAccountEvents {
     userAccountData: (payload: UserAccount) => void;
     userPositionsData: (payload: UserPositionsAccount) => void;
+    userOrdersData: (payload: UserOrdersAccount) => void;
     update: void;
 }
 export interface UserAccountSubscriber {
@@ -52,5 +78,5 @@ export interface UserAccountSubscriber {
     unsubscribe(): Promise<void>;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
+    getUserOrdersAccount(): UserOrdersAccount;
 }
-//# sourceMappingURL=types.d.ts.map

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -12,4 +12,3 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
 }
-//# sourceMappingURL=webSocketAccountSubscriber.d.ts.map

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, authority: PublicKey): Promise<[PublicKey, number]>;
+export declare function getUserOrdersAccountPublicKey(programId: PublicKey, authority: 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, authority) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('user_orders')),
+            authority.toBuffer(),
+        ], programId);
+    });
+}
+exports.getUserOrdersAccountPublicKeyAndNonce = getUserOrdersAccountPublicKeyAndNonce;
+function getUserOrdersAccountPublicKey(programId, authority) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield getUserOrdersAccountPublicKeyAndNonce(programId, authority))[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>;
@@ -21,10 +26,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>;
@@ -32,4 +39,3 @@ export declare class Admin extends ClearingHouse {
     updateExchangePaused(exchangePaused: boolean): Promise<TransactionSignature>;
     disableAdminControlsPrices(): Promise<TransactionSignature>;
 }
-//# sourceMappingURL=admin.d.ts.map

package/lib/admin.js

@@ -119,7 +119,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) {
@@ -312,6 +334,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, {
@@ -344,10 +377,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, CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market } from './types';
+import { MarketsAccount, StateAccount, CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market, OrderHistoryAccount, OrderStateAccount, OrderParams, Order } from './types';
 import { Connection, PublicKey, TransactionSignature, Keypair, ConfirmOptions, TransactionInstruction } from '@solana/web3.js';
 import { MockUSDCFaucet } from './mockUSDCFaucet';
 import { EventEmitter } from 'events';
@@ -57,6 +57,10 @@ export declare class ClearingHouse {
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
     getDepositHistoryAccount(): DepositHistoryAccount;
     getCurveHistoryAccount(): CurveHistoryAccount;
+    getOrderHistoryAccount(): OrderHistoryAccount;
+    orderStatePublicKey?: PublicKey;
+    getOrderStatePublicKey(): Promise<PublicKey>;
+    getOrderStateAccount(): OrderStateAccount;
     /**
      * Update the wallet to use for clearing house transactions and linked user account
      * @param newWallet
@@ -69,8 +73,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.
@@ -79,6 +85,12 @@ 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>;
     depositCollateral(amount: BN, collateralAccountPublicKey: PublicKey, userPositionsAccountPublicKey?: PublicKey): Promise<TransactionSignature>;
     getDepositCollateralInstruction(amount: BN, collateralAccountPublicKey: PublicKey, userPositionsAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
     /**
@@ -94,6 +106,14 @@ 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>;
+    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>;
+    fillOrder(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionSignature>;
+    getFillOrderIx(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionInstruction>;
+    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
@@ -111,4 +131,3 @@ export declare class ClearingHouse {
     getSettleFundingPaymentIx(userAccount: PublicKey, userPositionsAccount: PublicKey): Promise<TransactionInstruction>;
     triggerEvent(eventName: keyof ClearingHouseAccountEvents, data?: any): void;
 }
-//# sourceMappingURL=clearingHouse.d.ts.map