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

package/lib/clearingHouse.js

@@ -38,19 +38,19 @@ const anchor = __importStar(require("@project-serum/anchor"));
 const clearing_house_json_1 = __importDefault(require("./idl/clearing_house.json"));
 const web3_js_1 = require("@solana/web3.js");
 const addresses_1 = require("./addresses");
-const defaultClearingHouseAccountSubscriber_1 = require("./accounts/defaultClearingHouseAccountSubscriber");
 const defaultTxSender_1 = require("./tx/defaultTxSender");
 const utils_1 = require("./tx/utils");
+const clearingHouse_1 = require("./factory/clearingHouse");
 /**
  * # ClearingHouse
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
  *
- * The default way to construct a ClearingHouse instance is using the {@link from} method. This will create an instance using the static {@link DefaultClearingHouseAccountSubscriber}, which will use a websocket for each state account subscription.
+ * The default way to construct a ClearingHouse instance is using the {@link from} method. This will create an instance using the static {@link WebSocketClearingHouseAccountSubscriber}, which will use a websocket for each state account subscription.
  * Alternatively, if you want to implement your own method of subscribing to the state accounts on the blockchain, you can implement a {@link ClearingHouseAccountSubscriber} and use it in the {@link ClearingHouse.constructor}
  */
 class ClearingHouse {
     constructor(connection, wallet, program, accountSubscriber, txSender, opts) {
-        this.isSubscribed = false;
+        this._isSubscribed = false;
         this.connection = connection;
         this.wallet = wallet;
         this.opts = opts;
@@ -59,12 +59,23 @@ class ClearingHouse {
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.txSender = txSender;
     }
+    get isSubscribed() {
+        return this._isSubscribed && this.accountSubscriber.isSubscribed;
+    }
+    set isSubscribed(val) {
+        this._isSubscribed = val;
+    }
+    /**
+     * @deprecated You should use the getClearingHouse factory method instead
+     * @param connection
+     * @param wallet
+     * @param clearingHouseProgramId
+     * @param opts
+     * @returns
+     */
     static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.Provider.defaultOptions()) {
-        const provider = new anchor_1.Provider(connection, wallet, opts);
-        const program = new anchor_1.Program(clearing_house_json_1.default, clearingHouseProgramId, provider);
-        const accountSubscriber = new defaultClearingHouseAccountSubscriber_1.DefaultClearingHouseAccountSubscriber(program);
-        const txSender = new defaultTxSender_1.DefaultTxSender(provider);
-        return new ClearingHouse(connection, wallet, program, accountSubscriber, txSender, opts);
+        const config = clearingHouse_1.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
+        return clearingHouse_1.getClearingHouse(config);
     }
     /**
      *
@@ -230,10 +241,10 @@ class ClearingHouse {
     }
     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();
             }
+            const [userOrdersAccountPublicKey, userOrdersAccountNonce] = yield addresses_1.getUserOrdersAccountPublicKeyAndNonce(this.program.programId, userAccountPublicKey);
             return yield this.program.instruction.initializeUserOrders(userOrdersAccountNonce, {
                 accounts: {
                     user: userAccountPublicKey,
@@ -277,7 +288,7 @@ class ClearingHouse {
             if (this.userOrdersAccountPublicKey) {
                 return this.userOrdersAccountPublicKey;
             }
-            this.userOrdersAccountPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, this.wallet.publicKey);
+            this.userOrdersAccountPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, yield this.getUserAccountPublicKey());
             return this.userOrdersAccountPublicKey;
         });
     }
@@ -517,6 +528,33 @@ class ClearingHouse {
             });
         });
     }
+    cancelOrderByUserId(userOrderId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
+        });
+    }
+    getCancelOrderByUserIdIx(userOrderId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userAccountPublicKey = yield this.getUserAccountPublicKey();
+            const userAccount = yield this.getUserAccount();
+            const state = this.getStateAccount();
+            const orderState = this.getOrderStateAccount();
+            return yield this.program.instruction.cancelOrderByUserId(userOrderId, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    user: userAccountPublicKey,
+                    authority: this.wallet.publicKey,
+                    markets: state.markets,
+                    userOrders: yield this.getUserOrdersAccountPublicKey(),
+                    userPositions: userAccount.positions,
+                    fundingPaymentHistory: state.fundingPaymentHistory,
+                    fundingRateHistory: state.fundingRateHistory,
+                    orderState: yield this.getOrderStatePublicKey(),
+                    orderHistory: orderState.orderHistory,
+                },
+            });
+        });
+    }
     fillOrder(userAccountPublicKey, userOrdersAccountPublicKey, order) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.txSender.send(utils_1.wrapInTx(yield this.getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order)), [], this.opts);
@@ -553,6 +591,7 @@ class ClearingHouse {
                     fundingRateHistory: state.fundingRateHistory,
                     orderState: yield this.getOrderStatePublicKey(),
                     orderHistory: orderState.orderHistory,
+                    extendedCurveHistory: state.extendedCurveHistory,
                     oracle: oracle,
                 },
                 remainingAccounts,
@@ -606,6 +645,7 @@ class ClearingHouse {
                     fundingRateHistory: state.fundingRateHistory,
                     orderState: yield this.getOrderStatePublicKey(),
                     orderHistory: orderState.orderHistory,
+                    extendedCurveHistory: state.extendedCurveHistory,
                     oracle: priceOracle,
                 },
                 remainingAccounts,

package/lib/clearingHouseUser.d.ts

@@ -13,8 +13,16 @@ export declare class ClearingHouseUser {
     accountSubscriber: UserAccountSubscriber;
     userAccountPublicKey?: PublicKey;
     userOrdersAccountPublicKey?: PublicKey;
-    isSubscribed: boolean;
+    _isSubscribed: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+    get isSubscribed(): boolean;
+    set isSubscribed(val: boolean);
+    /**
+     * @deprecated You should use getClearingHouseUser factory method instead
+     * @param clearingHouse
+     * @param authority
+     * @returns
+     */
     static from(clearingHouse: ClearingHouse, authority: PublicKey): ClearingHouseUser;
     constructor(clearingHouse: ClearingHouse, authority: PublicKey, accountSubscriber: UserAccountSubscriber);
     /**

package/lib/clearingHouseUser.js

@@ -16,20 +16,34 @@ exports.ClearingHouseUser = void 0;
 const bn_js_1 = __importDefault(require("bn.js"));
 const position_1 = require("./math/position");
 const numericConstants_1 = require("./constants/numericConstants");
-const defaultUserAccountSubscriber_1 = require("./accounts/defaultUserAccountSubscriber");
 const _1 = require(".");
 const addresses_1 = require("./addresses");
+const clearingHouseUser_1 = require("./factory/clearingHouseUser");
 class ClearingHouseUser {
     constructor(clearingHouse, authority, accountSubscriber) {
-        this.isSubscribed = false;
+        this._isSubscribed = false;
         this.clearingHouse = clearingHouse;
         this.authority = authority;
         this.accountSubscriber = accountSubscriber;
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }
+    get isSubscribed() {
+        return this._isSubscribed && this.accountSubscriber.isSubscribed;
+    }
+    set isSubscribed(val) {
+        this._isSubscribed = val;
+    }
+    /**
+     * @deprecated You should use getClearingHouseUser factory method instead
+     * @param clearingHouse
+     * @param authority
+     * @returns
+     */
     static from(clearingHouse, authority) {
-        const accountSubscriber = new defaultUserAccountSubscriber_1.DefaultUserAccountSubscriber(clearingHouse.program, authority);
-        return new ClearingHouseUser(clearingHouse, authority, accountSubscriber);
+        if (clearingHouse.accountSubscriber.type !== 'websocket')
+            throw 'This method only works for clearing houses with a websocket account listener. Try using the getClearingHouseUser factory method to initialize a ClearingHouseUser instead';
+        const config = clearingHouseUser_1.getWebSocketClearingHouseUserConfig(clearingHouse, authority);
+        return clearingHouseUser_1.getClearingHouseUser(config);
     }
     /**
      * Subscribe to ClearingHouseUser state accounts
@@ -104,7 +118,7 @@ class ClearingHouseUser {
             if (this.userOrdersAccountPublicKey) {
                 return this.userOrdersAccountPublicKey;
             }
-            this.userOrdersAccountPublicKey = yield _1.getUserOrdersAccountPublicKey(this.clearingHouse.program.programId, this.authority);
+            this.userOrdersAccountPublicKey = yield _1.getUserOrdersAccountPublicKey(this.clearingHouse.program.programId, yield this.getUserAccountPublicKey());
             return this.userOrdersAccountPublicKey;
         });
     }

package/lib/config.js

@@ -5,7 +5,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: 'HiZ8CnfEE9LrBZTfc8hBneWrPg1Cbsn8Wdy6SPLfae9V',
+        CLEARING_HOUSE_PROGRAM_ID: '8mKouB1uzsoMAhAu4qAXCiu8KAfwH7nonpuYfTM21Xg2',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
     },
     'mainnet-beta': {

package/lib/constants/markets.js

@@ -86,4 +86,20 @@ exports.Markets = [
         mainnetPythOracle: '3pyn4svBbxJ9Wnn3RVeafyLWfzie6yC5eTig2S62v9SC',
         launchTs: 1643084413000,
     },
+    {
+        symbol: 'ALGO-PERP',
+        baseAssetSymbol: 'ALGO',
+        marketIndex: new bn_js_1.default(10),
+        devnetPythOracle: 'c1A946dY5NHuVda77C8XXtXytyR3wK1SCP3eA9VRfC3',
+        mainnetPythOracle: 'HqFyq1wh1xKvL7KDqqT7NJeSPdAqsDqnmBisUC2XdXAX',
+        launchTs: 1643686767000,
+    },
+    // {
+    // 	symbol: 'mSOL-PERP',
+    // 	baseAssetSymbol: 'mSOL',
+    // 	marketIndex: new BN(11), //todo
+    // 	devnetPythOracle: '9a6RNx3tCu1TSs6TBSfV2XRXEPEZXQ6WB7jRojZRvyeZ',
+    // 	mainnetPythOracle: 'E4v1BBgoso9s64TQvmyownAVJbhbEPGyzA3qn4n46qj9',
+    // 	launchTs: 1643346125000,
+    // },
 ];

package/lib/factory/clearingHouse.d.ts

@@ -0,0 +1,25 @@
+import { ConfirmOptions, Connection, PublicKey } from '@solana/web3.js';
+import { IWallet } from '../types';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { TxSender } from '../tx/types';
+import { ClearingHouse } from '../clearingHouse';
+import { Admin } from '../admin';
+export declare type ClearingHouseConfigType = 'websocket' | 'polling' | 'custom';
+declare type BaseClearingHouseConfig = {
+    type: ClearingHouseConfigType;
+    connection: Connection;
+    wallet: IWallet;
+    programID: PublicKey;
+    opts?: ConfirmOptions;
+    txSender?: TxSender;
+};
+declare type WebSocketClearingHouseConfiguration = BaseClearingHouseConfig;
+declare type PollingClearingHouseConfiguration = BaseClearingHouseConfig & {
+    accountLoader: BulkAccountLoader;
+};
+declare type ClearingHouseConfig = PollingClearingHouseConfiguration | WebSocketClearingHouseConfiguration;
+export declare function getWebSocketClearingHouseConfig(connection: Connection, wallet: IWallet, programID: PublicKey, opts?: ConfirmOptions, txSender?: TxSender): WebSocketClearingHouseConfiguration;
+export declare function getPollingClearingHouseConfig(connection: Connection, wallet: IWallet, programID: PublicKey, accountLoader: BulkAccountLoader, opts?: ConfirmOptions, txSender?: TxSender): PollingClearingHouseConfiguration;
+export declare function getClearingHouse(config: ClearingHouseConfig): ClearingHouse;
+export declare function getAdmin(config: ClearingHouseConfig): Admin;
+export {};

package/lib/factory/clearingHouse.js

@@ -0,0 +1,64 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAdmin = exports.getClearingHouse = exports.getPollingClearingHouseConfig = exports.getWebSocketClearingHouseConfig = void 0;
+const anchor_1 = require("@project-serum/anchor");
+const clearingHouse_1 = require("../clearingHouse");
+const clearing_house_json_1 = __importDefault(require("../idl/clearing_house.json"));
+const webSocketClearingHouseAccountSubscriber_1 = require("../accounts/webSocketClearingHouseAccountSubscriber");
+const defaultTxSender_1 = require("../tx/defaultTxSender");
+const pollingClearingHouseAccountSubscriber_1 = require("../accounts/pollingClearingHouseAccountSubscriber");
+const admin_1 = require("../admin");
+function getWebSocketClearingHouseConfig(connection, wallet, programID, opts = anchor_1.Provider.defaultOptions(), txSender) {
+    return {
+        type: 'websocket',
+        connection,
+        wallet,
+        programID,
+        opts,
+        txSender,
+    };
+}
+exports.getWebSocketClearingHouseConfig = getWebSocketClearingHouseConfig;
+function getPollingClearingHouseConfig(connection, wallet, programID, accountLoader, opts = anchor_1.Provider.defaultOptions(), txSender) {
+    return {
+        type: 'polling',
+        connection,
+        wallet,
+        programID,
+        accountLoader,
+        opts,
+        txSender,
+    };
+}
+exports.getPollingClearingHouseConfig = getPollingClearingHouseConfig;
+function getClearingHouse(config) {
+    const provider = new anchor_1.Provider(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') {
+        accountSubscriber = new webSocketClearingHouseAccountSubscriber_1.WebSocketClearingHouseAccountSubscriber(program);
+    }
+    else if (config.type === 'polling') {
+        accountSubscriber = new pollingClearingHouseAccountSubscriber_1.PollingClearingHouseAccountSubscriber(program, config.accountLoader);
+    }
+    const txSender = config.txSender || new defaultTxSender_1.DefaultTxSender(provider);
+    return new clearingHouse_1.ClearingHouse(config.connection, config.wallet, program, accountSubscriber, txSender, config.opts);
+}
+exports.getClearingHouse = getClearingHouse;
+function getAdmin(config) {
+    const provider = new anchor_1.Provider(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') {
+        accountSubscriber = new webSocketClearingHouseAccountSubscriber_1.WebSocketClearingHouseAccountSubscriber(program);
+    }
+    else if (config.type === 'polling') {
+        accountSubscriber = new pollingClearingHouseAccountSubscriber_1.PollingClearingHouseAccountSubscriber(program, config.accountLoader);
+    }
+    const txSender = config.txSender || new defaultTxSender_1.DefaultTxSender(provider);
+    return new admin_1.Admin(config.connection, config.wallet, program, accountSubscriber, txSender, config.opts);
+}
+exports.getAdmin = getAdmin;

package/lib/factory/clearingHouseUser.d.ts

@@ -0,0 +1,19 @@
+import { PublicKey } from '@solana/web3.js';
+import { ClearingHouse } from '../clearingHouse';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { ClearingHouseUser } from '../clearingHouseUser';
+export declare type ClearingHouseUserConfigType = 'websocket' | 'polling' | 'custom';
+declare type BaseClearingHouseUserConfig = {
+    type: ClearingHouseUserConfigType;
+    clearingHouse: ClearingHouse;
+    authority: PublicKey;
+};
+declare type WebSocketClearingHouseUserConfig = BaseClearingHouseUserConfig;
+declare type PollingClearingHouseUserConfig = BaseClearingHouseUserConfig & {
+    accountLoader: BulkAccountLoader;
+};
+declare type ClearingHouseUserConfig = PollingClearingHouseUserConfig | WebSocketClearingHouseUserConfig;
+export declare function getWebSocketClearingHouseUserConfig(clearingHouse: ClearingHouse, authority: PublicKey): WebSocketClearingHouseUserConfig;
+export declare function getPollingClearingHouseUserConfig(clearingHouse: ClearingHouse, authority: PublicKey, accountLoader: BulkAccountLoader): PollingClearingHouseUserConfig;
+export declare function getClearingHouseUser(config: ClearingHouseUserConfig): ClearingHouseUser;
+export {};

package/lib/factory/clearingHouseUser.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getClearingHouseUser = exports.getPollingClearingHouseUserConfig = exports.getWebSocketClearingHouseUserConfig = void 0;
+const clearingHouseUser_1 = require("../clearingHouseUser");
+const webSocketUserAccountSubscriber_1 = require("../accounts/webSocketUserAccountSubscriber");
+const pollingUserAccountSubscriber_1 = require("../accounts/pollingUserAccountSubscriber");
+function getWebSocketClearingHouseUserConfig(clearingHouse, authority) {
+    return {
+        type: 'websocket',
+        clearingHouse,
+        authority,
+    };
+}
+exports.getWebSocketClearingHouseUserConfig = getWebSocketClearingHouseUserConfig;
+function getPollingClearingHouseUserConfig(clearingHouse, authority, accountLoader) {
+    return {
+        type: 'polling',
+        clearingHouse,
+        authority,
+        accountLoader,
+    };
+}
+exports.getPollingClearingHouseUserConfig = getPollingClearingHouseUserConfig;
+function getClearingHouseUser(config) {
+    let accountSubscriber;
+    if (config.type === 'websocket') {
+        accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.clearingHouse.program, config.authority);
+    }
+    else if (config.type === 'polling') {
+        accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.clearingHouse.program, config.authority, config.accountLoader);
+    }
+    return new clearingHouseUser_1.ClearingHouseUser(config.clearingHouse, config.authority, accountSubscriber);
+}
+exports.getClearingHouseUser = getClearingHouseUser;