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

package/VERSION

@@ -1 +1 @@
-2.33.1-beta.1
+2.33.1-beta.2

package/lib/user.js

@@ -1113,7 +1113,6 @@ class User {
         const outOraclePrice = this.getOracleDataForSpotMarket(outMarketIndex).price;
         const inPrecision = new _1.BN(10 ** inMarket.decimals);
         const outPrecision = new _1.BN(10 ** outMarket.decimals);
-        const outSaferThanIn = inMarket.initialAssetWeight < outMarket.initialAssetWeight;
         const inSpotPosition = this.getSpotPosition(inMarketIndex) ||
             this.getEmptySpotPosition(inMarketIndex);
         const outSpotPosition = this.getSpotPosition(outMarketIndex) ||
@@ -1137,6 +1136,12 @@ class User {
         let inSwap = numericConstants_1.ZERO;
         let outSwap = numericConstants_1.ZERO;
         const inTokenAmount = this.getTokenAmount(inMarketIndex);
+        const outTokenAmount = this.getTokenAmount(outMarketIndex);
+        const outSaferThanIn = 
+        // selling asset to close borrow
+        (inTokenAmount.gt(numericConstants_1.ZERO) && outTokenAmount.lt(numericConstants_1.ZERO)) ||
+            // buying asset with higher initial asset weight
+            inMarket.initialAssetWeight < outMarket.initialAssetWeight;
         if (freeCollateral.lt(numericConstants_1.ONE)) {
             if (outSaferThanIn && inTokenAmount.gt(numericConstants_1.ZERO)) {
                 inSwap = inTokenAmount;
@@ -1145,11 +1150,9 @@ class User {
         }
         else {
             let minSwap = numericConstants_1.ZERO;
-            let maxSwap = freeCollateral
-                .mul(inPrecision)
-                .mul(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
-                .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION.div(new _1.BN(100)))
-                .div(inOraclePrice); // just assume user can go 100x
+            let maxSwap = _1.BN.max(freeCollateral.mul(inPrecision).mul(new _1.BN(100)).div(inOraclePrice), // 100x current free collateral
+            inTokenAmount.abs().mul(new _1.BN(10)) // 10x current position
+            );
             inSwap = maxSwap.div(numericConstants_1.TWO);
             const error = freeCollateral.div(new _1.BN(10000));
             let i = 0;

package/package.json

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

package/src/user.ts

@@ -2009,9 +2009,6 @@ export class User {
 		const inPrecision = new BN(10 ** inMarket.decimals);
 		const outPrecision = new BN(10 ** outMarket.decimals);
 
-		const outSaferThanIn =
-			inMarket.initialAssetWeight < outMarket.initialAssetWeight;
-
 		const inSpotPosition =
 			this.getSpotPosition(inMarketIndex) ||
 			this.getEmptySpotPosition(inMarketIndex);
@@ -2053,6 +2050,14 @@ export class User {
 		let inSwap = ZERO;
 		let outSwap = ZERO;
 		const inTokenAmount = this.getTokenAmount(inMarketIndex);
+		const outTokenAmount = this.getTokenAmount(outMarketIndex);
+
+		const outSaferThanIn =
+			// selling asset to close borrow
+			(inTokenAmount.gt(ZERO) && outTokenAmount.lt(ZERO)) ||
+			// buying asset with higher initial asset weight
+			inMarket.initialAssetWeight < outMarket.initialAssetWeight;
+
 		if (freeCollateral.lt(ONE)) {
 			if (outSaferThanIn && inTokenAmount.gt(ZERO)) {
 				inSwap = inTokenAmount;
@@ -2060,11 +2065,10 @@ export class User {
 			}
 		} else {
 			let minSwap = ZERO;
-			let maxSwap = freeCollateral
-				.mul(inPrecision)
-				.mul(SPOT_MARKET_WEIGHT_PRECISION)
-				.div(SPOT_MARKET_WEIGHT_PRECISION.div(new BN(100)))
-				.div(inOraclePrice); // just assume user can go 100x
+			let maxSwap = BN.max(
+				freeCollateral.mul(inPrecision).mul(new BN(100)).div(inOraclePrice), // 100x current free collateral
+				inTokenAmount.abs().mul(new BN(10)) // 10x current position
+			);
 			inSwap = maxSwap.div(TWO);
 			const error = freeCollateral.div(new BN(10000));
 

package/tests/dlob/test.ts

@@ -22,10 +22,11 @@ import {
 	ZERO,
 	convertToNumber,
 	QUOTE_PRECISION,
+	isVariant,
+	TWO
 } from '../../src';
 
 import { mockPerpMarkets, mockSpotMarkets, mockStateAccount } from './helpers';
-import { isVariant, TWO } from '../../lib';
 import { DLOBOrdersCoder } from '../../src/dlob/DLOBOrders';
 
 function insertOrderToDLOB(