@drift-labs/sdk 0.1.36-master.2 → 0.1.36-master.5

package/lib/admin.js

@@ -45,7 +45,7 @@ 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()) {
+    static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.AnchorProvider.defaultOptions()) {
         const config = (0, clearingHouse_2.getWebSocketClearingHouseConfig)(connection, wallet, clearingHouseProgramId, opts);
         return (0, clearingHouse_2.getAdmin)(config);
     }

package/lib/clearingHouse.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
-import { BN, Program, Provider } from '@project-serum/anchor';
+import { AnchorProvider, BN, Program } from '@project-serum/anchor';
 import { MarketsAccount, StateAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market, OrderHistoryAccount, OrderStateAccount, OrderParams, Order, ExtendedCurveHistoryAccount, UserPositionsAccount } from './types';
 import { Connection, PublicKey, TransactionSignature, Keypair, ConfirmOptions, TransactionInstruction } from '@solana/web3.js';
 import { MockUSDCFaucet } from './mockUSDCFaucet';
@@ -19,7 +19,7 @@ export declare class ClearingHouse {
     connection: Connection;
     wallet: IWallet;
     program: Program;
-    provider: Provider;
+    provider: AnchorProvider;
     opts?: ConfirmOptions;
     accountSubscriber: ClearingHouseAccountSubscriber;
     eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
@@ -126,8 +126,10 @@ export declare class ClearingHouse {
     getCancelOrderIx(orderId: BN, oracle?: PublicKey): Promise<TransactionInstruction>;
     cancelOrderByUserId(userOrderId: number, oracle?: PublicKey): Promise<TransactionSignature>;
     getCancelOrderByUserIdIx(userOrderId: number, oracle?: PublicKey): Promise<TransactionInstruction>;
-    cancelAllOrders(oracles?: PublicKey[]): Promise<TransactionSignature>;
-    getCancelAllOrdersIx(oracles: PublicKey[]): Promise<TransactionInstruction>;
+    cancelAllOrders(oracles?: PublicKey[], bestEffort?: boolean): Promise<TransactionSignature>;
+    getCancelAllOrdersIx(oracles: PublicKey[], bestEffort?: boolean): Promise<TransactionInstruction>;
+    cancelOrdersByMarketAndSide(oracles?: PublicKey[], bestEffort?: boolean, marketIndexOnly?: BN, directionOnly?: PositionDirection): Promise<TransactionSignature>;
+    getCancelOrdersByMarketAndSideIx(oracles: PublicKey[], bestEffort?: boolean, marketIndexOnly?: BN, directionOnly?: PositionDirection): 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>;

package/lib/clearingHouse.js

@@ -77,7 +77,7 @@ class ClearingHouse {
      * @param opts
      * @returns
      */
-    static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.Provider.defaultOptions()) {
+    static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.AnchorProvider.defaultOptions()) {
         const config = (0, clearingHouse_1.getWebSocketClearingHouseConfig)(connection, wallet, clearingHouseProgramId, opts);
         return (0, clearingHouse_1.getClearingHouse)(config);
     }
@@ -185,7 +185,7 @@ class ClearingHouse {
      * @param newWallet
      */
     updateWallet(newWallet) {
-        const newProvider = new anchor_1.Provider(this.connection, newWallet, this.opts);
+        const newProvider = new anchor_1.AnchorProvider(this.connection, newWallet, this.opts);
         const newProgram = new anchor_1.Program(clearing_house_json_1.default, this.program.programId, newProvider);
         // Update provider for txSender with new wallet details
         this.txSender.provider = newProvider;
@@ -352,7 +352,7 @@ class ClearingHouse {
                 .add(initializeUserAccountIx)
                 .add(initializeUserOrdersAccountIx)
                 .add(depositCollateralIx);
-            const txSig = yield this.program.provider.send(tx, [userPositionsAccount]);
+            const txSig = yield this.txSender.send(tx, [userPositionsAccount]);
             return [txSig, userAccountPublicKey];
         });
     }
@@ -367,7 +367,9 @@ class ClearingHouse {
                 .add(initializeUserAccountIx)
                 .add(initializeUserOrdersAccountIx)
                 .add(depositCollateralIx);
-            const txSig = yield this.program.provider.send(tx, [userPositionsAccount]);
+            const txSig = yield this.program.provider.sendAndConfirm(tx, [
+                userPositionsAccount,
+            ]);
             return [txSig, userAccountPublicKey];
         });
     }
@@ -620,12 +622,48 @@ class ClearingHouse {
             });
         });
     }
-    cancelAllOrders(oracles) {
+    cancelAllOrders(oracles, bestEffort) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelAllOrdersIx(oracles, bestEffort)), [], this.opts);
+        });
+    }
+    getCancelAllOrdersIx(oracles, bestEffort) {
+        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();
+            const remainingAccounts = [];
+            for (const oracle of oracles) {
+                remainingAccounts.push({
+                    pubkey: oracle,
+                    isWritable: false,
+                    isSigner: false,
+                });
+            }
+            return yield this.program.instruction.cancelAllOrders(bestEffort, {
+                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,
+                },
+                remainingAccounts,
+            });
+        });
+    }
+    cancelOrdersByMarketAndSide(oracles, bestEffort, marketIndexOnly, directionOnly) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelAllOrdersIx(oracles)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelOrdersByMarketAndSideIx(oracles, bestEffort, marketIndexOnly, directionOnly)), [], this.opts);
         });
     }
-    getCancelAllOrdersIx(oracles) {
+    getCancelOrdersByMarketAndSideIx(oracles, bestEffort, marketIndexOnly, directionOnly) {
         return __awaiter(this, void 0, void 0, function* () {
             const userAccountPublicKey = yield this.getUserAccountPublicKey();
             const userAccount = yield this.getUserAccount();
@@ -639,7 +677,7 @@ class ClearingHouse {
                     isSigner: false,
                 });
             }
-            return yield this.program.instruction.cancelAllOrders({
+            return yield this.program.instruction.cancelOrdersByMarketAndSide(bestEffort, marketIndexOnly, directionOnly, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     user: userAccountPublicKey,

package/lib/examples/makeTradeExample.js

@@ -30,7 +30,7 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
     const connection = new web3_js_1.Connection(rpcAddress);
     // Set up the Provider
-    const provider = new anchor_1.Provider(connection, wallet, anchor_1.Provider.defaultOptions());
+    const provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
     // Check SOL Balance
     const lamportsBalance = yield connection.getBalance(wallet.publicKey);
     console.log('SOL balance:', lamportsBalance / Math.pow(10, 9));

package/lib/factory/clearingHouse.js

@@ -12,7 +12,7 @@ const defaultTxSender_1 = require("../tx/defaultTxSender");
 const pollingClearingHouseAccountSubscriber_1 = require("../accounts/pollingClearingHouseAccountSubscriber");
 const admin_1 = require("../admin");
 const retryTxSender_1 = require("../tx/retryTxSender");
-function getWebSocketClearingHouseConfig(connection, wallet, programID, opts = anchor_1.Provider.defaultOptions(), txSenderConfig) {
+function getWebSocketClearingHouseConfig(connection, wallet, programID, opts = anchor_1.AnchorProvider.defaultOptions(), txSenderConfig) {
     return {
         type: 'websocket',
         connection,
@@ -23,7 +23,7 @@ function getWebSocketClearingHouseConfig(connection, wallet, programID, opts = a
     };
 }
 exports.getWebSocketClearingHouseConfig = getWebSocketClearingHouseConfig;
-function getPollingClearingHouseConfig(connection, wallet, programID, accountLoader, opts = anchor_1.Provider.defaultOptions(), txSenderConfig) {
+function getPollingClearingHouseConfig(connection, wallet, programID, accountLoader, opts = anchor_1.AnchorProvider.defaultOptions(), txSenderConfig) {
     return {
         type: 'polling',
         connection,
@@ -37,7 +37,7 @@ function getPollingClearingHouseConfig(connection, wallet, programID, accountLoa
 exports.getPollingClearingHouseConfig = getPollingClearingHouseConfig;
 function getClearingHouse(config) {
     var _a;
-    const provider = new anchor_1.Provider(config.connection, config.wallet, config.opts);
+    const provider = new anchor_1.AnchorProvider(config.connection, config.wallet, config.opts);
     const program = new anchor_1.Program(clearing_house_json_1.default, config.programID, provider);
     let accountSubscriber;
     if (config.type === 'websocket') {
@@ -59,7 +59,7 @@ function getClearingHouse(config) {
 exports.getClearingHouse = getClearingHouse;
 function getAdmin(config) {
     var _a;
-    const provider = new anchor_1.Provider(config.connection, config.wallet, config.opts);
+    const provider = new anchor_1.AnchorProvider(config.connection, config.wallet, config.opts);
     const program = new anchor_1.Program(clearing_house_json_1.default, config.programID, provider);
     let accountSubscriber;
     if (config.type === 'websocket') {