@drift-labs/sdk 2.32.1-beta.1 → 2.32.1-beta.10

package/VERSION

@@ -1 +1 @@
-2.32.1-beta.1
+2.32.1-beta.10

package/lib/driftClient.js

@@ -2039,7 +2039,7 @@ class DriftClient {
     async getSwapIx({ outMarketIndex, inMarketIndex, amountIn, inTokenAccount, outTokenAccount, limitPrice, reduceOnly, userAccountPublicKey, }) {
         const userAccountPublicKeyToUse = userAccountPublicKey || (await this.getUserAccountPublicKey());
         const userAccounts = [];
-        if (this.getUser().getUserAccountAndSlot()) {
+        if (this.hasUser() && this.getUser().getUserAccountAndSlot()) {
             userAccounts.push(this.getUser().getUserAccountAndSlot().data);
         }
         const remainingAccounts = this.getRemainingAccounts({

package/lib/index.d.ts

@@ -24,6 +24,7 @@ export * from './testClient';
 export * from './user';
 export * from './userConfig';
 export * from './userStats';
+export * from './userName';
 export * from './userStatsConfig';
 export * from './driftClient';
 export * from './factory/oracleClient';
@@ -82,4 +83,5 @@ export * from './orderSubscriber';
 export * from './orderSubscriber/types';
 export * from './auctionSubscriber';
 export * from './auctionSubscriber/types';
+export * from './memcmp';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -47,6 +47,7 @@ __exportStar(require("./testClient"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./userConfig"), exports);
 __exportStar(require("./userStats"), exports);
+__exportStar(require("./userName"), exports);
 __exportStar(require("./userStatsConfig"), exports);
 __exportStar(require("./driftClient"), exports);
 __exportStar(require("./factory/oracleClient"), exports);
@@ -105,3 +106,4 @@ __exportStar(require("./orderSubscriber"), exports);
 __exportStar(require("./orderSubscriber/types"), exports);
 __exportStar(require("./auctionSubscriber"), exports);
 __exportStar(require("./auctionSubscriber/types"), exports);
+__exportStar(require("./memcmp"), exports);

package/lib/math/spotBalance.d.ts

@@ -56,7 +56,10 @@ export declare function calculateUtilization(bank: SpotMarketAccount, delta?: an
  * @param targetBorrowRate
  * @returns : Precision: TOKEN DECIMALS
  */
-export declare function calculateSpotMarketBorrowCapacity(spotMarketAccount: SpotMarketAccount, targetBorrowRate: BN): BN;
+export declare function calculateSpotMarketBorrowCapacity(spotMarketAccount: SpotMarketAccount, targetBorrowRate: BN): {
+    totalCapacity: BN;
+    remainingCapacity: BN;
+};
 export declare function calculateInterestRate(bank: SpotMarketAccount, delta?: any): BN;
 export declare function calculateDepositRate(bank: SpotMarketAccount): BN;
 export declare function calculateBorrowRate(bank: SpotMarketAccount): BN;

package/lib/math/spotBalance.js

@@ -188,38 +188,39 @@ exports.calculateUtilization = calculateUtilization;
  */
 function calculateSpotMarketBorrowCapacity(spotMarketAccount, targetBorrowRate) {
     const currentBorrowRate = calculateBorrowRate(spotMarketAccount);
+    const tokenDepositAmount = getTokenAmount(spotMarketAccount.depositBalance, spotMarketAccount, types_1.SpotBalanceType.DEPOSIT);
+    const tokenBorrowAmount = getTokenAmount(spotMarketAccount.borrowBalance, spotMarketAccount, types_1.SpotBalanceType.BORROW);
+    let targetUtilization;
+    // target utilization past mid point
+    if (targetBorrowRate.gte(new anchor_1.BN(spotMarketAccount.optimalBorrowRate))) {
+        const borrowRateSlope = new anchor_1.BN(spotMarketAccount.maxBorrowRate - spotMarketAccount.optimalBorrowRate)
+            .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
+            .div(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION.sub(new anchor_1.BN(spotMarketAccount.optimalUtilization)));
+        const surplusTargetUtilization = targetBorrowRate
+            .sub(new anchor_1.BN(spotMarketAccount.optimalBorrowRate))
+            .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
+            .div(borrowRateSlope);
+        targetUtilization = surplusTargetUtilization.add(new anchor_1.BN(spotMarketAccount.optimalUtilization));
+    }
+    else {
+        const borrowRateSlope = new anchor_1.BN(spotMarketAccount.optimalBorrowRate)
+            .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
+            .div(new anchor_1.BN(spotMarketAccount.optimalUtilization));
+        targetUtilization = targetBorrowRate
+            .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
+            .div(borrowRateSlope);
+    }
+    const totalCapacity = tokenDepositAmount
+        .mul(targetUtilization)
+        .div(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION);
+    let remainingCapacity;
     if (currentBorrowRate.gte(targetBorrowRate)) {
-        return numericConstants_1.ZERO;
+        remainingCapacity = numericConstants_1.ZERO;
     }
     else {
-        const tokenDepositAmount = getTokenAmount(spotMarketAccount.depositBalance, spotMarketAccount, types_1.SpotBalanceType.DEPOSIT);
-        const tokenBorrowAmount = getTokenAmount(spotMarketAccount.borrowBalance, spotMarketAccount, types_1.SpotBalanceType.BORROW);
-        let targetUtilization;
-        // target utilization past mid point
-        if (targetBorrowRate.gte(new anchor_1.BN(spotMarketAccount.optimalBorrowRate))) {
-            const borrowRateSlope = new anchor_1.BN(spotMarketAccount.maxBorrowRate - spotMarketAccount.optimalBorrowRate)
-                .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
-                .div(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION.sub(new anchor_1.BN(spotMarketAccount.optimalUtilization)));
-            const surplusTargetUtilization = targetBorrowRate
-                .sub(new anchor_1.BN(spotMarketAccount.optimalBorrowRate))
-                .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
-                .div(borrowRateSlope);
-            targetUtilization = surplusTargetUtilization.add(new anchor_1.BN(spotMarketAccount.optimalUtilization));
-        }
-        else {
-            const borrowRateSlope = new anchor_1.BN(spotMarketAccount.optimalBorrowRate)
-                .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
-                .div(new anchor_1.BN(spotMarketAccount.optimalUtilization));
-            targetUtilization = targetBorrowRate
-                .mul(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION)
-                .div(borrowRateSlope);
-        }
-        const targetBorrowAmount = tokenDepositAmount
-            .mul(targetUtilization)
-            .div(numericConstants_1.SPOT_MARKET_UTILIZATION_PRECISION);
-        const capacity = anchor_1.BN.max(numericConstants_1.ZERO, targetBorrowAmount.sub(tokenBorrowAmount));
-        return capacity;
+        remainingCapacity = anchor_1.BN.max(numericConstants_1.ZERO, totalCapacity.sub(tokenBorrowAmount));
     }
+    return { totalCapacity, remainingCapacity };
 }
 exports.calculateSpotMarketBorrowCapacity = calculateSpotMarketBorrowCapacity;
 function calculateInterestRate(bank, delta = numericConstants_1.ZERO) {

package/lib/math/superStake.d.ts

@@ -4,11 +4,13 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
-export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, }: {
+export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMariande, }: {
     amount: BN;
     jupiterClient: JupiterClient;
     driftClient: DriftClient;
+    marinadePrice?: number;
     userAccountPublicKey?: PublicKey;
+    forceMariande?: boolean;
 }): Promise<{
     ixs: TransactionInstruction[];
     lookupTables: AddressLookupTableAccount[];

package/lib/math/superStake.js

@@ -10,19 +10,28 @@ const anchor_1 = require("@coral-xyz/anchor");
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, }) {
-    const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
-    const marinadePrice = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
+async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMariande, }) {
+    if (!marinadePrice) {
+        const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
+        marinadePrice = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
+    }
     const solMint = driftClient.getSpotMarketAccount(1).mint;
     const mSOLMint = driftClient.getSpotMarketAccount(2).mint;
-    const jupiterRoutes = await jupiterClient.getRoutes({
-        inputMint: solMint,
-        outputMint: mSOLMint,
-        amount,
-    });
-    const bestRoute = jupiterRoutes[0];
-    const jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
-    if (marinadePrice <= jupiterPrice) {
+    let jupiterPrice;
+    let bestRoute;
+    try {
+        const jupiterRoutes = await jupiterClient.getRoutes({
+            inputMint: solMint,
+            outputMint: mSOLMint,
+            amount,
+        });
+        bestRoute = jupiterRoutes[0];
+        jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
+    }
+    catch (e) {
+        console.error('Error getting jupiter price', e);
+    }
+    if (!jupiterPrice || marinadePrice <= jupiterPrice || forceMariande) {
         const ixs = await driftClient.getStakeForMSOLIx({ amount });
         return {
             method: 'marinade',

package/lib/memcmp.d.ts

@@ -4,3 +4,4 @@ export declare function getNonIdleUserFilter(): MemcmpFilter;
 export declare function getUserWithOrderFilter(): MemcmpFilter;
 export declare function getUserWithAuctionFilter(): MemcmpFilter;
 export declare function getUserThatHasBeenLP(): MemcmpFilter;
+export declare function getUserWithName(name: string): MemcmpFilter;

package/lib/memcmp.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
+exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("@coral-xyz/anchor");
+const userName_1 = require("./userName");
 function getUserFilter() {
     return {
         memcmp: {
@@ -51,3 +52,12 @@ function getUserThatHasBeenLP() {
     };
 }
 exports.getUserThatHasBeenLP = getUserThatHasBeenLP;
+function getUserWithName(name) {
+    return {
+        memcmp: {
+            offset: 72,
+            bytes: bs58_1.default.encode(Uint8Array.from((0, userName_1.encodeName)(name))),
+        },
+    };
+}
+exports.getUserWithName = getUserWithName;

package/lib/user.js

@@ -1151,7 +1151,7 @@ class User {
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION.div(new _1.BN(100)))
                 .div(inOraclePrice); // just assume user can go 100x
             inSwap = maxSwap.div(numericConstants_1.TWO);
-            const error = _1.BN.min(numericConstants_1.QUOTE_PRECISION, freeCollateral.div(new _1.BN(100)));
+            const error = freeCollateral.div(new _1.BN(10000));
             let i = 0;
             let freeCollateralAfter = freeCollateral;
             while (freeCollateralAfter.gt(error) || freeCollateralAfter.isNeg()) {
@@ -1172,7 +1172,8 @@ class User {
                     inSwap = minSwap.add(maxSwap).div(numericConstants_1.TWO);
                 }
                 if (i++ > iterationLimit) {
-                    throw new Error('getMaxSwapAmount iteration limit reached');
+                    console.log('getMaxSwapAmount iteration limit reached');
+                    break;
                 }
             }
         }

package/package.json

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

package/src/driftClient.ts

@@ -3574,7 +3574,7 @@ export class DriftClient {
 			userAccountPublicKey || (await this.getUserAccountPublicKey());
 
 		const userAccounts = [];
-		if (this.getUser().getUserAccountAndSlot()) {
+		if (this.hasUser() && this.getUser().getUserAccountAndSlot()) {
 			userAccounts.push(this.getUser().getUserAccountAndSlot()!.data);
 		}
 		const remainingAccounts = this.getRemainingAccounts({

package/src/index.ts

@@ -25,6 +25,7 @@ export * from './testClient';
 export * from './user';
 export * from './userConfig';
 export * from './userStats';
+export * from './userName';
 export * from './userStatsConfig';
 export * from './driftClient';
 export * from './factory/oracleClient';
@@ -83,5 +84,6 @@ export * from './orderSubscriber';
 export * from './orderSubscriber/types';
 export * from './auctionSubscriber';
 export * from './auctionSubscriber/types';
+export * from './memcmp';
 
 export { BN, PublicKey, pyth };

package/src/math/spotBalance.ts

@@ -280,62 +280,64 @@ export function calculateUtilization(
 export function calculateSpotMarketBorrowCapacity(
 	spotMarketAccount: SpotMarketAccount,
 	targetBorrowRate: BN
-): BN {
+): { totalCapacity: BN; remainingCapacity: BN } {
 	const currentBorrowRate = calculateBorrowRate(spotMarketAccount);
 
-	if (currentBorrowRate.gte(targetBorrowRate)) {
-		return ZERO;
-	} else {
-		const tokenDepositAmount = getTokenAmount(
-			spotMarketAccount.depositBalance,
-			spotMarketAccount,
-			SpotBalanceType.DEPOSIT
-		);
-		const tokenBorrowAmount = getTokenAmount(
-			spotMarketAccount.borrowBalance,
-			spotMarketAccount,
-			SpotBalanceType.BORROW
-		);
+	const tokenDepositAmount = getTokenAmount(
+		spotMarketAccount.depositBalance,
+		spotMarketAccount,
+		SpotBalanceType.DEPOSIT
+	);
 
-		let targetUtilization;
-
-		// target utilization past mid point
-		if (targetBorrowRate.gte(new BN(spotMarketAccount.optimalBorrowRate))) {
-			const borrowRateSlope = new BN(
-				spotMarketAccount.maxBorrowRate - spotMarketAccount.optimalBorrowRate
-			)
-				.mul(SPOT_MARKET_UTILIZATION_PRECISION)
-				.div(
-					SPOT_MARKET_UTILIZATION_PRECISION.sub(
-						new BN(spotMarketAccount.optimalUtilization)
-					)
-				);
-
-			const surplusTargetUtilization = targetBorrowRate
-				.sub(new BN(spotMarketAccount.optimalBorrowRate))
-				.mul(SPOT_MARKET_UTILIZATION_PRECISION)
-				.div(borrowRateSlope);
-
-			targetUtilization = surplusTargetUtilization.add(
-				new BN(spotMarketAccount.optimalUtilization)
+	const tokenBorrowAmount = getTokenAmount(
+		spotMarketAccount.borrowBalance,
+		spotMarketAccount,
+		SpotBalanceType.BORROW
+	);
+
+	let targetUtilization;
+	// target utilization past mid point
+	if (targetBorrowRate.gte(new BN(spotMarketAccount.optimalBorrowRate))) {
+		const borrowRateSlope = new BN(
+			spotMarketAccount.maxBorrowRate - spotMarketAccount.optimalBorrowRate
+		)
+			.mul(SPOT_MARKET_UTILIZATION_PRECISION)
+			.div(
+				SPOT_MARKET_UTILIZATION_PRECISION.sub(
+					new BN(spotMarketAccount.optimalUtilization)
+				)
 			);
-		} else {
-			const borrowRateSlope = new BN(spotMarketAccount.optimalBorrowRate)
-				.mul(SPOT_MARKET_UTILIZATION_PRECISION)
-				.div(new BN(spotMarketAccount.optimalUtilization));
-
-			targetUtilization = targetBorrowRate
-				.mul(SPOT_MARKET_UTILIZATION_PRECISION)
-				.div(borrowRateSlope);
-		}
-
-		const targetBorrowAmount = tokenDepositAmount
-			.mul(targetUtilization)
-			.div(SPOT_MARKET_UTILIZATION_PRECISION);
-		const capacity = BN.max(ZERO, targetBorrowAmount.sub(tokenBorrowAmount));
 
-		return capacity;
+		const surplusTargetUtilization = targetBorrowRate
+			.sub(new BN(spotMarketAccount.optimalBorrowRate))
+			.mul(SPOT_MARKET_UTILIZATION_PRECISION)
+			.div(borrowRateSlope);
+
+		targetUtilization = surplusTargetUtilization.add(
+			new BN(spotMarketAccount.optimalUtilization)
+		);
+	} else {
+		const borrowRateSlope = new BN(spotMarketAccount.optimalBorrowRate)
+			.mul(SPOT_MARKET_UTILIZATION_PRECISION)
+			.div(new BN(spotMarketAccount.optimalUtilization));
+
+		targetUtilization = targetBorrowRate
+			.mul(SPOT_MARKET_UTILIZATION_PRECISION)
+			.div(borrowRateSlope);
 	}
+
+	const totalCapacity = tokenDepositAmount
+		.mul(targetUtilization)
+		.div(SPOT_MARKET_UTILIZATION_PRECISION);
+
+	let remainingCapacity;
+	if (currentBorrowRate.gte(targetBorrowRate)) {
+		remainingCapacity = ZERO;
+	} else {
+		remainingCapacity = BN.max(ZERO, totalCapacity.sub(tokenBorrowAmount));
+	}
+
+	return { totalCapacity, remainingCapacity };
 }
 
 export function calculateInterestRate(

package/src/math/superStake.ts

@@ -18,32 +18,45 @@ export async function findBestSuperStakeIxs({
 	jupiterClient,
 	driftClient,
 	userAccountPublicKey,
+	marinadePrice,
+	forceMariande,
 }: {
 	amount: BN;
 	jupiterClient: JupiterClient;
 	driftClient: DriftClient;
+	marinadePrice?: number;
 	userAccountPublicKey?: PublicKey;
+	forceMariande?: boolean;
 }): Promise<{
 	ixs: TransactionInstruction[];
 	lookupTables: AddressLookupTableAccount[];
 	method: 'jupiter' | 'marinade';
 	price: number;
 }> {
-	const marinadeProgram = getMarinadeFinanceProgram(driftClient.provider);
-	const marinadePrice = await getMarinadeMSolPrice(marinadeProgram);
+	if (!marinadePrice) {
+		const marinadeProgram = getMarinadeFinanceProgram(driftClient.provider);
+		marinadePrice = await getMarinadeMSolPrice(marinadeProgram);
+	}
 
 	const solMint = driftClient.getSpotMarketAccount(1).mint;
 	const mSOLMint = driftClient.getSpotMarketAccount(2).mint;
-	const jupiterRoutes = await jupiterClient.getRoutes({
-		inputMint: solMint,
-		outputMint: mSOLMint,
-		amount,
-	});
 
-	const bestRoute = jupiterRoutes[0];
-	const jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
+	let jupiterPrice;
+	let bestRoute;
+	try {
+		const jupiterRoutes = await jupiterClient.getRoutes({
+			inputMint: solMint,
+			outputMint: mSOLMint,
+			amount,
+		});
+
+		bestRoute = jupiterRoutes[0];
+		jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
+	} catch (e) {
+		console.error('Error getting jupiter price', e);
+	}
 
-	if (marinadePrice <= jupiterPrice) {
+	if (!jupiterPrice || marinadePrice <= jupiterPrice || forceMariande) {
 		const ixs = await driftClient.getStakeForMSOLIx({ amount });
 		return {
 			method: 'marinade',

package/src/memcmp.ts

@@ -1,6 +1,7 @@
 import { MemcmpFilter } from '@solana/web3.js';
 import bs58 from 'bs58';
 import { BorshAccountsCoder } from '@coral-xyz/anchor';
+import { encodeName } from './userName';
 
 export function getUserFilter(): MemcmpFilter {
 	return {
@@ -46,3 +47,12 @@ export function getUserThatHasBeenLP(): MemcmpFilter {
 		},
 	};
 }
+
+export function getUserWithName(name: string): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 72,
+			bytes: bs58.encode(Uint8Array.from(encodeName(name))),
+		},
+	};
+}

package/src/user.ts

@@ -2066,7 +2066,7 @@ export class User {
 				.div(SPOT_MARKET_WEIGHT_PRECISION.div(new BN(100)))
 				.div(inOraclePrice); // just assume user can go 100x
 			inSwap = maxSwap.div(TWO);
-			const error = BN.min(QUOTE_PRECISION, freeCollateral.div(new BN(100)));
+			const error = freeCollateral.div(new BN(10000));
 
 			let i = 0;
 			let freeCollateralAfter = freeCollateral;
@@ -2106,7 +2106,8 @@ export class User {
 				}
 
 				if (i++ > iterationLimit) {
-					throw new Error('getMaxSwapAmount iteration limit reached');
+					console.log('getMaxSwapAmount iteration limit reached');
+					break;
 				}
 			}
 		}

package/tests/spot/test.ts

@@ -27,19 +27,17 @@ describe('Spot Tests', () => {
 		mockSpot.borrowBalance = ZERO;
 
 		// todo, should incorp all other spot market constraints?
-		const aboveMaxAmount = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(2000000)
-		);
+		const { remainingCapacity: aboveMaxAmount } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(2000000));
 		assert(aboveMaxAmount.gt(mockSpot.depositBalance));
 
-		const maxAmount = calculateSpotMarketBorrowCapacity(
+		const { remainingCapacity: maxAmount } = calculateSpotMarketBorrowCapacity(
 			mockSpot,
 			new BN(1000000)
 		);
 		assert(maxAmount.eq(mockSpot.depositBalance));
 
-		const optAmount = calculateSpotMarketBorrowCapacity(
+		const { remainingCapacity: optAmount } = calculateSpotMarketBorrowCapacity(
 			mockSpot,
 			new BN(100000)
 		);
@@ -47,34 +45,26 @@ describe('Spot Tests', () => {
 		// console.log('optAmount:', optAmount.toNumber(), ans.toNumber());
 		assert(optAmount.eq(ans));
 
-		const betweenOptMaxAmount = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(810000)
-		);
+		const { remainingCapacity: betweenOptMaxAmount } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(810000));
 		// console.log('betweenOptMaxAmount:', betweenOptMaxAmount.toNumber());
 		assert(betweenOptMaxAmount.lt(mockSpot.depositBalance));
 		assert(betweenOptMaxAmount.gt(ans));
 		assert(betweenOptMaxAmount.eq(new BN(93666600000000)));
 
-		const belowOptAmount = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(50000)
-		);
+		const { remainingCapacity: belowOptAmount } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(50000));
 		// console.log('belowOptAmount:', belowOptAmount.toNumber());
 		assert(belowOptAmount.eq(ans.div(new BN(2))));
 
-		const belowOptAmount2 = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(24900)
-		);
+		const { remainingCapacity: belowOptAmount2 } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(24900));
 		// console.log('belowOptAmount2:', belowOptAmount2.toNumber());
 		assert(belowOptAmount2.lt(ans.div(new BN(4))));
 		assert(belowOptAmount2.eq(new BN('17430000000000')));
 
-		const belowOptAmount3 = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(1)
-		);
+		const { remainingCapacity: belowOptAmount3 } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(1));
 		// console.log('belowOptAmount3:', belowOptAmount3.toNumber());
 		assert(belowOptAmount3.eq(new BN('700000000'))); //0.7
 	});
@@ -97,59 +87,47 @@ describe('Spot Tests', () => {
 		mockSpot.borrowBalance = new BN(7089.91675884 * 1e9);
 
 		// todo, should incorp all other spot market constraints?
-		const aboveMaxAmount = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(2000000)
-		);
+		const { remainingCapacity: aboveMaxAmount } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(2000000));
 		assert(aboveMaxAmount.eq(new BN('111498270939007')));
 
-		const maxAmount = calculateSpotMarketBorrowCapacity(
+		const { remainingCapacity: maxAmount } = calculateSpotMarketBorrowCapacity(
 			mockSpot,
 			new BN(1000000)
 		);
 		assert(maxAmount.eq(new BN('82502230374168')));
 		// console.log('aboveMaxAmount:', aboveMaxAmount.toNumber(), 'maxAmount:', maxAmount.toNumber());
-		const optAmount = calculateSpotMarketBorrowCapacity(
+		const { remainingCapacity: optAmount } = calculateSpotMarketBorrowCapacity(
 			mockSpot,
 			new BN(70000)
 		);
 		// console.log('optAmount:', optAmount.toNumber());
 		assert(optAmount.eq(new BN('55535858716123'))); // ~ 55535
 
-		const betweenOptMaxAmount = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(810000)
-		);
+		const { remainingCapacity: betweenOptMaxAmount } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(810000));
 		// console.log('betweenOptMaxAmount:', betweenOptMaxAmount.toNumber());
 		assert(betweenOptMaxAmount.lt(maxAmount));
 		assert(betweenOptMaxAmount.eq(new BN(76992910756523)));
 		assert(betweenOptMaxAmount.gt(optAmount));
 
-		const belowOptAmount = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(50000)
-		);
+		const { remainingCapacity: belowOptAmount } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(50000));
 		// console.log('belowOptAmount:', belowOptAmount.toNumber());
 		assert(belowOptAmount.eq(new BN('37558277610760')));
 
-		const belowOptAmount2 = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(24900)
-		);
+		const { remainingCapacity: belowOptAmount2 } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(24900));
 		// console.log('belowOptAmount2:', belowOptAmount2.toNumber());
 		assert(belowOptAmount2.eq(new BN('14996413323529')));
 
-		const belowOptAmount3 = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(4900)
-		);
+		const { remainingCapacity: belowOptAmount3 } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(4900));
 		// console.log('belowOptAmount2:', belowOptAmount3.toNumber());
 		assert(belowOptAmount3.eq(new BN('0')));
 
-		const belowOptAmount4 = calculateSpotMarketBorrowCapacity(
-			mockSpot,
-			new BN(1)
-		);
+		const { remainingCapacity: belowOptAmount4 } =
+			calculateSpotMarketBorrowCapacity(mockSpot, new BN(1));
 		// console.log('belowOptAmount3:', belowOptAmount4.toNumber());
 		assert(belowOptAmount4.eq(new BN('0')));
 	});