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

package/lib/admin.js

@@ -69,7 +69,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
             const tradeHistory = anchor.web3.Keypair.generate();
             const liquidationHistory = anchor.web3.Keypair.generate();
             const curveHistory = anchor.web3.Keypair.generate();
-            const [clearingHouseStatePublicKey, clearingHouseNonce] = yield (0, addresses_1.getClearingHouseStateAccountPublicKeyAndNonce)(this.program.programId);
+            const [clearingHouseStatePublicKey, clearingHouseNonce] = yield addresses_1.getClearingHouseStateAccountPublicKeyAndNonce(this.program.programId);
             const initializeTx = yield this.program.transaction.initialize(clearingHouseNonce, collateralVaultNonce, insuranceVaultNonce, adminControlsPrices, {
                 accounts: {
                     admin: this.wallet.publicKey,
@@ -108,7 +108,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                     yield this.program.account.tradeHistory.createInstruction(tradeHistory),
                     yield this.program.account.liquidationHistory.createInstruction(liquidationHistory),
                     yield this.program.account.depositHistory.createInstruction(depositHistory),
-                    yield this.program.account.extendedCurveHistory.createInstruction(curveHistory),
+                    yield this.program.account.curveHistory.createInstruction(curveHistory),
                 ],
             });
             const initializeHistoryTxSig = yield this.txSender.send(initializeHistoryTx, [
@@ -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) {
@@ -153,43 +175,21 @@ class Admin extends clearingHouse_1.ClearingHouse {
     updateK(sqrtK, marketIndex) {
         return __awaiter(this, void 0, void 0, function* () {
             const state = this.getStateAccount();
-            const markets = this.getMarketsAccount();
-            const marketData = markets.markets[marketIndex.toNumber()];
-            const ammData = marketData.amm;
             return yield this.program.rpc.updateK(sqrtK, marketIndex, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     admin: this.wallet.publicKey,
                     markets: state.markets,
-                    curveHistory: state.extendedCurveHistory,
-                    oracle: ammData.oracle,
-                },
-            });
-        });
-    }
-    updateCurveHistory() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const extendedCurveHistory = anchor.web3.Keypair.generate();
-            const state = this.getStateAccount();
-            return yield this.program.rpc.updateCurveHistory({
-                accounts: {
-                    state: yield this.getStatePublicKey(),
-                    admin: this.wallet.publicKey,
                     curveHistory: state.curveHistory,
-                    extendedCurveHistory: extendedCurveHistory.publicKey,
                 },
-                instructions: [
-                    yield this.program.account.extendedCurveHistory.createInstruction(extendedCurveHistory),
-                ],
-                signers: [extendedCurveHistory],
             });
         });
     }
     moveAmmToPrice(marketIndex, targetPrice) {
         return __awaiter(this, void 0, void 0, function* () {
             const market = this.getMarket(marketIndex);
-            const [direction, tradeSize, _] = (0, trade_1.calculateTargetPriceTrade)(market, targetPrice);
-            const [newQuoteAssetAmount, newBaseAssetAmount] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'quote', tradeSize, (0, amm_1.getSwapDirection)('quote', direction));
+            const [direction, tradeSize, _] = trade_1.calculateTargetPriceTrade(market, targetPrice);
+            const [newQuoteAssetAmount, newBaseAssetAmount] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'quote', tradeSize, amm_1.getSwapDirection('quote', direction));
             const state = this.getStateAccount();
             return yield this.program.rpc.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, marketIndex, {
                 accounts: {
@@ -212,7 +212,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                     admin: this.wallet.publicKey,
                     oracle: ammData.oracle,
                     markets: state.markets,
-                    curveHistory: state.extendedCurveHistory,
+                    curveHistory: state.curveHistory,
                 },
             });
         });
@@ -334,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, {
@@ -366,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, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market, ExtendedCurveHistoryAccount } 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';
@@ -56,7 +56,11 @@ export declare class ClearingHouse {
     getTradeHistoryAccount(): TradeHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
     getDepositHistoryAccount(): DepositHistoryAccount;
-    getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
+    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

package/lib/clearingHouse.js

@@ -90,6 +90,7 @@ class ClearingHouse {
                 'fundingRateHistoryAccount',
                 'liquidationHistoryAccount',
                 'tradeHistoryAccount',
+                'orderHistoryAccount',
             ]);
         });
     }
@@ -115,7 +116,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 +150,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 +182,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 +210,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 +219,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* () {
+            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(),
+                },
+            });
         });
     }
     /**
@@ -213,7 +255,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 +268,19 @@ 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);
@@ -264,10 +319,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 +332,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 +360,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 +389,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 +438,180 @@ 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
@@ -390,7 +621,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 +669,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 +713,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 +731,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

@@ -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 { UserAccount, UserPosition, UserPositionsAccount } from './types';
+import { Order, UserAccount, UserOrdersAccount, UserPosition, UserPositionsAccount } from './types';
 import { UserAccountSubscriber, UserAccountEvents } from './accounts/types';
 import { PositionDirection } from '.';
 export declare class ClearingHouseUser {
@@ -12,6 +12,7 @@ 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;
@@ -28,6 +29,7 @@ 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
@@ -35,7 +37,13 @@ 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
@@ -125,21 +133,6 @@ 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
@@ -166,5 +159,5 @@ export declare class ClearingHouseUser {
      * @returns positionValue : Precision QUOTE_PRECISION
      */
     private getTotalPositionValueExcludingMarket;
+    canFillOrder(order: Order): boolean;
 }
-//# sourceMappingURL=clearingHouseUser.d.ts.map