@drift-labs/sdk 2.45.0-beta.2 → 2.45.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.45.0-beta.2
+2.45.0-beta.4

package/lib/accounts/bulkAccountLoader.d.ts

@@ -27,6 +27,7 @@ export declare class BulkAccountLoader {
     loadChunk(accountsToLoadChunks: AccountToLoad[][]): Promise<void>;
     handleAccountCallbacks(accountToLoad: AccountToLoad, buffer: Buffer, slot: number): void;
     getBufferAndSlot(publicKey: PublicKey): BufferAndSlot | undefined;
+    getSlot(): number;
     startPolling(): void;
     stopPolling(): void;
     log(msg: string): void;

package/lib/accounts/bulkAccountLoader.js

@@ -186,6 +186,9 @@ class BulkAccountLoader {
     getBufferAndSlot(publicKey) {
         return this.bufferAndSlotMap.get(publicKey.toString());
     }
+    getSlot() {
+        return this.mostRecentSlot;
+    }
     startPolling() {
         if (this.intervalId) {
             return;

package/lib/dlob/orderBookLevels.js

@@ -173,8 +173,8 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 if (remainingBaseLiquidity.lt(baseSwapped)) {
                     baseSwapped = remainingBaseLiquidity;
                     [afterSwapQuoteReserves, afterSwapBaseReserves] =
-                        (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'base', baseSwapped, __1.SwapDirection.REMOVE);
-                    quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(bidAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), bidAmm.pegMultiplier, __1.SwapDirection.REMOVE);
+                        (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'base', baseSwapped, __1.SwapDirection.REMOVE);
+                    quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(askAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), askAmm.pegMultiplier, __1.SwapDirection.REMOVE);
                 }
                 topOfBookAskSize = topOfBookAskSize.add(baseSwapped);
                 askSize = openAsks

package/lib/math/spotBalance.d.ts

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

package/lib/math/spotBalance.js

@@ -263,9 +263,11 @@ function calculateInterestRate(bank, delta = numericConstants_1.ZERO) {
     return interestRate;
 }
 exports.calculateInterestRate = calculateInterestRate;
-function calculateDepositRate(bank) {
-    const utilization = calculateUtilization(bank);
-    const borrowRate = calculateBorrowRate(bank);
+function calculateDepositRate(bank, delta = numericConstants_1.ZERO) {
+    // positive delta => adding to deposit
+    // negative delta => adding to borrow
+    const utilization = calculateUtilization(bank, delta);
+    const borrowRate = calculateBorrowRate(bank, delta);
     const depositRate = borrowRate
         .mul(numericConstants_2.PERCENTAGE_PRECISION.sub(new anchor_1.BN(bank.insuranceFund.totalFactor)))
         .mul(utilization)
@@ -274,8 +276,8 @@ function calculateDepositRate(bank) {
     return depositRate;
 }
 exports.calculateDepositRate = calculateDepositRate;
-function calculateBorrowRate(bank) {
-    return calculateInterestRate(bank);
+function calculateBorrowRate(bank, delta = numericConstants_1.ZERO) {
+    return calculateInterestRate(bank, delta);
 }
 exports.calculateBorrowRate = calculateBorrowRate;
 function calculateInterestAccumulated(bank, now) {

package/package.json

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

package/src/accounts/bulkAccountLoader.ts

@@ -249,6 +249,10 @@ export class BulkAccountLoader {
 		return this.bufferAndSlotMap.get(publicKey.toString());
 	}
 
+	public getSlot(): number {
+		return this.mostRecentSlot;
+	}
+
 	public startPolling(): void {
 		if (this.intervalId) {
 			return;

package/src/dlob/orderBookLevels.ts

@@ -302,15 +302,15 @@ export function getVammL2Generator({
 					baseSwapped = remainingBaseLiquidity;
 					[afterSwapQuoteReserves, afterSwapBaseReserves] =
 						calculateAmmReservesAfterSwap(
-							bidAmm,
+							askAmm,
 							'base',
 							baseSwapped,
 							SwapDirection.REMOVE
 						);
 
 					quoteSwapped = calculateQuoteAssetAmountSwapped(
-						bidAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(),
-						bidAmm.pegMultiplier,
+						askAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(),
+						askAmm.pegMultiplier,
 						SwapDirection.REMOVE
 					);
 				}

package/src/math/spotBalance.ts

@@ -398,9 +398,15 @@ export function calculateInterestRate(
 	return interestRate;
 }
 
-export function calculateDepositRate(bank: SpotMarketAccount): BN {
-	const utilization = calculateUtilization(bank);
-	const borrowRate = calculateBorrowRate(bank);
+export function calculateDepositRate(
+	bank: SpotMarketAccount,
+	delta = ZERO
+): BN {
+	// positive delta => adding to deposit
+	// negative delta => adding to borrow
+
+	const utilization = calculateUtilization(bank, delta);
+	const borrowRate = calculateBorrowRate(bank, delta);
 	const depositRate = borrowRate
 		.mul(PERCENTAGE_PRECISION.sub(new BN(bank.insuranceFund.totalFactor)))
 		.mul(utilization)
@@ -409,8 +415,8 @@ export function calculateDepositRate(bank: SpotMarketAccount): BN {
 	return depositRate;
 }
 
-export function calculateBorrowRate(bank: SpotMarketAccount): BN {
-	return calculateInterestRate(bank);
+export function calculateBorrowRate(bank: SpotMarketAccount, delta = ZERO): BN {
+	return calculateInterestRate(bank, delta);
 }
 
 export function calculateInterestAccumulated(

package/tests/spot/test.ts

@@ -4,6 +4,8 @@ import {
 	calculateSpotMarketBorrowCapacity,
 	SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION,
 	calculateSizePremiumLiabilityWeight,
+	calculateBorrowRate,
+	calculateDepositRate,
 } from '../../src';
 import { mockSpotMarkets } from '../dlob/helpers';
 import * as _ from 'lodash';
@@ -172,4 +174,53 @@ describe('Spot Tests', () => {
 		// console.log('belowOptAmount3:', belowOptAmount4.toNumber());
 		assert(belowOptAmount4.eq(new BN('0')));
 	});
+
+	it('borrow rates', () => {
+		const mockSpot = _.cloneDeep(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(17089.91675884 * 1e9);
+
+		const noDeltad = calculateDepositRate(mockSpot);
+		// console.log(noDeltad.toNumber());
+		assert(noDeltad.eqn(3922));
+		const noDelta = calculateBorrowRate(mockSpot);
+		// console.log(noDelta.toNumber());
+		assert(noDelta.eqn(19805));
+
+		// manually update deposits
+		mockSpot.depositBalance = new BN((88522.734106451 + 9848.12512736) * 1e9);
+		const noDeltad2 = calculateDepositRate(mockSpot);
+		console.log(noDeltad2.toNumber());
+		assert(noDeltad2.eqn(3176));
+		const noDelta2 = calculateBorrowRate(mockSpot);
+		console.log(noDelta2.toNumber());
+		assert(noDelta2.eqn(17822));
+
+		mockSpot.depositBalance = new BN(88522.734106451 * 1e9);
+		const addDep1d = calculateDepositRate(mockSpot, new BN(10000 * 1e9));
+		// console.log(addDep1d.toNumber());
+		assert(addDep1d.eqn(3176)); // went down
+		const addDep1 = calculateBorrowRate(mockSpot, new BN(10000 * 1e9));
+		// console.log(addDep1.toNumber());
+		assert(addDep1.eqn(17822)); // went down
+
+		const addBord1 = calculateDepositRate(mockSpot, new BN(-1000 * 1e9));
+		// console.log(addBord1.toNumber());
+		assert(addBord1.eqn(4375)); // went up
+		const addBor1 = calculateBorrowRate(mockSpot, new BN(-1000 * 1e9));
+		// console.log(addBor1.toNumber());
+		assert(addBor1.eqn(20918)); // went up
+	});
 });