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

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
@@ -63,6 +77,9 @@ class ClearingHouseUser {
     getUserPositionsAccount() {
         return this.accountSubscriber.getUserPositionsAccount();
     }
+    getUserOrdersAccount() {
+        return this.accountSubscriber.getUserOrdersAccount();
+    }
     /**
      * Gets the user's current position for a given market. If the user has no position returns undefined
      * @param marketIndex
@@ -77,17 +94,34 @@ class ClearingHouseUser {
             lastCumulativeFundingRate: numericConstants_1.ZERO,
             marketIndex,
             quoteAssetAmount: numericConstants_1.ZERO,
+            openOrders: numericConstants_1.ZERO,
         };
     }
+    /**
+     * @param orderId
+     * @returns Order
+     */
+    getOrder(orderId) {
+        return this.getUserOrdersAccount().orders.find((order) => order.orderId.eq(orderId));
+    }
     getUserAccountPublicKey() {
         return __awaiter(this, void 0, void 0, function* () {
             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;
         });
     }
+    getUserOrdersAccountPublicKey() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.userOrdersAccountPublicKey) {
+                return this.userOrdersAccountPublicKey;
+            }
+            this.userOrdersAccountPublicKey = yield _1.getUserOrdersAccountPublicKey(this.clearingHouse.program.programId, yield this.getUserAccountPublicKey());
+            return this.userOrdersAccountPublicKey;
+        });
+    }
     exists() {
         return __awaiter(this, void 0, void 0, function* () {
             const userAccountPublicKey = yield this.getUserAccountPublicKey();
@@ -122,7 +156,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 +168,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);
     }
     /**
@@ -152,7 +186,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 +196,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 +215,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 +227,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 +334,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);
@@ -313,9 +347,10 @@ class ClearingHouseUser {
             baseAssetAmount: currentMarketPositionBaseSize.add(positionBaseSizeChange),
             lastCumulativeFundingRate: new bn_js_1.default(0),
             quoteAssetAmount: new bn_js_1.default(0),
+            openOrders: new bn_js_1.default(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()
@@ -373,14 +408,14 @@ class ClearingHouseUser {
     liquidationPrice(targetMarket, positionBaseSizeChange = numericConstants_1.ZERO, partial = false) {
         // solves formula for example calc below
         /* example: assume BTC price is $40k (examine 10% up/down)
-            
-            if 10k deposit and levered 10x short BTC => BTC up $400 means:
-            1. higher base_asset_value (+$4k)
-            2. lower collateral (-$4k)
-            3. (10k - 4k)/(100k + 4k) => 6k/104k => .0576
-    
-            for 10x long, BTC down $400:
-            3. (10k - 4k) / (100k - 4k) = 6k/96k => .0625 */
+
+        if 10k deposit and levered 10x short BTC => BTC up $400 means:
+        1. higher base_asset_value (+$4k)
+        2. lower collateral (-$4k)
+        3. (10k - 4k)/(100k + 4k) => 6k/104k => .0576
+
+        for 10x long, BTC down $400:
+        3. (10k - 4k) / (100k - 4k) = 6k/96k => .0625 */
         const tc = this.getTotalCollateral();
         const tpv = this.getTotalPositionValue();
         const partialLev = 16;
@@ -398,9 +433,10 @@ class ClearingHouseUser {
             baseAssetAmount: proposedBaseAssetAmount,
             lastCumulativeFundingRate: currentMarketPosition.lastCumulativeFundingRate,
             quoteAssetAmount: new bn_js_1.default(0),
+            openOrders: new bn_js_1.default(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
@@ -428,13 +464,13 @@ class ClearingHouseUser {
         }
         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) &&
@@ -474,42 +510,32 @@ class ClearingHouseUser {
     }
     /**
      * 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
      * @returns tradeSizeAllowed : Precision QUOTE_PRECISION
      */
     getMaxTradeSizeUSDC(targetMarketIndex, tradeSide, userMaxLeverageSetting) {
+        // inline function which get's the current position size on the opposite side of the target trade
+        const getOppositePositionValueUSDC = () => {
+            if (!currentPosition)
+                return numericConstants_1.ZERO;
+            const side = tradeSide === _1.PositionDirection.SHORT ? 'short' : 'long';
+            if (side === 'long' && (currentPosition === null || currentPosition === void 0 ? void 0 : currentPosition.baseAssetAmount.isNeg())) {
+                return this.getPositionValue(targetMarketIndex);
+            }
+            else if (side === 'short' &&
+                !(currentPosition === null || currentPosition === void 0 ? void 0 : currentPosition.baseAssetAmount.isNeg())) {
+                return this.getPositionValue(targetMarketIndex);
+            }
+            return numericConstants_1.ZERO;
+        };
         const currentPosition = this.getUserPosition(targetMarketIndex) ||
             this.getEmptyPosition(targetMarketIndex);
-        const targetSide = tradeSide === _1.PositionDirection.SHORT ? 'short' : 'long';
-        const currentPositionSide = (currentPosition === null || currentPosition === void 0 ? void 0 : currentPosition.baseAssetAmount.isNeg())
-            ? 'short'
-            : 'long';
-        const targettingSameSide = !currentPosition
-            ? true
-            : targetSide === currentPositionSide;
-        // add any position we have on the opposite side of the current trade, because we can "flip" the size of this position without taking any extra leverage.
-        const oppositeSizeValueUSDC = targettingSameSide
-            ? numericConstants_1.ZERO
-            : this.getPositionValue(targetMarketIndex);
         // get current leverage
         const currentLeverage = this.getLeverage();
+        // remaining leverage
+        // let remainingLeverage = userMaxLeverageSetting;
         const remainingLeverage = bn_js_1.default.max(userMaxLeverageSetting.sub(currentLeverage), numericConstants_1.ZERO);
         // get total collateral
         const totalCollateral = this.getTotalCollateral();
@@ -517,43 +543,9 @@ class ClearingHouseUser {
         let maxPositionSize = remainingLeverage
             .mul(totalCollateral)
             .div(numericConstants_1.TEN_THOUSAND);
-        if (userMaxLeverageSetting.sub(currentLeverage).gte(numericConstants_1.ZERO)) {
-            if (oppositeSizeValueUSDC.eq(numericConstants_1.ZERO)) {
-                // case 1 : Regular trade where current total position less than max, and no opposite position to account for
-                // do nothing
-            }
-            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)));
-            }
-        }
-        else {
-            // current leverage is greater than max leverage - can only reduce position size
-            if (!targettingSameSide) {
-                const currentPositionQuoteSize = this.getPositionValue(targetMarketIndex);
-                const currentTotalQuoteSize = currentLeverage
-                    .mul(totalCollateral)
-                    .div(numericConstants_1.TEN_THOUSAND);
-                const otherPositionsTotalQuoteSize = currentTotalQuoteSize.sub(currentPositionQuoteSize);
-                const quoteValueOfMaxLeverage = userMaxLeverageSetting
-                    .mul(totalCollateral)
-                    .div(numericConstants_1.TEN_THOUSAND);
-                if (otherPositionsTotalQuoteSize
-                    .sub(currentPositionQuoteSize)
-                    .gte(quoteValueOfMaxLeverage)) {
-                    // case 3: Can only reduce the current position because it will still be greater than max leverage
-                    maxPositionSize = currentPositionQuoteSize;
-                }
-                else {
-                    // case 4: Can reduce the position, and then take extra remaining quote to get to max leverage
-                    const allowedQuoteSizeAfterClosingCurrentPosition = quoteValueOfMaxLeverage.sub(otherPositionsTotalQuoteSize);
-                    maxPositionSize = currentPositionQuoteSize.add(allowedQuoteSizeAfterClosingCurrentPosition);
-                }
-            }
-            else {
-                // do nothing if targetting same side
-            }
-        }
+        // add any position we have on the opposite side of the current trade, because we can "flip" the size of this position without taking any extra leverage.
+        const oppositeSizeValueUSDC = getOppositePositionValueUSDC();
+        maxPositionSize = maxPositionSize.add(oppositeSizeValueUSDC.mul(new bn_js_1.default(2)));
         // subtract oneMillionth of maxPositionSize
         // => to avoid rounding errors when taking max leverage
         const oneMilli = maxPositionSize.div(numericConstants_1.QUOTE_PRECISION);
@@ -582,18 +574,12 @@ class ClearingHouseUser {
             .add(tradeQuoteAmount)
             .abs();
         const totalPositionAfterTradeExcludingTargetMarket = this.getTotalPositionValueExcludingMarket(targetMarketIndex);
-        const totalCollateral = this.getTotalCollateral();
-        if (totalCollateral.gt(numericConstants_1.ZERO)) {
-            const newLeverage = currentMarketPositionAfterTrade
-                .add(totalPositionAfterTradeExcludingTargetMarket)
-                .abs()
-                .mul(numericConstants_1.TEN_THOUSAND)
-                .div(totalCollateral);
-            return newLeverage;
-        }
-        else {
-            return new bn_js_1.default(0);
-        }
+        const newLeverage = currentMarketPositionAfterTrade
+            .add(totalPositionAfterTradeExcludingTargetMarket)
+            .abs()
+            .mul(numericConstants_1.TEN_THOUSAND)
+            .div(this.getTotalCollateral());
+        return newLeverage;
     }
     /**
      * Calculates how much fee will be taken for a given sized trade
@@ -616,9 +602,51 @@ class ClearingHouseUser {
             this.getEmptyPosition(marketToIgnore);
         let currentMarketPositionValueUSDC = numericConstants_1.ZERO;
         if (currentMarketPosition) {
-            currentMarketPositionValueUSDC = this.getPositionValue(marketToIgnore);
+            const market = this.clearingHouse.getMarket(currentMarketPosition.marketIndex);
+            currentMarketPositionValueUSDC = _1.calculateBaseAssetValue(market, currentMarketPosition);
         }
         return this.getTotalPositionValue().sub(currentMarketPositionValueUSDC);
     }
+    canFillOrder(order) {
+        const userAccount = this.getUserAccount();
+        const userPositionsAccount = this.getUserPositionsAccount();
+        const userPosition = this.getUserPosition(order.marketIndex);
+        const market = this.clearingHouse.getMarket(order.marketIndex);
+        if (position_1.isEmptyPosition(userPosition)) {
+            return false;
+        }
+        const newState = _1.calculateNewStateAfterOrder(userAccount, userPosition, market, order);
+        if (newState === null) {
+            return false;
+        }
+        const [userAccountAfter, userPositionAfter, marketAfter] = newState;
+        const totalPositionValue = userPositionsAccount.positions.reduce((positionValue, marketPosition) => {
+            let market = this.clearingHouse.getMarket(marketPosition.marketIndex);
+            if (marketPosition.marketIndex.eq(order.marketIndex)) {
+                market = marketAfter;
+                marketPosition = userPositionAfter;
+            }
+            return positionValue.add(_1.calculateBaseAssetValue(market, marketPosition));
+        }, numericConstants_1.ZERO);
+        if (totalPositionValue.eq(numericConstants_1.ZERO)) {
+            return true;
+        }
+        const unrealizedPnL = userPositionsAccount.positions.reduce((pnl, marketPosition) => {
+            let market = this.clearingHouse.getMarket(marketPosition.marketIndex);
+            pnl = pnl.add(_1.calculatePositionFundingPNL(market, marketPosition).div(numericConstants_1.PRICE_TO_QUOTE_PRECISION));
+            if (marketPosition.marketIndex.eq(order.marketIndex)) {
+                market = marketAfter;
+                marketPosition = userPositionAfter;
+            }
+            // update
+            return pnl.add(_1.calculatePositionPNL(market, marketPosition, false));
+        }, numericConstants_1.ZERO);
+        const totalCollateral = userAccountAfter.collateral.add(unrealizedPnL);
+        const marginRatioAfter = totalCollateral
+            .mul(numericConstants_1.TEN_THOUSAND)
+            .div(totalPositionValue);
+        const marginRatioInitial = this.clearingHouse.getStateAccount().marginRatioInitial;
+        return marginRatioAfter.gte(marginRatioInitial);
+    }
 }
 exports.ClearingHouseUser = ClearingHouseUser;

package/lib/config.d.ts

@@ -21,4 +21,3 @@ export declare const initialize: (props: {
     overrideEnv?: Partial<DriftConfig>;
 }) => DriftConfig;
 export {};
-//# sourceMappingURL=config.d.ts.map

package/lib/config.js

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

package/lib/constants/markets.d.ts

@@ -9,4 +9,3 @@ declare type Market = {
 };
 export declare const Markets: Market[];
 export {};
-//# sourceMappingURL=markets.d.ts.map

package/lib/constants/markets.js

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

package/lib/constants/numericConstants.d.ts

@@ -14,4 +14,3 @@ export declare const AMM_RESERVE_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;
-//# sourceMappingURL=numericConstants.d.ts.map

package/lib/examples/makeTradeExample.d.ts

@@ -1,3 +1,2 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const getTokenAddress: (mintAddress: string, userPubKey: string) => Promise<PublicKey>;
-//# sourceMappingURL=makeTradeExample.d.ts.map

package/lib/examples/makeTradeExample.js

@@ -21,7 +21,7 @@ const getTokenAddress = (mintAddress, userPubKey) => {
 exports.getTokenAddress = getTokenAddress;
 const main = () => __awaiter(void 0, void 0, void 0, function* () {
     // Initialize Drift SDK
-    const sdkConfig = (0, __2.initialize)({ env: 'devnet' });
+    const sdkConfig = __2.initialize({ env: 'devnet' });
     // Set up the Wallet and Provider
     const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
     const keypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(privateKey)));
@@ -35,7 +35,7 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     const lamportsBalance = yield connection.getBalance(wallet.publicKey);
     console.log('SOL balance:', lamportsBalance / Math.pow(10, 9));
     // Misc. other things to set up
-    const usdcTokenAddress = yield (0, exports.getTokenAddress)(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
+    const usdcTokenAddress = yield exports.getTokenAddress(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
     // Set up the Drift Clearing House
     const clearingHousePublicKey = new web3_js_1.PublicKey(sdkConfig.CLEARING_HOUSE_PROGRAM_ID);
     const clearingHouse = __2.ClearingHouse.from(connection, provider.wallet, clearingHousePublicKey);
@@ -47,18 +47,18 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     if (!userAccountExists) {
         //// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
         const depositAmount = new anchor_1.BN(10000).mul(__2.QUOTE_PRECISION);
-        yield clearingHouse.initializeUserAccountAndDepositCollateral(depositAmount, yield (0, exports.getTokenAddress)(usdcTokenAddress.toString(), wallet.publicKey.toString()));
+        yield clearingHouse.initializeUserAccountAndDepositCollateral(depositAmount, yield exports.getTokenAddress(usdcTokenAddress.toString(), wallet.publicKey.toString()));
     }
     yield user.subscribe();
     // Get current price
     const solMarketInfo = __2.Markets.find((market) => market.baseAssetSymbol === 'SOL');
-    const currentMarketPrice = (0, __2.calculateMarkPrice)(clearingHouse.getMarket(solMarketInfo.marketIndex));
-    const formattedPrice = (0, __2.convertToNumber)(currentMarketPrice, __2.QUOTE_PRECISION);
+    const currentMarketPrice = __2.calculateMarkPrice(clearingHouse.getMarket(solMarketInfo.marketIndex));
+    const formattedPrice = __2.convertToNumber(currentMarketPrice, __2.QUOTE_PRECISION);
     console.log(`Current Market Price is $${formattedPrice}`);
     // Estimate the slippage for a $5000 LONG trade
     const solMarketAccount = clearingHouse.getMarket(solMarketInfo.marketIndex);
     const longAmount = new anchor_1.BN(5000).mul(__2.QUOTE_PRECISION);
-    const slippage = (0, __2.convertToNumber)((0, __2.calculateTradeSlippage)(__2.PositionDirection.LONG, longAmount, solMarketAccount)[0], __2.MARK_PRICE_PRECISION);
+    const slippage = __2.convertToNumber(__2.calculateTradeSlippage(__2.PositionDirection.LONG, longAmount, solMarketAccount)[0], __2.MARK_PRICE_PRECISION);
     console.log(`Slippage for a $5000 LONG on the SOL market would be $${slippage}`);
     // Make a $5000 LONG trade
     yield clearingHouse.openPosition(__2.PositionDirection.LONG, longAmount, solMarketInfo.marketIndex);

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;