@drift-labs/sdk 2.95.0-beta.15 → 2.95.0-beta.16

package/VERSION

@@ -1 +1 @@
-2.95.0-beta.15
+2.95.0-beta.16

package/lib/math/spotBalance.d.ts

@@ -62,9 +62,9 @@ export declare function calculateSpotMarketBorrowCapacity(spotMarketAccount: Spo
     totalCapacity: BN;
     remainingCapacity: BN;
 };
-export declare function calculateInterestRate(bank: SpotMarketAccount, delta?: BN): BN;
-export declare function calculateDepositRate(bank: SpotMarketAccount, delta?: BN): BN;
-export declare function calculateBorrowRate(bank: SpotMarketAccount, delta?: BN): BN;
+export declare function calculateInterestRate(bank: SpotMarketAccount, delta?: BN, currentUtilization?: BN): BN;
+export declare function calculateDepositRate(bank: SpotMarketAccount, delta?: BN, currentUtilization?: BN): BN;
+export declare function calculateBorrowRate(bank: SpotMarketAccount, delta?: BN, currentUtilization?: BN): BN;
 export declare function calculateInterestAccumulated(bank: SpotMarketAccount, now: BN): {
     borrowInterest: BN;
     depositInterest: BN;

package/lib/math/spotBalance.js

@@ -246,8 +246,8 @@ function calculateSpotMarketBorrowCapacity(spotMarketAccount, targetBorrowRate)
     return { totalCapacity, remainingCapacity };
 }
 exports.calculateSpotMarketBorrowCapacity = calculateSpotMarketBorrowCapacity;
-function calculateInterestRate(bank, delta = numericConstants_1.ZERO) {
-    const utilization = calculateUtilization(bank, delta);
+function calculateInterestRate(bank, delta = numericConstants_1.ZERO, currentUtilization = null) {
+    const utilization = currentUtilization || calculateUtilization(bank, delta);
     let interestRate;
     if (utilization.gt(new anchor_1.BN(bank.optimalUtilization))) {
         const surplusUtilization = utilization.sub(new anchor_1.BN(bank.optimalUtilization));
@@ -269,11 +269,11 @@ function calculateInterestRate(bank, delta = numericConstants_1.ZERO) {
     return anchor_1.BN.max(interestRate, new anchor_1.BN(bank.minBorrowRate).mul(numericConstants_2.PERCENTAGE_PRECISION.divn(200)));
 }
 exports.calculateInterestRate = calculateInterestRate;
-function calculateDepositRate(bank, delta = numericConstants_1.ZERO) {
+function calculateDepositRate(bank, delta = numericConstants_1.ZERO, currentUtilization = null) {
     // positive delta => adding to deposit
     // negative delta => adding to borrow
-    const utilization = calculateUtilization(bank, delta);
-    const borrowRate = calculateBorrowRate(bank, delta);
+    const utilization = currentUtilization || calculateUtilization(bank, delta);
+    const borrowRate = calculateBorrowRate(bank, delta, utilization);
     const depositRate = borrowRate
         .mul(numericConstants_2.PERCENTAGE_PRECISION.sub(new anchor_1.BN(bank.insuranceFund.totalFactor)))
         .mul(utilization)
@@ -282,8 +282,8 @@ function calculateDepositRate(bank, delta = numericConstants_1.ZERO) {
     return depositRate;
 }
 exports.calculateDepositRate = calculateDepositRate;
-function calculateBorrowRate(bank, delta = numericConstants_1.ZERO) {
-    return calculateInterestRate(bank, delta);
+function calculateBorrowRate(bank, delta = numericConstants_1.ZERO, currentUtilization = null) {
+    return calculateInterestRate(bank, delta, currentUtilization);
 }
 exports.calculateBorrowRate = calculateBorrowRate;
 function calculateInterestAccumulated(bank, now) {

package/package.json

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

package/src/math/spotBalance.ts

@@ -379,9 +379,10 @@ export function calculateSpotMarketBorrowCapacity(
 
 export function calculateInterestRate(
 	bank: SpotMarketAccount,
-	delta = ZERO
+	delta = ZERO,
+	currentUtilization: BN = null
 ): BN {
-	const utilization = calculateUtilization(bank, delta);
+	const utilization = currentUtilization || calculateUtilization(bank, delta);
 	let interestRate: BN;
 	if (utilization.gt(new BN(bank.optimalUtilization))) {
 		const surplusUtilization = utilization.sub(new BN(bank.optimalUtilization));
@@ -414,13 +415,14 @@ export function calculateInterestRate(
 
 export function calculateDepositRate(
 	bank: SpotMarketAccount,
-	delta = ZERO
+	delta = ZERO,
+	currentUtilization: BN = null
 ): BN {
 	// positive delta => adding to deposit
 	// negative delta => adding to borrow
 
-	const utilization = calculateUtilization(bank, delta);
-	const borrowRate = calculateBorrowRate(bank, delta);
+	const utilization = currentUtilization || calculateUtilization(bank, delta);
+	const borrowRate = calculateBorrowRate(bank, delta, utilization);
 	const depositRate = borrowRate
 		.mul(PERCENTAGE_PRECISION.sub(new BN(bank.insuranceFund.totalFactor)))
 		.mul(utilization)
@@ -429,8 +431,12 @@ export function calculateDepositRate(
 	return depositRate;
 }
 
-export function calculateBorrowRate(bank: SpotMarketAccount, delta = ZERO): BN {
-	return calculateInterestRate(bank, delta);
+export function calculateBorrowRate(
+	bank: SpotMarketAccount,
+	delta = ZERO,
+	currentUtilization: BN = null
+): BN {
+	return calculateInterestRate(bank, delta, currentUtilization);
 }
 
 export function calculateInterestAccumulated(