@drift-labs/sdk 2.60.0-beta.12 → 2.60.0-beta.13

package/VERSION

@@ -1 +1 @@
-2.60.0-beta.12
+2.60.0-beta.13

package/lib/user.js

@@ -1136,6 +1136,8 @@ class User {
                 freeCollateralChange = costBasis.sub(newPositionValue);
             }
             else {
+                console.log('newPositionValue', newPositionValue.toString());
+                console.log('costBasis', costBasis.toString());
                 freeCollateralChange = newPositionValue.sub(costBasis);
             }
             // assume worst fee tier
@@ -1146,17 +1148,12 @@ class User {
             freeCollateralChange = freeCollateralChange.sub(takerFee);
         }
         const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
-        const marginRatioBefore = (0, _1.calculateMarketMarginRatio)(market, worstCaseBaseAssetAmount.abs(), 'Maintenance');
         const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
         const newMarginRatio = (0, _1.calculateMarketMarginRatio)(market, newWorstCaseBaseAssetAmount.abs(), 'Maintenance');
-        // update free collateral to account for change in margin ratio from position change
-        freeCollateralChange = freeCollateralChange.sub(worstCaseBaseAssetAmount
-            .mul(oraclePrice)
-            .div(numericConstants_1.BASE_PRECISION)
-            .mul(new _1.BN(newMarginRatio - marginRatioBefore))
-            .div(numericConstants_1.MARGIN_PRECISION));
         // update free collateral to account for new margin requirement from position change
-        freeCollateralChange = freeCollateralChange.sub(positionBaseSizeChange
+        freeCollateralChange = freeCollateralChange.sub(newWorstCaseBaseAssetAmount
+            .abs()
+            .sub(worstCaseBaseAssetAmount.abs())
             .mul(oraclePrice)
             .div(numericConstants_1.BASE_PRECISION)
             .mul(new _1.BN(newMarginRatio))

package/package.json

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

package/src/user.ts

@@ -2092,6 +2092,8 @@ export class User {
 			if (positionBaseSizeChange.gt(ZERO)) {
 				freeCollateralChange = costBasis.sub(newPositionValue);
 			} else {
+				console.log('newPositionValue', newPositionValue.toString());
+				console.log('costBasis', costBasis.toString());
 				freeCollateralChange = newPositionValue.sub(costBasis);
 			}
 
@@ -2107,12 +2109,6 @@ export class User {
 		const worstCaseBaseAssetAmount =
 			calculateWorstCaseBaseAssetAmount(perpPosition);
 
-		const marginRatioBefore = calculateMarketMarginRatio(
-			market,
-			worstCaseBaseAssetAmount.abs(),
-			'Maintenance'
-		);
-
 		const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(
 			positionBaseSizeChange
 		);
@@ -2123,18 +2119,11 @@ export class User {
 			'Maintenance'
 		);
 
-		// update free collateral to account for change in margin ratio from position change
-		freeCollateralChange = freeCollateralChange.sub(
-			worstCaseBaseAssetAmount
-				.mul(oraclePrice)
-				.div(BASE_PRECISION)
-				.mul(new BN(newMarginRatio - marginRatioBefore))
-				.div(MARGIN_PRECISION)
-		);
-
 		// update free collateral to account for new margin requirement from position change
 		freeCollateralChange = freeCollateralChange.sub(
-			positionBaseSizeChange
+			newWorstCaseBaseAssetAmount
+				.abs()
+				.sub(worstCaseBaseAssetAmount.abs())
 				.mul(oraclePrice)
 				.div(BASE_PRECISION)
 				.mul(new BN(newMarginRatio))