@defisaver/positions-sdk 2.1.72-aave-v4-dev → 2.1.72-aave-v4-3-dev

package/esm/aaveV4/index.js

@@ -10,12 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { getViemProvider } from '../services/viem';
-import { IncentiveKind, } from '../types/common';
+import { IncentiveKind, } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { wethToEth } from '../services/utils';
 import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
+import { aprToApy } from '../moneymarket';
+export * as lend from './lend';
 const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
     return {
@@ -23,12 +25,71 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
             acc[assetOnChainData.assetId] = {
                 assetId: assetOnChainData.assetId,
                 drawnRate: assetOnChainData.drawnRate,
+                liquidity: assetOnChainData.liquidity,
+                liquidityFee: assetOnChainData.liquidityFee,
+                swept: assetOnChainData.swept,
+                totalDrawn: assetOnChainData.totalDrawn,
+                totalDrawnShares: assetOnChainData.totalDrawnShares,
+                totalPremiumShares: assetOnChainData.totalPremiumShares,
             };
             return acc;
         }, {}),
     };
 });
+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);
     const symbol = wethToEth(assetInfo.symbol);
     const hubInfo = getAaveV4HubByAddress(network, reserveAsset.hub);
@@ -56,6 +117,26 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
             });
         }
     }
+    const totalSuppliedRaw = (_a = reserveAsset.totalSupplied) !== null && _a !== void 0 ? _a : 0;
+    const totalDrawnRaw = (_b = reserveAsset.totalDrawn) !== null && _b !== void 0 ? _b : 0;
+    const totalPremiumRaw = (_c = reserveAsset.totalPremium) !== null && _c !== void 0 ? _c : 0;
+    const totalDebtRaw = (_d = reserveAsset.totalDebt) !== null && _d !== void 0 ? _d : 0;
+    const supplyCapRaw = (_e = reserveAsset.supplyCap) !== null && _e !== void 0 ? _e : 0;
+    const borrowCapRaw = (_f = reserveAsset.borrowCap) !== null && _f !== void 0 ? _f : 0;
+    /** @DEV Hub related calculations */
+    const drawnRate = new Dec(hubAsset.drawnRate.toString()).div(new Dec(10).pow(27));
+    const borrowApr = drawnRate.mul(100);
+    const totalDrawn = new Dec(hubAsset.totalDrawn.toString());
+    const liquidity = new Dec(hubAsset.liquidity.toString());
+    const swept = new Dec(hubAsset.swept.toString());
+    const hubUtilization = totalDrawn.div(totalDrawn.add(swept).add(liquidity));
+    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.add(totalPremiumShares).div(totalDrawnShares);
+    const supplyApr = borrowApr.mul(hubUtilization).mul(new Dec(1).minus(liquidityFee));
     return ({
         symbol,
         underlying: reserveAsset.underlying,
@@ -70,16 +151,17 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
         liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
         price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-        totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), symbol),
-        totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), symbol),
-        totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), symbol),
-        totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), symbol),
-        supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), symbol),
-        borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), symbol),
+        totalSupplied: assetAmountInEth(totalSuppliedRaw.toString(), symbol),
+        totalDrawn: assetAmountInEth(totalDrawnRaw.toString(), symbol),
+        totalPremium: assetAmountInEth(totalPremiumRaw.toString(), symbol),
+        totalDebt: assetAmountInEth(totalDebtRaw.toString(), symbol),
+        supplyCap: assetAmountInEth(supplyCapRaw.toString(), symbol),
+        borrowCap: assetAmountInEth(borrowCapRaw.toString(), symbol),
         spokeActive: reserveAsset.spokeActive,
         spokeHalted: reserveAsset.spokeHalted,
-        drawnRate: new Dec(hubAsset.drawnRate).div(new Dec(10).pow(27)).toString(),
-        supplyRate: '0', // To be implemented
+        drawnRate: drawnRate.toString(),
+        borrowRate: aprToApy(borrowApr.toString()),
+        supplyRate: aprToApy(supplyApr.toString()),
         supplyIncentives,
         borrowIncentives,
         canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
@@ -149,13 +231,16 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
             };
             return acc;
         }, {});
-        return Object.assign({ usedAssets,
-            healthFactor }, aaveV4GetAggregatedPositionData({
+        const aggregated = aaveV4GetAggregatedPositionData({
             usedAssets,
             assetsData: spokeData.assetsData,
             network,
             useUserCollateralFactor: true,
-        }));
+        });
+        const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, spokeData.assetsData);
+        return Object.assign(Object.assign({}, aggregated), { usedAssets,
+            healthFactor,
+            riskPremiumBps });
     });
 }
 export function getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {

package/esm/aaveV4/lend.d.ts

@@ -0,0 +1,45 @@
+import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+export interface AaveV4TokenizationSpokeData {
+    underlyingAsset: EthAddress;
+    assetId: string;
+    decimals: number;
+    spoke: EthAddress;
+    spokeActive: boolean;
+    spokeHalted: boolean;
+    spokeDepositCap: string;
+    spokeTotalAssets: string;
+    spokeTotalShares: string;
+    hub: EthAddress;
+    hubLiquidity: string;
+    hubDrawnRate: string;
+    convertToShares: string;
+    convertToAssets: string;
+    user: EthAddress;
+    userSuppliedAssets: string;
+    userSuppliedShares: string;
+}
+export declare const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress>;
+export declare const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>>;
+export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME';
+export declare const aaveV4GetTokenizedHubKey: (hubNameOrKey?: string | null) => AaveV4TokenizedHubKey | null;
+export declare const aaveV4GetTokenizedVaultKey: (symbol: string, hubNameOrKey?: string | null) => string | null;
+export declare const aaveV4GetTokenizedVaultAddress: (network: NetworkNumber, symbol: string, hubNameOrKey?: string | null) => EthAddress | undefined;
+/** Parsed tokenization spoke data with human-readable supplied amounts for display */
+export interface AaveV4TokenizationSpokeDataParsed {
+    vaultAddress: EthAddress;
+    key: string | null;
+    symbol: string;
+    hubKey: string;
+    userSuppliedAssetsEth: string;
+    userSuppliedSharesEth: string;
+    userSuppliedAssets: string;
+    userSuppliedShares: string;
+    underlyingAsset: EthAddress;
+    spoke: EthAddress;
+    decimals: number;
+}
+/**
+ * Fetches tokenization vault data for the given user via getTokenizationSpokesData.
+ * Returns parsed data including userSuppliedAssets in human-readable form for each vault.
+ */
+export declare function getAaveV4TokenizationSpokesData(provider: EthereumProvider, network: NetworkNumber, userAddress: EthAddress): Promise<AaveV4TokenizationSpokeDataParsed[]>;

package/esm/aaveV4/lend.js

@@ -0,0 +1,134 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
+import { AaveV4ViewContractViem } from '../contracts';
+import { getViemProvider } from '../services/viem';
+import { wethToEth } from '../services/utils';
+import { NetworkNumber, } from '../types/common';
+export const AAVE_V4_TOKENIZED_SPOKES = {
+    AAVE_CORE: '0x08309234884cF7E015b07Bf22569017Aa035cdeF',
+    EURC_CORE: '0x73596dED4B2Eb0aC85e477b3c8dB56FC427E6774',
+    GHO_CORE: '0xf7E1f1b43922527e5054bD77E7f863Cf182b194D',
+    GHO_PRIME: '0xeF1cAd5c6a2C9cb83c952b4B96bbD35b3F61F18f',
+    LBTC_CORE: '0x8f4D423590F22833131e3493bf67A27213398f8e',
+    LINK_CORE: '0xBE1197750b423e30137E97d9183065d33E903BE6',
+    PT_USDe_PLUS: '0x8cA27Ab284F2aA2BcF33D9129e11c101aD2d16de',
+    PT_sUSDe_PLUS: '0xb8A464EC56071a98c854f30fE19CfeCc41FA6233',
+    PYUSD_CORE: '0x203FB463087005698d50768FcA837047f738632d',
+    RLUSD_CORE: '0xa9afdd0c54fb153CaE39cE86E49626B5e9d15513',
+    USDC_CORE: '0xa2e476f4cbB06C7bFA8Ad51bCcbF198cd32CfD35',
+    USDC_PLUS: '0x320Bec4fB7a25e64c003A007D0AeF7AB3D6C30d7',
+    USDC_PRIME: '0x0A0507F7A1129892b5cf74b8B4e911442c466b87',
+    USDG_CORE: '0x87c224256f09a014C1BC3e9FbB094C3AdD8fBaCC',
+    USDT_CORE: '0x3f12BD5999b9172550893FF52691c980676f9E73',
+    USDT_PLUS: '0xa4E74a78bED2d3ab8971e8AB26fb39f26DD8eEd9',
+    USDT_PRIME: '0xF565fB55bc96d65561887898bfeb25C1dE7e06d2',
+    USDe_PLUS: '0xA0d346ab2699B689AC67aba5174164A84206BB73',
+    WBTC_CORE: '0x837Ab872A665e0CF467d41cF56a054031b4A38bc',
+    WBTC_PRIME: '0xeae98b8a1798738182B2123DF1eB93d97BD29F34',
+    WETH_CORE: '0x3961a75099E986F59a1a31c6f945061641dFD2b2',
+    WETH_PRIME: '0xa411826a6ef5d289c0FAa7d5B45FE8aAB52257F6',
+    XAUt_CORE: '0x470341bC0e2B833C54D0120642713BdF762A494F',
+    cbBTC_CORE: '0xe8D5E595d5b6b5EFf84B7064765fd0e8DfD214C9',
+    cbBTC_PRIME: '0x0E986545150DcDDe46Ea9df355D0fD2af33bd75D',
+    frxUSD_CORE: '0x00C8A6a42947Cc4E7B6f27963Cab0143ccaaD2B5',
+    frxUSD_PLUS: '0xCAB288d37CAb5a9db7b503F086455276Dcde61F1',
+    rsETH_CORE: '0x6eEce89caE2163584bA7Ff9743861B9633c245E0',
+    sUSDe_PLUS: '0xdf47fc43c88B06edC47753b7d647ff18037D2F3d',
+    weETH_CORE: '0xB67F20bFF413C8E5d633B54BD28899c4c9e33ed0',
+    wstETH_CORE: '0x474602394d0B02F43AC3D7C8c5cFc0814b03fd40',
+    wstETH_PRIME: '0xAcCdAb49ECB9A801CfF62a92fc80D52339b33770',
+};
+export const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES = {
+    [NetworkNumber.Eth]: Object.values(AAVE_V4_TOKENIZED_SPOKES),
+};
+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')
+        return 'PLUS';
+    if (normalized === 'PRIME' || normalized === 'PRIME HUB')
+        return 'PRIME';
+    if (normalized.includes('CORE'))
+        return 'CORE';
+    if (normalized.includes('PLUS'))
+        return 'PLUS';
+    if (normalized.includes('PRIME'))
+        return 'PRIME';
+    return null;
+};
+export const aaveV4GetTokenizedVaultKey = (symbol, hubNameOrKey) => {
+    if (!symbol)
+        return null;
+    const hubKey = aaveV4GetTokenizedHubKey(hubNameOrKey);
+    if (!hubKey)
+        return null;
+    const normalizedSymbol = symbol.trim().replace(/-/g, '_');
+    return `${normalizedSymbol}_${hubKey}`;
+};
+export const aaveV4GetTokenizedVaultAddress = (network, symbol, hubNameOrKey) => {
+    if (network !== NetworkNumber.Eth)
+        return undefined;
+    const key = aaveV4GetTokenizedVaultKey(symbol, hubNameOrKey);
+    if (!key)
+        return undefined;
+    return AAVE_V4_TOKENIZED_SPOKES[key];
+};
+const AAVE_V4_TOKENIZED_SPOKE_ADDRESS_TO_KEY = Object.entries(AAVE_V4_TOKENIZED_SPOKES).reduce((acc, [k, v]) => {
+    acc[v.toLowerCase()] = k;
+    return acc;
+}, {});
+/**
+ * Fetches tokenization vault data for the given user via getTokenizationSpokesData.
+ * Returns parsed data including userSuppliedAssets in human-readable form for each vault.
+ */
+export function getAaveV4TokenizationSpokesData(provider, network, userAddress) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const spokes = (_a = AAVE_V4_TOKENIZED_SPOKE_ADDRESSES[network]) !== null && _a !== void 0 ? _a : [];
+        if (spokes.length === 0)
+            return [];
+        const client = getViemProvider(provider, network);
+        const viewContract = AaveV4ViewContractViem(client, network);
+        const raw = yield viewContract.read.getTokenizationSpokesData([spokes, userAddress]);
+        return raw.map((r, i) => {
+            var _a, _b, _c, _d, _e;
+            const vaultAddress = spokes[i];
+            const key = (_a = AAVE_V4_TOKENIZED_SPOKE_ADDRESS_TO_KEY[vaultAddress.toLowerCase()]) !== null && _a !== void 0 ? _a : null;
+            const symbol = wethToEth(getAssetInfoByAddress(r.underlyingAsset, network).symbol);
+            if (symbol === '?') { // unsupported asset
+                return null;
+            }
+            const hubKey = key ? (_b = key.split('_').pop()) !== null && _b !== void 0 ? _b : '' : '';
+            const decimals = Number((_c = r.decimals) !== null && _c !== void 0 ? _c : 18);
+            const userSuppliedAssetsRaw = (_d = r.userSuppliedAssets) !== null && _d !== void 0 ? _d : 0;
+            const userSuppliedSharesRaw = (_e = r.userSuppliedShares) !== null && _e !== void 0 ? _e : 0;
+            const userSuppliedAssetsEth = assetAmountInEth(userSuppliedAssetsRaw.toString(), symbol);
+            const userSuppliedSharesEth = assetAmountInEth(userSuppliedSharesRaw.toString(), symbol);
+            return {
+                vaultAddress,
+                key,
+                symbol,
+                hubKey,
+                userSuppliedAssetsEth,
+                userSuppliedSharesEth,
+                userSuppliedAssets: userSuppliedAssetsRaw.toString(),
+                userSuppliedShares: userSuppliedSharesRaw.toString(),
+                underlyingAsset: r.underlyingAsset,
+                spoke: r.spoke,
+                decimals,
+            };
+        }).filter(item => item != null);
+    });
+}

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

@@ -1,5 +1,4 @@
-import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets } from '../../types';
-import { LeverageType, NetworkNumber } from '../../types/common';
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, LeverageType, NetworkNumber } from '../../types';
 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,6 @@
 import Dec from 'decimal.js';
 import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS } from '../../moneymarket';
-import { LeverageType } from '../../types/common';
+import { LeverageType, } from '../../types';
 export const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
 export const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

package/esm/types/aaveV4.d.ts

@@ -22,6 +22,12 @@ export interface AaveV4HubInfo {
 export interface AaveV4HubAssetOnChainData {
     assetId: number;
     drawnRate: bigint;
+    liquidity: bigint;
+    liquidityFee: number;
+    swept: bigint;
+    totalDrawn: bigint;
+    totalDrawnShares: bigint;
+    totalPremiumShares: bigint;
 }
 export interface AaveV4HubOnChainData {
     assets: Record<number, AaveV4HubAssetOnChainData>;
@@ -87,6 +93,7 @@ export interface AaveV4ReserveAssetData {
     spokeHalted: boolean;
     drawnRate: string;
     supplyRate: string;
+    borrowRate: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
     canBeBorrowed: boolean;
@@ -142,4 +149,5 @@ export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
 export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
     usedAssets: AaveV4UsedReserveAssets;
     healthFactor: string;
+    riskPremiumBps: number;
 }

package/package.json

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

package/src/aaveV4/index.ts

@@ -6,17 +6,26 @@ import {
   AaveV4AccountData,
   AaveV4HubAssetOnChainData,
   AaveV4HubOnChainData,
-  AaveV4ReserveAssetData, AaveV4ReserveAssetOnChain, AaveV4SpokeData, AaveV4SpokeInfo,
+  AaveV4ReserveAssetData,
+  AaveV4ReserveAssetOnChain,
+  AaveV4SpokeData,
+  AaveV4SpokeInfo,
   AaveV4UsedReserveAssets,
+  AaveV4AssetsData,
+  EthAddress,
+  EthereumProvider,
+  IncentiveData,
+  IncentiveKind,
+  NetworkNumber,
 } from '../types';
-import {
-  EthAddress, EthereumProvider, IncentiveData, IncentiveKind, NetworkNumber,
-} from '../types/common';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { wethToEth } from '../services/utils';
 import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
+import { aprToApy } from '../moneymarket';
+
+export * as lend from './lend';
 
 const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractViem>, hubAddress: EthAddress): Promise<AaveV4HubOnChainData> => {
   const hubData = await viewContract.read.getHubAllAssetsData([hubAddress]);
@@ -25,12 +34,85 @@ const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractVi
       acc[assetOnChainData.assetId] = {
         assetId: assetOnChainData.assetId,
         drawnRate: assetOnChainData.drawnRate,
+        liquidity: assetOnChainData.liquidity,
+        liquidityFee: assetOnChainData.liquidityFee,
+        swept: assetOnChainData.swept,
+        totalDrawn: assetOnChainData.totalDrawn,
+        totalDrawnShares: assetOnChainData.totalDrawnShares,
+        totalPremiumShares: assetOnChainData.totalPremiumShares,
       };
       return acc;
     }, {}),
   };
 };
 
+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);
   const symbol = wethToEth(assetInfo.symbol);
@@ -62,6 +144,28 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     }
   }
 
+  const totalSuppliedRaw = reserveAsset.totalSupplied ?? 0;
+  const totalDrawnRaw = reserveAsset.totalDrawn ?? 0;
+  const totalPremiumRaw = reserveAsset.totalPremium ?? 0;
+  const totalDebtRaw = reserveAsset.totalDebt ?? 0;
+  const supplyCapRaw = reserveAsset.supplyCap ?? 0;
+  const borrowCapRaw = reserveAsset.borrowCap ?? 0;
+
+  /** @DEV Hub related calculations */
+  const drawnRate = new Dec(hubAsset.drawnRate.toString()).div(new Dec(10).pow(27));
+  const borrowApr = drawnRate.mul(100);
+  const totalDrawn = new Dec(hubAsset.totalDrawn.toString());
+  const liquidity = new Dec(hubAsset.liquidity.toString());
+  const swept = new Dec(hubAsset.swept.toString());
+  const hubUtilization = totalDrawn.div(totalDrawn.add(swept).add(liquidity));
+  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.add(totalPremiumShares).div(totalDrawnShares);
+  const supplyApr = borrowApr.mul(hubUtilization).mul(new Dec(1).minus(liquidityFee));
+
   return ({
     symbol,
     underlying: reserveAsset.underlying,
@@ -76,16 +180,17 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
     liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
     price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-    totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), symbol),
-    totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), symbol),
-    totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), symbol),
-    totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), symbol),
-    supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), symbol),
-    borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), symbol),
+    totalSupplied: assetAmountInEth(totalSuppliedRaw.toString(), symbol),
+    totalDrawn: assetAmountInEth(totalDrawnRaw.toString(), symbol),
+    totalPremium: assetAmountInEth(totalPremiumRaw.toString(), symbol),
+    totalDebt: assetAmountInEth(totalDebtRaw.toString(), symbol),
+    supplyCap: assetAmountInEth(supplyCapRaw.toString(), symbol),
+    borrowCap: assetAmountInEth(borrowCapRaw.toString(), symbol),
     spokeActive: reserveAsset.spokeActive,
     spokeHalted: reserveAsset.spokeHalted,
-    drawnRate: new Dec(hubAsset.drawnRate).div(new Dec(10).pow(27)).toString(),
-    supplyRate: '0', // To be implemented
+    drawnRate: drawnRate.toString(),
+    borrowRate: aprToApy(borrowApr.toString()),
+    supplyRate: aprToApy(supplyApr.toString()),
     supplyIncentives,
     borrowIncentives,
     canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
@@ -159,15 +264,20 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
     return acc;
   }, {});
 
+  const aggregated = aaveV4GetAggregatedPositionData({
+    usedAssets,
+    assetsData: spokeData.assetsData,
+    network,
+    useUserCollateralFactor: true,
+  });
+
+  const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, spokeData.assetsData);
+
   return {
+    ...aggregated,
     usedAssets,
     healthFactor,
-    ...aaveV4GetAggregatedPositionData({
-      usedAssets,
-      assetsData: spokeData.assetsData,
-      network,
-      useUserCollateralFactor: true,
-    }),
+    riskPremiumBps,
   };
 }