@drift-labs/sdk 2.13.0-beta.1 → 2.13.0-beta.2

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.13.0-beta.1",
+    "version": "2.13.0-beta.2",
     "name": "drift",
     "instructions": [
         {

package/lib/math/margin.d.ts

@@ -7,5 +7,5 @@ imfFactor: BN, liabilityWeight: BN, precision: BN): BN;
 export declare function calculateSizeDiscountAssetWeight(size: BN, // AMM_RESERVE_PRECISION
 imfFactor: BN, assetWeight: BN): BN;
 export declare function calculateOraclePriceForPerpMargin(perpPosition: PerpPosition, market: PerpMarketAccount, oraclePriceData: OraclePriceData): BN;
-export declare function calculateBaseAssetValueWithOracle(market: PerpMarketAccount, perpPosition: PerpPosition, oraclePriceData: OraclePriceData): BN;
+export declare function calculateBaseAssetValueWithOracle(market: PerpMarketAccount, perpPosition: PerpPosition, oraclePriceData: OraclePriceData, includeOpenOrders?: boolean): BN;
 export declare function calculateWorstCaseBaseAssetAmount(perpPosition: PerpPosition): BN;

package/lib/math/margin.js

@@ -11,7 +11,7 @@ imfFactor, liabilityWeight, precision) {
     if (imfFactor.eq(numericConstants_1.ZERO)) {
         return liabilityWeight;
     }
-    const sizeSqrt = utils_1.squareRootBN(size.mul(new anchor_1.BN(10)).add(new anchor_1.BN(1))); //1e9 -> 1e10 -> 1e5
+    const sizeSqrt = utils_1.squareRootBN(size.abs().mul(new anchor_1.BN(10)).add(new anchor_1.BN(1))); //1e9 -> 1e10 -> 1e5
     const denom0 = anchor_1.BN.max(new anchor_1.BN(1), numericConstants_1.SPOT_MARKET_IMF_PRECISION.div(imfFactor));
     assert_1.assert(denom0.gt(numericConstants_1.ZERO));
     const liabilityWeightNumerator = liabilityWeight.sub(liabilityWeight.div(anchor_1.BN.max(new anchor_1.BN(1), numericConstants_1.SPOT_MARKET_IMF_PRECISION.div(imfFactor))));
@@ -30,7 +30,7 @@ imfFactor, assetWeight) {
     if (imfFactor.eq(numericConstants_1.ZERO)) {
         return assetWeight;
     }
-    const sizeSqrt = utils_1.squareRootBN(size.mul(new anchor_1.BN(10)).add(new anchor_1.BN(1))); //1e9 -> 1e10 -> 1e5
+    const sizeSqrt = utils_1.squareRootBN(size.abs().mul(new anchor_1.BN(10)).add(new anchor_1.BN(1))); //1e9 -> 1e10 -> 1e5
     const imfNumerator = numericConstants_1.SPOT_MARKET_IMF_PRECISION.add(numericConstants_1.SPOT_MARKET_IMF_PRECISION.div(new anchor_1.BN(10)));
     const sizeDiscountAssetWeight = imfNumerator
         .mul(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
@@ -58,15 +58,15 @@ function calculateOraclePriceForPerpMargin(perpPosition, market, oraclePriceData
     return marginPrice;
 }
 exports.calculateOraclePriceForPerpMargin = calculateOraclePriceForPerpMargin;
-function calculateBaseAssetValueWithOracle(market, perpPosition, oraclePriceData) {
+function calculateBaseAssetValueWithOracle(market, perpPosition, oraclePriceData, includeOpenOrders = false) {
     let price = oraclePriceData.price;
     if (types_1.isVariant(market.status, 'settlement')) {
         price = market.expiryPrice;
     }
-    return perpPosition.baseAssetAmount
-        .abs()
-        .mul(price)
-        .div(numericConstants_1.AMM_RESERVE_PRECISION);
+    const baseAssetAmount = includeOpenOrders
+        ? calculateWorstCaseBaseAssetAmount(perpPosition)
+        : perpPosition.baseAssetAmount;
+    return baseAssetAmount.abs().mul(price).div(numericConstants_1.AMM_RESERVE_PRECISION);
 }
 exports.calculateBaseAssetValueWithOracle = calculateBaseAssetValueWithOracle;
 function calculateWorstCaseBaseAssetAmount(perpPosition) {

package/lib/math/oracles.js

@@ -54,16 +54,13 @@ function isOracleTooDivergent(amm, oraclePriceData, oracleGuardRails, now) {
 exports.isOracleTooDivergent = isOracleTooDivergent;
 function calculateLiveOracleTwap(histOracleData, oraclePriceData, now, period) {
     let oracleTwap = undefined;
-    if (period.eq(numericConstants_1.ONE_HOUR)) {
-        //todo: assumes its 1hr
-        // period = amm.fundingPeriod;
-        oracleTwap = histOracleData.lastOraclePriceTwap;
-    }
-    else if (period.eq(numericConstants_1.FIVE_MINUTE)) {
-        histOracleData.lastOraclePriceTwap5Min;
+    if (period.eq(numericConstants_1.FIVE_MINUTE)) {
+        oracleTwap = histOracleData.lastOraclePriceTwap5Min;
     }
     else {
-        throw Error('unsupported twap period passed');
+        //todo: assumes its fundingPeriod (1hr)
+        // period = amm.fundingPeriod;
+        oracleTwap = histOracleData.lastOraclePriceTwap;
     }
     const sinceLastUpdate = index_1.BN.max(numericConstants_1.ONE, now.sub(histOracleData.lastOraclePriceTwapTs));
     const sinceStart = index_1.BN.max(numericConstants_1.ZERO, period.sub(sinceLastUpdate));

package/lib/math/utils.js

@@ -7,6 +7,9 @@ function clampBN(x, min, max) {
 }
 exports.clampBN = clampBN;
 const squareRootBN = (n, closeness = new __1.BN(1)) => {
+    if (n.lt(__1.ZERO)) {
+        throw new Error('square root of negative number');
+    }
     // Assuming the sqrt of n as n only
     let x = n;
     // The closed guess will be stored in the root

package/lib/user.d.ts

@@ -77,10 +77,11 @@ export declare class User {
      */
     getSettledLPPosition(marketIndex: number): [PerpPosition, BN, BN];
     /**
-     * calculates Buying Power = FC * MAX_LEVERAGE
+     * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
     getBuyingPower(marketIndex: number): BN;
+    getBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN): BN;
     /**
      * calculates Free Collateral = Total collateral - initial margin requirement
      * @returns : Precision QUOTE_PRECISION
@@ -133,7 +134,7 @@ export declare class User {
      * calculates position value in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpPositionValue(marketIndex: number, oraclePriceData: OraclePriceData): BN;
+    getPerpPositionValue(marketIndex: number, oraclePriceData: OraclePriceData, includeOpenOrders?: boolean): BN;
     getPositionSide(currentPosition: Pick<PerpPosition, 'baseAssetAmount'>): PositionDirection | undefined;
     /**
      * calculates average exit price (optionally for closing up to 100% of position)

package/lib/user.js

@@ -239,13 +239,20 @@ class User {
         return [position, remainderBaa, pnl];
     }
     /**
-     * calculates Buying Power = FC * MAX_LEVERAGE
+     * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
     getBuyingPower(marketIndex) {
-        return this.getFreeCollateral()
-            .mul(this.getMaxLeverage(marketIndex, 'Initial'))
-            .div(numericConstants_1.TEN_THOUSAND);
+        const perpPosition = this.getPerpPosition(marketIndex);
+        const worstCaseBaseAssetAmount = perpPosition
+            ? margin_1.calculateWorstCaseBaseAssetAmount(perpPosition)
+            : numericConstants_1.ZERO;
+        const freeCollateral = this.getFreeCollateral();
+        return this.getBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount);
+    }
+    getBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount) {
+        const marginRatio = _1.calculateMarketMarginRatio(this.driftClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial');
+        return freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new _1.BN(marginRatio));
     }
     /**
      * calculates Free Collateral = Total collateral - initial margin requirement
@@ -557,10 +564,10 @@ class User {
      * calculates position value in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpPositionValue(marketIndex, oraclePriceData) {
+    getPerpPositionValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
         const userPosition = this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         const market = this.driftClient.getPerpMarketAccount(userPosition.marketIndex);
-        return margin_1.calculateBaseAssetValueWithOracle(market, userPosition, oraclePriceData);
+        return margin_1.calculateBaseAssetValueWithOracle(market, userPosition, oraclePriceData, includeOpenOrders);
     }
     getPositionSide(currentPosition) {
         if (currentPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
@@ -779,7 +786,7 @@ class User {
         3. (10k - 4k) / (100k - 4k) = 6k/96k => .0625 */
         const totalCollateral = this.getTotalCollateral('Maintenance');
         // calculate the total position value ignoring any value from the target market of the trade
-        const totalPositionValueExcludingTargetMarket = this.getTotalPerpPositionValueExcludingMarket(perpPosition.marketIndex);
+        const totalPositionValueExcludingTargetMarket = this.getTotalPerpPositionValueExcludingMarket(perpPosition.marketIndex, undefined, undefined, true);
         const currentPerpPosition = this.getPerpPosition(perpPosition.marketIndex) ||
             this.getEmptyPosition(perpPosition.marketIndex);
         const currentPerpPositionBaseSize = currentPerpPosition.baseAssetAmount;
@@ -794,8 +801,8 @@ class User {
             quoteBreakEvenAmount: new _1.BN(0),
             quoteEntryAmount: new _1.BN(0),
             openOrders: 0,
-            openBids: new _1.BN(0),
-            openAsks: new _1.BN(0),
+            openBids: currentPerpPosition.openBids,
+            openAsks: currentPerpPosition.openAsks,
             settledPnl: numericConstants_1.ZERO,
             lpShares: numericConstants_1.ZERO,
             lastBaseAssetAmountPerLp: numericConstants_1.ZERO,
@@ -804,13 +811,13 @@ class User {
         if (proposedBaseAssetAmount.eq(numericConstants_1.ZERO))
             return new _1.BN(-1);
         const market = this.driftClient.getPerpMarketAccount(proposedPerpPosition.marketIndex);
-        const proposedPerpPositionValue = margin_1.calculateBaseAssetValueWithOracle(market, proposedPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex));
+        const proposedPerpPositionValue = margin_1.calculateBaseAssetValueWithOracle(market, proposedPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex), true);
         // total position value after trade
         const totalPositionValueAfterTrade = totalPositionValueExcludingTargetMarket.add(proposedPerpPositionValue);
         const marginRequirementOfAll = this.getMaintenanceMarginRequirement();
-        const positionValue = margin_1.calculateBaseAssetValueWithOracle(market, proposedPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex));
+        const positionValue = margin_1.calculateBaseAssetValueWithOracle(market, currentPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex), true);
         const marginRequirementOfTargetMarket = positionValue
-            .mul(new _1.BN(_1.calculateMarketMarginRatio(market, proposedPerpPosition.baseAssetAmount.abs(), 'Maintenance')))
+            .mul(new _1.BN(_1.calculateMarketMarginRatio(market, margin_1.calculateWorstCaseBaseAssetAmount(currentPerpPosition).abs(), 'Maintenance')))
             .div(numericConstants_1.MARGIN_PRECISION);
         const marginRequirementExcludingTargetMarket = marginRequirementOfAll.sub(marginRequirementOfTargetMarket);
         const freeCollateralExcludingTargetMarket = totalCollateral.sub(marginRequirementExcludingTargetMarket);
@@ -819,13 +826,14 @@ class User {
             proposedPerpPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
             return new _1.BN(-1);
         }
+        const proposedWorstCastBaseAssetAmount = margin_1.calculateWorstCaseBaseAssetAmount(proposedPerpPosition);
         const marginRequirementTargetMarket = proposedPerpPositionValue
-            .mul(new _1.BN(_1.calculateMarketMarginRatio(market, proposedPerpPosition.baseAssetAmount.abs(), 'Maintenance')))
+            .mul(new _1.BN(_1.calculateMarketMarginRatio(market, proposedWorstCastBaseAssetAmount.abs(), 'Maintenance')))
             .div(numericConstants_1.MARGIN_PRECISION);
         const marginRequirementAfterTrade = marginRequirementExcludingTargetMarket.add(marginRequirementTargetMarket);
         const freeCollateralAfterTrade = totalCollateral.sub(marginRequirementAfterTrade);
         const marketMaxMaintLeverage = new _1.BN(numericConstants_1.TEN_THOUSAND.mul(numericConstants_1.TEN_THOUSAND).toNumber() /
-            _1.calculateMarketMarginRatio(market, proposedPerpPosition.baseAssetAmount, 'Maintenance'));
+            _1.calculateMarketMarginRatio(market, proposedWorstCastBaseAssetAmount.abs(), 'Maintenance'));
         let priceDelta;
         if (proposedBaseAssetAmount.lt(numericConstants_1.ZERO)) {
             priceDelta = freeCollateralAfterTrade
@@ -933,9 +941,7 @@ class User {
                 }
                 else {
                     const freeCollateralAfterClose = totalCollateral.sub(marginRequirementAfterClosing);
-                    const buyingPowerAfterClose = freeCollateralAfterClose
-                        .mul(this.getMaxLeverage(targetMarketIndex))
-                        .div(numericConstants_1.TEN_THOUSAND);
+                    const buyingPowerAfterClose = this.getBuyingPowerFromFreeCollateralAndBaseAssetAmount(targetMarketIndex, freeCollateralAfterClose, numericConstants_1.ZERO);
                     maxPositionSize = perpPositionValue.add(buyingPowerAfterClose);
                 }
             }
@@ -960,7 +966,7 @@ class User {
         const currentPosition = this.getPerpPosition(targetMarketIndex) ||
             this.getEmptyPosition(targetMarketIndex);
         const oracleData = this.getOracleDataForPerpMarket(targetMarketIndex);
-        let currentPositionQuoteAmount = this.getPerpPositionValue(targetMarketIndex, oracleData);
+        let currentPositionQuoteAmount = this.getPerpPositionValue(targetMarketIndex, oracleData, includeOpenOrders);
         const currentSide = currentPosition && currentPosition.baseAssetAmount.isNeg()
             ? _1.PositionDirection.SHORT
             : _1.PositionDirection.LONG;
@@ -1089,7 +1095,7 @@ class User {
         const oracleData = this.getOracleDataForPerpMarket(marketToIgnore);
         let currentPerpPositionValueUSDC = numericConstants_1.ZERO;
         if (currentPerpPosition) {
-            currentPerpPositionValueUSDC = this.getPerpPositionValue(marketToIgnore, oracleData);
+            currentPerpPositionValueUSDC = this.getPerpPositionValue(marketToIgnore, oracleData, includeOpenOrders);
         }
         return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, includeOpenOrders).sub(currentPerpPositionValueUSDC);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.13.0-beta.1",
+	"version": "2.13.0-beta.2",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.13.0-beta.1",
+  "version": "2.13.0-beta.2",
   "name": "drift",
   "instructions": [
     {

package/src/math/margin.ts

@@ -22,7 +22,7 @@ export function calculateSizePremiumLiabilityWeight(
 		return liabilityWeight;
 	}
 
-	const sizeSqrt = squareRootBN(size.mul(new BN(10)).add(new BN(1))); //1e9 -> 1e10 -> 1e5
+	const sizeSqrt = squareRootBN(size.abs().mul(new BN(10)).add(new BN(1))); //1e9 -> 1e10 -> 1e5
 
 	const denom0 = BN.max(new BN(1), SPOT_MARKET_IMF_PRECISION.div(imfFactor));
 	assert(denom0.gt(ZERO));
@@ -57,7 +57,7 @@ export function calculateSizeDiscountAssetWeight(
 		return assetWeight;
 	}
 
-	const sizeSqrt = squareRootBN(size.mul(new BN(10)).add(new BN(1))); //1e9 -> 1e10 -> 1e5
+	const sizeSqrt = squareRootBN(size.abs().mul(new BN(10)).add(new BN(1))); //1e9 -> 1e10 -> 1e5
 	const imfNumerator = SPOT_MARKET_IMF_PRECISION.add(
 		SPOT_MARKET_IMF_PRECISION.div(new BN(10))
 	);
@@ -106,17 +106,19 @@ export function calculateOraclePriceForPerpMargin(
 export function calculateBaseAssetValueWithOracle(
 	market: PerpMarketAccount,
 	perpPosition: PerpPosition,
-	oraclePriceData: OraclePriceData
+	oraclePriceData: OraclePriceData,
+	includeOpenOrders = false
 ): BN {
 	let price = oraclePriceData.price;
 	if (isVariant(market.status, 'settlement')) {
 		price = market.expiryPrice;
 	}
 
-	return perpPosition.baseAssetAmount
-		.abs()
-		.mul(price)
-		.div(AMM_RESERVE_PRECISION);
+	const baseAssetAmount = includeOpenOrders
+		? calculateWorstCaseBaseAssetAmount(perpPosition)
+		: perpPosition.baseAssetAmount;
+
+	return baseAssetAmount.abs().mul(price).div(AMM_RESERVE_PRECISION);
 }
 
 export function calculateWorstCaseBaseAssetAmount(

package/src/math/oracles.ts

@@ -7,7 +7,6 @@ import {
 	ONE,
 	ZERO,
 	FIVE_MINUTE,
-	ONE_HOUR,
 } from '../constants/numericConstants';
 import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';
 import { assert } from '../assert/assert';
@@ -98,14 +97,12 @@ export function calculateLiveOracleTwap(
 	period: BN
 ): BN {
 	let oracleTwap = undefined;
-	if (period.eq(ONE_HOUR)) {
-		//todo: assumes its 1hr
+	if (period.eq(FIVE_MINUTE)) {
+		oracleTwap = histOracleData.lastOraclePriceTwap5Min;
+	} else {
+		//todo: assumes its fundingPeriod (1hr)
 		// period = amm.fundingPeriod;
 		oracleTwap = histOracleData.lastOraclePriceTwap;
-	} else if (period.eq(FIVE_MINUTE)) {
-		histOracleData.lastOraclePriceTwap5Min;
-	} else {
-		throw Error('unsupported twap period passed');
 	}
 
 	const sinceLastUpdate = BN.max(

package/src/math/utils.ts

@@ -1,10 +1,14 @@
-import { BN } from '../';
+import { BN, ZERO } from '../';
 
 export function clampBN(x: BN, min: BN, max: BN): BN {
 	return BN.max(min, BN.min(x, max));
 }
 
 export const squareRootBN = (n, closeness = new BN(1)): BN => {
+	if (n.lt(ZERO)) {
+		throw new Error('square root of negative number');
+	}
+
 	// Assuming the sqrt of n as n only
 	let x = n;
 

package/src/user.ts

@@ -365,13 +365,36 @@ export class User {
 	}
 
 	/**
-	 * calculates Buying Power = FC * MAX_LEVERAGE
+	 * calculates Buying Power = free collateral / initial margin ratio
 	 * @returns : Precision QUOTE_PRECISION
 	 */
 	public getBuyingPower(marketIndex: number): BN {
-		return this.getFreeCollateral()
-			.mul(this.getMaxLeverage(marketIndex, 'Initial'))
-			.div(TEN_THOUSAND);
+		const perpPosition = this.getPerpPosition(marketIndex);
+		const worstCaseBaseAssetAmount = perpPosition
+			? calculateWorstCaseBaseAssetAmount(perpPosition)
+			: ZERO;
+
+		const freeCollateral = this.getFreeCollateral();
+
+		return this.getBuyingPowerFromFreeCollateralAndBaseAssetAmount(
+			marketIndex,
+			freeCollateral,
+			worstCaseBaseAssetAmount
+		);
+	}
+
+	getBuyingPowerFromFreeCollateralAndBaseAssetAmount(
+		marketIndex: number,
+		freeCollateral: BN,
+		baseAssetAmount: BN
+	): BN {
+		const marginRatio = calculateMarketMarginRatio(
+			this.driftClient.getPerpMarketAccount(marketIndex),
+			baseAssetAmount,
+			'Initial'
+		);
+
+		return freeCollateral.mul(MARGIN_PRECISION).div(new BN(marginRatio));
 	}
 
 	/**
@@ -978,7 +1001,8 @@ export class User {
 	 */
 	public getPerpPositionValue(
 		marketIndex: number,
-		oraclePriceData: OraclePriceData
+		oraclePriceData: OraclePriceData,
+		includeOpenOrders = false
 	): BN {
 		const userPosition =
 			this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
@@ -988,7 +1012,8 @@ export class User {
 		return calculateBaseAssetValueWithOracle(
 			market,
 			userPosition,
-			oraclePriceData
+			oraclePriceData,
+			includeOpenOrders
 		);
 	}
 
@@ -1341,7 +1366,12 @@ export class User {
 
 		// calculate the total position value ignoring any value from the target market of the trade
 		const totalPositionValueExcludingTargetMarket =
-			this.getTotalPerpPositionValueExcludingMarket(perpPosition.marketIndex);
+			this.getTotalPerpPositionValueExcludingMarket(
+				perpPosition.marketIndex,
+				undefined,
+				undefined,
+				true
+			);
 
 		const currentPerpPosition =
 			this.getPerpPosition(perpPosition.marketIndex) ||
@@ -1363,8 +1393,8 @@ export class User {
 			quoteBreakEvenAmount: new BN(0),
 			quoteEntryAmount: new BN(0),
 			openOrders: 0,
-			openBids: new BN(0),
-			openAsks: new BN(0),
+			openBids: currentPerpPosition.openBids,
+			openAsks: currentPerpPosition.openAsks,
 			settledPnl: ZERO,
 			lpShares: ZERO,
 			lastBaseAssetAmountPerLp: ZERO,
@@ -1380,7 +1410,8 @@ export class User {
 		const proposedPerpPositionValue = calculateBaseAssetValueWithOracle(
 			market,
 			proposedPerpPosition,
-			this.getOracleDataForPerpMarket(market.marketIndex)
+			this.getOracleDataForPerpMarket(market.marketIndex),
+			true
 		);
 
 		// total position value after trade
@@ -1390,15 +1421,16 @@ export class User {
 		const marginRequirementOfAll = this.getMaintenanceMarginRequirement();
 		const positionValue = calculateBaseAssetValueWithOracle(
 			market,
-			proposedPerpPosition,
-			this.getOracleDataForPerpMarket(market.marketIndex)
+			currentPerpPosition,
+			this.getOracleDataForPerpMarket(market.marketIndex),
+			true
 		);
 		const marginRequirementOfTargetMarket = positionValue
 			.mul(
 				new BN(
 					calculateMarketMarginRatio(
 						market,
-						proposedPerpPosition.baseAssetAmount.abs(),
+						calculateWorstCaseBaseAssetAmount(currentPerpPosition).abs(),
 						'Maintenance'
 					)
 				)
@@ -1421,12 +1453,14 @@ export class User {
 			return new BN(-1);
 		}
 
+		const proposedWorstCastBaseAssetAmount =
+			calculateWorstCaseBaseAssetAmount(proposedPerpPosition);
 		const marginRequirementTargetMarket = proposedPerpPositionValue
 			.mul(
 				new BN(
 					calculateMarketMarginRatio(
 						market,
-						proposedPerpPosition.baseAssetAmount.abs(),
+						proposedWorstCastBaseAssetAmount.abs(),
 						'Maintenance'
 					)
 				)
@@ -1443,7 +1477,7 @@ export class User {
 			TEN_THOUSAND.mul(TEN_THOUSAND).toNumber() /
 				calculateMarketMarginRatio(
 					market,
-					proposedPerpPosition.baseAssetAmount,
+					proposedWorstCastBaseAssetAmount.abs(),
 					'Maintenance'
 				)
 		);
@@ -1591,9 +1625,12 @@ export class User {
 					const freeCollateralAfterClose = totalCollateral.sub(
 						marginRequirementAfterClosing
 					);
-					const buyingPowerAfterClose = freeCollateralAfterClose
-						.mul(this.getMaxLeverage(targetMarketIndex))
-						.div(TEN_THOUSAND);
+					const buyingPowerAfterClose =
+						this.getBuyingPowerFromFreeCollateralAndBaseAssetAmount(
+							targetMarketIndex,
+							freeCollateralAfterClose,
+							ZERO
+						);
 					maxPositionSize = perpPositionValue.add(buyingPowerAfterClose);
 				}
 			} else {
@@ -1630,7 +1667,8 @@ export class User {
 
 		let currentPositionQuoteAmount = this.getPerpPositionValue(
 			targetMarketIndex,
-			oracleData
+			oracleData,
+			includeOpenOrders
 		);
 
 		const currentSide =
@@ -1841,7 +1879,8 @@ export class User {
 		if (currentPerpPosition) {
 			currentPerpPositionValueUSDC = this.getPerpPositionValue(
 				marketToIgnore,
-				oracleData
+				oracleData,
+				includeOpenOrders
 			);
 		}