@drift-labs/sdk 0.1.19-master.1 → 0.1.21-master.3

package/lib/admin.js

@@ -27,9 +27,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Admin = void 0;
 const web3_js_1 = require("@solana/web3.js");
@@ -39,18 +36,13 @@ const addresses_1 = require("./addresses");
 const spl_token_1 = require("@solana/spl-token");
 const clearingHouse_1 = require("./clearingHouse");
 const numericConstants_1 = require("./constants/numericConstants");
-const clearing_house_json_1 = __importDefault(require("./idl/clearing_house.json"));
-const defaultClearingHouseAccountSubscriber_1 = require("./accounts/defaultClearingHouseAccountSubscriber");
-const defaultTxSender_1 = require("./tx/defaultTxSender");
 const trade_1 = require("./math/trade");
 const amm_1 = require("./math/amm");
+const clearingHouse_2 = require("./factory/clearingHouse");
 class Admin extends clearingHouse_1.ClearingHouse {
     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 Admin(connection, wallet, program, accountSubscriber, txSender, opts);
+        const config = clearingHouse_2.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
+        return clearingHouse_2.getAdmin(config);
     }
     initialize(usdcMint, adminControlsPrices) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -69,7 +61,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,
@@ -119,7 +111,29 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 fundingRateHistory,
                 curveHistory,
             ], this.opts);
-            return [initializeTxSig, initializeHistoryTxSig];
+            const initializeOrderStateTxSig = yield this.initializeOrderState();
+            return [initializeTxSig, initializeHistoryTxSig, initializeOrderStateTxSig];
+        });
+    }
+    initializeOrderState() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orderHistory = anchor.web3.Keypair.generate();
+            const [orderStatePublicKey, orderStateNonce] = yield addresses_1.getOrderStateAccountPublicKeyAndNonce(this.program.programId);
+            const clearingHouseStatePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const initializeOrderStateTx = yield this.program.transaction.initializeOrderState(orderStateNonce, {
+                accounts: {
+                    admin: this.wallet.publicKey,
+                    state: clearingHouseStatePublicKey,
+                    orderHistory: orderHistory.publicKey,
+                    orderState: orderStatePublicKey,
+                    rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                    systemProgram: anchor.web3.SystemProgram.programId,
+                },
+                instructions: [
+                    yield this.program.account.orderHistory.createInstruction(orderHistory),
+                ],
+            });
+            return yield this.txSender.send(initializeOrderStateTx, [orderHistory], this.opts);
         });
     }
     initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION) {
@@ -188,8 +202,8 @@ class Admin extends clearingHouse_1.ClearingHouse {
     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: {
@@ -368,6 +382,17 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
+    updateOrderFillerRewardStructure(orderFillerRewardStructure) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.program.rpc.updateOrderFillerRewardStructure(orderFillerRewardStructure, {
+                accounts: {
+                    admin: this.wallet.publicKey,
+                    state: yield this.getStatePublicKey(),
+                    orderState: yield this.getOrderStatePublicKey(),
+                },
+            });
+        });
+    }
     updateFee(fees) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.program.rpc.updateFee(fees, {
@@ -400,10 +425,22 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
-    updateMarketMinimumTradeSize(marketIndex, minimumTradeSize) {
+    updateMarketMinimumQuoteAssetTradeSize(marketIndex, minimumTradeSize) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const state = this.getStateAccount();
+            return yield this.program.rpc.updateMarketMinimumQuoteAssetTradeSize(marketIndex, minimumTradeSize, {
+                accounts: {
+                    admin: this.wallet.publicKey,
+                    state: yield this.getStatePublicKey(),
+                    markets: state.markets,
+                },
+            });
+        });
+    }
+    updateMarketMinimumBaseAssetTradeSize(marketIndex, minimumTradeSize) {
         return __awaiter(this, void 0, void 0, function* () {
             const state = this.getStateAccount();
-            return yield this.program.rpc.updateMarketMinimumTradeSize(marketIndex, minimumTradeSize, {
+            return yield this.program.rpc.updateMarketMinimumBaseAssetTradeSize(marketIndex, minimumTradeSize, {
                 accounts: {
                     admin: this.wallet.publicKey,
                     state: yield this.getStatePublicKey(),

package/lib/assert/assert.d.ts

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

package/lib/clearingHouse.d.ts

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