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

package/VERSION

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

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -24,10 +24,8 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     state?: DataAndSlot<StateAccount>;
     perpMarket: Map<number, DataAndSlot<PerpMarketAccount>>;
     perpOracleMap: Map<number, PublicKey>;
-    perpOracleStringMap: Map<number, string>;
     spotMarket: Map<number, DataAndSlot<SpotMarketAccount>>;
     spotOracleMap: Map<number, PublicKey>;
-    spotOracleStringMap: Map<number, string>;
     oracles: Map<string, DataAndSlot<OraclePriceData>>;
     user?: DataAndSlot<UserAccount>;
     private isSubscribing;
@@ -60,7 +58,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency(pollingFrequency: number): void;

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -9,7 +9,6 @@ const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
-const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
 class PollingDriftClientAccountSubscriber {
     constructor(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
@@ -17,10 +16,8 @@ class PollingDriftClientAccountSubscriber {
         this.oraclesToPoll = new Map();
         this.perpMarket = new Map();
         this.perpOracleMap = new Map();
-        this.perpOracleStringMap = new Map();
         this.spotMarket = new Map();
         this.spotOracleMap = new Map();
-        this.spotOracleStringMap = new Map();
         this.oracles = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -303,7 +300,6 @@ class PollingDriftClientAccountSubscriber {
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
-            this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
         }
         await Promise.all(oraclePromises);
     }
@@ -321,7 +317,6 @@ class PollingDriftClientAccountSubscriber {
                 }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
-            this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
         }
         await Promise.all(oraclePromises);
     }
@@ -348,21 +343,17 @@ class PollingDriftClientAccountSubscriber {
     }
     getOraclePriceDataAndSlot(oraclePublicKey) {
         this.assertIsSubscribed();
-        const oracleString = typeof oraclePublicKey === 'string'
-            ? oraclePublicKey
-            : oraclePublicKey.toBase58();
-        if (oracleString === ORACLE_DEFAULT_KEY) {
+        if (oraclePublicKey.equals(web3_js_1.PublicKey.default)) {
             return {
                 data: quoteAssetOracleClient_1.QUOTE_ORACLE_PRICE_DATA,
                 slot: 0,
             };
         }
-        return this.oracles.get(oracleString);
+        return this.oracles.get(oraclePublicKey.toString());
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
-        const oracleString = this.perpOracleStringMap.get(marketIndex);
         if (!perpMarketAccount || !oracle) {
             return undefined;
         }
@@ -370,12 +361,11 @@ class PollingDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setPerpOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracle);
     }
     getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
-        const oracleString = this.spotOracleStringMap.get(marketIndex);
         if (!spotMarketAccount || !oracle) {
             return undefined;
         }
@@ -383,7 +373,7 @@ class PollingDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setSpotOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracle);
     }
     updateAccountLoaderPollingFrequency(pollingFrequency) {
         this.accountLoader.updatePollingFrequency(pollingFrequency);

package/lib/accounts/types.d.ts

@@ -45,7 +45,7 @@ export interface DriftClientAccountSubscriber {
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -22,10 +22,8 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
     perpMarketAccountSubscribers: Map<number, AccountSubscriber<PerpMarketAccount>>;
     perpOracleMap: Map<number, PublicKey>;
-    perpOracleStringMap: Map<number, string>;
     spotMarketAccountSubscribers: Map<number, AccountSubscriber<SpotMarketAccount>>;
     spotOracleMap: Map<number, PublicKey>;
-    spotOracleStringMap: Map<number, string>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
     initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
     initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
@@ -59,7 +57,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -9,16 +9,13 @@ const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
-const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
 class WebSocketDriftClientAccountSubscriber {
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubOpts, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.perpOracleMap = new Map();
-        this.perpOracleStringMap = new Map();
         this.spotMarketAccountSubscribers = new Map();
         this.spotOracleMap = new Map();
-        this.spotOracleStringMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -227,7 +224,6 @@ class WebSocketDriftClientAccountSubscriber {
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
-            this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
         }
         await Promise.all(addOraclePromises);
     }
@@ -248,7 +244,6 @@ class WebSocketDriftClientAccountSubscriber {
                 }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
-            this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
         }
         await Promise.all(addOraclePromises);
     }
@@ -277,21 +272,17 @@ class WebSocketDriftClientAccountSubscriber {
     }
     getOraclePriceDataAndSlot(oraclePublicKey) {
         this.assertIsSubscribed();
-        const oracleString = typeof oraclePublicKey === 'string'
-            ? oraclePublicKey
-            : oraclePublicKey.toBase58();
-        if (oracleString === ORACLE_DEFAULT_KEY) {
+        if (oraclePublicKey.equals(web3_js_1.PublicKey.default)) {
             return {
                 data: quoteAssetOracleClient_1.QUOTE_ORACLE_PRICE_DATA,
                 slot: 0,
             };
         }
-        return this.oracleSubscribers.get(oracleString).dataAndSlot;
+        return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
-        const oracleString = this.perpOracleStringMap.get(marketIndex);
         if (!perpMarketAccount || !oracle) {
             return undefined;
         }
@@ -299,12 +290,11 @@ class WebSocketDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setPerpOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracle);
     }
     getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
-        const oracleString = this.spotOracleStringMap.get(marketIndex);
         if (!spotMarketAccount || !oracle) {
             return undefined;
         }
@@ -312,7 +302,7 @@ class WebSocketDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setSpotOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracle);
     }
 }
 exports.WebSocketDriftClientAccountSubscriber = WebSocketDriftClientAccountSubscriber;

package/lib/driftClient.js

@@ -309,7 +309,7 @@ class DriftClient {
         return this.accountSubscriber.getSpotMarketAccountAndSlot(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).data;
     }
     getOraclePriceDataAndSlot(oraclePublicKey) {
-        return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey.toBase58());
+        return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey);
     }
     async getSerumV3FulfillmentConfig(serumMarket) {
         const address = await (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);

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.14",
+	"version": "2.95.0-beta.16",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -28,8 +28,6 @@ import { OracleClientCache } from '../oracles/oracleClientCache';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
 import { findAllMarketAndOracles } from '../config';
 
-const ORACLE_DEFAULT_KEY = PublicKey.default.toBase58();
-
 export class PollingDriftClientAccountSubscriber
 	implements DriftClientAccountSubscriber
 {
@@ -52,10 +50,8 @@ export class PollingDriftClientAccountSubscriber
 	state?: DataAndSlot<StateAccount>;
 	perpMarket = new Map<number, DataAndSlot<PerpMarketAccount>>();
 	perpOracleMap = new Map<number, PublicKey>();
-	perpOracleStringMap = new Map<number, string>();
 	spotMarket = new Map<number, DataAndSlot<SpotMarketAccount>>();
 	spotOracleMap = new Map<number, PublicKey>();
-	spotOracleStringMap = new Map<number, string>();
 	oracles = new Map<string, DataAndSlot<OraclePriceData>>();
 	user?: DataAndSlot<UserAccount>;
 
@@ -474,7 +470,6 @@ export class PollingDriftClientAccountSubscriber
 				);
 			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
-			this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(oraclePromises);
 	}
@@ -495,7 +490,6 @@ export class PollingDriftClientAccountSubscriber
 				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
-			this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(oraclePromises);
 	}
@@ -534,21 +528,17 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	public getOraclePriceDataAndSlot(
-		oraclePublicKey: PublicKey | string
+		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined {
 		this.assertIsSubscribed();
-		const oracleString =
-			typeof oraclePublicKey === 'string'
-				? oraclePublicKey
-				: oraclePublicKey.toBase58();
-		if (oracleString === ORACLE_DEFAULT_KEY) {
+		if (oraclePublicKey.equals(PublicKey.default)) {
 			return {
 				data: QUOTE_ORACLE_PRICE_DATA,
 				slot: 0,
 			};
 		}
 
-		return this.oracles.get(oracleString);
+		return this.oracles.get(oraclePublicKey.toString());
 	}
 
 	public getOraclePriceDataAndSlotForPerpMarket(
@@ -556,7 +546,6 @@ export class PollingDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
 		const oracle = this.perpOracleMap.get(marketIndex);
-		const oracleString = this.perpOracleStringMap.get(marketIndex);
 
 		if (!perpMarketAccount || !oracle) {
 			return undefined;
@@ -567,7 +556,7 @@ export class PollingDriftClientAccountSubscriber
 			this.setPerpOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracleString);
+		return this.getOraclePriceDataAndSlot(oracle);
 	}
 
 	public getOraclePriceDataAndSlotForSpotMarket(
@@ -575,7 +564,6 @@ export class PollingDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
 		const oracle = this.spotOracleMap.get(marketIndex);
-		const oracleString = this.spotOracleStringMap.get(marketIndex);
 		if (!spotMarketAccount || !oracle) {
 			return undefined;
 		}
@@ -585,7 +573,7 @@ export class PollingDriftClientAccountSubscriber
 			this.setSpotOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracleString);
+		return this.getOraclePriceDataAndSlot(oracle);
 	}
 
 	public updateAccountLoaderPollingFrequency(pollingFrequency: number): void {

package/src/accounts/types.ts

@@ -72,7 +72,7 @@ export interface DriftClientAccountSubscriber {
 	): DataAndSlot<SpotMarketAccount> | undefined;
 	getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
 	getOraclePriceDataAndSlot(
-		oraclePublicKey: PublicKey | string
+		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined;
 	getOraclePriceDataAndSlotForPerpMarket(
 		marketIndex: number

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -24,8 +24,6 @@ import * as Buffer from 'buffer';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
 import { findAllMarketAndOracles } from '../config';
 
-const ORACLE_DEFAULT_KEY = PublicKey.default.toBase58();
-
 export class WebSocketDriftClientAccountSubscriber
 	implements DriftClientAccountSubscriber
 {
@@ -47,13 +45,11 @@ export class WebSocketDriftClientAccountSubscriber
 		AccountSubscriber<PerpMarketAccount>
 	>();
 	perpOracleMap = new Map<number, PublicKey>();
-	perpOracleStringMap = new Map<number, string>();
 	spotMarketAccountSubscribers = new Map<
 		number,
 		AccountSubscriber<SpotMarketAccount>
 	>();
 	spotOracleMap = new Map<number, PublicKey>();
-	spotOracleStringMap = new Map<number, string>();
 	oracleSubscribers = new Map<string, AccountSubscriber<OraclePriceData>>();
 
 	initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
@@ -436,7 +432,6 @@ export class WebSocketDriftClientAccountSubscriber
 				);
 			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
-			this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(addOraclePromises);
 	}
@@ -460,7 +455,6 @@ export class WebSocketDriftClientAccountSubscriber
 				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
-			this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(addOraclePromises);
 	}
@@ -505,20 +499,16 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	public getOraclePriceDataAndSlot(
-		oraclePublicKey: PublicKey | string
+		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined {
 		this.assertIsSubscribed();
-		const oracleString =
-			typeof oraclePublicKey === 'string'
-				? oraclePublicKey
-				: oraclePublicKey.toBase58();
-		if (oracleString === ORACLE_DEFAULT_KEY) {
+		if (oraclePublicKey.equals(PublicKey.default)) {
 			return {
 				data: QUOTE_ORACLE_PRICE_DATA,
 				slot: 0,
 			};
 		}
-		return this.oracleSubscribers.get(oracleString).dataAndSlot;
+		return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
 	}
 
 	public getOraclePriceDataAndSlotForPerpMarket(
@@ -526,7 +516,6 @@ export class WebSocketDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
 		const oracle = this.perpOracleMap.get(marketIndex);
-		const oracleString = this.perpOracleStringMap.get(marketIndex);
 		if (!perpMarketAccount || !oracle) {
 			return undefined;
 		}
@@ -536,7 +525,7 @@ export class WebSocketDriftClientAccountSubscriber
 			this.setPerpOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracleString);
+		return this.getOraclePriceDataAndSlot(oracle);
 	}
 
 	public getOraclePriceDataAndSlotForSpotMarket(
@@ -544,7 +533,6 @@ export class WebSocketDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
 		const oracle = this.spotOracleMap.get(marketIndex);
-		const oracleString = this.spotOracleStringMap.get(marketIndex);
 		if (!spotMarketAccount || !oracle) {
 			return undefined;
 		}
@@ -554,6 +542,6 @@ export class WebSocketDriftClientAccountSubscriber
 			this.setSpotOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracleString);
+		return this.getOraclePriceDataAndSlot(oracle);
 	}
 }

package/src/driftClient.ts

@@ -538,9 +538,7 @@ export class DriftClient {
 	public getOraclePriceDataAndSlot(
 		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined {
-		return this.accountSubscriber.getOraclePriceDataAndSlot(
-			oraclePublicKey.toBase58()
-		);
+		return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey);
 	}
 
 	public async getSerumV3FulfillmentConfig(

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(