@haven-fi/solauto-sdk 1.0.202 → 1.0.203

package/dist/constants/marginfiAccounts.js

@@ -43,6 +43,12 @@ exports.MARGINFI_ACCOUNTS = {
             vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
             priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
         },
+        [tokens.M_SOL]: {
+            bank: "22DcjMZrMwC5Bpa5AGBsmjc5V9VuQrXG6N9ZtdUNyYGE",
+            liquidityVault: "B6HqNn83a2bLqo4i5ygjLHJgD11ePtQksUyx4MjD55DV",
+            vaultAuthority: "6YxGd65JbXzgFGWjE44jsyVeCnZp7Bb1wfL9jDia1n8w",
+            priceOracle: "5CKzb9j4ChgLUt8Gfm5CNGLN6khXKiqMbnGAW4cgXgxK",
+        },
         [tokens.JITO_SOL]: {
             bank: "Bohoc1ikHLD7xKJuzTyiTyCwzaL5N7ggJQu75A8mKYM8",
             liquidityVault: "38VGtXd2pDPq9FMh1z6AVjcHCoHgvWyMhdNyamDTeeks",
@@ -55,12 +61,6 @@ exports.MARGINFI_ACCOUNTS = {
             vaultAuthority: "6PWVauGLhBFHUJspsnBVZHr56ZnbvmhSD2gS7czBHGpE",
             priceOracle: "7aT9A5knp62jVvnEW33xaWopaPHa3Y7ggULyYiUsDhu8",
         },
-        [tokens.M_SOL]: {
-            bank: "22DcjMZrMwC5Bpa5AGBsmjc5V9VuQrXG6N9ZtdUNyYGE",
-            liquidityVault: "B6HqNn83a2bLqo4i5ygjLHJgD11ePtQksUyx4MjD55DV",
-            vaultAuthority: "6YxGd65JbXzgFGWjE44jsyVeCnZp7Bb1wfL9jDia1n8w",
-            priceOracle: "5CKzb9j4ChgLUt8Gfm5CNGLN6khXKiqMbnGAW4cgXgxK",
-        },
         [tokens.INF]: {
             bank: "AwLRW3aPMMftXEjgWhTkYwM9CGBHdtKecvahCJZBwAqY",
             liquidityVault: "HQ1CGcqRshMhuonTGTnnmgw9ffcXxizGdZ6F6PKffWWi",

package/dist/constants/pythConstants.d.ts

@@ -1,9 +1,9 @@
 export declare const PYTH_PRICE_FEED_IDS: {
     [x: string]: string;
     bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1: string;
+    mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So: string;
     J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn: string;
     LSTxxxnJzKDFSLr4dUkPcmCf5VyryEqzPLz5j4bpxFp: string;
-    mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So: string;
     "5oVNBeEEQvYi1cX3ir8Dx5n1P7pdxydbGF2X4TxVusJm": string;
     JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN: string;
     DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263: string;

package/dist/constants/pythConstants.js

@@ -30,9 +30,9 @@ const tokens = __importStar(require("./tokenConstants"));
 exports.PYTH_PRICE_FEED_IDS = {
     [spl_token_1.NATIVE_MINT.toString()]: "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
     [tokens.B_SOL]: "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
+    [tokens.M_SOL]: "0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4",
     [tokens.JITO_SOL]: "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb",
     [tokens.LST]: "0x12fb674ee496045b1d9cf7d5e65379acb026133c2ad69f3ed996fb9fe68e3a37",
-    [tokens.M_SOL]: "0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4",
     [tokens.INF]: "0xf51570985c642c49c2d6e50156390fdba80bb6d5f7fa389d2f012ced4f7d208f",
     [tokens.JUP]: "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
     [tokens.BONK]: "0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419",

package/dist/constants/tokenConstants.js

@@ -23,9 +23,9 @@ exports.USDT = "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB";
 exports.ALL_SUPPORTED_TOKENS = [
     spl_token_1.NATIVE_MINT.toString(),
     exports.B_SOL,
+    exports.M_SOL,
     exports.JITO_SOL,
     exports.LST,
-    exports.M_SOL,
     exports.INF,
     exports.JUP,
     exports.BONK,
@@ -53,6 +53,11 @@ exports.TOKEN_INFO = {
         decimals: 9,
         isLST: true,
     },
+    [exports.M_SOL]: {
+        ticker: "mSOL",
+        decimals: 9,
+        isLST: true,
+    },
     [exports.JITO_SOL]: {
         ticker: "JitoSOL",
         decimals: 9,
@@ -63,11 +68,6 @@ exports.TOKEN_INFO = {
         decimals: 9,
         isLST: true,
     },
-    [exports.M_SOL]: {
-        ticker: "mSOL",
-        decimals: 9,
-        isLST: true,
-    },
     [exports.INF]: {
         ticker: "INF",
         decimals: 9,

package/dist/utils/marginfiUtils.d.ts

@@ -19,5 +19,6 @@ export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: P
     debtMint?: PublicKey;
 }[]>;
 export declare function getMarginfiAccountPositionState(umi: Umi, marginfiAccountPk: PublicKey, marginfiGroup?: PublicKey, supplyMint?: PublicKey, debtMint?: PublicKey, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;
-export declare function getUpToDateShareValues(umi: Umi, bank: Bank): Promise<[number, number]>;
+export declare function calculateAnnualAPYs(bank: Bank): [number, number];
+export declare function getUpToDateShareValues(bank: Bank): Promise<[number, number]>;
 //# sourceMappingURL=marginfiUtils.d.ts.map

package/dist/utils/marginfiUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAY3E;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAmLpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAY3E;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AA6DD,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+KpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}

package/dist/utils/marginfiUtils.js

@@ -5,6 +5,7 @@ exports.marginfiMaxLtvAndLiqThresholdBps = marginfiMaxLtvAndLiqThresholdBps;
 exports.getMaxLtvAndLiqThreshold = getMaxLtvAndLiqThreshold;
 exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
 exports.getMarginfiAccountPositionState = getMarginfiAccountPositionState;
+exports.calculateAnnualAPYs = calculateAnnualAPYs;
 exports.getUpToDateShareValues = getUpToDateShareValues;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
@@ -103,13 +104,13 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
         }));
     }
 }
-async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
+async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
     let amountUsed = 0;
     let amountCanBeUsed = 0;
     let marketPrice = 0;
     if (bank !== null) {
         [marketPrice] = await (0, generalUtils_1.fetchTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
-        const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(umi, bank);
+        const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(bank);
         const shareValue = isAsset ? assetShareValue : liabilityShareValue;
         amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
         const totalDeposited = (0, numberUtils_1.bytesToI80F48)(bank.totalAssetShares.value) * assetShareValue;
@@ -172,7 +173,7 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, marginfiG
             if (!supplyMint) {
                 supplyMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint);
             }
-            supplyUsage = await getTokenUsage(umi, supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), livePositionUpdates?.supplyAdjustment);
+            supplyUsage = await getTokenUsage(supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), livePositionUpdates?.supplyAdjustment);
         }
         if (debtBalances.length > 0) {
             if (debtBank === null) {
@@ -183,7 +184,7 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, marginfiG
             if (!debtMint) {
                 debtMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(debtBank.mint);
             }
-            debtUsage = await getTokenUsage(umi, debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), livePositionUpdates?.debtAdjustment);
+            debtUsage = await getTokenUsage(debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), livePositionUpdates?.debtAdjustment);
         }
     }
     if (supplyBank === null) {
@@ -194,14 +195,14 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, marginfiG
         return undefined;
     }
     if (!supplyUsage) {
-        supplyUsage = await getTokenUsage(umi, supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
+        supplyUsage = await getTokenUsage(supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
     }
     if (constants_1.TOKEN_INFO[supplyBank.mint.toString()].isStableCoin &&
         (debtBank === null || constants_1.TOKEN_INFO[debtBank.mint.toString()].isStableCoin)) {
         return undefined;
     }
     if (!debtUsage) {
-        debtUsage = await getTokenUsage(umi, debtBank, false, 0, livePositionUpdates?.debtAdjustment);
+        debtUsage = await getTokenUsage(debtBank, false, 0, livePositionUpdates?.debtAdjustment);
     }
     const supplyPrice = (0, generalUtils_1.safeGetPrice)(supplyMint);
     let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(umi, marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP), {
@@ -234,10 +235,10 @@ function marginfiInterestRateCurve(bank, utilizationRatio) {
     const plateauIr = (0, numberUtils_1.bytesToI80F48)(bank.config.interestRateConfig.plateauInterestRate.value);
     const maxIr = (0, numberUtils_1.bytesToI80F48)(bank.config.interestRateConfig.maxInterestRate.value);
     if (utilizationRatio <= optimalUr) {
-        return (utilizationRatio / optimalUr) * plateauIr;
+        return (utilizationRatio * plateauIr) / optimalUr;
     }
     else {
-        return (((utilizationRatio - optimalUr) / (1 - optimalUr)) * (maxIr - plateauIr) +
+        return ((((utilizationRatio - optimalUr) / (1 - optimalUr)) * (maxIr - plateauIr)) +
             plateauIr);
     }
 }
@@ -250,7 +251,7 @@ function calcInterestRate(bank, utilizationRatio) {
     const insuranceFixedFeeApr = (0, numberUtils_1.bytesToI80F48)(bank.config.interestRateConfig.insuranceFeeFixedApr.value);
     const rateFee = protocolIrFee + insuranceIrFee;
     const totalFixedFeeApr = protocolFixedFeeApr + insuranceFixedFeeApr;
-    const borrowingRate = baseRate * (1 + rateFee) * totalFixedFeeApr;
+    const borrowingRate = (baseRate * (1 + rateFee)) + totalFixedFeeApr;
     return [lendingRate, borrowingRate];
 }
 function calcAccruedInterestPaymentPerPeriod(apr, timeDelta, shareValue) {
@@ -258,14 +259,17 @@ function calcAccruedInterestPaymentPerPeriod(apr, timeDelta, shareValue) {
     const newValue = shareValue * (1 + irPerPeriod);
     return newValue;
 }
-async function getUpToDateShareValues(umi, bank) {
-    let timeDelta = (0, generalUtils_1.currentUnixSeconds)() - Number(bank.lastUpdate);
+function calculateAnnualAPYs(bank) {
     const totalAssets = (0, numberUtils_1.bytesToI80F48)(bank.totalAssetShares.value) *
         (0, numberUtils_1.bytesToI80F48)(bank.assetShareValue.value);
     const totalLiabilities = (0, numberUtils_1.bytesToI80F48)(bank.totalLiabilityShares.value) *
         (0, numberUtils_1.bytesToI80F48)(bank.liabilityShareValue.value);
     const utilizationRatio = totalLiabilities / totalAssets;
-    const [lendingApr, borrowingApr] = calcInterestRate(bank, utilizationRatio);
+    return calcInterestRate(bank, utilizationRatio);
+}
+async function getUpToDateShareValues(bank) {
+    let timeDelta = (0, generalUtils_1.currentUnixSeconds)() - Number(bank.lastUpdate);
+    const [lendingApr, borrowingApr] = calculateAnnualAPYs(bank);
     return [
         calcAccruedInterestPaymentPerPeriod(lendingApr, timeDelta, (0, numberUtils_1.bytesToI80F48)(bank.assetShareValue.value)),
         calcAccruedInterestPaymentPerPeriod(borrowingApr, timeDelta, (0, numberUtils_1.bytesToI80F48)(bank.liabilityShareValue.value)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.202",
+  "version": "1.0.203",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/constants/marginfiAccounts.ts

@@ -24,6 +24,12 @@ export const MARGINFI_ACCOUNTS: {
       vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
       priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
     },
+    [tokens.M_SOL]: {
+      bank: "22DcjMZrMwC5Bpa5AGBsmjc5V9VuQrXG6N9ZtdUNyYGE",
+      liquidityVault: "B6HqNn83a2bLqo4i5ygjLHJgD11ePtQksUyx4MjD55DV",
+      vaultAuthority: "6YxGd65JbXzgFGWjE44jsyVeCnZp7Bb1wfL9jDia1n8w",
+      priceOracle: "5CKzb9j4ChgLUt8Gfm5CNGLN6khXKiqMbnGAW4cgXgxK",
+    },
     [tokens.JITO_SOL]: {
       bank: "Bohoc1ikHLD7xKJuzTyiTyCwzaL5N7ggJQu75A8mKYM8",
       liquidityVault: "38VGtXd2pDPq9FMh1z6AVjcHCoHgvWyMhdNyamDTeeks",
@@ -36,12 +42,6 @@ export const MARGINFI_ACCOUNTS: {
       vaultAuthority: "6PWVauGLhBFHUJspsnBVZHr56ZnbvmhSD2gS7czBHGpE",
       priceOracle: "7aT9A5knp62jVvnEW33xaWopaPHa3Y7ggULyYiUsDhu8",
     },
-    [tokens.M_SOL]: {
-      bank: "22DcjMZrMwC5Bpa5AGBsmjc5V9VuQrXG6N9ZtdUNyYGE",
-      liquidityVault: "B6HqNn83a2bLqo4i5ygjLHJgD11ePtQksUyx4MjD55DV",
-      vaultAuthority: "6YxGd65JbXzgFGWjE44jsyVeCnZp7Bb1wfL9jDia1n8w",
-      priceOracle: "5CKzb9j4ChgLUt8Gfm5CNGLN6khXKiqMbnGAW4cgXgxK",
-    },
     [tokens.INF]: {
       bank: "AwLRW3aPMMftXEjgWhTkYwM9CGBHdtKecvahCJZBwAqY",
       liquidityVault: "HQ1CGcqRshMhuonTGTnnmgw9ffcXxizGdZ6F6PKffWWi",

package/src/constants/pythConstants.ts

@@ -7,12 +7,12 @@ export const PYTH_PRICE_FEED_IDS = {
     "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
   [tokens.B_SOL]:
     "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
+  [tokens.M_SOL]:
+    "0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4",
   [tokens.JITO_SOL]:
     "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb",
   [tokens.LST]:
     "0x12fb674ee496045b1d9cf7d5e65379acb026133c2ad69f3ed996fb9fe68e3a37",
-  [tokens.M_SOL]:
-    "0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4",
   [tokens.INF]:
     "0xf51570985c642c49c2d6e50156390fdba80bb6d5f7fa389d2f012ced4f7d208f",
   [tokens.JUP]:

package/src/constants/tokenConstants.ts

@@ -22,9 +22,9 @@ export const USDT = "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB";
 export const ALL_SUPPORTED_TOKENS = [
   NATIVE_MINT.toString(),
   B_SOL,
+  M_SOL,
   JITO_SOL,
   LST,
-  M_SOL,
   INF,
   JUP,
   BONK,
@@ -60,6 +60,11 @@ export const TOKEN_INFO: { [key: string]: TokenInfo } = {
     decimals: 9,
     isLST: true,
   },
+  [M_SOL]: {
+    ticker: "mSOL",
+    decimals: 9,
+    isLST: true,
+  },
   [JITO_SOL]: {
     ticker: "JitoSOL",
     decimals: 9,
@@ -70,11 +75,6 @@ export const TOKEN_INFO: { [key: string]: TokenInfo } = {
     decimals: 9,
     isLST: true,
   },
-  [M_SOL]: {
-    ticker: "mSOL",
-    decimals: 9,
-    isLST: true,
-  },
   [INF]: {
     ticker: "INF",
     decimals: 9,

package/src/utils/marginfiUtils.ts

@@ -198,7 +198,6 @@ export async function getAllMarginfiAccountsByAuthority(
 }
 
 async function getTokenUsage(
-  umi: Umi,
   bank: Bank | null,
   isAsset: boolean,
   shares: number,
@@ -210,10 +209,8 @@ async function getTokenUsage(
 
   if (bank !== null) {
     [marketPrice] = await fetchTokenPrices([toWeb3JsPublicKey(bank.mint)]);
-    const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(
-      umi,
-      bank
-    );
+    const [assetShareValue, liabilityShareValue] =
+      await getUpToDateShareValues(bank);
     const shareValue = isAsset ? assetShareValue : liabilityShareValue;
     amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
 
@@ -333,7 +330,6 @@ export async function getMarginfiAccountPositionState(
         supplyMint = toWeb3JsPublicKey(supplyBank!.mint);
       }
       supplyUsage = await getTokenUsage(
-        umi,
         supplyBank!,
         true,
         bytesToI80F48(supplyBalances[0].assetShares.value),
@@ -351,7 +347,6 @@ export async function getMarginfiAccountPositionState(
         debtMint = toWeb3JsPublicKey(debtBank!.mint);
       }
       debtUsage = await getTokenUsage(
-        umi,
         debtBank!,
         false,
         bytesToI80F48(debtBalances[0].liabilityShares.value),
@@ -375,7 +370,6 @@ export async function getMarginfiAccountPositionState(
 
   if (!supplyUsage) {
     supplyUsage = await getTokenUsage(
-      umi,
       supplyBank,
       true,
       0,
@@ -392,7 +386,6 @@ export async function getMarginfiAccountPositionState(
 
   if (!debtUsage) {
     debtUsage = await getTokenUsage(
-      umi,
       debtBank,
       false,
       0,
@@ -462,10 +455,10 @@ function marginfiInterestRateCurve(
   );
 
   if (utilizationRatio <= optimalUr) {
-    return (utilizationRatio / optimalUr) * plateauIr;
+    return (utilizationRatio * plateauIr) / optimalUr;
   } else {
     return (
-      ((utilizationRatio - optimalUr) / (1 - optimalUr)) * (maxIr - plateauIr) +
+      (((utilizationRatio - optimalUr) / (1 - optimalUr)) * (maxIr - plateauIr)) +
       plateauIr
     );
   }
@@ -493,7 +486,7 @@ function calcInterestRate(
   );
   const rateFee = protocolIrFee + insuranceIrFee;
   const totalFixedFeeApr = protocolFixedFeeApr + insuranceFixedFeeApr;
-  const borrowingRate = baseRate * (1 + rateFee) * totalFixedFeeApr;
+  const borrowingRate = (baseRate * (1 + rateFee)) + totalFixedFeeApr;
 
   return [lendingRate, borrowingRate];
 }
@@ -508,12 +501,7 @@ function calcAccruedInterestPaymentPerPeriod(
   return newValue;
 }
 
-export async function getUpToDateShareValues(
-  umi: Umi,
-  bank: Bank
-): Promise<[number, number]> {
-  let timeDelta = currentUnixSeconds() - Number(bank.lastUpdate);
-
+export function calculateAnnualAPYs(bank: Bank) {
   const totalAssets =
     bytesToI80F48(bank.totalAssetShares.value) *
     bytesToI80F48(bank.assetShareValue.value);
@@ -522,7 +510,14 @@ export async function getUpToDateShareValues(
     bytesToI80F48(bank.liabilityShareValue.value);
 
   const utilizationRatio = totalLiabilities / totalAssets;
-  const [lendingApr, borrowingApr] = calcInterestRate(bank, utilizationRatio);
+  return calcInterestRate(bank, utilizationRatio);
+}
+
+export async function getUpToDateShareValues(
+  bank: Bank
+): Promise<[number, number]> {
+  let timeDelta = currentUnixSeconds() - Number(bank.lastUpdate);
+  const [lendingApr, borrowingApr] = calculateAnnualAPYs(bank);
 
   return [
     calcAccruedInterestPaymentPerPeriod(