@drift-labs/sdk 0.1.18-orders.1 → 0.1.19-master.2

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

package/lib/clearingHouse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clearingHouse.d.ts","sourceRoot":"","sources":["../src/clearingHouse.ts"],"names":[],"mappings":"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"}

package/lib/clearingHouse.js

@@ -90,7 +90,6 @@ class ClearingHouse {
                 'fundingRateHistoryAccount',
                 'liquidationHistoryAccount',
                 'tradeHistoryAccount',
-                'orderHistoryAccount',
             ]);
         });
     }
@@ -116,7 +115,7 @@ class ClearingHouse {
             if (this.statePublicKey) {
                 return this.statePublicKey;
             }
-            this.statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            this.statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             return this.statePublicKey;
         });
     }
@@ -150,21 +149,6 @@ 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
@@ -182,17 +166,15 @@ class ClearingHouse {
     }
     initializeUserAccount() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx, initializeUserOrdersAccountIx,] = yield this.getInitializeUserInstructions();
-            const tx = new web3_js_1.Transaction()
-                .add(initializeUserAccountIx)
-                .add(initializeUserOrdersAccountIx);
+            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx,] = yield this.getInitializeUserInstructions();
+            const tx = new web3_js_1.Transaction().add(initializeUserAccountIx);
             const txSig = yield this.txSender.send(tx, [userPositionsAccount], this.opts);
             return [txSig, userAccountPublicKey];
         });
     }
     getInitializeUserInstructions() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userAccountPublicKey, userAccountNonce] = yield addresses_1.getUserAccountPublicKeyAndNonce(this.program.programId, this.wallet.publicKey);
+            const [userPublicKey, userAccountNonce] = yield (0, addresses_1.getUserAccountPublicKeyAndNonce)(this.program.programId, this.wallet.publicKey);
             const remainingAccounts = [];
             const optionalAccounts = {
                 whitelistToken: false,
@@ -210,7 +192,7 @@ class ClearingHouse {
             const userPositions = new web3_js_1.Keypair();
             const initializeUserAccountIx = yield this.program.instruction.initializeUser(userAccountNonce, optionalAccounts, {
                 accounts: {
-                    user: userAccountPublicKey,
+                    user: userPublicKey,
                     authority: this.wallet.publicKey,
                     rent: anchor.web3.SYSVAR_RENT_PUBKEY,
                     systemProgram: anchor.web3.SystemProgram.programId,
@@ -219,31 +201,7 @@ class ClearingHouse {
                 },
                 remainingAccounts: remainingAccounts,
             });
-            const initializeUserOrdersAccountIx = yield this.getInitializeUserOrdersInstruction(userAccountPublicKey);
-            return [
-                userPositions,
-                userAccountPublicKey,
-                initializeUserAccountIx,
-                initializeUserOrdersAccountIx,
-            ];
-        });
-    }
-    getInitializeUserOrdersInstruction(userAccountPublicKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [userOrdersAccountPublicKey, userOrdersAccountNonce] = yield addresses_1.getUserOrdersAccountPublicKeyAndNonce(this.program.programId, this.wallet.publicKey);
-            if (!userAccountPublicKey) {
-                userAccountPublicKey = yield this.getUserAccountPublicKey();
-            }
-            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(),
-                },
-            });
+            return [userPositions, userPublicKey, initializeUserAccountIx];
         });
     }
     /**
@@ -255,7 +213,7 @@ class ClearingHouse {
             if (this.userAccountPublicKey) {
                 return this.userAccountPublicKey;
             }
-            this.userAccountPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.wallet.publicKey);
+            this.userAccountPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey);
             return this.userAccountPublicKey;
         });
     }
@@ -268,19 +226,6 @@ 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, this.wallet.publicKey);
-            return this.userOrdersAccountPublicKey;
-        });
-    }
     depositCollateral(amount, collateralAccountPublicKey, userPositionsAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
             const depositCollateralIx = yield this.getDepositCollateralInstruction(amount, collateralAccountPublicKey, userPositionsAccountPublicKey);
@@ -319,11 +264,10 @@ class ClearingHouse {
      */
     initializeUserAccountAndDepositCollateral(amount, collateralAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx, initializeUserOrdersAccountIx,] = yield this.getInitializeUserInstructions();
+            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx,] = 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];
@@ -332,13 +276,12 @@ 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, initializeUserOrdersAccountIx,] = yield this.getInitializeUserInstructions();
+            const [userPositionsAccount, userAccountPublicKey, initializeUserAccountIx,] = 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];
@@ -360,7 +303,7 @@ class ClearingHouse {
     }
     withdrawCollateral(amount, collateralAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
         });
     }
     getWithdrawCollateralIx(amount, collateralAccountPublicKey) {
@@ -389,7 +332,7 @@ class ClearingHouse {
     }
     openPosition(direction, amount, marketIndex, limitPrice, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
         });
     }
     getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer) {
@@ -438,180 +381,6 @@ class ClearingHouse {
             });
         });
     }
-    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,
-                },
-            });
-        });
-    }
-    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,
-                    oracle: oracle,
-                },
-                remainingAccounts,
-            });
-        });
-    }
-    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,
-                    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
@@ -621,7 +390,7 @@ class ClearingHouse {
      */
     closePosition(marketIndex, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
         });
     }
     getClosePositionIx(marketIndex, discountToken, referrer) {
@@ -669,7 +438,7 @@ class ClearingHouse {
     }
     liquidate(liquidateeUserAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
         });
     }
     getLiquidateIx(liquidateeUserAccountPublicKey) {
@@ -713,7 +482,7 @@ class ClearingHouse {
     }
     updateFundingRate(oracle, marketIndex) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
         });
     }
     getUpdateFundingRateIx(oracle, marketIndex) {
@@ -731,7 +500,7 @@ class ClearingHouse {
     }
     settleFundingPayment(userAccount, userPositionsAccount) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
         });
     }
     getSettleFundingPaymentIx(userAccount, userPositionsAccount) {

package/lib/clearingHouseUser.d.ts

@@ -4,7 +4,7 @@ import BN from 'bn.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { ClearingHouse } from './clearingHouse';
-import { Order, UserAccount, UserOrdersAccount, UserPosition, UserPositionsAccount } from './types';
+import { UserAccount, UserPosition, UserPositionsAccount } from './types';
 import { UserAccountSubscriber, UserAccountEvents } from './accounts/types';
 import { PositionDirection } from '.';
 export declare class ClearingHouseUser {
@@ -12,7 +12,6 @@ export declare class ClearingHouseUser {
     authority: PublicKey;
     accountSubscriber: UserAccountSubscriber;
     userAccountPublicKey?: PublicKey;
-    userOrdersAccountPublicKey?: PublicKey;
     isSubscribed: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     static from(clearingHouse: ClearingHouse, authority: PublicKey): ClearingHouseUser;
@@ -29,7 +28,6 @@ export declare class ClearingHouseUser {
     unsubscribe(): Promise<void>;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
-    getUserOrdersAccount(): UserOrdersAccount;
     /**
      * Gets the user's current position for a given market. If the user has no position returns undefined
      * @param marketIndex
@@ -37,13 +35,7 @@ export declare class ClearingHouseUser {
      */
     getUserPosition(marketIndex: BN): UserPosition | undefined;
     getEmptyPosition(marketIndex: BN): UserPosition;
-    /**
-     * @param orderId
-     * @returns Order
-     */
-    getOrder(orderId: BN): Order | undefined;
     getUserAccountPublicKey(): Promise<PublicKey>;
-    getUserOrdersAccountPublicKey(): Promise<PublicKey>;
     exists(): Promise<boolean>;
     /**
      * calculates Buying Power = FC * MAX_LEVERAGE
@@ -133,6 +125,21 @@ export declare class ClearingHouseUser {
     liquidationPriceAfterClose(positionMarketIndex: BN, closeQuoteAmount: BN): BN;
     /**
      * Get the maximum trade size for a given market, taking into account the user's current leverage, positions, collateral, etc.
+     *
+     * To Calculate Max Quote Available:
+     *
+     * Case 1: SameSide
+     * 	=> Remaining quote to get to maxLeverage
+     *
+     * Case 2: NOT SameSide && currentLeverage <= maxLeverage
+     * 	=> Current opposite position x2 + remaining to get to maxLeverage
+     *
+     * Case 3: NOT SameSide && currentLeverage > maxLeverage && otherPositions - currentPosition > maxLeverage
+     * 	=> strictly reduce current position size
+     *
+     * Case 4: NOT SameSide && currentLeverage > maxLeverage && otherPositions - currentPosition < maxLeverage
+     * 	=> current position + remaining to get to maxLeverage
+     *
      * @param marketIndex
      * @param tradeSide
      * @param userMaxLeverageSetting - leverage : Precision TEN_THOUSAND
@@ -159,5 +166,5 @@ export declare class ClearingHouseUser {
      * @returns positionValue : Precision QUOTE_PRECISION
      */
     private getTotalPositionValueExcludingMarket;
-    canFillOrder(order: Order): boolean;
 }
+//# sourceMappingURL=clearingHouseUser.d.ts.map

package/lib/clearingHouseUser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clearingHouseUser.d.ts","sourceRoot":"","sources":["../src/clearingHouseUser.ts"],"names":[],"mappings":"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"}