@drift-labs/sdk 0.1.19-master.0 → 0.1.21-master.0

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);
     }
     /**
      *
@@ -115,7 +126,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;
         });
     }
@@ -174,7 +185,7 @@ class ClearingHouse {
     }
     getInitializeUserInstructions() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userPublicKey, userAccountNonce] = yield (0, addresses_1.getUserAccountPublicKeyAndNonce)(this.program.programId, this.wallet.publicKey);
+            const [userPublicKey, userAccountNonce] = yield addresses_1.getUserAccountPublicKeyAndNonce(this.program.programId, this.wallet.publicKey);
             const remainingAccounts = [];
             const optionalAccounts = {
                 whitelistToken: false,
@@ -213,7 +224,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;
         });
     }
@@ -303,7 +314,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 +343,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) {
@@ -390,7 +401,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 +449,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 +493,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 +511,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

@@ -1,19 +1,27 @@
 /// <reference types="node" />
+/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
-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 { UserAccountSubscriber, UserAccountEvents } from './accounts/types';
-import { PositionDirection } from '.';
+import { PositionDirection, BN } from '.';
 export declare class ClearingHouseUser {
     clearingHouse: ClearingHouse;
     authority: PublicKey;
     accountSubscriber: UserAccountSubscriber;
     userAccountPublicKey?: 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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clearingHouseUser.d.ts","sourceRoot":"","sources":["../src/clearingHouseUser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clearingHouseUser.d.ts","sourceRoot":"","sources":["../src/clearingHouseUser.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAc1E,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAKN,iBAAiB,EAEjB,EAAE,EACF,MAAM,GAAG,CAAC;AAOX,qBAAa,iBAAiB;IAC7B,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,qBAAqB,CAAC;IACzC,oBAAoB,CAAC,EAAE,SAAS,CAAC;IACjC,aAAa,UAAS;IACtB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAElE,IAAW,YAAY,IAIM,OAAO,CAFnC;IAED,IAAW,YAAY,CAAC,GAAG,EAAE,OAAO,EAEnC;IAED;;;;;OAKG;WACW,IAAI,CACjB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,GAClB,iBAAiB;gBAYnB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,qBAAqB;IAQzC;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ1C;;OAEG;IACU,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,cAAc,IAAI,WAAW;IAI7B,uBAAuB,IAAI,oBAAoB;IAItD;;;;OAIG;IACI,eAAe,CAAC,WAAW,EAAE,EAAE,GAAG,YAAY,GAAG,SAAS;IAM1D,gBAAgB,CAAC,WAAW,EAAE,EAAE,GAAG,YAAY;IASzC,uBAAuB,IAAI,OAAO,CAAC,SAAS,CAAC;IAY7C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IASvC;;;OAGG;IACI,cAAc,IAAI,EAAE;IAM3B;;;OAGG;IACI,iBAAiB,IAAI,EAAE;IAQ9B;;;OAGG;IACI,gBAAgB,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE;IAapE;;;OAGG;IACI,uBAAuB,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE;IAWpD;;;OAGG;IACI,kBAAkB,IAAI,EAAE;IAO/B;;;OAGG;IACH,qBAAqB,IAAI,EAAE;IAY3B;;;OAGG;IACI,gBAAgB,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE;IAOrC,eAAe,CACrB,eAAe,EAAE,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,GACpD,iBAAiB,GAAG,SAAS;IAUhC;;;OAGG;IACI,mCAAmC,CACzC,QAAQ,EAAE,YAAY,EACtB,aAAa,CAAC,EAAE,EAAE,GAChB,CAAC,EAAE,EAAE,EAAE,CAAC;IAoCX;;;OAGG;IACI,WAAW,IAAI,EAAE;IASxB;;;;OAIG;IACI,cAAc,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,aAAa,GAAG,EAAE;IAsB3E;;;OAGG;IACI,cAAc,IAAI,EAAE;IAUpB,eAAe,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;IAMvC;;;OAGG;IACI,2BAA2B,IAAI,OAAO;IAyB7C;;;;;;OAMG;IACI,mBAAmB,CACzB,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,EAC/C,sBAAsB,GAAE,EAAS,EACjC,OAAO,UAAQ,GACb,EAAE;IAkHL;;;;;;OAMG;IACI,gBAAgB,CACtB,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,EAC/C,sBAAsB,GAAE,EAAS,EACjC,OAAO,UAAQ,GACb,EAAE;IA+HL;;;;;OAKG;IACI,0BAA0B,CAChC,mBAAmB,EAAE,EAAE,EACvB,gBAAgB,EAAE,EAAE,GAClB,EAAE;IAuBL;;;;;;;;;;;;;;;;;;;;;OAqBG;IACI,mBAAmB,CACzB,iBAAiB,EAAE,EAAE,EACrB,SAAS,EAAE,iBAAiB,EAC5B,sBAAsB,EAAE,EAAE,GACxB,EAAE;IAgGL;;;;;;OAMG;IACI,8BAA8B,CACpC,iBAAiB,EAAE,EAAE,EACrB,gBAAgB,EAAE,EAAE,EACpB,SAAS,EAAE,iBAAiB,GAC1B,EAAE;IAuCL;;;;OAIG;IACI,0BAA0B,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE;IAQtD;;;;OAIG;IACH,OAAO,CAAC,oCAAoC;CAY5C"}

package/lib/clearingHouseUser.js

@@ -8,28 +8,38 @@ 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.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
@@ -84,7 +94,7 @@ class ClearingHouseUser {
             if (this.userAccountPublicKey) {
                 return this.userAccountPublicKey;
             }
-            this.userAccountPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.clearingHouse.program.programId, this.authority);
+            this.userAccountPublicKey = yield addresses_1.getUserAccountPublicKey(this.clearingHouse.program.programId, this.authority);
             return this.userAccountPublicKey;
         });
     }
@@ -122,7 +132,7 @@ class ClearingHouseUser {
             .positions.filter((pos) => marketIndex ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return pnl.add((0, _1.calculatePositionPNL)(market, marketPosition, withFunding));
+            return pnl.add(_1.calculatePositionPNL(market, marketPosition, withFunding));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -134,7 +144,7 @@ class ClearingHouseUser {
             .positions.filter((pos) => marketIndex ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return pnl.add((0, _1.calculatePositionFundingPNL)(market, marketPosition));
+            return pnl.add(_1.calculatePositionFundingPNL(market, marketPosition));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -143,7 +153,7 @@ class ClearingHouseUser {
      */
     getTotalCollateral() {
         var _a;
-        return ((_a = this.getUserAccount().collateral.add(this.getUnrealizedPNL(true))) !== null && _a !== void 0 ? _a : new bn_js_1.default(0));
+        return ((_a = this.getUserAccount().collateral.add(this.getUnrealizedPNL(true))) !== null && _a !== void 0 ? _a : new _1.BN(0));
     }
     /**
      * calculates sum of position value across all positions
@@ -152,7 +162,7 @@ class ClearingHouseUser {
     getTotalPositionValue() {
         return this.getUserPositionsAccount().positions.reduce((positionValue, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return positionValue.add((0, _1.calculateBaseAssetValue)(market, marketPosition));
+            return positionValue.add(_1.calculateBaseAssetValue(market, marketPosition));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -162,7 +172,7 @@ class ClearingHouseUser {
     getPositionValue(marketIndex) {
         const userPosition = this.getUserPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         const market = this.clearingHouse.getMarket(userPosition.marketIndex);
-        return (0, _1.calculateBaseAssetValue)(market, userPosition);
+        return _1.calculateBaseAssetValue(market, userPosition);
     }
     getPositionSide(currentPosition) {
         if (currentPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
@@ -181,10 +191,10 @@ class ClearingHouseUser {
      */
     getPositionEstimatedExitPriceAndPnl(position, amountToClose) {
         const market = this.clearingHouse.getMarket(position.marketIndex);
-        const entryPrice = (0, position_1.calculateEntryPrice)(position);
+        const entryPrice = position_1.calculateEntryPrice(position);
         if (amountToClose) {
             if (amountToClose.eq(numericConstants_1.ZERO)) {
-                return [(0, _1.calculateMarkPrice)(market), numericConstants_1.ZERO];
+                return [_1.calculateMarkPrice(market), numericConstants_1.ZERO];
             }
             position = {
                 baseAssetAmount: amountToClose,
@@ -193,7 +203,7 @@ class ClearingHouseUser {
                 quoteAssetAmount: position.quoteAssetAmount,
             };
         }
-        const baseAssetValue = (0, _1.calculateBaseAssetValue)(market, position);
+        const baseAssetValue = _1.calculateBaseAssetValue(market, position);
         if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
         }
@@ -300,7 +310,7 @@ class ClearingHouseUser {
 
         for 10x long, BTC down $400:
         3. (10k - 4k) / (100k - 4k) = 6k/96k => .0625 */
-        const currentPrice = (0, _1.calculateMarkPrice)(this.clearingHouse.getMarket(targetMarket.marketIndex));
+        const currentPrice = _1.calculateMarkPrice(this.clearingHouse.getMarket(targetMarket.marketIndex));
         const totalCollateralUSDC = this.getTotalCollateral();
         // calculate the total position value ignoring any value from the target market of the trade
         const totalCurrentPositionValueIgnoringTargetUSDC = this.getTotalPositionValueExcludingMarket(targetMarket.marketIndex);
@@ -311,11 +321,11 @@ class ClearingHouseUser {
         const proposedMarketPosition = {
             marketIndex: targetMarket.marketIndex,
             baseAssetAmount: currentMarketPositionBaseSize.add(positionBaseSizeChange),
-            lastCumulativeFundingRate: new bn_js_1.default(0),
-            quoteAssetAmount: new bn_js_1.default(0),
+            lastCumulativeFundingRate: new _1.BN(0),
+            quoteAssetAmount: new _1.BN(0),
         };
         const market = this.clearingHouse.getMarket(proposedMarketPosition.marketIndex);
-        const proposedMarketPositionValueUSDC = (0, _1.calculateBaseAssetValue)(market, proposedMarketPosition);
+        const proposedMarketPositionValueUSDC = _1.calculateBaseAssetValue(market, proposedMarketPosition);
         // total position value after trade
         const targetTotalPositionValueUSDC = totalCurrentPositionValueIgnoringTargetUSDC.add(proposedMarketPositionValueUSDC);
         let totalFreeCollateralUSDC = this.getTotalCollateral().sub(this.getTotalPositionValue()
@@ -329,7 +339,7 @@ class ClearingHouseUser {
         // if the position value after the trade is less than total collateral, there is no liq price
         if (targetTotalPositionValueUSDC.lte(totalFreeCollateralUSDC) &&
             proposedMarketPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
-            return new bn_js_1.default(-1);
+            return new _1.BN(-1);
         }
         // get current margin ratio based on current collateral and proposed total position value
         let marginRatio;
@@ -356,7 +366,7 @@ class ClearingHouseUser {
             if (numericConstants_1.TEN_THOUSAND.lte(pctChange)) {
                 // no liquidation price, position is a fully/over collateralized long
                 // handle as NaN on UI
-                return new bn_js_1.default(-1);
+                return new _1.BN(-1);
             }
             pctChange = numericConstants_1.TEN_THOUSAND.sub(pctChange);
         }
@@ -385,7 +395,7 @@ class ClearingHouseUser {
         const tpv = this.getTotalPositionValue();
         const partialLev = 16;
         const maintLev = 20;
-        const thisLev = partial ? new bn_js_1.default(partialLev) : new bn_js_1.default(maintLev);
+        const thisLev = partial ? new _1.BN(partialLev) : new _1.BN(maintLev);
         // calculate the total position value ignoring any value from the target market of the trade
         const totalCurrentPositionValueIgnoringTargetUSDC = this.getTotalPositionValueExcludingMarket(targetMarket.marketIndex);
         const currentMarketPosition = this.getUserPosition(targetMarket.marketIndex) ||
@@ -397,10 +407,10 @@ class ClearingHouseUser {
             marketIndex: targetMarket.marketIndex,
             baseAssetAmount: proposedBaseAssetAmount,
             lastCumulativeFundingRate: currentMarketPosition.lastCumulativeFundingRate,
-            quoteAssetAmount: new bn_js_1.default(0),
+            quoteAssetAmount: new _1.BN(0),
         };
         const market = this.clearingHouse.getMarket(proposedMarketPosition.marketIndex);
-        const proposedMarketPositionValueUSDC = (0, _1.calculateBaseAssetValue)(market, proposedMarketPosition);
+        const proposedMarketPositionValueUSDC = _1.calculateBaseAssetValue(market, proposedMarketPosition);
         // total position value after trade
         const targetTotalPositionValueUSDC = totalCurrentPositionValueIgnoringTargetUSDC.add(proposedMarketPositionValueUSDC);
         let totalFreeCollateralUSDC = tc.sub(totalCurrentPositionValueIgnoringTargetUSDC
@@ -417,37 +427,37 @@ class ClearingHouseUser {
                 .mul(thisLev)
                 .sub(tpv)
                 .mul(numericConstants_1.PRICE_TO_QUOTE_PRECISION)
-                .div(thisLev.add(new bn_js_1.default(1)));
+                .div(thisLev.add(new _1.BN(1)));
         }
         else {
             priceDelt = tc
                 .mul(thisLev)
                 .sub(tpv)
                 .mul(numericConstants_1.PRICE_TO_QUOTE_PRECISION)
-                .div(thisLev.sub(new bn_js_1.default(1)));
+                .div(thisLev.sub(new _1.BN(1)));
         }
         let currentPrice;
         if (positionBaseSizeChange.eq(numericConstants_1.ZERO)) {
-            currentPrice = (0, _1.calculateMarkPrice)(this.clearingHouse.getMarket(targetMarket.marketIndex));
+            currentPrice = _1.calculateMarkPrice(this.clearingHouse.getMarket(targetMarket.marketIndex));
         }
         else {
             const direction = positionBaseSizeChange.gt(numericConstants_1.ZERO)
                 ? _1.PositionDirection.LONG
                 : _1.PositionDirection.SHORT;
-            currentPrice = (0, _1.calculateTradeSlippage)(direction, positionBaseSizeChange.abs(), this.clearingHouse.getMarket(targetMarket.marketIndex), 'base')[3]; // newPrice after swap
+            currentPrice = _1.calculateTradeSlippage(direction, positionBaseSizeChange.abs(), this.clearingHouse.getMarket(targetMarket.marketIndex), 'base')[3]; // newPrice after swap
         }
         // if the position value after the trade is less than total collateral, there is no liq price
         if (targetTotalPositionValueUSDC.lte(totalFreeCollateralUSDC) &&
             proposedMarketPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
-            return new bn_js_1.default(-1);
+            return new _1.BN(-1);
         }
         if (proposedBaseAssetAmount.eq(numericConstants_1.ZERO))
-            return new bn_js_1.default(-1);
+            return new _1.BN(-1);
         const eatMargin2 = priceDelt
             .mul(numericConstants_1.AMM_RESERVE_PRECISION)
             .div(proposedBaseAssetAmount);
         if (eatMargin2.gt(currentPrice)) {
-            return new bn_js_1.default(-1);
+            return new _1.BN(-1);
         }
         const liqPrice = currentPrice.sub(eatMargin2);
         return liqPrice;
@@ -510,7 +520,7 @@ class ClearingHouseUser {
             : this.getPositionValue(targetMarketIndex);
         // get current leverage
         const currentLeverage = this.getLeverage();
-        const remainingLeverage = bn_js_1.default.max(userMaxLeverageSetting.sub(currentLeverage), numericConstants_1.ZERO);
+        const remainingLeverage = _1.BN.max(userMaxLeverageSetting.sub(currentLeverage), numericConstants_1.ZERO);
         // get total collateral
         const totalCollateral = this.getTotalCollateral();
         // position side allowed based purely on current leverage
@@ -524,7 +534,7 @@ class ClearingHouseUser {
             }
             else {
                 // case 2 : trade where current total position less than max, but need to account for flipping the current position over to the other side
-                maxPositionSize = maxPositionSize.add(oppositeSizeValueUSDC.mul(new bn_js_1.default(2)));
+                maxPositionSize = maxPositionSize.add(oppositeSizeValueUSDC.mul(new _1.BN(2)));
             }
         }
         else {
@@ -592,7 +602,7 @@ class ClearingHouseUser {
             return newLeverage;
         }
         else {
-            return new bn_js_1.default(0);
+            return new _1.BN(0);
         }
     }
     /**

package/lib/constants/markets.d.ts

@@ -1,4 +1,5 @@
-import BN from 'bn.js';
+/// <reference types="bn.js" />
+import { BN } from '../';
 declare type Market = {
     symbol: string;
     baseAssetSymbol: string;

package/lib/constants/markets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markets.d.ts","sourceRoot":"","sources":["../../src/constants/markets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB,aAAK,MAAM,GAAG;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,EAAE,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,MAAM,EAiG3B,CAAC"}
+{"version":3,"file":"markets.d.ts","sourceRoot":"","sources":["../../src/constants/markets.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC;AAEzB,aAAK,MAAM,GAAG;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,EAAE,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,MAAM,EAyG3B,CAAC"}

package/lib/constants/markets.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Markets = void 0;
-const bn_js_1 = __importDefault(require("bn.js"));
+const __1 = require("../");
 exports.Markets = [
     {
         symbol: 'SOL-PERP',
         baseAssetSymbol: 'SOL',
-        marketIndex: new bn_js_1.default(0),
+        marketIndex: new __1.BN(0),
         devnetPythOracle: 'J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix',
         mainnetPythOracle: 'H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG',
         launchTs: 1635209696886,
@@ -17,7 +14,7 @@ exports.Markets = [
     {
         symbol: 'BTC-PERP',
         baseAssetSymbol: 'BTC',
-        marketIndex: new bn_js_1.default(1),
+        marketIndex: new __1.BN(1),
         devnetPythOracle: 'HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J',
         mainnetPythOracle: 'GVXRSBjFk6e6J3NbVPXohDJetcTjaeeuykUpbQF8UoMU',
         launchTs: 1637691088868,
@@ -25,7 +22,7 @@ exports.Markets = [
     {
         symbol: 'ETH-PERP',
         baseAssetSymbol: 'ETH',
-        marketIndex: new bn_js_1.default(2),
+        marketIndex: new __1.BN(2),
         devnetPythOracle: 'EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw',
         mainnetPythOracle: 'JBu1AL4obBcCMqKBBxhpWCNUt136ijcuMZLFvTP7iWdB',
         launchTs: 1637691133472,
@@ -33,7 +30,7 @@ exports.Markets = [
     {
         symbol: 'LUNA-PERP',
         baseAssetSymbol: 'LUNA',
-        marketIndex: new bn_js_1.default(3),
+        marketIndex: new __1.BN(3),
         devnetPythOracle: '8PugCXTAHLM9kfLSQWe2njE5pzAgUdpPk3Nx5zSm7BD3',
         mainnetPythOracle: '5bmWuR1dgP4avtGYMNKLuxumZTVKGgoN2BCMXWDNL9nY',
         launchTs: 1638821738525,
@@ -41,7 +38,7 @@ exports.Markets = [
     {
         symbol: 'AVAX-PERP',
         baseAssetSymbol: 'AVAX',
-        marketIndex: new bn_js_1.default(4),
+        marketIndex: new __1.BN(4),
         devnetPythOracle: 'FVb5h1VmHPfVb1RfqZckchq18GxRv4iKt8T4eVTQAqdz',
         mainnetPythOracle: 'Ax9ujW5B9oqcv59N8m6f1BpTBq2rGeGaBcpKjC5UYsXU',
         launchTs: 1639092501080,
@@ -49,7 +46,7 @@ exports.Markets = [
     {
         symbol: 'BNB-PERP',
         baseAssetSymbol: 'BNB',
-        marketIndex: new bn_js_1.default(5),
+        marketIndex: new __1.BN(5),
         devnetPythOracle: 'GwzBgrXb4PG59zjce24SF2b9JXbLEjJJTBkmytuEZj1b',
         mainnetPythOracle: '4CkQJBxhU8EZ2UjhigbtdaPbpTe6mqf811fipYBFbSYN',
         launchTs: 1639523193012,
@@ -57,7 +54,7 @@ exports.Markets = [
     {
         symbol: 'MATIC-PERP',
         baseAssetSymbol: 'MATIC',
-        marketIndex: new bn_js_1.default(6),
+        marketIndex: new __1.BN(6),
         devnetPythOracle: 'FBirwuDFuRAu4iSGc7RGxN5koHB7EJM1wbCmyPuQoGur',
         mainnetPythOracle: '7KVswB9vkCgeM3SHP7aGDijvdRAHK8P5wi9JXViCrtYh',
         launchTs: 1641488603564,
@@ -65,7 +62,7 @@ exports.Markets = [
     {
         symbol: 'ATOM-PERP',
         baseAssetSymbol: 'ATOM',
-        marketIndex: new bn_js_1.default(7),
+        marketIndex: new __1.BN(7),
         devnetPythOracle: '7YAze8qFUMkBnyLVdKT4TFUUFui99EwS5gfRArMcrvFk',
         mainnetPythOracle: 'CrCpTerNqtZvqLcKqz1k13oVeXV9WkMD2zA9hBKXrsbN',
         launchTs: 1641920238195,
@@ -73,7 +70,7 @@ exports.Markets = [
     {
         symbol: 'DOT-PERP',
         baseAssetSymbol: 'DOT',
-        marketIndex: new bn_js_1.default(8),
+        marketIndex: new __1.BN(8),
         devnetPythOracle: '4dqq5VBpN4EwYb7wyywjjfknvMKu7m78j9mKZRXTj462',
         mainnetPythOracle: 'EcV1X1gY2yb4KXxjVQtTHTbioum2gvmPnFk4zYAt7zne',
         launchTs: 1642629253786,
@@ -81,7 +78,7 @@ exports.Markets = [
     {
         symbol: 'ADA-PERP',
         baseAssetSymbol: 'ADA',
-        marketIndex: new bn_js_1.default(9),
+        marketIndex: new __1.BN(9),
         devnetPythOracle: '8oGTURNmSQkrBS1AQ5NjB2p8qY34UVmMA9ojrw8vnHus',
         mainnetPythOracle: '3pyn4svBbxJ9Wnn3RVeafyLWfzie6yC5eTig2S62v9SC',
         launchTs: 1643084413000,
@@ -89,11 +86,19 @@ exports.Markets = [
     {
         symbol: 'ALGO-PERP',
         baseAssetSymbol: 'ALGO',
-        marketIndex: new bn_js_1.default(10),
+        marketIndex: new __1.BN(10),
         devnetPythOracle: 'c1A946dY5NHuVda77C8XXtXytyR3wK1SCP3eA9VRfC3',
         mainnetPythOracle: 'HqFyq1wh1xKvL7KDqqT7NJeSPdAqsDqnmBisUC2XdXAX',
         launchTs: 1643686767000,
     },
+    {
+        symbol: 'FTT-PERP',
+        baseAssetSymbol: 'FTT',
+        marketIndex: new __1.BN(11),
+        devnetPythOracle: '6vivTRs5ZPeeXbjo7dfburfaYDWoXjBtdtuYgQRuGfu',
+        mainnetPythOracle: '8JPJJkmDScpcNmBRKGZuPuG2GYAveQgP3t5gFuMymwvF',
+        launchTs: 1644382122000,
+    },
     // {
     // 	symbol: 'mSOL-PERP',
     // 	baseAssetSymbol: 'mSOL',

package/lib/constants/numericConstants.d.ts

@@ -1,4 +1,5 @@
-import BN from 'bn.js';
+/// <reference types="bn.js" />
+import { BN } from '../';
 export declare const ZERO: BN;
 export declare const ONE: BN;
 export declare const TEN_THOUSAND: BN;
@@ -11,6 +12,7 @@ export declare const MARK_PRICE_PRECISION: BN;
 export declare const FUNDING_PAYMENT_PRECISION: BN;
 export declare const PEG_PRECISION: BN;
 export declare const AMM_RESERVE_PRECISION: BN;
+export declare const BASE_PRECISION: BN;
 export declare const AMM_TO_QUOTE_PRECISION_RATIO: BN;
 export declare const PRICE_TO_QUOTE_PRECISION: BN;
 export declare const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO: BN;

package/lib/constants/numericConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"numericConstants.d.ts","sourceRoot":"","sources":["../../src/constants/numericConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB,eAAO,MAAM,IAAI,IAAY,CAAC;AAC9B,eAAO,MAAM,GAAG,IAAY,CAAC;AAC7B,eAAO,MAAM,YAAY,IAAgB,CAAC;AAC1C,eAAO,MAAM,MAAM,IAAkC,CAAC;AAEtD,eAAO,MAAM,YAAY,IAAY,CAAC;AACtC,eAAO,MAAM,sBAAsB,IAAc,CAAC;AAClD,eAAO,MAAM,yBAAyB,IAAc,CAAC;AAErD,eAAO,MAAM,eAAe,IAAkB,CAAC;AAC/C,eAAO,MAAM,oBAAoB,IAAmB,CAAC;AACrD,eAAO,MAAM,yBAAyB,IAAgB,CAAC;AACvD,eAAO,MAAM,aAAa,IAAe,CAAC;AAE1C,eAAO,MAAM,qBAAqB,IAAmB,CAAC;AACtD,eAAO,MAAM,4BAA4B,IACE,CAAC;AAC5C,eAAO,MAAM,wBAAwB,IACK,CAAC;AAC3C,eAAO,MAAM,sCAAsC,IACW,CAAC"}
+{"version":3,"file":"numericConstants.d.ts","sourceRoot":"","sources":["../../src/constants/numericConstants.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC;AAEzB,eAAO,MAAM,IAAI,IAAY,CAAC;AAC9B,eAAO,MAAM,GAAG,IAAY,CAAC;AAC7B,eAAO,MAAM,YAAY,IAAgB,CAAC;AAC1C,eAAO,MAAM,MAAM,IAAkC,CAAC;AAEtD,eAAO,MAAM,YAAY,IAAY,CAAC;AACtC,eAAO,MAAM,sBAAsB,IAAc,CAAC;AAClD,eAAO,MAAM,yBAAyB,IAAc,CAAC;AAErD,eAAO,MAAM,eAAe,IAAkB,CAAC;AAC/C,eAAO,MAAM,oBAAoB,IAAmB,CAAC;AACrD,eAAO,MAAM,yBAAyB,IAAgB,CAAC;AACvD,eAAO,MAAM,aAAa,IAAe,CAAC;AAE1C,eAAO,MAAM,qBAAqB,IAAmB,CAAC;AACtD,eAAO,MAAM,cAAc,IAAwB,CAAC;AACpD,eAAO,MAAM,4BAA4B,IACE,CAAC;AAC5C,eAAO,MAAM,wBAAwB,IACK,CAAC;AAC3C,eAAO,MAAM,sCAAsC,IACW,CAAC"}

package/lib/constants/numericConstants.js

@@ -1,22 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.PARTIAL_LIQUIDATION_RATIO = exports.FULL_LIQUIDATION_RATIO = exports.MAX_LEVERAGE = exports.BN_MAX = exports.TEN_THOUSAND = exports.ONE = exports.ZERO = void 0;
-const bn_js_1 = __importDefault(require("bn.js"));
-exports.ZERO = new bn_js_1.default(0);
-exports.ONE = new bn_js_1.default(1);
-exports.TEN_THOUSAND = new bn_js_1.default(10000);
-exports.BN_MAX = new bn_js_1.default(Number.MAX_SAFE_INTEGER);
-exports.MAX_LEVERAGE = new bn_js_1.default(5);
-exports.FULL_LIQUIDATION_RATIO = new bn_js_1.default(500);
-exports.PARTIAL_LIQUIDATION_RATIO = new bn_js_1.default(625);
-exports.QUOTE_PRECISION = new bn_js_1.default(Math.pow(10, 6));
-exports.MARK_PRICE_PRECISION = new bn_js_1.default(Math.pow(10, 10));
-exports.FUNDING_PAYMENT_PRECISION = new bn_js_1.default(10000);
-exports.PEG_PRECISION = new bn_js_1.default(1000);
-exports.AMM_RESERVE_PRECISION = new bn_js_1.default(Math.pow(10, 13));
+exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.PARTIAL_LIQUIDATION_RATIO = exports.FULL_LIQUIDATION_RATIO = exports.MAX_LEVERAGE = exports.BN_MAX = exports.TEN_THOUSAND = exports.ONE = exports.ZERO = void 0;
+const __1 = require("../");
+exports.ZERO = new __1.BN(0);
+exports.ONE = new __1.BN(1);
+exports.TEN_THOUSAND = new __1.BN(10000);
+exports.BN_MAX = new __1.BN(Number.MAX_SAFE_INTEGER);
+exports.MAX_LEVERAGE = new __1.BN(5);
+exports.FULL_LIQUIDATION_RATIO = new __1.BN(500);
+exports.PARTIAL_LIQUIDATION_RATIO = new __1.BN(625);
+exports.QUOTE_PRECISION = new __1.BN(Math.pow(10, 6));
+exports.MARK_PRICE_PRECISION = new __1.BN(Math.pow(10, 10));
+exports.FUNDING_PAYMENT_PRECISION = new __1.BN(10000);
+exports.PEG_PRECISION = new __1.BN(1000);
+exports.AMM_RESERVE_PRECISION = new __1.BN(Math.pow(10, 13));
+exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION;
 exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.div(exports.QUOTE_PRECISION); // 10^7
 exports.PRICE_TO_QUOTE_PRECISION = exports.MARK_PRICE_PRECISION.div(exports.QUOTE_PRECISION);
 exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.mul(exports.PEG_PRECISION).div(exports.QUOTE_PRECISION); // 10^10