@defisaver/positions-sdk 2.1.79-aave-v4-4-dev → 2.1.79-aave-v4-6-dev

package/cjs/aaveV4/index.js

@@ -79,59 +79,6 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
         }, {}),
     };
 });
-// TODO AaveV4: Will be used for after values, onchain data is available when fetching position data
-const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
-    const collaterals = [];
-    const debts = [];
-    Object.entries(usedAssets).forEach(([identifier, asset]) => {
-        const reserveData = assetsData[identifier];
-        if (!reserveData)
-            return;
-        const borrowedUsdDec = new decimal_js_1.default(asset.borrowedUsd || '0');
-        if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
-            debts.push({ valueUsd: borrowedUsdDec });
-        }
-        const suppliedUsdDec = new decimal_js_1.default(asset.suppliedUsd || '0');
-        const isActiveCollateral = asset.collateral
-            && asset.isSupplied
-            && asset.collateralFactor > 0
-            && suppliedUsdDec.gt(0);
-        if (isActiveCollateral) {
-            // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
-            const riskBps = new decimal_js_1.default(reserveData.collateralRisk).mul(10000).toNumber();
-            collaterals.push({
-                riskBps,
-                valueUsd: suppliedUsdDec,
-            });
-        }
-    });
-    const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new decimal_js_1.default(0));
-    if (totalDebtUsd.lte(0)) {
-        return 0;
-    }
-    // sort by risk ASC, value DESC
-    collaterals.sort((a, b) => {
-        if (a.riskBps !== b.riskBps)
-            return a.riskBps - b.riskBps;
-        return b.valueUsd.comparedTo(a.valueUsd);
-    });
-    let debtLeftToCover = totalDebtUsd;
-    let numerator = new decimal_js_1.default(0); // sum(coveredUsd * riskBps)
-    let coveredDebt = new decimal_js_1.default(0); // sum(coveredUsd)
-    collaterals.forEach(({ riskBps, valueUsd }) => {
-        if (debtLeftToCover.lte(0))
-            return;
-        const coveredUsd = decimal_js_1.default.min(valueUsd, debtLeftToCover);
-        numerator = numerator.add(coveredUsd.mul(riskBps));
-        coveredDebt = coveredDebt.add(coveredUsd);
-        debtLeftToCover = debtLeftToCover.sub(coveredUsd);
-    });
-    if (coveredDebt.lte(0)) {
-        return 0;
-    }
-    const riskPremiumBps = numerator.div(coveredDebt);
-    return riskPremiumBps.toNumber();
-};
 const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, network) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e, _f;
     const assetInfo = (0, tokens_1.getAssetInfoByAddress)(reserveAsset.underlying, network);
@@ -181,10 +128,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
     const liquidityFee = new decimal_js_1.default(hubAsset.liquidityFee.toString()).div(new decimal_js_1.default(10).pow(4));
     const totalDrawnShares = new decimal_js_1.default(hubAsset.totalDrawnShares.toString());
     const totalPremiumShares = new decimal_js_1.default(hubAsset.totalPremiumShares.toString());
-    // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
-    // TODO JKJ@JK when we confirm that this is the right way to calculate it
     const premiumMultiplier = totalDrawnShares.isZero() ? new decimal_js_1.default(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
-    const supplyApr = borrowApr.mul(hubUtilization).mul(new decimal_js_1.default(1).minus(liquidityFee));
+    const supplyApr = borrowApr.mul(hubUtilization).mul(premiumMultiplier).mul(new decimal_js_1.default(1).minus(liquidityFee));
     return ({
         symbol,
         underlying: reserveAsset.underlying,
@@ -251,7 +196,7 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
         const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
         const loanData = yield viewContract.read.getLoanData([spokeData.address, address]);
         const healthFactorFromContract = new decimal_js_1.default(loanData.healthFactor.toString());
-        const healthFactor = (0, utils_1.isMaxUint)(healthFactorFromContract.toString()) ? '0' : healthFactorFromContract.div(1e18).toString();
+        const healthFactor = (0, utils_1.isMaxUint)(healthFactorFromContract.toString()) ? 'Infinity' : healthFactorFromContract.div(1e18).toString();
         const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
             const identifier = `${(0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
             const reserveData = spokeData.assetsData[identifier];
@@ -286,7 +231,7 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
             network,
             useUserCollateralFactor: true,
         });
-        const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, spokeData.assetsData);
+        const riskPremiumBps = (0, aaveV4Helpers_1.calcUserRiskPremiumBps)(usedAssets, spokeData.assetsData);
         return Object.assign(Object.assign({}, aggregated), { usedAssets,
             healthFactor,
             riskPremiumBps });

package/cjs/aaveV4/lend.js

@@ -57,7 +57,6 @@ const aaveV4GetTokenizedHubKey = (hubNameOrKey) => {
     if (!hubNameOrKey)
         return null;
     const normalized = hubNameOrKey.trim().toUpperCase();
-    // TODO AaveV4 Maybe turn into constants
     if (normalized === 'CORE' || normalized === 'CORE HUB')
         return 'CORE';
     if (normalized === 'PLUS' || normalized === 'PLUS HUB')

package/cjs/helpers/aaveV4Helpers/index.d.ts

@@ -1,4 +1,9 @@
 import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, LeverageType, NetworkNumber } from '../../types';
+export declare const calcUserRiskPremiumBps: (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData) => number;
+export declare const getApyAfterValuesEstimation: (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData) => Record<string, {
+    borrowRate: string;
+    supplyRate: string;
+}>;
 export declare const aaveV4GetCollateralFactor: (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor?: boolean) => number;
 export declare const isLeveragedPosAaveV4: (usedAssets: AaveV4UsedReserveAssets, dustLimit?: number) => {
     leveragedType: LeverageType;

package/cjs/helpers/aaveV4Helpers/index.js

@@ -3,10 +3,81 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV4GetAggregatedPositionData = exports.isLeveragedPosAaveV4 = exports.aaveV4GetCollateralFactor = void 0;
+exports.aaveV4GetAggregatedPositionData = exports.isLeveragedPosAaveV4 = exports.aaveV4GetCollateralFactor = exports.getApyAfterValuesEstimation = exports.calcUserRiskPremiumBps = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
 const types_1 = require("../../types");
+const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
+    const collaterals = [];
+    const debts = [];
+    Object.entries(usedAssets).forEach(([identifier, asset]) => {
+        const reserveData = assetsData[identifier];
+        if (!reserveData)
+            return;
+        const borrowedUsdDec = new decimal_js_1.default(asset.borrowedUsd || '0');
+        if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
+            debts.push({ valueUsd: borrowedUsdDec });
+        }
+        const suppliedUsdDec = new decimal_js_1.default(asset.suppliedUsd || '0');
+        const isActiveCollateral = asset.collateral
+            && asset.isSupplied
+            && asset.collateralFactor > 0
+            && suppliedUsdDec.gt(0);
+        if (isActiveCollateral) {
+            // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
+            const riskBps = new decimal_js_1.default(reserveData.collateralRisk).mul(10000).toNumber();
+            collaterals.push({
+                riskBps,
+                valueUsd: suppliedUsdDec,
+            });
+        }
+    });
+    const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new decimal_js_1.default(0));
+    if (totalDebtUsd.lte(0)) {
+        return 0;
+    }
+    // sort by risk ASC, value DESC
+    collaterals.sort((a, b) => {
+        if (a.riskBps !== b.riskBps)
+            return a.riskBps - b.riskBps;
+        return b.valueUsd.comparedTo(a.valueUsd);
+    });
+    let debtLeftToCover = totalDebtUsd;
+    let numerator = new decimal_js_1.default(0); // sum(coveredUsd * riskBps)
+    let coveredDebt = new decimal_js_1.default(0); // sum(coveredUsd)
+    collaterals.forEach(({ riskBps, valueUsd }) => {
+        if (debtLeftToCover.lte(0))
+            return;
+        const coveredUsd = decimal_js_1.default.min(valueUsd, debtLeftToCover);
+        numerator = numerator.add(coveredUsd.mul(riskBps));
+        coveredDebt = coveredDebt.add(coveredUsd);
+        debtLeftToCover = debtLeftToCover.sub(coveredUsd);
+    });
+    if (coveredDebt.lte(0)) {
+        return 0;
+    }
+    const riskPremiumBps = numerator.div(coveredDebt);
+    return riskPremiumBps.toNumber();
+};
+exports.calcUserRiskPremiumBps = calcUserRiskPremiumBps;
+const getApyAfterValuesEstimation = (usedAssets, assetsData) => {
+    const riskPremiumBps = (0, exports.calcUserRiskPremiumBps)(usedAssets, assetsData);
+    const riskPremiumFraction = new decimal_js_1.default(riskPremiumBps).div(10000); // bps to fraction
+    const result = {};
+    Object.entries(assetsData).forEach(([identifier, assetData]) => {
+        const drawnRate = new decimal_js_1.default(assetData.drawnRate);
+        const baseBorrowApr = drawnRate.mul(100);
+        // finalBorrowRate = baseBorrowRate * (1 + riskPremiumFraction)
+        const userBorrowApr = baseBorrowApr.mul(new decimal_js_1.default(1).add(riskPremiumFraction));
+        result[identifier] = {
+            borrowRate: (0, moneymarket_1.aprToApy)(userBorrowApr.toString()),
+            // Supply rate is market-level (not user-specific), use existing value
+            supplyRate: assetData.supplyRate,
+        };
+    });
+    return result;
+};
+exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
 exports.aaveV4GetCollateralFactor = aaveV4GetCollateralFactor;
 const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {

package/esm/aaveV4/index.js

@@ -14,7 +14,7 @@ import { IncentiveKind, } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { isMaxUint, wethToEth } from '../services/utils';
-import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
+import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
 export * as lend from './lend';
@@ -36,59 +36,6 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
         }, {}),
     };
 });
-// TODO AaveV4: Will be used for after values, onchain data is available when fetching position data
-const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
-    const collaterals = [];
-    const debts = [];
-    Object.entries(usedAssets).forEach(([identifier, asset]) => {
-        const reserveData = assetsData[identifier];
-        if (!reserveData)
-            return;
-        const borrowedUsdDec = new Dec(asset.borrowedUsd || '0');
-        if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
-            debts.push({ valueUsd: borrowedUsdDec });
-        }
-        const suppliedUsdDec = new Dec(asset.suppliedUsd || '0');
-        const isActiveCollateral = asset.collateral
-            && asset.isSupplied
-            && asset.collateralFactor > 0
-            && suppliedUsdDec.gt(0);
-        if (isActiveCollateral) {
-            // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
-            const riskBps = new Dec(reserveData.collateralRisk).mul(10000).toNumber();
-            collaterals.push({
-                riskBps,
-                valueUsd: suppliedUsdDec,
-            });
-        }
-    });
-    const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new Dec(0));
-    if (totalDebtUsd.lte(0)) {
-        return 0;
-    }
-    // sort by risk ASC, value DESC
-    collaterals.sort((a, b) => {
-        if (a.riskBps !== b.riskBps)
-            return a.riskBps - b.riskBps;
-        return b.valueUsd.comparedTo(a.valueUsd);
-    });
-    let debtLeftToCover = totalDebtUsd;
-    let numerator = new Dec(0); // sum(coveredUsd * riskBps)
-    let coveredDebt = new Dec(0); // sum(coveredUsd)
-    collaterals.forEach(({ riskBps, valueUsd }) => {
-        if (debtLeftToCover.lte(0))
-            return;
-        const coveredUsd = Dec.min(valueUsd, debtLeftToCover);
-        numerator = numerator.add(coveredUsd.mul(riskBps));
-        coveredDebt = coveredDebt.add(coveredUsd);
-        debtLeftToCover = debtLeftToCover.sub(coveredUsd);
-    });
-    if (coveredDebt.lte(0)) {
-        return 0;
-    }
-    const riskPremiumBps = numerator.div(coveredDebt);
-    return riskPremiumBps.toNumber();
-};
 const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, network) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e, _f;
     const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
@@ -138,10 +85,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
     const liquidityFee = new Dec(hubAsset.liquidityFee.toString()).div(new Dec(10).pow(4));
     const totalDrawnShares = new Dec(hubAsset.totalDrawnShares.toString());
     const totalPremiumShares = new Dec(hubAsset.totalPremiumShares.toString());
-    // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
-    // TODO JKJ@JK when we confirm that this is the right way to calculate it
     const premiumMultiplier = totalDrawnShares.isZero() ? new Dec(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
-    const supplyApr = borrowApr.mul(hubUtilization).mul(new Dec(1).minus(liquidityFee));
+    const supplyApr = borrowApr.mul(hubUtilization).mul(premiumMultiplier).mul(new Dec(1).minus(liquidityFee));
     return ({
         symbol,
         underlying: reserveAsset.underlying,
@@ -208,7 +153,7 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
         const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
         const loanData = yield viewContract.read.getLoanData([spokeData.address, address]);
         const healthFactorFromContract = new Dec(loanData.healthFactor.toString());
-        const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? '0' : healthFactorFromContract.div(1e18).toString();
+        const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? 'Infinity' : healthFactorFromContract.div(1e18).toString();
         const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
             const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
             const reserveData = spokeData.assetsData[identifier];

package/esm/aaveV4/lend.js

@@ -53,7 +53,6 @@ export const aaveV4GetTokenizedHubKey = (hubNameOrKey) => {
     if (!hubNameOrKey)
         return null;
     const normalized = hubNameOrKey.trim().toUpperCase();
-    // TODO AaveV4 Maybe turn into constants
     if (normalized === 'CORE' || normalized === 'CORE HUB')
         return 'CORE';
     if (normalized === 'PLUS' || normalized === 'PLUS HUB')

package/esm/helpers/aaveV4Helpers/index.d.ts

@@ -1,4 +1,9 @@
 import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, LeverageType, NetworkNumber } from '../../types';
+export declare const calcUserRiskPremiumBps: (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData) => number;
+export declare const getApyAfterValuesEstimation: (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData) => Record<string, {
+    borrowRate: string;
+    supplyRate: string;
+}>;
 export declare const aaveV4GetCollateralFactor: (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor?: boolean) => number;
 export declare const isLeveragedPosAaveV4: (usedAssets: AaveV4UsedReserveAssets, dustLimit?: number) => {
     leveragedType: LeverageType;

package/esm/helpers/aaveV4Helpers/index.js

@@ -1,6 +1,75 @@
 import Dec from 'decimal.js';
-import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS } from '../../moneymarket';
+import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS, } from '../../moneymarket';
 import { LeverageType, } from '../../types';
+export const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
+    const collaterals = [];
+    const debts = [];
+    Object.entries(usedAssets).forEach(([identifier, asset]) => {
+        const reserveData = assetsData[identifier];
+        if (!reserveData)
+            return;
+        const borrowedUsdDec = new Dec(asset.borrowedUsd || '0');
+        if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
+            debts.push({ valueUsd: borrowedUsdDec });
+        }
+        const suppliedUsdDec = new Dec(asset.suppliedUsd || '0');
+        const isActiveCollateral = asset.collateral
+            && asset.isSupplied
+            && asset.collateralFactor > 0
+            && suppliedUsdDec.gt(0);
+        if (isActiveCollateral) {
+            // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
+            const riskBps = new Dec(reserveData.collateralRisk).mul(10000).toNumber();
+            collaterals.push({
+                riskBps,
+                valueUsd: suppliedUsdDec,
+            });
+        }
+    });
+    const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new Dec(0));
+    if (totalDebtUsd.lte(0)) {
+        return 0;
+    }
+    // sort by risk ASC, value DESC
+    collaterals.sort((a, b) => {
+        if (a.riskBps !== b.riskBps)
+            return a.riskBps - b.riskBps;
+        return b.valueUsd.comparedTo(a.valueUsd);
+    });
+    let debtLeftToCover = totalDebtUsd;
+    let numerator = new Dec(0); // sum(coveredUsd * riskBps)
+    let coveredDebt = new Dec(0); // sum(coveredUsd)
+    collaterals.forEach(({ riskBps, valueUsd }) => {
+        if (debtLeftToCover.lte(0))
+            return;
+        const coveredUsd = Dec.min(valueUsd, debtLeftToCover);
+        numerator = numerator.add(coveredUsd.mul(riskBps));
+        coveredDebt = coveredDebt.add(coveredUsd);
+        debtLeftToCover = debtLeftToCover.sub(coveredUsd);
+    });
+    if (coveredDebt.lte(0)) {
+        return 0;
+    }
+    const riskPremiumBps = numerator.div(coveredDebt);
+    return riskPremiumBps.toNumber();
+};
+export const getApyAfterValuesEstimation = (usedAssets, assetsData) => {
+    const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, assetsData);
+    const riskPremiumFraction = new Dec(riskPremiumBps).div(10000); // bps to fraction
+    const result = {};
+    Object.entries(assetsData).forEach(([identifier, assetData]) => {
+        const drawnRate = new Dec(assetData.drawnRate);
+        const baseBorrowApr = drawnRate.mul(100);
+        // finalBorrowRate = baseBorrowRate * (1 + riskPremiumFraction)
+        const userBorrowApr = baseBorrowApr.mul(new Dec(1).add(riskPremiumFraction));
+        result[identifier] = {
+            borrowRate: aprToApy(userBorrowApr.toString()),
+            // Supply rate is market-level (not user-specific), use existing value
+            supplyRate: assetData.supplyRate,
+        };
+    });
+    return result;
+};
 export const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
 export const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.79-aave-v4-4-dev",
+  "version": "2.1.79-aave-v4-6-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/index.ts

@@ -11,7 +11,6 @@ import {
   AaveV4SpokeData,
   AaveV4SpokeInfo,
   AaveV4UsedReserveAssets,
-  AaveV4AssetsData,
   EthAddress,
   EthereumProvider,
   IncentiveData,
@@ -21,7 +20,7 @@ import {
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { isMaxUint, wethToEth } from '../services/utils';
-import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
+import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
 
@@ -46,73 +45,6 @@ const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractVi
   };
 };
 
-// TODO AaveV4: Will be used for after values, onchain data is available when fetching position data
-const calcUserRiskPremiumBps = (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData): number => {
-  type CollateralInfo = { riskBps: number; valueUsd: Dec };
-  type DebtInfo = { valueUsd: Dec };
-
-  const collaterals: CollateralInfo[] = [];
-  const debts: DebtInfo[] = [];
-
-  Object.entries(usedAssets).forEach(([identifier, asset]) => {
-    const reserveData = assetsData[identifier];
-    if (!reserveData) return;
-
-    const borrowedUsdDec = new Dec(asset.borrowedUsd || '0');
-    if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
-      debts.push({ valueUsd: borrowedUsdDec });
-    }
-
-    const suppliedUsdDec = new Dec(asset.suppliedUsd || '0');
-    const isActiveCollateral = asset.collateral
-      && asset.isSupplied
-      && asset.collateralFactor > 0
-      && suppliedUsdDec.gt(0);
-
-    if (isActiveCollateral) {
-      // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
-      const riskBps = new Dec(reserveData.collateralRisk).mul(10000).toNumber();
-      collaterals.push({
-        riskBps,
-        valueUsd: suppliedUsdDec,
-      });
-    }
-  });
-
-  const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new Dec(0));
-
-  if (totalDebtUsd.lte(0)) {
-    return 0;
-  }
-
-  // sort by risk ASC, value DESC
-  collaterals.sort((a, b) => {
-    if (a.riskBps !== b.riskBps) return a.riskBps - b.riskBps;
-    return b.valueUsd.comparedTo(a.valueUsd);
-  });
-
-  let debtLeftToCover = totalDebtUsd;
-  let numerator = new Dec(0); // sum(coveredUsd * riskBps)
-  let coveredDebt = new Dec(0); // sum(coveredUsd)
-
-  collaterals.forEach(({ riskBps, valueUsd }) => {
-    if (debtLeftToCover.lte(0)) return;
-
-    const coveredUsd = Dec.min(valueUsd, debtLeftToCover);
-
-    numerator = numerator.add(coveredUsd.mul(riskBps));
-    coveredDebt = coveredDebt.add(coveredUsd);
-
-    debtLeftToCover = debtLeftToCover.sub(coveredUsd);
-  });
-
-  if (coveredDebt.lte(0)) {
-    return 0;
-  }
-
-  const riskPremiumBps = numerator.div(coveredDebt);
-  return riskPremiumBps.toNumber();
-};
 
 const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: AaveV4HubAssetOnChainData, reserveId: number, oracleDecimals: number, network: NetworkNumber): Promise<AaveV4ReserveAssetData> => {
   const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
@@ -166,10 +98,8 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
   const liquidityFee = new Dec(hubAsset.liquidityFee.toString()).div(new Dec(10).pow(4));
   const totalDrawnShares = new Dec(hubAsset.totalDrawnShares.toString());
   const totalPremiumShares = new Dec(hubAsset.totalPremiumShares.toString());
-  // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
-  // TODO JKJ@JK when we confirm that this is the right way to calculate it
   const premiumMultiplier = totalDrawnShares.isZero() ? new Dec(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
-  const supplyApr = borrowApr.mul(hubUtilization).mul(new Dec(1).minus(liquidityFee));
+  const supplyApr = borrowApr.mul(hubUtilization).mul(premiumMultiplier).mul(new Dec(1).minus(liquidityFee));
 
   return ({
     symbol,
@@ -240,7 +170,7 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
   const loanData = await viewContract.read.getLoanData([spokeData.address, address]);
 
   const healthFactorFromContract = new Dec(loanData.healthFactor.toString());
-  const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? '0' : healthFactorFromContract.div(1e18).toString();
+  const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? 'Infinity' : healthFactorFromContract.div(1e18).toString();
   const usedAssets = loanData.reserves.reduce((acc: AaveV4UsedReserveAssets, usedReserveAsset) => {
     const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
     const reserveData = spokeData.assetsData[identifier];

package/src/aaveV4/lend.ts

@@ -73,7 +73,6 @@ export const aaveV4GetTokenizedHubKey = (hubNameOrKey?: string | null): AaveV4To
   if (!hubNameOrKey) return null;
   const normalized = hubNameOrKey.trim().toUpperCase();
 
-  // TODO AaveV4 Maybe turn into constants
   if (normalized === 'CORE' || normalized === 'CORE HUB') return 'CORE';
   if (normalized === 'PLUS' || normalized === 'PLUS HUB') return 'PLUS';
   if (normalized === 'PRIME' || normalized === 'PRIME HUB') return 'PRIME';

package/src/helpers/aaveV4Helpers/index.ts

@@ -1,5 +1,10 @@
 import Dec from 'decimal.js';
-import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS } from '../../moneymarket';
+import {
+  aprToApy,
+  calcLeverageLiqPrice,
+  getAssetsTotal,
+  STABLE_ASSETS,
+} from '../../moneymarket';
 import {
   AaveV4AggregatedPositionData,
   AaveV4AssetsData,
@@ -10,6 +15,98 @@ import {
   NetworkNumber,
 } from '../../types';
 
+export const calcUserRiskPremiumBps = (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData): number => {
+  type CollateralInfo = { riskBps: number; valueUsd: Dec };
+  type DebtInfo = { valueUsd: Dec };
+
+  const collaterals: CollateralInfo[] = [];
+  const debts: DebtInfo[] = [];
+
+  Object.entries(usedAssets).forEach(([identifier, asset]) => {
+    const reserveData = assetsData[identifier];
+    if (!reserveData) return;
+
+    const borrowedUsdDec = new Dec(asset.borrowedUsd || '0');
+    if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
+      debts.push({ valueUsd: borrowedUsdDec });
+    }
+
+    const suppliedUsdDec = new Dec(asset.suppliedUsd || '0');
+    const isActiveCollateral = asset.collateral
+      && asset.isSupplied
+      && asset.collateralFactor > 0
+      && suppliedUsdDec.gt(0);
+
+    if (isActiveCollateral) {
+      // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
+      const riskBps = new Dec(reserveData.collateralRisk).mul(10000).toNumber();
+      collaterals.push({
+        riskBps,
+        valueUsd: suppliedUsdDec,
+      });
+    }
+  });
+
+  const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new Dec(0));
+
+  if (totalDebtUsd.lte(0)) {
+    return 0;
+  }
+
+  // sort by risk ASC, value DESC
+  collaterals.sort((a, b) => {
+    if (a.riskBps !== b.riskBps) return a.riskBps - b.riskBps;
+    return b.valueUsd.comparedTo(a.valueUsd);
+  });
+
+  let debtLeftToCover = totalDebtUsd;
+  let numerator = new Dec(0); // sum(coveredUsd * riskBps)
+  let coveredDebt = new Dec(0); // sum(coveredUsd)
+
+  collaterals.forEach(({ riskBps, valueUsd }) => {
+    if (debtLeftToCover.lte(0)) return;
+
+    const coveredUsd = Dec.min(valueUsd, debtLeftToCover);
+
+    numerator = numerator.add(coveredUsd.mul(riskBps));
+    coveredDebt = coveredDebt.add(coveredUsd);
+
+    debtLeftToCover = debtLeftToCover.sub(coveredUsd);
+  });
+
+  if (coveredDebt.lte(0)) {
+    return 0;
+  }
+
+  const riskPremiumBps = numerator.div(coveredDebt);
+  return riskPremiumBps.toNumber();
+};
+
+export const getApyAfterValuesEstimation = (
+  usedAssets: AaveV4UsedReserveAssets,
+  assetsData: AaveV4AssetsData,
+): Record<string, { borrowRate: string; supplyRate: string }> => {
+  const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, assetsData);
+  const riskPremiumFraction = new Dec(riskPremiumBps).div(10000); // bps to fraction
+
+  const result: Record<string, { borrowRate: string; supplyRate: string }> = {};
+
+  Object.entries(assetsData).forEach(([identifier, assetData]) => {
+    const drawnRate = new Dec(assetData.drawnRate);
+    const baseBorrowApr = drawnRate.mul(100);
+    // finalBorrowRate = baseBorrowRate * (1 + riskPremiumFraction)
+    const userBorrowApr = baseBorrowApr.mul(new Dec(1).add(riskPremiumFraction));
+
+    result[identifier] = {
+      borrowRate: aprToApy(userBorrowApr.toString()),
+      // Supply rate is market-level (not user-specific), use existing value
+      supplyRate: assetData.supplyRate,
+    };
+  });
+
+  return result;
+};
+
 export const aaveV4GetCollateralFactor = (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor: boolean = false): number => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
 
 export const isLeveragedPosAaveV4 = (usedAssets: AaveV4UsedReserveAssets, dustLimit = 5) => {