@drift-labs/sdk 2.31.1-beta.24 → 2.31.1-beta.26

package/VERSION

@@ -1 +1 @@
-2.31.1-beta.24
+2.31.1-beta.26

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.1-beta.23",
+    "version": "2.31.1-beta.25",
     "name": "drift",
     "instructions": [
         {

package/lib/user.d.ts

@@ -127,7 +127,6 @@ export declare class User {
     getSpotLiabilityValue(tokenAmount: BN, oraclePriceData: OraclePriceData, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory, liquidationBuffer?: BN, strict?: boolean, now?: BN): BN;
     getSpotMarketAssetValue(marketIndex?: number, marginCategory?: MarginCategory, includeOpenOrders?: boolean, strict?: boolean, now?: BN): BN;
     getSpotAssetValue(tokenAmount: BN, oraclePriceData: OraclePriceData, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory, strict?: boolean, now?: BN): BN;
-    getSpotTokenAmount(marketIndex: number): BN;
     getSpotPositionValue(marketIndex: number, marginCategory?: MarginCategory, includeOpenOrders?: boolean, strict?: boolean, now?: BN): BN;
     getNetSpotMarketValue(withWeightMarginCategory?: MarginCategory): BN;
     /**
@@ -267,12 +266,16 @@ export declare class User {
      * @param outMarketIndex
      * @param calculateSwap function to similate in to out swa
      * @param iterationLimit how long to run appromixation before erroring out
+     * @param inDelta how much to initially add to inAmount
+     * @param outDelta how much to initially add to outAmount
      */
-    getMaxSwapAmount({ inMarketIndex, outMarketIndex, calculateSwap, iterationLimit, }: {
+    getMaxSwapAmount({ inMarketIndex, outMarketIndex, calculateSwap, iterationLimit, inDelta, outDelta, }: {
         inMarketIndex: number;
         outMarketIndex: number;
         calculateSwap?: (inAmount: BN) => BN;
         iterationLimit?: number;
+        inDelta?: BN;
+        outDelta?: BN;
     }): {
         inAmount: BN;
         outAmount: BN;

package/lib/user.js

@@ -502,11 +502,6 @@ class User {
         }
         return assetValue;
     }
-    getSpotTokenAmount(marketIndex) {
-        var _a;
-        const spotPosition = (_a = this.getSpotPosition(marketIndex)) !== null && _a !== void 0 ? _a : this.getEmptySpotPosition(marketIndex);
-        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, this.driftClient.getSpotMarketAccount(marketIndex), spotPosition.balanceType);
-    }
     getSpotPositionValue(marketIndex, marginCategory, includeOpenOrders, strict = false, now) {
         const { totalAssetValue, totalLiabilityValue } = this.getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, undefined, includeOpenOrders, strict, now);
         return totalAssetValue.sub(totalLiabilityValue);
@@ -1083,13 +1078,13 @@ class User {
             // if the user is buying/selling and already short/long, need to account for closing out short/long
             if ((0, types_1.isVariant)(direction, 'long') && currentSpotMarketNetValue.lt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue.abs();
-                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getSpotTokenAmount(targetMarketIndex), _1.SpotBalanceType.BORROW);
+                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getTokenAmount(targetMarketIndex).abs(), _1.SpotBalanceType.BORROW);
                 freeCollateral = freeCollateral.add(tradeAmount.mul(new _1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION));
             }
             else if ((0, types_1.isVariant)(direction, 'short') &&
                 currentSpotMarketNetValue.gt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue;
-                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getSpotTokenAmount(targetMarketIndex), _1.SpotBalanceType.DEPOSIT);
+                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getTokenAmount(targetMarketIndex), _1.SpotBalanceType.DEPOSIT);
                 freeCollateral = freeCollateral.add(tradeAmount.mul(new _1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION));
             }
             tradeAmount = tradeAmount.add(freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new _1.BN(marginRatio)));
@@ -1110,8 +1105,10 @@ class User {
      * @param outMarketIndex
      * @param calculateSwap function to similate in to out swa
      * @param iterationLimit how long to run appromixation before erroring out
+     * @param inDelta how much to initially add to inAmount
+     * @param outDelta how much to initially add to outAmount
      */
-    getMaxSwapAmount({ inMarketIndex, outMarketIndex, calculateSwap, iterationLimit = 1000, }) {
+    getMaxSwapAmount({ inMarketIndex, outMarketIndex, calculateSwap, iterationLimit = 1000, inDelta, outDelta, }) {
         const inMarket = this.driftClient.getSpotMarketAccount(inMarketIndex);
         const outMarket = this.driftClient.getSpotMarketAccount(outMarketIndex);
         const inOraclePrice = this.getOracleDataForSpotMarket(inMarketIndex).price;
@@ -1119,10 +1116,16 @@ class User {
         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) ||
+        let inSpotPosition = this.getSpotPosition(inMarketIndex) ||
             this.getEmptySpotPosition(inMarketIndex);
-        const outSpotPosition = this.getSpotPosition(outMarketIndex) ||
+        if (inDelta) {
+            inSpotPosition = this.cloneAndUpdateSpotPosition(inSpotPosition, inDelta, inMarket);
+        }
+        let outSpotPosition = this.getSpotPosition(outMarketIndex) ||
             this.getEmptySpotPosition(outMarketIndex);
+        if (outDelta) {
+            outSpotPosition = this.cloneAndUpdateSpotPosition(outSpotPosition, outDelta, outMarket);
+        }
         const freeCollateral = this.getFreeCollateral();
         const inContributionInitial = this.calculateSpotPositionFreeCollateralContribution(inSpotPosition);
         const { totalAssetValue: inTotalAssetValueInitial, totalLiabilityValue: inTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(inSpotPosition);
@@ -1141,9 +1144,9 @@ class User {
         }
         let inSwap = numericConstants_1.ZERO;
         let outSwap = numericConstants_1.ZERO;
-        const inTokenAmount = this.getSpotTokenAmount(inMarketIndex);
+        const inTokenAmount = this.getTokenAmount(inMarketIndex);
         if (freeCollateral.lt(numericConstants_1.ONE)) {
-            if (outSaferThanIn) {
+            if (outSaferThanIn && inTokenAmount.gt(numericConstants_1.ZERO)) {
                 inSwap = inTokenAmount;
                 outSwap = calculateSwap(inSwap);
             }

package/package.json

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

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.1-beta.24",
+  "version": "2.31.1-beta.26",
   "name": "drift",
   "instructions": [
     {

package/src/user.ts

@@ -934,17 +934,6 @@ export class User {
 		return assetValue;
 	}
 
-	public getSpotTokenAmount(marketIndex: number): BN {
-		const spotPosition =
-			this.getSpotPosition(marketIndex) ??
-			this.getEmptySpotPosition(marketIndex);
-		return getTokenAmount(
-			spotPosition.scaledBalance,
-			this.driftClient.getSpotMarketAccount(marketIndex),
-			spotPosition.balanceType
-		);
-	}
-
 	public getSpotPositionValue(
 		marketIndex: number,
 		marginCategory?: MarginCategory,
@@ -1953,7 +1942,7 @@ export class User {
 				const marginRatio = calculateSpotMarketMarginRatio(
 					market,
 					'Initial',
-					this.getSpotTokenAmount(targetMarketIndex),
+					this.getTokenAmount(targetMarketIndex).abs(),
 					SpotBalanceType.BORROW
 				);
 				freeCollateral = freeCollateral.add(
@@ -1967,7 +1956,7 @@ export class User {
 				const marginRatio = calculateSpotMarketMarginRatio(
 					market,
 					'Initial',
-					this.getSpotTokenAmount(targetMarketIndex),
+					this.getTokenAmount(targetMarketIndex),
 					SpotBalanceType.DEPOSIT
 				);
 				freeCollateral = freeCollateral.add(
@@ -1998,17 +1987,23 @@ export class User {
 	 * @param outMarketIndex
 	 * @param calculateSwap function to similate in to out swa
 	 * @param iterationLimit how long to run appromixation before erroring out
+	 * @param inDelta how much to initially add to inAmount
+	 * @param outDelta how much to initially add to outAmount
 	 */
 	public getMaxSwapAmount({
 		inMarketIndex,
 		outMarketIndex,
 		calculateSwap,
 		iterationLimit = 1000,
+		inDelta,
+		outDelta,
 	}: {
 		inMarketIndex: number;
 		outMarketIndex: number;
 		calculateSwap?: (inAmount: BN) => BN;
 		iterationLimit?: number;
+		inDelta?: BN;
+		outDelta?: BN;
 	}): { inAmount: BN; outAmount: BN; leverage: BN } {
 		const inMarket = this.driftClient.getSpotMarketAccount(inMarketIndex);
 		const outMarket = this.driftClient.getSpotMarketAccount(outMarketIndex);
@@ -2023,12 +2018,26 @@ export class User {
 		const outSaferThanIn =
 			inMarket.initialAssetWeight < outMarket.initialAssetWeight;
 
-		const inSpotPosition =
+		let inSpotPosition =
 			this.getSpotPosition(inMarketIndex) ||
 			this.getEmptySpotPosition(inMarketIndex);
-		const outSpotPosition =
+		if (inDelta) {
+			inSpotPosition = this.cloneAndUpdateSpotPosition(
+				inSpotPosition,
+				inDelta,
+				inMarket
+			);
+		}
+		let outSpotPosition =
 			this.getSpotPosition(outMarketIndex) ||
 			this.getEmptySpotPosition(outMarketIndex);
+		if (outDelta) {
+			outSpotPosition = this.cloneAndUpdateSpotPosition(
+				outSpotPosition,
+				outDelta,
+				outMarket
+			);
+		}
 
 		const freeCollateral = this.getFreeCollateral();
 
@@ -2063,9 +2072,9 @@ export class User {
 
 		let inSwap = ZERO;
 		let outSwap = ZERO;
-		const inTokenAmount = this.getSpotTokenAmount(inMarketIndex);
+		const inTokenAmount = this.getTokenAmount(inMarketIndex);
 		if (freeCollateral.lt(ONE)) {
-			if (outSaferThanIn) {
+			if (outSaferThanIn && inTokenAmount.gt(ZERO)) {
 				inSwap = inTokenAmount;
 				outSwap = calculateSwap(inSwap);
 			}