@drift-labs/sdk 2.31.1-beta.16 → 2.31.1-beta.18

package/VERSION

@@ -1 +1 @@
-2.31.1-beta.16
+2.31.1-beta.18

package/lib/idl/drift.json

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

package/lib/math/spotBalance.d.ts

@@ -49,7 +49,7 @@ export declare function getStrictTokenValue(tokenAmount: BN, spotDecimals: numbe
 export declare function getTokenValue(tokenAmount: BN, spotDecimals: number, oraclePriceData: OraclePriceData): BN;
 export declare function calculateAssetWeight(balanceAmount: BN, spotMarket: SpotMarketAccount, marginCategory: MarginCategory): BN;
 export declare function calculateLiabilityWeight(size: BN, spotMarket: SpotMarketAccount, marginCategory: MarginCategory): BN;
-export declare function calculateUtilization(bank: SpotMarketAccount): BN;
+export declare function calculateUtilization(bank: SpotMarketAccount, delta?: any): BN;
 /**
  * calculates max borrow amount where rate would stay below targetBorrowRate
  * @param spotMarketAccount
@@ -57,7 +57,7 @@ export declare function calculateUtilization(bank: SpotMarketAccount): BN;
  * @returns : Precision: TOKEN DECIMALS
  */
 export declare function calculateSpotMarketBorrowCapacity(spotMarketAccount: SpotMarketAccount, targetBorrowRate: BN): BN;
-export declare function calculateInterestRate(bank: SpotMarketAccount): BN;
+export declare function calculateInterestRate(bank: SpotMarketAccount, delta?: any): BN;
 export declare function calculateDepositRate(bank: SpotMarketAccount): BN;
 export declare function calculateBorrowRate(bank: SpotMarketAccount): BN;
 export declare function calculateInterestAccumulated(bank: SpotMarketAccount, now: BN): {

package/lib/math/spotBalance.js

@@ -156,9 +156,15 @@ function calculateLiabilityWeight(size, spotMarket, marginCategory) {
     return liabilityWeight;
 }
 exports.calculateLiabilityWeight = calculateLiabilityWeight;
-function calculateUtilization(bank) {
-    const tokenDepositAmount = getTokenAmount(bank.depositBalance, bank, types_1.SpotBalanceType.DEPOSIT);
-    const tokenBorrowAmount = getTokenAmount(bank.borrowBalance, bank, types_1.SpotBalanceType.BORROW);
+function calculateUtilization(bank, delta = numericConstants_1.ZERO) {
+    let tokenDepositAmount = getTokenAmount(bank.depositBalance, bank, types_1.SpotBalanceType.DEPOSIT);
+    let tokenBorrowAmount = getTokenAmount(bank.borrowBalance, bank, types_1.SpotBalanceType.BORROW);
+    if (delta.gt(numericConstants_1.ZERO)) {
+        tokenDepositAmount = tokenDepositAmount.add(delta);
+    }
+    else if (delta.lt(numericConstants_1.ZERO)) {
+        tokenBorrowAmount = tokenBorrowAmount.add(delta.abs());
+    }
     let utilization;
     if (tokenBorrowAmount.eq(numericConstants_1.ZERO) && tokenDepositAmount.eq(numericConstants_1.ZERO)) {
         utilization = numericConstants_1.ZERO;
@@ -216,8 +222,8 @@ function calculateSpotMarketBorrowCapacity(spotMarketAccount, targetBorrowRate)
     }
 }
 exports.calculateSpotMarketBorrowCapacity = calculateSpotMarketBorrowCapacity;
-function calculateInterestRate(bank) {
-    const utilization = calculateUtilization(bank);
+function calculateInterestRate(bank, delta = numericConstants_1.ZERO) {
+    const utilization = calculateUtilization(bank, delta);
     let interestRate;
     if (utilization.gt(new anchor_1.BN(bank.optimalUtilization))) {
         const surplusUtilization = utilization.sub(new anchor_1.BN(bank.optimalUtilization));

package/lib/math/superStake.d.ts

@@ -2,6 +2,8 @@ import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@s
 import { JupiterClient } from '../jupiter/jupiterClient';
 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, }: {
     amount: BN;
     jupiterClient: JupiterClient;
@@ -13,3 +15,7 @@ export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClie
     method: 'jupiter' | 'marinade';
     price: number;
 }>;
+export declare function calculateSolEarned({ user, depositRecords, }: {
+    user: User;
+    depositRecords: DepositRecord[];
+}): Promise<BN>;

package/lib/math/superStake.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findBestSuperStakeIxs = void 0;
+exports.calculateSolEarned = exports.findBestSuperStakeIxs = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const marinade_1 = require("../marinade");
+const anchor_1 = require("@coral-xyz/anchor");
+const types_1 = require("../types");
+const numericConstants_1 = require("../constants/numericConstants");
 async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, }) {
     const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
     const marinadePrice = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
@@ -41,3 +45,52 @@ async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userA
     }
 }
 exports.findBestSuperStakeIxs = findBestSuperStakeIxs;
+async function calculateSolEarned({ user, depositRecords, }) {
+    const now = Date.now() / 1000;
+    const timestamps = [
+        now,
+        ...depositRecords.map((r) => r.ts.toNumber()),
+    ];
+    const msolRatios = new Map();
+    const getPrice = async (timestamp) => {
+        const date = new Date(timestamp * 1000); // Convert Unix timestamp to milliseconds
+        const swaggerApiDateTime = date.toISOString(); // Format date as swagger API date-time
+        const url = `https://api.marinade.finance/msol/price_sol?time=${swaggerApiDateTime}`;
+        const response = await fetch(url);
+        if (response.status === 200) {
+            const data = await response.json();
+            msolRatios.set(timestamp, data);
+        }
+    };
+    await Promise.all(timestamps.map(getPrice));
+    let solEarned = numericConstants_1.ZERO;
+    for (const record of depositRecords) {
+        if (record.marketIndex === 1) {
+            if ((0, types_1.isVariant)(record.explanation, 'deposit')) {
+                solEarned = solEarned.sub(record.amount);
+            }
+            else {
+                solEarned = solEarned.add(record.amount);
+            }
+        }
+        else if (record.marketIndex === 2) {
+            const msolRatio = msolRatios.get(record.ts.toNumber());
+            const msolRatioBN = new anchor_1.BN(msolRatio * web3_js_1.LAMPORTS_PER_SOL);
+            const solAmount = record.amount.mul(msolRatioBN).div(numericConstants_1.LAMPORTS_PRECISION);
+            if ((0, types_1.isVariant)(record.explanation, 'deposit')) {
+                solEarned = solEarned.sub(solAmount);
+            }
+            else {
+                solEarned = solEarned.add(solAmount);
+            }
+        }
+    }
+    const currentMSOLTokenAmount = await user.getTokenAmount(2);
+    const currentSOLTokenAmount = await user.getTokenAmount(1);
+    const currentMSOLRatio = msolRatios.get(now);
+    const currentMSOLRatioBN = new anchor_1.BN(currentMSOLRatio * web3_js_1.LAMPORTS_PER_SOL);
+    solEarned = solEarned.add(currentMSOLTokenAmount.mul(currentMSOLRatioBN).div(numericConstants_1.LAMPORTS_PRECISION));
+    solEarned = solEarned.add(currentSOLTokenAmount);
+    return solEarned;
+}
+exports.calculateSolEarned = calculateSolEarned;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.31.1-beta.16",
+	"version": "2.31.1-beta.18",
 	"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.16",
+  "version": "2.31.1-beta.18",
   "name": "drift",
   "instructions": [
     {

package/src/math/spotBalance.ts

@@ -236,18 +236,27 @@ export function calculateLiabilityWeight(
 	return liabilityWeight;
 }
 
-export function calculateUtilization(bank: SpotMarketAccount): BN {
-	const tokenDepositAmount = getTokenAmount(
+export function calculateUtilization(
+	bank: SpotMarketAccount,
+	delta = ZERO
+): BN {
+	let tokenDepositAmount = getTokenAmount(
 		bank.depositBalance,
 		bank,
 		SpotBalanceType.DEPOSIT
 	);
-	const tokenBorrowAmount = getTokenAmount(
+	let tokenBorrowAmount = getTokenAmount(
 		bank.borrowBalance,
 		bank,
 		SpotBalanceType.BORROW
 	);
 
+	if (delta.gt(ZERO)) {
+		tokenDepositAmount = tokenDepositAmount.add(delta);
+	} else if (delta.lt(ZERO)) {
+		tokenBorrowAmount = tokenBorrowAmount.add(delta.abs());
+	}
+
 	let utilization: BN;
 	if (tokenBorrowAmount.eq(ZERO) && tokenDepositAmount.eq(ZERO)) {
 		utilization = ZERO;
@@ -329,9 +338,11 @@ export function calculateSpotMarketBorrowCapacity(
 	}
 }
 
-export function calculateInterestRate(bank: SpotMarketAccount): BN {
-	const utilization = calculateUtilization(bank);
-
+export function calculateInterestRate(
+	bank: SpotMarketAccount,
+	delta = ZERO
+): BN {
+	const utilization = calculateUtilization(bank, delta);
 	let interestRate: BN;
 	if (utilization.gt(new BN(bank.optimalUtilization))) {
 		const surplusUtilization = utilization.sub(new BN(bank.optimalUtilization));

package/src/math/superStake.ts

@@ -1,5 +1,6 @@
 import {
 	AddressLookupTableAccount,
+	LAMPORTS_PER_SOL,
 	PublicKey,
 	TransactionInstruction,
 } from '@solana/web3.js';
@@ -7,6 +8,9 @@ import { JupiterClient } from '../jupiter/jupiterClient';
 import { DriftClient } from '../driftClient';
 import { getMarinadeFinanceProgram, getMarinadeMSolPrice } from '../marinade';
 import { BN } from '@coral-xyz/anchor';
+import { User } from '../user';
+import { DepositRecord, isVariant } from '../types';
+import { LAMPORTS_PRECISION, ZERO } from '../constants/numericConstants';
 
 export async function findBestSuperStakeIxs({
 	amount,
@@ -63,3 +67,66 @@ export async function findBestSuperStakeIxs({
 		};
 	}
 }
+
+export async function calculateSolEarned({
+	user,
+	depositRecords,
+}: {
+	user: User;
+	depositRecords: DepositRecord[];
+}): Promise<BN> {
+	const now = Date.now() / 1000;
+	const timestamps: number[] = [
+		now,
+		...depositRecords.map((r) => r.ts.toNumber()),
+	];
+
+	const msolRatios = new Map<number, number>();
+
+	const getPrice = async (timestamp) => {
+		const date = new Date(timestamp * 1000); // Convert Unix timestamp to milliseconds
+		const swaggerApiDateTime = date.toISOString(); // Format date as swagger API date-time
+		const url = `https://api.marinade.finance/msol/price_sol?time=${swaggerApiDateTime}`;
+		const response = await fetch(url);
+		if (response.status === 200) {
+			const data = await response.json();
+			msolRatios.set(timestamp, data);
+		}
+	};
+
+	await Promise.all(timestamps.map(getPrice));
+
+	let solEarned = ZERO;
+	for (const record of depositRecords) {
+		if (record.marketIndex === 1) {
+			if (isVariant(record.explanation, 'deposit')) {
+				solEarned = solEarned.sub(record.amount);
+			} else {
+				solEarned = solEarned.add(record.amount);
+			}
+		} else if (record.marketIndex === 2) {
+			const msolRatio = msolRatios.get(record.ts.toNumber());
+			const msolRatioBN = new BN(msolRatio * LAMPORTS_PER_SOL);
+
+			const solAmount = record.amount.mul(msolRatioBN).div(LAMPORTS_PRECISION);
+			if (isVariant(record.explanation, 'deposit')) {
+				solEarned = solEarned.sub(solAmount);
+			} else {
+				solEarned = solEarned.add(solAmount);
+			}
+		}
+	}
+
+	const currentMSOLTokenAmount = await user.getTokenAmount(2);
+	const currentSOLTokenAmount = await user.getTokenAmount(1);
+
+	const currentMSOLRatio = msolRatios.get(now);
+	const currentMSOLRatioBN = new BN(currentMSOLRatio * LAMPORTS_PER_SOL);
+
+	solEarned = solEarned.add(
+		currentMSOLTokenAmount.mul(currentMSOLRatioBN).div(LAMPORTS_PRECISION)
+	);
+	solEarned = solEarned.add(currentSOLTokenAmount);
+
+	return solEarned;
+}

package/tests/spot/test.ts

@@ -1,102 +1,156 @@
-import { BN, ZERO, calculateSpotMarketBorrowCapacity } from '../../src';
+import {
+	BN,
+	ZERO,
+	calculateSpotMarketBorrowCapacity,
+	SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION,
+} from '../../src';
 import { mockSpotMarkets } from '../dlob/helpers';
 
 import { assert } from '../../src/assert/assert';
-import { SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION } from '@drift-labs/sdk';
 
 describe('Spot Tests', () => {
 	it('base borrow capacity', () => {
-        const mockSpot = mockSpotMarkets[0];
-        mockSpot.maxBorrowRate = 1000000;
-        mockSpot.optimalBorrowRate = 100000;
-        mockSpot.optimalUtilization = 700000;
-
-        mockSpot.decimals = 9;
-        mockSpot.cumulativeDepositInterest = SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION;
-        mockSpot.cumulativeBorrowInterest = SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION;
-
-        const tokenAmount = 100000;
-        // no borrows
-        mockSpot.depositBalance = new BN(tokenAmount * 1e9);
-        mockSpot.borrowBalance = ZERO; 
-
-        // todo, should incorp all other spot market constraints?
-        const aboveMaxAmount = calculateSpotMarketBorrowCapacity(mockSpot, new BN(2000000));
-        assert(aboveMaxAmount.gt(mockSpot.depositBalance));
-
-        const maxAmount = calculateSpotMarketBorrowCapacity(mockSpot, new BN(1000000));
-        assert(maxAmount.eq(mockSpot.depositBalance));
-
-        const optAmount = calculateSpotMarketBorrowCapacity(mockSpot, new BN(100000));
-        const ans = new BN(mockSpot.depositBalance.toNumber() * 7 / 10);
-        // console.log('optAmount:', optAmount.toNumber(), ans.toNumber());
-        assert(optAmount.eq(ans));
-
-        const 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));
-        // console.log('belowOptAmount:', belowOptAmount.toNumber());
-        assert(belowOptAmount.eq(ans.div(new BN(2))));
-
-        const 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));
-        // console.log('belowOptAmount3:', belowOptAmount3.toNumber());
-        assert(belowOptAmount3.eq(new BN('700000000'))); //0.7
-    });
-
-
-    it('complex borrow capacity', () => {
-        const mockSpot = mockSpotMarkets[0];
-        mockSpot.maxBorrowRate = 1000000;
-        mockSpot.optimalBorrowRate =  70000;
-        mockSpot.optimalUtilization = 700000;
-
-        mockSpot.decimals = 9;
-        mockSpot.cumulativeDepositInterest = new BN(1.0154217042 * SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION.toNumber());
-        mockSpot.cumulativeBorrowInterest = new BN(1.0417153549 * SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION.toNumber());
-
-        mockSpot.depositBalance = new BN(88522.734106451 * 1e9);
-        mockSpot.borrowBalance = new BN(7089.91675884 * 1e9);
-
-        // todo, should incorp all other spot market constraints?
-        const aboveMaxAmount = calculateSpotMarketBorrowCapacity(mockSpot, new BN(2000000));
-        assert(aboveMaxAmount.eq(new BN('111498270939007')));
-
-        const maxAmount = calculateSpotMarketBorrowCapacity(mockSpot, new BN(1000000));
-        assert(maxAmount.eq(new BN('82502230374168')));
-        // console.log('aboveMaxAmount:', aboveMaxAmount.toNumber(), 'maxAmount:', maxAmount.toNumber());
-        const 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));
-        // 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));
-        // console.log('belowOptAmount:', belowOptAmount.toNumber());
-        assert(belowOptAmount.eq(new BN('37558277610760')));
-
-        const belowOptAmount2 = calculateSpotMarketBorrowCapacity(mockSpot, new BN(24900));
-        // console.log('belowOptAmount2:', belowOptAmount2.toNumber());
-        assert(belowOptAmount2.eq(new BN('14996413323529')));
-
-        const belowOptAmount3 = calculateSpotMarketBorrowCapacity(mockSpot, new BN(4900));
-        // console.log('belowOptAmount2:', belowOptAmount3.toNumber());
-        assert(belowOptAmount3.eq(new BN('0')));
-
-        const belowOptAmount4 = calculateSpotMarketBorrowCapacity(mockSpot, new BN(1));
-        // console.log('belowOptAmount3:', belowOptAmount4.toNumber());
-        assert(belowOptAmount4.eq(new BN('0')));
-    });
-});
+		const mockSpot = mockSpotMarkets[0];
+		mockSpot.maxBorrowRate = 1000000;
+		mockSpot.optimalBorrowRate = 100000;
+		mockSpot.optimalUtilization = 700000;
+
+		mockSpot.decimals = 9;
+		mockSpot.cumulativeDepositInterest =
+			SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION;
+		mockSpot.cumulativeBorrowInterest =
+			SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION;
+
+		const tokenAmount = 100000;
+		// no borrows
+		mockSpot.depositBalance = new BN(tokenAmount * 1e9);
+		mockSpot.borrowBalance = ZERO;
+
+		// todo, should incorp all other spot market constraints?
+		const aboveMaxAmount = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(2000000)
+		);
+		assert(aboveMaxAmount.gt(mockSpot.depositBalance));
+
+		const maxAmount = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(1000000)
+		);
+		assert(maxAmount.eq(mockSpot.depositBalance));
+
+		const optAmount = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(100000)
+		);
+		const ans = new BN((mockSpot.depositBalance.toNumber() * 7) / 10);
+		// console.log('optAmount:', optAmount.toNumber(), ans.toNumber());
+		assert(optAmount.eq(ans));
+
+		const 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)
+		);
+		// console.log('belowOptAmount:', belowOptAmount.toNumber());
+		assert(belowOptAmount.eq(ans.div(new BN(2))));
+
+		const 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)
+		);
+		// console.log('belowOptAmount3:', belowOptAmount3.toNumber());
+		assert(belowOptAmount3.eq(new BN('700000000'))); //0.7
+	});
+
+	it('complex borrow capacity', () => {
+		const mockSpot = mockSpotMarkets[0];
+		mockSpot.maxBorrowRate = 1000000;
+		mockSpot.optimalBorrowRate = 70000;
+		mockSpot.optimalUtilization = 700000;
+
+		mockSpot.decimals = 9;
+		mockSpot.cumulativeDepositInterest = new BN(
+			1.0154217042 * SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION.toNumber()
+		);
+		mockSpot.cumulativeBorrowInterest = new BN(
+			1.0417153549 * SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION.toNumber()
+		);
+
+		mockSpot.depositBalance = new BN(88522.734106451 * 1e9);
+		mockSpot.borrowBalance = new BN(7089.91675884 * 1e9);
+
+		// todo, should incorp all other spot market constraints?
+		const aboveMaxAmount = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(2000000)
+		);
+		assert(aboveMaxAmount.eq(new BN('111498270939007')));
+
+		const maxAmount = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(1000000)
+		);
+		assert(maxAmount.eq(new BN('82502230374168')));
+		// console.log('aboveMaxAmount:', aboveMaxAmount.toNumber(), 'maxAmount:', maxAmount.toNumber());
+		const 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)
+		);
+		// 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)
+		);
+		// console.log('belowOptAmount:', belowOptAmount.toNumber());
+		assert(belowOptAmount.eq(new BN('37558277610760')));
+
+		const belowOptAmount2 = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(24900)
+		);
+		// console.log('belowOptAmount2:', belowOptAmount2.toNumber());
+		assert(belowOptAmount2.eq(new BN('14996413323529')));
+
+		const belowOptAmount3 = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(4900)
+		);
+		// console.log('belowOptAmount2:', belowOptAmount3.toNumber());
+		assert(belowOptAmount3.eq(new BN('0')));
+
+		const belowOptAmount4 = calculateSpotMarketBorrowCapacity(
+			mockSpot,
+			new BN(1)
+		);
+		// console.log('belowOptAmount3:', belowOptAmount4.toNumber());
+		assert(belowOptAmount4.eq(new BN('0')));
+	});
+});