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

package/lib/clearingHouse.js

@@ -38,19 +38,19 @@ const anchor = __importStar(require("@project-serum/anchor"));
 const clearing_house_json_1 = __importDefault(require("./idl/clearing_house.json"));
 const web3_js_1 = require("@solana/web3.js");
 const addresses_1 = require("./addresses");
-const defaultClearingHouseAccountSubscriber_1 = require("./accounts/defaultClearingHouseAccountSubscriber");
 const defaultTxSender_1 = require("./tx/defaultTxSender");
 const utils_1 = require("./tx/utils");
+const clearingHouse_1 = require("./factory/clearingHouse");
 /**
  * # ClearingHouse
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
  *
- * The default way to construct a ClearingHouse instance is using the {@link from} method. This will create an instance using the static {@link DefaultClearingHouseAccountSubscriber}, which will use a websocket for each state account subscription.
+ * The default way to construct a ClearingHouse instance is using the {@link from} method. This will create an instance using the static {@link WebSocketClearingHouseAccountSubscriber}, which will use a websocket for each state account subscription.
  * Alternatively, if you want to implement your own method of subscribing to the state accounts on the blockchain, you can implement a {@link ClearingHouseAccountSubscriber} and use it in the {@link ClearingHouse.constructor}
  */
 class ClearingHouse {
     constructor(connection, wallet, program, accountSubscriber, txSender, opts) {
-        this.isSubscribed = false;
+        this._isSubscribed = false;
         this.connection = connection;
         this.wallet = wallet;
         this.opts = opts;
@@ -59,12 +59,23 @@ class ClearingHouse {
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.txSender = txSender;
     }
+    get isSubscribed() {
+        return this._isSubscribed && this.accountSubscriber.isSubscribed;
+    }
+    set isSubscribed(val) {
+        this._isSubscribed = val;
+    }
+    /**
+     * @deprecated You should use the getClearingHouse factory method instead
+     * @param connection
+     * @param wallet
+     * @param clearingHouseProgramId
+     * @param opts
+     * @returns
+     */
     static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.Provider.defaultOptions()) {
-        const provider = new anchor_1.Provider(connection, wallet, opts);
-        const program = new anchor_1.Program(clearing_house_json_1.default, clearingHouseProgramId, provider);
-        const accountSubscriber = new defaultClearingHouseAccountSubscriber_1.DefaultClearingHouseAccountSubscriber(program);
-        const txSender = new defaultTxSender_1.DefaultTxSender(provider);
-        return new ClearingHouse(connection, wallet, program, accountSubscriber, txSender, opts);
+        const config = clearingHouse_1.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
+        return clearingHouse_1.getClearingHouse(config);
     }
     /**
      *
@@ -90,6 +101,7 @@ class ClearingHouse {
                 'fundingRateHistoryAccount',
                 'liquidationHistoryAccount',
                 'tradeHistoryAccount',
+                'orderHistoryAccount',
             ]);
         });
     }
@@ -115,7 +127,7 @@ class ClearingHouse {
             if (this.statePublicKey) {
                 return this.statePublicKey;
             }
-            this.statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
+            this.statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
             return this.statePublicKey;
         });
     }
@@ -149,6 +161,21 @@ class ClearingHouse {
     getCurveHistoryAccount() {
         return this.accountSubscriber.getCurveHistoryAccount();
     }
+    getOrderHistoryAccount() {
+        return this.accountSubscriber.getOrderHistoryAccount();
+    }
+    getOrderStatePublicKey() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.orderStatePublicKey) {
+                return this.orderStatePublicKey;
+            }
+            this.orderStatePublicKey = yield addresses_1.getOrderStateAccountPublicKey(this.program.programId);
+            return this.orderStatePublicKey;
+        });
+    }
+    getOrderStateAccount() {
+        return this.accountSubscriber.getOrderStateAccount();
+    }
     /**
      * Update the wallet to use for clearing house transactions and linked user account
      * @param newWallet
@@ -166,15 +193,17 @@ class ClearingHouse {
     }
     initializeUserAccount() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx,] = yield this.getInitializeUserInstructions();
-            const tx = new web3_js_1.Transaction().add(initializeUserAccountIx);
+            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx, initializeUserOrdersAccountIx,] = yield this.getInitializeUserInstructions();
+            const tx = new web3_js_1.Transaction()
+                .add(initializeUserAccountIx)
+                .add(initializeUserOrdersAccountIx);
             const txSig = yield this.txSender.send(tx, [userPositionsAccount], this.opts);
             return [txSig, userAccountPublicKey];
         });
     }
     getInitializeUserInstructions() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userPublicKey, userAccountNonce] = yield (0, addresses_1.getUserAccountPublicKeyAndNonce)(this.program.programId, this.wallet.publicKey);
+            const [userAccountPublicKey, userAccountNonce] = yield addresses_1.getUserAccountPublicKeyAndNonce(this.program.programId, this.wallet.publicKey);
             const remainingAccounts = [];
             const optionalAccounts = {
                 whitelistToken: false,
@@ -192,7 +221,7 @@ class ClearingHouse {
             const userPositions = new web3_js_1.Keypair();
             const initializeUserAccountIx = yield this.program.instruction.initializeUser(userAccountNonce, optionalAccounts, {
                 accounts: {
-                    user: userPublicKey,
+                    user: userAccountPublicKey,
                     authority: this.wallet.publicKey,
                     rent: anchor.web3.SYSVAR_RENT_PUBKEY,
                     systemProgram: anchor.web3.SystemProgram.programId,
@@ -201,7 +230,31 @@ class ClearingHouse {
                 },
                 remainingAccounts: remainingAccounts,
             });
-            return [userPositions, userPublicKey, initializeUserAccountIx];
+            const initializeUserOrdersAccountIx = yield this.getInitializeUserOrdersInstruction(userAccountPublicKey);
+            return [
+                userPositions,
+                userAccountPublicKey,
+                initializeUserAccountIx,
+                initializeUserOrdersAccountIx,
+            ];
+        });
+    }
+    getInitializeUserOrdersInstruction(userAccountPublicKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!userAccountPublicKey) {
+                userAccountPublicKey = yield this.getUserAccountPublicKey();
+            }
+            const [userOrdersAccountPublicKey, userOrdersAccountNonce] = yield addresses_1.getUserOrdersAccountPublicKeyAndNonce(this.program.programId, userAccountPublicKey);
+            return yield this.program.instruction.initializeUserOrders(userOrdersAccountNonce, {
+                accounts: {
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+                    systemProgram: anchor.web3.SystemProgram.programId,
+                    userOrders: userOrdersAccountPublicKey,
+                    state: yield this.getStatePublicKey(),
+                },
+            });
         });
     }
     /**
@@ -213,7 +266,7 @@ class ClearingHouse {
             if (this.userAccountPublicKey) {
                 return this.userAccountPublicKey;
             }
-            this.userAccountPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey);
+            this.userAccountPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.wallet.publicKey);
             return this.userAccountPublicKey;
         });
     }
@@ -226,6 +279,29 @@ class ClearingHouse {
             return this.userAccount;
         });
     }
+    /**
+     * Get the address for the Clearing House User Order's account. NOT the user's wallet address.
+     * @returns
+     */
+    getUserOrdersAccountPublicKey() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.userOrdersAccountPublicKey) {
+                return this.userOrdersAccountPublicKey;
+            }
+            this.userOrdersAccountPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, yield this.getUserAccountPublicKey());
+            return this.userOrdersAccountPublicKey;
+        });
+    }
+    userOrdersAccountExists() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.userOrdersExist) {
+                return this.userOrdersExist;
+            }
+            const userOrdersAccountRPCResponse = yield this.connection.getParsedAccountInfo(yield this.getUserOrdersAccountPublicKey());
+            this.userOrdersExist = userOrdersAccountRPCResponse.value !== null;
+            return this.userOrdersExist;
+        });
+    }
     depositCollateral(amount, collateralAccountPublicKey, userPositionsAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
             const depositCollateralIx = yield this.getDepositCollateralInstruction(amount, collateralAccountPublicKey, userPositionsAccountPublicKey);
@@ -264,10 +340,11 @@ class ClearingHouse {
      */
     initializeUserAccountAndDepositCollateral(amount, collateralAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx,] = yield this.getInitializeUserInstructions();
+            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx, initializeUserOrdersAccountIx,] = yield this.getInitializeUserInstructions();
             const depositCollateralIx = yield this.getDepositCollateralInstruction(amount, collateralAccountPublicKey, userPositionsAccount.publicKey);
             const tx = new web3_js_1.Transaction()
                 .add(initializeUserAccountIx)
+                .add(initializeUserOrdersAccountIx)
                 .add(depositCollateralIx);
             const txSig = yield this.program.provider.send(tx, [userPositionsAccount]);
             return [txSig, userAccountPublicKey];
@@ -276,12 +353,13 @@ class ClearingHouse {
     initializeUserAccountForDevnet(mockUSDCFaucet, amount) {
         return __awaiter(this, void 0, void 0, function* () {
             const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] = yield mockUSDCFaucet.createAssociatedTokenAccountAndMintToInstructions(this.wallet.publicKey, amount);
-            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx,] = yield this.getInitializeUserInstructions();
+            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx, initializeUserOrdersAccountIx,] = yield this.getInitializeUserInstructions();
             const depositCollateralIx = yield this.getDepositCollateralInstruction(amount, associateTokenPublicKey, userPositionsAccount.publicKey);
             const tx = new web3_js_1.Transaction()
                 .add(createAssociatedAccountIx)
                 .add(mintToIx)
                 .add(initializeUserAccountIx)
+                .add(initializeUserOrdersAccountIx)
                 .add(depositCollateralIx);
             const txSig = yield this.program.provider.send(tx, [userPositionsAccount]);
             return [txSig, userAccountPublicKey];
@@ -303,7 +381,7 @@ class ClearingHouse {
     }
     withdrawCollateral(amount, collateralAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
         });
     }
     getWithdrawCollateralIx(amount, collateralAccountPublicKey) {
@@ -332,7 +410,7 @@ class ClearingHouse {
     }
     openPosition(direction, amount, marketIndex, limitPrice, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
         });
     }
     getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer) {
@@ -381,6 +459,239 @@ class ClearingHouse {
             });
         });
     }
+    initializeUserOrdersThenPlaceOrder(orderParams, discountToken, referrer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const instructions = [];
+            const userOrdersAccountExists = yield this.userOrdersAccountExists();
+            if (!userOrdersAccountExists) {
+                instructions.push(yield this.getInitializeUserOrdersInstruction());
+            }
+            instructions.push(yield this.getPlaceOrderIx(orderParams, discountToken, referrer));
+            const tx = new web3_js_1.Transaction();
+            for (const instruction of instructions) {
+                tx.add(instruction);
+            }
+            return yield this.txSender.send(tx, [], this.opts);
+        });
+    }
+    placeOrder(orderParams, discountToken, referrer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getPlaceOrderIx(orderParams, discountToken, referrer)), [], this.opts);
+        });
+    }
+    getPlaceOrderIx(orderParams, discountToken, referrer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userAccountPublicKey = yield this.getUserAccountPublicKey();
+            const userAccount = yield this.getUserAccount();
+            const priceOracle = this.getMarketsAccount().markets[orderParams.marketIndex.toNumber()].amm
+                .oracle;
+            const remainingAccounts = [];
+            if (orderParams.optionalAccounts.discountToken) {
+                if (!discountToken) {
+                    throw Error('Optional accounts specified discount token but no discount token present');
+                }
+                remainingAccounts.push({
+                    pubkey: discountToken,
+                    isWritable: false,
+                    isSigner: false,
+                });
+            }
+            if (orderParams.optionalAccounts.referrer) {
+                if (!referrer) {
+                    throw Error('Optional accounts specified referrer but no referrer present');
+                }
+                remainingAccounts.push({
+                    pubkey: referrer,
+                    isWritable: false,
+                    isSigner: false,
+                });
+            }
+            const state = this.getStateAccount();
+            const orderState = this.getOrderStateAccount();
+            return yield this.program.instruction.placeOrder(orderParams, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    markets: state.markets,
+                    userOrders: yield this.getUserOrdersAccountPublicKey(),
+                    userPositions: userAccount.positions,
+                    fundingPaymentHistory: state.fundingPaymentHistory,
+                    fundingRateHistory: state.fundingRateHistory,
+                    orderState: yield this.getOrderStatePublicKey(),
+                    orderHistory: orderState.orderHistory,
+                    oracle: priceOracle,
+                },
+                remainingAccounts,
+            });
+        });
+    }
+    cancelOrder(orderId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getCancelOrderIx(orderId)), [], this.opts);
+        });
+    }
+    getCancelOrderIx(orderId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userAccountPublicKey = yield this.getUserAccountPublicKey();
+            const userAccount = yield this.getUserAccount();
+            const state = this.getStateAccount();
+            const orderState = this.getOrderStateAccount();
+            return yield this.program.instruction.cancelOrder(orderId, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    markets: state.markets,
+                    userOrders: yield this.getUserOrdersAccountPublicKey(),
+                    userPositions: userAccount.positions,
+                    fundingPaymentHistory: state.fundingPaymentHistory,
+                    fundingRateHistory: state.fundingRateHistory,
+                    orderState: yield this.getOrderStatePublicKey(),
+                    orderHistory: orderState.orderHistory,
+                },
+            });
+        });
+    }
+    cancelOrderByUserId(userOrderId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
+        });
+    }
+    getCancelOrderByUserIdIx(userOrderId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userAccountPublicKey = yield this.getUserAccountPublicKey();
+            const userAccount = yield this.getUserAccount();
+            const state = this.getStateAccount();
+            const orderState = this.getOrderStateAccount();
+            return yield this.program.instruction.cancelOrderByUserId(userOrderId, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    markets: state.markets,
+                    userOrders: yield this.getUserOrdersAccountPublicKey(),
+                    userPositions: userAccount.positions,
+                    fundingPaymentHistory: state.fundingPaymentHistory,
+                    fundingRateHistory: state.fundingRateHistory,
+                    orderState: yield this.getOrderStatePublicKey(),
+                    orderHistory: orderState.orderHistory,
+                },
+            });
+        });
+    }
+    fillOrder(userAccountPublicKey, userOrdersAccountPublicKey, order) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order)), [], this.opts);
+        });
+    }
+    getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fillerPublicKey = yield this.getUserAccountPublicKey();
+            const userAccount = yield this.program.account.user.fetch(userAccountPublicKey);
+            const marketIndex = order.marketIndex;
+            const oracle = this.getMarket(marketIndex).amm.oracle;
+            const state = this.getStateAccount();
+            const orderState = this.getOrderStateAccount();
+            const remainingAccounts = [];
+            if (!order.referrer.equals(web3_js_1.PublicKey.default)) {
+                remainingAccounts.push({
+                    pubkey: order.referrer,
+                    isWritable: true,
+                    isSigner: false,
+                });
+            }
+            const orderId = order.orderId;
+            return yield this.program.instruction.fillOrder(orderId, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    filler: fillerPublicKey,
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    markets: state.markets,
+                    userPositions: userAccount.positions,
+                    userOrders: userOrdersAccountPublicKey,
+                    tradeHistory: state.tradeHistory,
+                    fundingPaymentHistory: state.fundingPaymentHistory,
+                    fundingRateHistory: state.fundingRateHistory,
+                    orderState: yield this.getOrderStatePublicKey(),
+                    orderHistory: orderState.orderHistory,
+                    extendedCurveHistory: state.extendedCurveHistory,
+                    oracle: oracle,
+                },
+                remainingAccounts,
+            });
+        });
+    }
+    initializeUserOrdersThenPlaceAndFillOrder(orderParams, discountToken, referrer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const instructions = [];
+            const userOrdersAccountExists = yield this.userOrdersAccountExists();
+            if (!userOrdersAccountExists) {
+                instructions.push(yield this.getInitializeUserOrdersInstruction());
+            }
+            instructions.push(yield this.getPlaceAndFillOrderIx(orderParams, discountToken, referrer));
+            const tx = new web3_js_1.Transaction();
+            for (const instruction of instructions) {
+                tx.add(instruction);
+            }
+            return yield this.txSender.send(tx, [], this.opts);
+        });
+    }
+    placeAndFillOrder(orderParams, discountToken, referrer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getPlaceAndFillOrderIx(orderParams, discountToken, referrer)), [], this.opts);
+        });
+    }
+    getPlaceAndFillOrderIx(orderParams, discountToken, referrer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userAccountPublicKey = yield this.getUserAccountPublicKey();
+            const userAccount = yield this.getUserAccount();
+            const priceOracle = this.getMarketsAccount().markets[orderParams.marketIndex.toNumber()].amm
+                .oracle;
+            const remainingAccounts = [];
+            if (orderParams.optionalAccounts.discountToken) {
+                if (!discountToken) {
+                    throw Error('Optional accounts specified discount token but no discount token present');
+                }
+                remainingAccounts.push({
+                    pubkey: discountToken,
+                    isWritable: false,
+                    isSigner: false,
+                });
+            }
+            if (orderParams.optionalAccounts.referrer) {
+                if (!referrer) {
+                    throw Error('Optional accounts specified referrer but no referrer present');
+                }
+                remainingAccounts.push({
+                    pubkey: referrer,
+                    isWritable: true,
+                    isSigner: false,
+                });
+            }
+            const state = this.getStateAccount();
+            const orderState = this.getOrderStateAccount();
+            return yield this.program.instruction.placeAndFillOrder(orderParams, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    markets: state.markets,
+                    userOrders: yield this.getUserOrdersAccountPublicKey(),
+                    userPositions: userAccount.positions,
+                    tradeHistory: state.tradeHistory,
+                    fundingPaymentHistory: state.fundingPaymentHistory,
+                    fundingRateHistory: state.fundingRateHistory,
+                    orderState: yield this.getOrderStatePublicKey(),
+                    orderHistory: orderState.orderHistory,
+                    extendedCurveHistory: state.extendedCurveHistory,
+                    oracle: priceOracle,
+                },
+                remainingAccounts,
+            });
+        });
+    }
     /**
      * 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
@@ -390,7 +701,7 @@ class ClearingHouse {
      */
     closePosition(marketIndex, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
         });
     }
     getClosePositionIx(marketIndex, discountToken, referrer) {
@@ -438,7 +749,7 @@ class ClearingHouse {
     }
     liquidate(liquidateeUserAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
         });
     }
     getLiquidateIx(liquidateeUserAccountPublicKey) {
@@ -482,7 +793,7 @@ class ClearingHouse {
     }
     updateFundingRate(oracle, marketIndex) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
         });
     }
     getUpdateFundingRateIx(oracle, marketIndex) {
@@ -500,7 +811,7 @@ class ClearingHouse {
     }
     settleFundingPayment(userAccount, userPositionsAccount) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
         });
     }
     getSettleFundingPaymentIx(userAccount, userPositionsAccount) {

package/lib/clearingHouseUser.d.ts

@@ -1,19 +1,28 @@
 /// <reference types="node" />
+/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
-import BN from 'bn.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { ClearingHouse } from './clearingHouse';
-import { UserAccount, UserPosition, UserPositionsAccount } from './types';
+import { Order, UserAccount, UserOrdersAccount, UserPosition, UserPositionsAccount } from './types';
 import { UserAccountSubscriber, UserAccountEvents } from './accounts/types';
-import { PositionDirection } from '.';
+import { PositionDirection, BN } from '.';
 export declare class ClearingHouseUser {
     clearingHouse: ClearingHouse;
     authority: PublicKey;
     accountSubscriber: UserAccountSubscriber;
     userAccountPublicKey?: PublicKey;
-    isSubscribed: boolean;
+    userOrdersAccountPublicKey?: PublicKey;
+    _isSubscribed: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+    get isSubscribed(): boolean;
+    set isSubscribed(val: boolean);
+    /**
+     * @deprecated You should use getClearingHouseUser factory method instead
+     * @param clearingHouse
+     * @param authority
+     * @returns
+     */
     static from(clearingHouse: ClearingHouse, authority: PublicKey): ClearingHouseUser;
     constructor(clearingHouse: ClearingHouse, authority: PublicKey, accountSubscriber: UserAccountSubscriber);
     /**
@@ -28,6 +37,7 @@ export declare class ClearingHouseUser {
     unsubscribe(): Promise<void>;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
+    getUserOrdersAccount(): UserOrdersAccount | undefined;
     /**
      * Gets the user's current position for a given market. If the user has no position returns undefined
      * @param marketIndex
@@ -35,7 +45,18 @@ export declare class ClearingHouseUser {
      */
     getUserPosition(marketIndex: BN): UserPosition | undefined;
     getEmptyPosition(marketIndex: BN): UserPosition;
+    /**
+     * @param orderId
+     * @returns Order
+     */
+    getOrder(orderId: BN): Order | undefined;
+    /**
+     * @param userOrderId
+     * @returns Order
+     */
+    getOrderByUserOrderId(userOrderId: number): Order | undefined;
     getUserAccountPublicKey(): Promise<PublicKey>;
+    getUserOrdersAccountPublicKey(): Promise<PublicKey>;
     exists(): Promise<boolean>;
     /**
      * calculates Buying Power = FC * MAX_LEVERAGE
@@ -140,7 +161,7 @@ export declare class ClearingHouseUser {
      * Case 4: NOT SameSide && currentLeverage > maxLeverage && otherPositions - currentPosition < maxLeverage
      * 	=> current position + remaining to get to maxLeverage
      *
-     * @param marketIndex
+     * @param targetMarketIndex
      * @param tradeSide
      * @param userMaxLeverageSetting - leverage : Precision TEN_THOUSAND
      * @returns tradeSizeAllowed : Precision QUOTE_PRECISION
@@ -166,5 +187,5 @@ export declare class ClearingHouseUser {
      * @returns positionValue : Precision QUOTE_PRECISION
      */
     private getTotalPositionValueExcludingMarket;
+    canFillOrder(order: Order): boolean;
 }
-//# sourceMappingURL=clearingHouseUser.d.ts.map