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

package/VERSION

@@ -1 +1 @@
-2.32.1-beta.1
+2.32.1-beta.3

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/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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.32.1-beta.1",
+	"version": "2.32.1-beta.3",
 	"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/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/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')));
 	});