@drift-labs/sdk 0.1.22 → 0.1.23-master.3

package/lib/clearingHouseUser.js

@@ -38,8 +38,8 @@ class ClearingHouseUser {
     static from(clearingHouse, authority) {
         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);
+        const config = (0, clearingHouseUser_1.getWebSocketClearingHouseUserConfig)(clearingHouse, authority);
+        return (0, clearingHouseUser_1.getClearingHouseUser)(config);
     }
     /**
      * Subscribe to ClearingHouseUser state accounts
@@ -112,7 +112,7 @@ class ClearingHouseUser {
             if (this.userAccountPublicKey) {
                 return this.userAccountPublicKey;
             }
-            this.userAccountPublicKey = yield addresses_1.getUserAccountPublicKey(this.clearingHouse.program.programId, this.authority);
+            this.userAccountPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.clearingHouse.program.programId, this.authority);
             return this.userAccountPublicKey;
         });
     }
@@ -121,7 +121,7 @@ class ClearingHouseUser {
             if (this.userOrdersAccountPublicKey) {
                 return this.userOrdersAccountPublicKey;
             }
-            this.userOrdersAccountPublicKey = yield _1.getUserOrdersAccountPublicKey(this.clearingHouse.program.programId, yield this.getUserAccountPublicKey());
+            this.userOrdersAccountPublicKey = yield (0, _1.getUserOrdersAccountPublicKey)(this.clearingHouse.program.programId, yield this.getUserAccountPublicKey());
             return this.userOrdersAccountPublicKey;
         });
     }
@@ -159,7 +159,7 @@ class ClearingHouseUser {
             .positions.filter((pos) => marketIndex ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return pnl.add(_1.calculatePositionPNL(market, marketPosition, withFunding));
+            return pnl.add((0, _1.calculatePositionPNL)(market, marketPosition, withFunding));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -171,7 +171,7 @@ class ClearingHouseUser {
             .positions.filter((pos) => marketIndex ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return pnl.add(_1.calculatePositionFundingPNL(market, marketPosition));
+            return pnl.add((0, _1.calculatePositionFundingPNL)(market, marketPosition));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -189,7 +189,7 @@ class ClearingHouseUser {
     getTotalPositionValue() {
         return this.getUserPositionsAccount().positions.reduce((positionValue, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return positionValue.add(_1.calculateBaseAssetValue(market, marketPosition));
+            return positionValue.add((0, _1.calculateBaseAssetValue)(market, marketPosition));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -199,7 +199,7 @@ class ClearingHouseUser {
     getPositionValue(marketIndex) {
         const userPosition = this.getUserPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         const market = this.clearingHouse.getMarket(userPosition.marketIndex);
-        return _1.calculateBaseAssetValue(market, userPosition);
+        return (0, _1.calculateBaseAssetValue)(market, userPosition);
     }
     getPositionSide(currentPosition) {
         if (currentPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
@@ -218,10 +218,10 @@ class ClearingHouseUser {
      */
     getPositionEstimatedExitPriceAndPnl(position, amountToClose) {
         const market = this.clearingHouse.getMarket(position.marketIndex);
-        const entryPrice = position_1.calculateEntryPrice(position);
+        const entryPrice = (0, position_1.calculateEntryPrice)(position);
         if (amountToClose) {
             if (amountToClose.eq(numericConstants_1.ZERO)) {
-                return [_1.calculateMarkPrice(market), numericConstants_1.ZERO];
+                return [(0, _1.calculateMarkPrice)(market), numericConstants_1.ZERO];
             }
             position = {
                 baseAssetAmount: amountToClose,
@@ -230,7 +230,7 @@ class ClearingHouseUser {
                 quoteAssetAmount: position.quoteAssetAmount,
             };
         }
-        const baseAssetValue = _1.calculateBaseAssetValue(market, position);
+        const baseAssetValue = (0, _1.calculateBaseAssetValue)(market, position);
         if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
         }
@@ -337,7 +337,7 @@ class ClearingHouseUser {
 
         for 10x long, BTC down $400:
         3. (10k - 4k) / (100k - 4k) = 6k/96k => .0625 */
-        const currentPrice = _1.calculateMarkPrice(this.clearingHouse.getMarket(targetMarket.marketIndex));
+        const currentPrice = (0, _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);
@@ -353,7 +353,7 @@ class ClearingHouseUser {
             openOrders: new _1.BN(0),
         };
         const market = this.clearingHouse.getMarket(proposedMarketPosition.marketIndex);
-        const proposedMarketPositionValueUSDC = _1.calculateBaseAssetValue(market, proposedMarketPosition);
+        const proposedMarketPositionValueUSDC = (0, _1.calculateBaseAssetValue)(market, proposedMarketPosition);
         // total position value after trade
         const targetTotalPositionValueUSDC = totalCurrentPositionValueIgnoringTargetUSDC.add(proposedMarketPositionValueUSDC);
         let totalFreeCollateralUSDC = this.getTotalCollateral().sub(this.getTotalPositionValue()
@@ -439,7 +439,7 @@ class ClearingHouseUser {
             openOrders: new _1.BN(0),
         };
         const market = this.clearingHouse.getMarket(proposedMarketPosition.marketIndex);
-        const proposedMarketPositionValueUSDC = _1.calculateBaseAssetValue(market, proposedMarketPosition);
+        const proposedMarketPositionValueUSDC = (0, _1.calculateBaseAssetValue)(market, proposedMarketPosition);
         // total position value after trade
         const targetTotalPositionValueUSDC = totalCurrentPositionValueIgnoringTargetUSDC.add(proposedMarketPositionValueUSDC);
         let totalFreeCollateralUSDC = tc.sub(totalCurrentPositionValueIgnoringTargetUSDC
@@ -467,13 +467,13 @@ class ClearingHouseUser {
         }
         let currentPrice;
         if (positionBaseSizeChange.eq(numericConstants_1.ZERO)) {
-            currentPrice = _1.calculateMarkPrice(this.clearingHouse.getMarket(targetMarket.marketIndex));
+            currentPrice = (0, _1.calculateMarkPrice)(this.clearingHouse.getMarket(targetMarket.marketIndex));
         }
         else {
             const direction = positionBaseSizeChange.gt(numericConstants_1.ZERO)
                 ? _1.PositionDirection.LONG
                 : _1.PositionDirection.SHORT;
-            currentPrice = _1.calculateTradeSlippage(direction, positionBaseSizeChange.abs(), this.clearingHouse.getMarket(targetMarket.marketIndex), 'base')[3]; // newPrice after swap
+            currentPrice = (0, _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) &&
@@ -664,10 +664,10 @@ class ClearingHouseUser {
         const userPositionsAccount = this.getUserPositionsAccount();
         const userPosition = this.getUserPosition(order.marketIndex);
         const market = this.clearingHouse.getMarket(order.marketIndex);
-        if (position_1.isEmptyPosition(userPosition)) {
+        if ((0, position_1.isEmptyPosition)(userPosition)) {
             return false;
         }
-        const newState = _1.calculateNewStateAfterOrder(userAccount, userPosition, market, order);
+        const newState = (0, _1.calculateNewStateAfterOrder)(userAccount, userPosition, market, order);
         if (newState === null) {
             return false;
         }
@@ -678,20 +678,20 @@ class ClearingHouseUser {
                 market = marketAfter;
                 marketPosition = userPositionAfter;
             }
-            return positionValue.add(_1.calculateBaseAssetValue(market, marketPosition));
+            return positionValue.add((0, _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));
+            pnl = pnl.add((0, _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));
+            return pnl.add((0, _1.calculatePositionPNL)(market, marketPosition, false));
         }, numericConstants_1.ZERO);
         const totalCollateral = userAccountAfter.collateral.add(unrealizedPnL);
         const marginRatioAfter = totalCollateral

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 = __2.initialize({ env: 'devnet' });
+    const sdkConfig = (0, __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 exports.getTokenAddress(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
+    const usdcTokenAddress = yield (0, 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 exports.getTokenAddress(usdcTokenAddress.toString(), wallet.publicKey.toString()));
+        yield clearingHouse.initializeUserAccountAndDepositCollateral(depositAmount, yield (0, exports.getTokenAddress)(usdcTokenAddress.toString(), wallet.publicKey.toString()));
     }
     yield user.subscribe();
     // Get current price
     const solMarketInfo = __2.Markets.find((market) => market.baseAssetSymbol === 'SOL');
-    const currentMarketPrice = __2.calculateMarkPrice(clearingHouse.getMarket(solMarketInfo.marketIndex));
-    const formattedPrice = __2.convertToNumber(currentMarketPrice, __2.MARK_PRICE_PRECISION);
+    const currentMarketPrice = (0, __2.calculateMarkPrice)(clearingHouse.getMarket(solMarketInfo.marketIndex));
+    const formattedPrice = (0, __2.convertToNumber)(currentMarketPrice, __2.MARK_PRICE_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 = __2.convertToNumber(__2.calculateTradeSlippage(__2.PositionDirection.LONG, longAmount, solMarketAccount)[0], __2.MARK_PRICE_PRECISION);
+    const slippage = (0, __2.convertToNumber)((0, __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/idl/clearing_house.json

@@ -1321,6 +1321,52 @@
                 }
             ]
         },
+        {
+            "name": "initializeUserOrdersWithExplicitPayer",
+            "accounts": [
+                {
+                    "name": "user",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "userOrders",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "rent",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "userOrdersNonce",
+                    "type": "u8"
+                }
+            ]
+        },
         {
             "name": "deleteUser",
             "accounts": [
@@ -3667,6 +3713,23 @@
                 ]
             }
         },
+        {
+            "name": "LiquidationType",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "NONE"
+                    },
+                    {
+                        "name": "PARTIAL"
+                    },
+                    {
+                        "name": "FULL"
+                    }
+                ]
+            }
+        },
         {
             "name": "OracleSource",
             "type": {
@@ -4064,6 +4127,11 @@
             "code": 6055,
             "name": "UserOrderIdAlreadyInUse",
             "msg": "User Order Id Already In Use"
+        },
+        {
+            "code": 6056,
+            "name": "NoPositionsLiquidatable",
+            "msg": "No positions liquidatable"
         }
     ]
 }

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export * from './types';
 export * from './constants/markets';
 export * from './accounts/webSocketClearingHouseAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
+export * from './accounts/bulkUserSubscription';
 export * from './accounts/pollingClearingHouseAccountSubscriber';
 export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/types';
@@ -30,6 +31,7 @@ export * from './types';
 export * from './math/utils';
 export * from './config';
 export * from './constants/numericConstants';
+export * from './tx/retryTxSender';
 export * from './util/computeUnits';
 export * from './util/tps';
 export { BN, PublicKey };

package/lib/index.js

@@ -21,6 +21,7 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./constants/markets"), exports);
 __exportStar(require("./accounts/webSocketClearingHouseAccountSubscriber"), exports);
 __exportStar(require("./accounts/bulkAccountLoader"), exports);
+__exportStar(require("./accounts/bulkUserSubscription"), exports);
 __exportStar(require("./accounts/pollingClearingHouseAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
@@ -45,5 +46,6 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./math/utils"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./constants/numericConstants"), exports);
+__exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./util/computeUnits"), exports);
 __exportStar(require("./util/tps"), exports);

package/lib/math/amm.js

@@ -36,7 +36,7 @@ exports.calculatePrice = calculatePrice;
  * @returns quoteAssetReserve and baseAssetReserve after swap. : Precision AMM_RESERVE_PRECISION
  */
 function calculateAmmReservesAfterSwap(amm, inputAssetType, swapAmount, swapDirection) {
-    assert_1.assert(swapAmount.gte(numericConstants_1.ZERO), 'swapAmount must be greater than 0');
+    (0, assert_1.assert)(swapAmount.gte(numericConstants_1.ZERO), 'swapAmount must be greater than 0');
     let newQuoteAssetReserve;
     let newBaseAssetReserve;
     if (inputAssetType === 'quote') {
@@ -79,10 +79,10 @@ exports.calculateSwapOutput = calculateSwapOutput;
  * @param positionDirection
  */
 function getSwapDirection(inputAssetType, positionDirection) {
-    if (types_1.isVariant(positionDirection, 'long') && inputAssetType === 'base') {
+    if ((0, types_1.isVariant)(positionDirection, 'long') && inputAssetType === 'base') {
         return types_1.SwapDirection.REMOVE;
     }
-    if (types_1.isVariant(positionDirection, 'short') && inputAssetType === 'quote') {
+    if ((0, types_1.isVariant)(positionDirection, 'short') && inputAssetType === 'quote') {
         return types_1.SwapDirection.REMOVE;
     }
     return types_1.SwapDirection.ADD;
@@ -104,7 +104,7 @@ function calculateAdjustKCost(market, marketIndex, numerator, denomenator) {
         quoteAssetAmount: new anchor_1.BN(0),
         openOrders: new anchor_1.BN(0),
     };
-    const currentValue = position_1.calculateBaseAssetValue(market, netUserPosition);
+    const currentValue = (0, position_1.calculateBaseAssetValue)(market, netUserPosition);
     const marketNewK = Object.assign({}, market);
     marketNewK.amm = Object.assign({}, market.amm);
     marketNewK.amm.baseAssetReserve = market.amm.baseAssetReserve
@@ -115,7 +115,7 @@ function calculateAdjustKCost(market, marketIndex, numerator, denomenator) {
         .div(denomenator);
     marketNewK.amm.sqrtK = market.amm.sqrtK.mul(numerator).div(denomenator);
     netUserPosition.quoteAssetAmount = currentValue;
-    const cost = __1.calculatePositionPNL(marketNewK, netUserPosition);
+    const cost = (0, __1.calculatePositionPNL)(marketNewK, netUserPosition);
     const p = numericConstants_1.PEG_PRECISION.mul(numerator).div(denomenator);
     const x = market.amm.baseAssetReserve;
     const y = market.amm.quoteAssetReserve;
@@ -134,7 +134,7 @@ function calculateAdjustKCost(market, marketIndex, numerator, denomenator) {
         .sub(numer1)
         .mul(market.amm.pegMultiplier)
         .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
-    console.log(__1.convertToNumber(formulaCost, numericConstants_1.QUOTE_PRECISION));
+    console.log((0, __1.convertToNumber)(formulaCost, numericConstants_1.QUOTE_PRECISION));
     // p.div(p.mul(x).add(delta)).sub()
     return cost;
 }
@@ -155,22 +155,22 @@ function calculateRepegCost(market, marketIndex, newPeg) {
         quoteAssetAmount: new anchor_1.BN(0),
         openOrders: new anchor_1.BN(0),
     };
-    const currentValue = position_1.calculateBaseAssetValue(market, netUserPosition);
+    const currentValue = (0, position_1.calculateBaseAssetValue)(market, netUserPosition);
     netUserPosition.quoteAssetAmount = currentValue;
-    const prevMarketPrice = __1.calculateMarkPrice(market);
+    const prevMarketPrice = (0, __1.calculateMarkPrice)(market);
     const marketNewPeg = Object.assign({}, market);
     marketNewPeg.amm = Object.assign({}, market.amm);
     // const marketNewPeg = JSON.parse(JSON.stringify(market));
     marketNewPeg.amm.pegMultiplier = newPeg;
-    console.log('Price moves from', __1.convertToNumber(prevMarketPrice), 'to', __1.convertToNumber(__1.calculateMarkPrice(marketNewPeg)));
-    const cost = __1.calculatePositionPNL(marketNewPeg, netUserPosition);
+    console.log('Price moves from', (0, __1.convertToNumber)(prevMarketPrice), 'to', (0, __1.convertToNumber)((0, __1.calculateMarkPrice)(marketNewPeg)));
+    const cost = (0, __1.calculatePositionPNL)(marketNewPeg, netUserPosition);
     const k = market.amm.sqrtK.mul(market.amm.sqrtK);
     const newQuoteAssetReserve = k.div(market.amm.baseAssetReserve.add(netUserPosition.baseAssetAmount));
     const deltaQuoteAssetReserves = newQuoteAssetReserve.sub(market.amm.quoteAssetReserve);
     const cost2 = deltaQuoteAssetReserves
         .mul(market.amm.pegMultiplier.sub(newPeg))
         .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
-    console.log(__1.convertToNumber(cost2, numericConstants_1.QUOTE_PRECISION));
+    console.log((0, __1.convertToNumber)(cost2, numericConstants_1.QUOTE_PRECISION));
     return cost;
 }
 exports.calculateRepegCost = calculateRepegCost;
@@ -200,7 +200,7 @@ function calculateMaxBaseAssetAmountToTrade(amm, limit_price) {
         .mul(amm.pegMultiplier)
         .div(limit_price)
         .div(numericConstants_1.PEG_PRECISION);
-    const newBaseAssetReserve = __1.squareRootBN(newBaseAssetReserveSquared);
+    const newBaseAssetReserve = (0, __1.squareRootBN)(newBaseAssetReserveSquared);
     if (newBaseAssetReserve.gt(amm.baseAssetReserve)) {
         return [
             newBaseAssetReserve.sub(amm.baseAssetReserve),

package/lib/math/conversion.js

@@ -10,6 +10,6 @@ const convertToNumber = (bigNumber, precision = numericConstants_1.MARK_PRICE_PR
 };
 exports.convertToNumber = convertToNumber;
 const convertBaseAssetAmountToNumber = (baseAssetAmount) => {
-    return exports.convertToNumber(baseAssetAmount, numericConstants_1.MARK_PRICE_PRECISION.mul(numericConstants_1.PEG_PRECISION));
+    return (0, exports.convertToNumber)(baseAssetAmount, numericConstants_1.MARK_PRICE_PRECISION.mul(numericConstants_1.PEG_PRECISION));
 };
 exports.convertBaseAssetAmountToNumber = convertBaseAssetAmountToNumber;

package/lib/math/funding.js

@@ -40,7 +40,7 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
         const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
         const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
         const markTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastMarkChange));
-        const baseAssetPriceWithMantissa = market_1.calculateMarkPrice(market);
+        const baseAssetPriceWithMantissa = (0, market_1.calculateMarkPrice)(market);
         const markTwapWithMantissa = markTwapTimeSinceLastUpdate
             .mul(lastMarkTwapWithMantissa)
             .add(timeSinceLastMarkChange.mul(baseAssetPriceWithMantissa))

package/lib/math/market.js

@@ -9,11 +9,11 @@ const amm_1 = require("./amm");
  * @return markPrice : Precision MARK_PRICE_PRECISION
  */
 function calculateMarkPrice(market) {
-    return amm_1.calculatePrice(market.amm.baseAssetReserve, market.amm.quoteAssetReserve, market.amm.pegMultiplier);
+    return (0, amm_1.calculatePrice)(market.amm.baseAssetReserve, market.amm.quoteAssetReserve, market.amm.pegMultiplier);
 }
 exports.calculateMarkPrice = calculateMarkPrice;
 function calculateNewMarketAfterTrade(baseAssetAmount, direction, market) {
-    const [newQuoteAssetReserve, newBaseAssetReserve] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'base', baseAssetAmount.abs(), amm_1.getSwapDirection('base', direction));
+    const [newQuoteAssetReserve, newBaseAssetReserve] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'base', baseAssetAmount.abs(), (0, amm_1.getSwapDirection)('base', direction));
     const newAmm = Object.assign({}, market.amm);
     const newMarket = Object.assign({}, market);
     newMarket.amm = newAmm;

package/lib/math/orders.d.ts

@@ -1,3 +1,4 @@
 import { ClearingHouseUser } from '../clearingHouseUser';
 import { Order } from '../types';
 export declare function isOrderRiskIncreasing(user: ClearingHouseUser, order: Order): boolean;
+export declare function isOrderRiskIncreasingInSameDirection(user: ClearingHouseUser, order: Order): boolean;

package/lib/math/orders.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOrderRiskIncreasing = void 0;
+exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 function isOrderRiskIncreasing(user, order) {
-    if (types_1.isVariant(order.status, 'init')) {
+    if ((0, types_1.isVariant)(order.status, 'init')) {
         return false;
     }
     const position = user.getUserPosition(order.marketIndex) ||
@@ -14,12 +14,12 @@ function isOrderRiskIncreasing(user, order) {
         return true;
     }
     // if position is long and order is long
-    if (position.baseAssetAmount.gt(numericConstants_1.ZERO) && types_1.isVariant(order.direction, 'long')) {
+    if (position.baseAssetAmount.gt(numericConstants_1.ZERO) && (0, types_1.isVariant)(order.direction, 'long')) {
         return true;
     }
     // if position is short and order is short
     if (position.baseAssetAmount.lt(numericConstants_1.ZERO) &&
-        types_1.isVariant(order.direction, 'short')) {
+        (0, types_1.isVariant)(order.direction, 'short')) {
         return true;
     }
     const baseAssetAmountToFill = order.baseAssetAmount.sub(order.baseAssetAmountFilled);
@@ -30,3 +30,25 @@ function isOrderRiskIncreasing(user, order) {
     return false;
 }
 exports.isOrderRiskIncreasing = isOrderRiskIncreasing;
+function isOrderRiskIncreasingInSameDirection(user, order) {
+    if ((0, types_1.isVariant)(order.status, 'init')) {
+        return false;
+    }
+    const position = user.getUserPosition(order.marketIndex) ||
+        user.getEmptyPosition(order.marketIndex);
+    // if no position exists, it's risk increasing
+    if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
+        return true;
+    }
+    // if position is long and order is long
+    if (position.baseAssetAmount.gt(numericConstants_1.ZERO) && (0, types_1.isVariant)(order.direction, 'long')) {
+        return true;
+    }
+    // if position is short and order is short
+    if (position.baseAssetAmount.lt(numericConstants_1.ZERO) &&
+        (0, types_1.isVariant)(order.direction, 'short')) {
+        return true;
+    }
+    return false;
+}
+exports.isOrderRiskIncreasingInSameDirection = isOrderRiskIncreasingInSameDirection;

package/lib/math/position.js

@@ -17,7 +17,7 @@ function calculateBaseAssetValue(market, userPosition) {
         return numericConstants_1.ZERO;
     }
     const directionToClose = findDirectionToClose(userPosition);
-    const [newQuoteAssetReserve, _] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'base', userPosition.baseAssetAmount.abs(), amm_1.getSwapDirection('base', directionToClose));
+    const [newQuoteAssetReserve, _] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'base', userPosition.baseAssetAmount.abs(), (0, amm_1.getSwapDirection)('base', directionToClose));
     switch (directionToClose) {
         case types_1.PositionDirection.SHORT:
             return market.amm.quoteAssetReserve
@@ -28,7 +28,8 @@ function calculateBaseAssetValue(market, userPosition) {
             return newQuoteAssetReserve
                 .sub(market.amm.quoteAssetReserve)
                 .mul(market.amm.pegMultiplier)
-                .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
+                .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO)
+                .add(numericConstants_1.ONE);
     }
 }
 exports.calculateBaseAssetValue = calculateBaseAssetValue;
@@ -50,7 +51,7 @@ function calculatePositionPNL(market, marketPosition, withFunding = false) {
         pnl = baseAssetValue.sub(marketPosition.quoteAssetAmount);
     }
     else {
-        pnl = marketPosition.quoteAssetAmount.sub(baseAssetValue).sub(numericConstants_1.ONE);
+        pnl = marketPosition.quoteAssetAmount.sub(baseAssetValue);
     }
     if (withFunding) {
         const fundingRatePnL = calculatePositionFundingPNL(market, marketPosition).div(numericConstants_1.PRICE_TO_QUOTE_PRECISION);

package/lib/math/trade.js

@@ -25,18 +25,18 @@ const MAXPCT = new anchor_1.BN(1000); //percentage units are [0,1000] => [0,1]
  * 'newPrice' => the price of the asset after the trade : Precision MARK_PRICE_PRECISION
  */
 function calculateTradeSlippage(direction, amount, market, inputAssetType = 'quote') {
-    const oldPrice = market_1.calculateMarkPrice(market);
+    const oldPrice = (0, market_1.calculateMarkPrice)(market);
     if (amount.eq(numericConstants_1.ZERO)) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO, oldPrice, oldPrice];
     }
     const [acquiredBase, acquiredQuote] = calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType);
-    const entryPrice = amm_1.calculatePrice(acquiredBase, acquiredQuote, market.amm.pegMultiplier).mul(new anchor_1.BN(-1));
-    const newPrice = amm_1.calculatePrice(market.amm.baseAssetReserve.sub(acquiredBase), market.amm.quoteAssetReserve.sub(acquiredQuote), market.amm.pegMultiplier);
+    const entryPrice = (0, amm_1.calculatePrice)(acquiredBase, acquiredQuote, market.amm.pegMultiplier).mul(new anchor_1.BN(-1));
+    const newPrice = (0, amm_1.calculatePrice)(market.amm.baseAssetReserve.sub(acquiredBase), market.amm.quoteAssetReserve.sub(acquiredQuote), market.amm.pegMultiplier);
     if (direction == types_1.PositionDirection.SHORT) {
-        assert_1.assert(newPrice.lt(oldPrice));
+        (0, assert_1.assert)(newPrice.lt(oldPrice));
     }
     else {
-        assert_1.assert(oldPrice.lt(newPrice));
+        (0, assert_1.assert)(oldPrice.lt(newPrice));
     }
     const pctMaxSlippage = newPrice
         .sub(oldPrice)
@@ -64,9 +64,13 @@ function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType
     if (amount.eq(numericConstants_1.ZERO)) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO];
     }
-    const [newQuoteAssetReserve, newBaseAssetReserve] = amm_1.calculateAmmReservesAfterSwap(market.amm, inputAssetType, amount, amm_1.getSwapDirection(inputAssetType, direction));
+    const swapDirection = (0, amm_1.getSwapDirection)(inputAssetType, direction);
+    const [newQuoteAssetReserve, newBaseAssetReserve] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, inputAssetType, amount, swapDirection);
     const acquiredBase = market.amm.baseAssetReserve.sub(newBaseAssetReserve);
-    const acquiredQuote = market.amm.quoteAssetReserve.sub(newQuoteAssetReserve);
+    let acquiredQuote = market.amm.quoteAssetReserve.sub(newQuoteAssetReserve);
+    if (inputAssetType === 'base' && (0, types_1.isVariant)(swapDirection, 'remove')) {
+        acquiredQuote = acquiredQuote.sub(numericConstants_1.ONE);
+    }
     return [acquiredBase, acquiredQuote];
 }
 exports.calculateTradeAcquiredAmounts = calculateTradeAcquiredAmounts;
@@ -86,10 +90,10 @@ exports.calculateTradeAcquiredAmounts = calculateTradeAcquiredAmounts;
  * ]
  */
 function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAssetType = 'quote') {
-    assert_1.assert(market.amm.baseAssetReserve.gt(numericConstants_1.ZERO));
-    assert_1.assert(targetPrice.gt(numericConstants_1.ZERO));
-    assert_1.assert(pct.lte(MAXPCT) && pct.gt(numericConstants_1.ZERO));
-    const markPriceBefore = market_1.calculateMarkPrice(market);
+    (0, assert_1.assert)(market.amm.baseAssetReserve.gt(numericConstants_1.ZERO));
+    (0, assert_1.assert)(targetPrice.gt(numericConstants_1.ZERO));
+    (0, assert_1.assert)(pct.lte(MAXPCT) && pct.gt(numericConstants_1.ZERO));
+    const markPriceBefore = (0, market_1.calculateMarkPrice)(market);
     if (targetPrice.gt(markPriceBefore)) {
         const priceGap = targetPrice.sub(markPriceBefore);
         const priceGapScaled = priceGap.mul(pct).div(MAXPCT);
@@ -114,11 +118,11 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
     let markPriceAfter;
     if (markPriceBefore.gt(targetPrice)) {
         // overestimate y2
-        baseAssetReserveAfter = utils_1.squareRootBN(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).sub(biasModifier)).sub(new anchor_1.BN(1));
+        baseAssetReserveAfter = (0, utils_1.squareRootBN)(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).sub(biasModifier)).sub(new anchor_1.BN(1));
         quoteAssetReserveAfter = k
             .div(numericConstants_1.MARK_PRICE_PRECISION)
             .div(baseAssetReserveAfter);
-        markPriceAfter = amm_1.calculatePrice(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
+        markPriceAfter = (0, amm_1.calculatePrice)(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
         direction = types_1.PositionDirection.SHORT;
         tradeSize = quoteAssetReserveBefore
             .sub(quoteAssetReserveAfter)
@@ -129,11 +133,11 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
     }
     else if (markPriceBefore.lt(targetPrice)) {
         // underestimate y2
-        baseAssetReserveAfter = utils_1.squareRootBN(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).add(biasModifier)).add(new anchor_1.BN(1));
+        baseAssetReserveAfter = (0, utils_1.squareRootBN)(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).add(biasModifier)).add(new anchor_1.BN(1));
         quoteAssetReserveAfter = k
             .div(numericConstants_1.MARK_PRICE_PRECISION)
             .div(baseAssetReserveAfter);
-        markPriceAfter = amm_1.calculatePrice(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
+        markPriceAfter = (0, amm_1.calculatePrice)(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
         direction = types_1.PositionDirection.LONG;
         tradeSize = quoteAssetReserveAfter
             .sub(quoteAssetReserveBefore)
@@ -160,8 +164,8 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
         .mul(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO)
         .mul(numericConstants_1.MARK_PRICE_PRECISION)
         .div(baseSize.abs());
-    assert_1.assert(tp1.sub(tp2).lte(originalDiff), 'Target Price Calculation incorrect');
-    assert_1.assert(tp2.lte(tp1) || tp2.sub(tp1).abs() < 100000, 'Target Price Calculation incorrect' +
+    (0, assert_1.assert)(tp1.sub(tp2).lte(originalDiff), 'Target Price Calculation incorrect');
+    (0, assert_1.assert)(tp2.lte(tp1) || tp2.sub(tp1).abs() < 100000, 'Target Price Calculation incorrect' +
         tp2.toString() +
         '>=' +
         tp1.toString() +

package/lib/orders.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="bn.js" />
 import { Market, Order, UserAccount, UserPosition } from './types';
-import { BN } from '.';
+import { BN, ClearingHouseUser } from '.';
 export declare function calculateNewStateAfterOrder(userAccount: UserAccount, userPosition: UserPosition, market: Market, order: Order): [UserAccount, UserPosition, Market] | null;
+export declare function calculateBaseAssetAmountMarketCanExecute(market: Market, order: Order): BN;
 export declare function calculateAmountToTradeForLimit(market: Market, order: Order): BN;
 export declare function calculateAmountToTradeForTriggerLimit(market: Market, order: Order): BN;
+export declare function calculateBaseAssetAmountUserCanExecute(market: Market, order: Order, user: ClearingHouseUser): BN;