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

package/esm/types/aaveV4.d.ts

@@ -0,0 +1,153 @@
+import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common';
+export declare enum AaveV4HubsType {
+    AaveV4CoreHub = "aave_v4_core_hub",
+    AaveV4PlusHub = "aave_v4_plus_hub",
+    AaveV4PrimeHub = "aave_v4_prime_hub"
+}
+export declare enum AaveV4SpokesType {
+    AaveV4BluechipSpoke = "aave_v4_bluechip_spoke",
+    AaveV4EthenaSpoke = "aave_v4_ethena_spoke",
+    AaveV4EtherfiSpoke = "aave_v4_etherfi_spoke",
+    AaveV4GoldSpoke = "aave_v4_gold_spoke",
+    AaveV4KelpSpoke = "aave_v4_kelp_spoke",
+    AaveV4LidoSpoke = "aave_v4_lido_spoke",
+    AaveV4MainSpoke = "aave_v4_main_spoke"
+}
+export interface AaveV4HubInfo {
+    chainIds: NetworkNumber[];
+    label: string;
+    value: AaveV4HubsType;
+    address: EthAddress;
+}
+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>;
+}
+export interface AaveV4SpokeInfo {
+    chainIds: NetworkNumber[];
+    label: string;
+    value: AaveV4SpokesType;
+    url: string;
+    address: EthAddress;
+    hubs: EthAddress[];
+}
+export interface AaveV4SpokeData {
+    assetsData: AaveV4AssetsData;
+    oracle: EthAddress;
+    oracleDecimals: number;
+    address: EthAddress;
+}
+export interface AaveV4ReserveAssetOnChain {
+    underlying: EthAddress;
+    hub: EthAddress;
+    assetId: number;
+    decimals: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    maxLiquidationBonus: number;
+    liquidationFee: number;
+    price: bigint;
+    totalSupplied: bigint;
+    totalDrawn: bigint;
+    totalPremium: bigint;
+    totalDebt: bigint;
+    supplyCap: bigint;
+    borrowCap: bigint;
+    deficitRay: bigint;
+    spokeActive: boolean;
+    spokeHalted: boolean;
+}
+export interface AaveV4ReserveAssetData {
+    symbol: string;
+    underlying: EthAddress;
+    hub: EthAddress;
+    hubName: string;
+    assetId: number;
+    reserveId: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    liquidationFee: number;
+    price: string;
+    totalSupplied: string;
+    totalDrawn: string;
+    totalPremium: string;
+    totalDebt: string;
+    supplyCap: string;
+    borrowCap: string;
+    spokeActive: boolean;
+    spokeHalted: boolean;
+    drawnRate: string;
+    supplyRate: string;
+    borrowRate: string;
+    supplyIncentives: IncentiveData[];
+    borrowIncentives: IncentiveData[];
+    canBeBorrowed: boolean;
+    canBeSupplied: boolean;
+    canBeWithdrawn: boolean;
+    canBePayBacked: boolean;
+    utilization: string;
+}
+export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
+export interface AaveV4UsedReserveAsset {
+    symbol: string;
+    hubName: string;
+    assetId: number;
+    reserveId: number;
+    supplied: string;
+    suppliedUsd: string;
+    drawn: string;
+    drawnUsd: string;
+    premium: string;
+    premiumUsd: string;
+    borrowed: string;
+    borrowedUsd: string;
+    isSupplied: boolean;
+    isBorrowed: boolean;
+    collateral: boolean;
+    collateralFactor: number;
+}
+export interface AaveV4AggregatedPositionData {
+    suppliedUsd: string;
+    suppliedCollateralUsd: string;
+    borrowLimitUsd: string;
+    liquidationLimitUsd: string;
+    borrowedUsd: string;
+    drawnUsd: string;
+    premiumUsd: string;
+    leftToBorrowUsd: string;
+    ratio: string;
+    collRatio: string;
+    liqRatio: string;
+    liqPercent: string;
+    leveragedType: LeverageType;
+    leveragedAsset: string;
+    liquidationPrice: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
+    minHealthRatio: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
+    currentVolatilePairRatio?: string;
+}
+export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
+export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
+    usedAssets: AaveV4UsedReserveAssets;
+    healthFactor: string;
+    riskPremiumBps: number;
+}

package/esm/types/aaveV4.js

@@ -0,0 +1,16 @@
+export var AaveV4HubsType;
+(function (AaveV4HubsType) {
+    AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
+    AaveV4HubsType["AaveV4PlusHub"] = "aave_v4_plus_hub";
+    AaveV4HubsType["AaveV4PrimeHub"] = "aave_v4_prime_hub";
+})(AaveV4HubsType || (AaveV4HubsType = {}));
+export var AaveV4SpokesType;
+(function (AaveV4SpokesType) {
+    AaveV4SpokesType["AaveV4BluechipSpoke"] = "aave_v4_bluechip_spoke";
+    AaveV4SpokesType["AaveV4EthenaSpoke"] = "aave_v4_ethena_spoke";
+    AaveV4SpokesType["AaveV4EtherfiSpoke"] = "aave_v4_etherfi_spoke";
+    AaveV4SpokesType["AaveV4GoldSpoke"] = "aave_v4_gold_spoke";
+    AaveV4SpokesType["AaveV4KelpSpoke"] = "aave_v4_kelp_spoke";
+    AaveV4SpokesType["AaveV4LidoSpoke"] = "aave_v4_lido_spoke";
+    AaveV4SpokesType["AaveV4MainSpoke"] = "aave_v4_main_spoke";
+})(AaveV4SpokesType || (AaveV4SpokesType = {}));

package/esm/types/common.d.ts

@@ -6,7 +6,8 @@ export declare enum IncentiveEligibilityId {
     AaveV3EthenaLiquidLeverage = "0x8014e0076e5393e62c49a7134070d8fccc922e46BORROW_BL",
     AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",
     AaveV3ArbitrumETHLSBorrow = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351",
-    AaveV3EthenaLiquidLeveragePlasma = "0xeefac321069fbecc9d6b2aed2948f6d5503d8633BORROW_BL"
+    AaveV3EthenaLiquidLeveragePlasma = "0xeefac321069fbecc9d6b2aed2948f6d5503d8633BORROW_BL",
+    AaveV3EthenaLiquidLeveragePlasmaGHO = "replace_when_known"
 }
 export declare enum LeverageType {
     Long = "long",

package/esm/types/common.js

@@ -9,6 +9,7 @@ export var IncentiveEligibilityId;
     IncentiveEligibilityId["AaveV3ArbitrumEthSupply"] = "0x5d16261c6715a653248269861bbacf68a9774cde";
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
     IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0xeefac321069fbecc9d6b2aed2948f6d5503d8633BORROW_BL";
+    IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasmaGHO"] = "replace_when_known";
 })(IncentiveEligibilityId || (IncentiveEligibilityId = {}));
 export var LeverageType;
 (function (LeverageType) {

package/esm/types/index.d.ts

@@ -14,3 +14,4 @@ export * from './merit';
 export * from './merkl';
 export * from './savings';
 export * from './common';
+export * from './aaveV4';

package/esm/types/index.js

@@ -14,3 +14,4 @@ export * from './merit';
 export * from './merkl';
 export * from './savings';
 export * from './common';
+export * from './aaveV4';

package/esm/types/portfolio.d.ts

@@ -1,4 +1,5 @@
 import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
 import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
 import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
@@ -51,6 +52,9 @@ export interface PortfolioPositionsDataForAddress {
             [key: string]: FluidVaultData;
         };
     };
+    aaveV4: {
+        [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
+    };
 }
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.71",
+  "version": "2.1.72-aave-v4-3-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.25",
+    "@defisaver/tokens": "^1.7.26",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/aaveV4/index.ts

@@ -0,0 +1,286 @@
+import { Client } from 'viem';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
+import { getViemProvider } from '../services/viem';
+import {
+  AaveV4AccountData,
+  AaveV4HubAssetOnChainData,
+  AaveV4HubOnChainData,
+  AaveV4ReserveAssetData,
+  AaveV4ReserveAssetOnChain,
+  AaveV4SpokeData,
+  AaveV4SpokeInfo,
+  AaveV4UsedReserveAssets,
+  AaveV4AssetsData,
+  EthAddress,
+  EthereumProvider,
+  IncentiveData,
+  IncentiveKind,
+  NetworkNumber,
+} 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 = async (viewContract: ReturnType<typeof AaveV4ViewContractViem>, hubAddress: EthAddress): Promise<AaveV4HubOnChainData> => {
+  const hubData = await viewContract.read.getHubAllAssetsData([hubAddress]);
+  return {
+    assets: hubData.reduce((acc: Record<number, AaveV4HubAssetOnChainData>, assetOnChainData) => {
+      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);
+  const hubInfo = getAaveV4HubByAddress(network, reserveAsset.hub);
+  if (!hubInfo) {
+    throw new Error(`Hub not found with address: ${reserveAsset.hub}`);
+  }
+
+  const isStakingAsset = STAKING_ASSETS.includes(symbol);
+  const supplyIncentives: IncentiveData[] = [];
+  const borrowIncentives: IncentiveData[] = [];
+
+  if (isStakingAsset) {
+    const yieldApy = await getStakingApy(symbol, network as NetworkNumber);
+    supplyIncentives.push({
+      apy: yieldApy,
+      token: symbol,
+      incentiveKind: IncentiveKind.Staking,
+      description: `Native ${symbol} yield.`,
+    });
+    if (reserveAsset.borrowable) {
+      // when borrowing assets whose value increases over time
+      borrowIncentives.push({
+        apy: new Dec(yieldApy).mul(-1).toString(),
+        token: symbol,
+        incentiveKind: IncentiveKind.Reward,
+        description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
+      });
+    }
+  }
+
+  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,
+    hub: hubInfo.address,
+    hubName: hubInfo?.label,
+    assetId: reserveAsset.assetId,
+    reserveId,
+    paused: reserveAsset.paused,
+    frozen: reserveAsset.frozen,
+    borrowable: reserveAsset.borrowable,
+    collateralRisk: new Dec(reserveAsset.collateralRisk).div(10000).toNumber(),
+    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(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: drawnRate.toString(),
+    borrowRate: aprToApy(borrowApr.toString()),
+    supplyRate: aprToApy(supplyApr.toString()),
+    supplyIncentives,
+    borrowIncentives,
+    canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
+    canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
+    canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+    canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+    utilization: new Dec(reserveAsset.totalDrawn.toString()).times(100).div(new Dec(reserveAsset.totalSupplied.toString())).toString(),
+  });
+};
+
+export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
+  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
+
+  const hubsData: Record<EthAddress, AaveV4HubOnChainData> = {};
+  const [spokeData] = await Promise.all([
+    viewContract.read.getSpokeDataFull([market.address]),
+    ...market.hubs.map(async (hubAddress) => {
+      hubsData[hubAddress] = await fetchHubData(viewContract, hubAddress);
+    }),
+  ]);
+
+  const reserveAssetsArray = await Promise.all(spokeData[1].map(async (reserveAssetOnChain: AaveV4ReserveAssetOnChain, index: number) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], index, +spokeData[0].oracleDecimals.toString(), network)));
+
+  return {
+    assetsData: reserveAssetsArray.reduce((acc: Record<string, AaveV4ReserveAssetData>, reserveAsset: AaveV4ReserveAssetData) => {
+      acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
+      return acc;
+    }, {}),
+    oracle: spokeData[0].oracle,
+    oracleDecimals: +spokeData[0].oracleDecimals.toString(),
+    address: market.address,
+  };
+}
+
+export async function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
+  return _getAaveV4SpokeData(getViemProvider(provider, network), network, spoke, blockNumber);
+}
+
+export async function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4AccountData> {
+  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
+
+  const loanData = await viewContract.read.getLoanData([spokeData.address, address]);
+
+  const healthFactor = new Dec(loanData.healthFactor).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];
+    const price = reserveData.price;
+    const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
+    const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
+    const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
+    const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+    acc[identifier] = {
+      symbol: reserveData.symbol,
+      hubName: reserveData.hubName,
+      assetId: reserveData.assetId,
+      reserveId: +usedReserveAsset.reserveId.toString(),
+      supplied,
+      suppliedUsd: new Dec(supplied).mul(price).toString(),
+      drawn,
+      drawnUsd: new Dec(drawn).mul(price).toString(),
+      premium,
+      premiumUsd: new Dec(premium).mul(price).toString(),
+      borrowed,
+      borrowedUsd: new Dec(borrowed).mul(price).toString(),
+      isSupplied: !new Dec(supplied).eq(0),
+      isBorrowed: usedReserveAsset.isBorrowing,
+      collateral: usedReserveAsset.isUsingAsCollateral,
+      collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
+    };
+    return acc;
+  }, {});
+
+  const aggregated = aaveV4GetAggregatedPositionData({
+    usedAssets,
+    assetsData: spokeData.assetsData,
+    network,
+    useUserCollateralFactor: true,
+  });
+
+  const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, spokeData.assetsData);
+
+  return {
+    ...aggregated,
+    usedAssets,
+    healthFactor,
+    riskPremiumBps,
+  };
+}
+
+export async function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<any> {
+  return _getAaveV4AccountData(getViemProvider(provider, network), network, marketData, address, blockNumber);
+}