@defisaver/positions-sdk 2.1.75 → 2.1.78-aave-v4-dev

package/src/helpers/aaveV4Helpers/index.ts

@@ -0,0 +1,133 @@
+import Dec from 'decimal.js';
+import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS } from '../../moneymarket';
+import {
+  AaveV4AggregatedPositionData,
+  AaveV4AssetsData,
+  AaveV4ReserveAssetData,
+  AaveV4UsedReserveAsset,
+  AaveV4UsedReserveAssets,
+  LeverageType,
+  NetworkNumber,
+} from '../../types';
+
+export const aaveV4GetCollateralFactor = (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor: boolean = false): number => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
+
+export const isLeveragedPosAaveV4 = (usedAssets: AaveV4UsedReserveAssets, dustLimit = 5) => {
+  let borrowUnstable = 0;
+  let supplyStable = 0;
+  let borrowStable = 0;
+  let supplyUnstable = 0;
+  let longAsset = '';
+  let shortAsset = '';
+  Object.values(usedAssets).forEach(({
+    symbol, suppliedUsd, borrowedUsd, collateral, reserveId,
+  }) => {
+    const spokeAsset = `${symbol}-${reserveId}`;
+    const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
+    const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
+    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) supplyStable += 1;
+    if (isBorrowed && STABLE_ASSETS.includes(symbol)) borrowStable += 1;
+    if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
+      borrowUnstable += 1;
+      shortAsset = spokeAsset;
+    }
+    if (isSupplied && !STABLE_ASSETS.includes(symbol) && collateral) {
+      supplyUnstable += 1;
+      longAsset = spokeAsset;
+    }
+  });
+  const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
+  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
+  const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+  if (isLong) {
+    return {
+      leveragedType: LeverageType.Long,
+      leveragedAsset: longAsset,
+    };
+  }
+  if (isShort) {
+    return {
+      leveragedType: LeverageType.Short,
+      leveragedAsset: shortAsset,
+    };
+  }
+  if (isVolatilePair) {
+    return {
+      leveragedType: LeverageType.VolatilePair,
+      leveragedAsset: longAsset,
+    };
+  }
+  return {
+    leveragedType: LeverageType.None,
+    leveragedAsset: '',
+  };
+};
+
+export const aaveV4GetAggregatedPositionData = ({
+  usedAssets,
+  assetsData,
+  network,
+  useUserCollateralFactor = false,
+}: {
+  usedAssets: AaveV4UsedReserveAssets,
+  assetsData: AaveV4AssetsData,
+  network: NetworkNumber,
+  useUserCollateralFactor?: boolean,
+}): AaveV4AggregatedPositionData => {
+  const payload = {} as AaveV4AggregatedPositionData;
+  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowLimitUsd = getAssetsTotal(
+    usedAssets,
+    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
+    ({ symbol, suppliedUsd, reserveId }: { symbol: string, suppliedUsd: string, reserveId: number }) => new Dec(suppliedUsd).mul(aaveV4GetCollateralFactor(assetsData[`${symbol}-${reserveId}`], usedAssets[`${symbol}-${reserveId}`], useUserCollateralFactor)),
+  );
+  payload.liquidationLimitUsd = payload.borrowLimitUsd;
+  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+  payload.drawnUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ drawnUsd }: { drawnUsd: string }) => drawnUsd);
+  payload.premiumUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ premiumUsd }: { premiumUsd: string }) => premiumUsd);
+  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+  payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
+  payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+  const { leveragedType, leveragedAsset } = isLeveragedPosAaveV4(usedAssets);
+  payload.leveragedType = leveragedType;
+  payload.leveragedAsset = leveragedAsset;
+  payload.liquidationPrice = '';
+  if (leveragedType !== '') {
+    const leveragedAssetData = assetsData[leveragedAsset];
+    let assetPrice = leveragedAssetData?.price || '0';
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as AaveV4UsedReserveAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
+      const borrowedAssetPrice = assetsData[`${borrowedAsset!.symbol}-${borrowedAsset!.reserveId}`].price;
+      const leveragedAssetPrice = assetsData[leveragedAsset].price;
+      const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
+      if (isReverse) {
+        payload.leveragedType = LeverageType.VolatilePairReverse;
+        payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
+        assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
+      } else {
+        assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
+        payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
+      }
+    }
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+  }
+  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+  //   payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
+  payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
+
+  // TODO: Re-implement netApy calculation
+  //   const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({
+  //     usedAssets,
+  //     assetsData,
+  //     optionalData: { healthRatio: payload.healthRatio },
+  //   });
+  payload.netApy = '0';
+  payload.incentiveUsd = '0';
+  payload.totalInterestUsd = '0';
+  return payload;
+};

package/src/helpers/index.ts

@@ -8,3 +8,4 @@ export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';
 export * as fluidHelpers from './fluidHelpers';
+export * as aaveV4Helpers from './aaveV4Helpers';

package/src/index.ts

@@ -1,6 +1,7 @@
 import './setup';
 
 import * as fluid from './fluid';
+import * as aaveV4 from './aaveV4';
 import * as aaveV3 from './aaveV3';
 import * as aaveV2 from './aaveV2';
 import * as compoundV3 from './compoundV3';
@@ -27,6 +28,7 @@ export * from './types';
 export {
   aaveV2,
   aaveV3,
+  aaveV4,
   compoundV2,
   compoundV3,
   spark,

package/src/markets/aaveV4/index.ts

@@ -0,0 +1,149 @@
+import {
+  AaveV4HubInfo,
+  AaveV4HubsType,
+  AaveV4SpokeInfo,
+  AaveV4SpokesType,
+  NetworkNumber,
+} from '../../types';
+
+// HUBS
+
+export const AAVE_V4_CORE_HUB = (networkId: NetworkNumber): AaveV4HubInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Core Hub',
+  value: AaveV4HubsType.AaveV4CoreHub,
+  address: '0x3Ed2C9829FBCab6015E331a0352F8ae148217D70',
+});
+
+export const AAVE_V4_PLUS_HUB = (networkId: NetworkNumber): AaveV4HubInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Plus Hub',
+  value: AaveV4HubsType.AaveV4PlusHub,
+  address: '0xcb8C80026248f92c6DE735264c23c8e22922C562',
+});
+
+export const AAVE_V4_PRIME_HUB = (networkId: NetworkNumber): AaveV4HubInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Prime Hub',
+  value: AaveV4HubsType.AaveV4PrimeHub,
+  address: '0xea40581231Ca775e6A3d7c129cF231D292B85f20',
+});
+
+export const AaveV4Hubs = (networkId: NetworkNumber) => ({
+  [AaveV4HubsType.AaveV4CoreHub]: AAVE_V4_CORE_HUB(networkId),
+  [AaveV4HubsType.AaveV4PlusHub]: AAVE_V4_PLUS_HUB(networkId),
+  [AaveV4HubsType.AaveV4PrimeHub]: AAVE_V4_PRIME_HUB(networkId),
+}) as const;
+
+export const getAaveV4HubTypeInfo = (type: AaveV4HubsType, network?: NetworkNumber) => ({ ...AaveV4Hubs(network ?? NetworkNumber.Eth) }[type]);
+
+export const getAaveV4HubByAddress = (networkId: NetworkNumber, address: string): AaveV4HubInfo | undefined => Object.values(AaveV4Hubs(networkId)).find(
+  hub => hub.address.toLowerCase() === address.toLowerCase(),
+);
+
+// SPOKES
+
+export const AAVE_V4_BLUECHIP_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Bluechip Spoke',
+  value: AaveV4SpokesType.AaveV4BluechipSpoke,
+  url: 'bluechip',
+  address: '0x637F9E189332a2821e5B046E2d7EEFae2405d6c5',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PLUS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AAVE_V4_ETHENA_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Ethena Spoke',
+  value: AaveV4SpokesType.AaveV4EthenaSpoke,
+  url: 'ethena',
+  address: '0xf3b207c235f6154120F41eB63D5ACCBAfD4086D1',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PLUS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AAVE_V4_ETHERFI_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Etherfi Spoke',
+  value: AaveV4SpokesType.AaveV4EtherfiSpoke,
+  url: 'etherfi',
+  address: '0x4054a9EbfcdB692599a8dF61eb0b3484F2d279D4',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PLUS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AAVE_V4_GOLD_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Gold Spoke',
+  value: AaveV4SpokesType.AaveV4GoldSpoke,
+  url: 'gold',
+  address: '0x0DC7ccE912Afab8B49031A0A95DB74531741C2c4',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PLUS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AAVE_V4_KELP_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Kelp Spoke',
+  value: AaveV4SpokesType.AaveV4KelpSpoke,
+  url: 'kelp',
+  address: '0x8aC76d950a3D03F9E1d857b5AAFFdA3f86C1e9AA',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PLUS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AAVE_V4_LIDO_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Lido Spoke',
+  value: AaveV4SpokesType.AaveV4LidoSpoke,
+  url: 'lido',
+  address: '0x4D4a7b3Ce709b4362D7095a4A0105bDFDb5dA2a7',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PLUS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AAVE_V4_MAIN_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Main Spoke',
+  value: AaveV4SpokesType.AaveV4MainSpoke,
+  url: 'main',
+  address: '0x46539e9123A18c427e6b4DFF114c28CF405Cb023',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PLUS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AaveV4Spokes = (networkId: NetworkNumber) => ({
+  [AaveV4SpokesType.AaveV4BluechipSpoke]: AAVE_V4_BLUECHIP_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4EthenaSpoke]: AAVE_V4_ETHENA_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4EtherfiSpoke]: AAVE_V4_ETHERFI_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4GoldSpoke]: AAVE_V4_GOLD_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4KelpSpoke]: AAVE_V4_KELP_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4LidoSpoke]: AAVE_V4_LIDO_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4MainSpoke]: AAVE_V4_MAIN_SPOKE(networkId),
+}) as const;
+
+export const getAaveV4SpokeTypeInfo = (type: AaveV4SpokesType, network?: NetworkNumber) => ({ ...AaveV4Spokes(network ?? NetworkNumber.Eth) }[type]);
+
+

package/src/markets/index.ts

@@ -21,5 +21,10 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export {
-  FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress,
+  FluidMarkets,
+  getFluidVersionsDataForNetwork,
+  getFluidMarketInfoById,
+  getFTokenAddress,
+  getFluidMarketInfoByAddress,
 } from './fluid';
+export { AaveV4Spokes } from './aaveV4';

package/src/portfolio/index.ts

@@ -2,6 +2,7 @@ import Dec from 'decimal.js';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
 import {
   AaveMarkets,
+  AaveV4Spokes,
   CompoundMarkets,
   CrvUsdMarkets,
   EulerV2Markets,
@@ -14,6 +15,7 @@ import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } fr
 import {
   AaveV2MarketData,
   AaveV3MarketData,
+  AaveV4SpokeData,
   AaveVersions,
   CdpInfo,
   CompoundV2MarketsData,
@@ -49,6 +51,7 @@ import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
 import { fetchMorphoBlueRewards } from '../claiming/morphoBlue';
 import { getKingRewards } from '../claiming/king';
 import { fetchEthenaAirdropRewards } from '../claiming/ethena';
+import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
 
 export async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim = false): Promise<{
   positions: PortfolioPositionsData;
@@ -71,6 +74,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
   const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
   const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
+  const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
 
   const args: [NetworkNumber, any?] = [network, { batch: { multicall: { batchSize: isSim ? 500_000 : 2_500_000 } } }];
   const client = getViemProvider(provider, ...args);
@@ -87,6 +91,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData> = {};
   const llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData> = {};
   const liquityV2MarketsData: Record<string, LiquityV2MarketData> = {};
+  const aaveV4SpokesData: Record<string, AaveV4SpokeData> = {};
 
   const markets = {
     morphoMarketsData,
@@ -99,6 +104,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     crvUsdMarketsData,
     llamaLendMarketsData,
     liquityV2MarketsData,
+    aaveV4SpokesData,
   };
 
   const positions: PortfolioPositionsData = {};
@@ -109,6 +115,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   for (const address of allAddresses) {
     positions[address.toLowerCase() as EthAddress] = {
       aaveV3: {},
+      aaveV4: {},
       morphoBlue: {},
       compoundV3: {},
       spark: {},
@@ -177,6 +184,10 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
       const marketData = await _getAaveV3MarketData(client, network, market);
       aaveV3MarketsData[market.value] = marketData;
     }),
+    ...aaveV4Spokes.map(async (spoke) => {
+      const spokeData = await _getAaveV4SpokeData(client, network, spoke);
+      aaveV4SpokesData[spoke.value] = spokeData;
+    }),
     ...aaveV2Markets.map(async (market) => {
       const marketData = await _getAaveV2MarketsData(client, network, market);
       aaveV2MarketsData[market.value] = marketData;
@@ -429,6 +440,15 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         positions[address.toLowerCase() as EthAddress].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
       }
     })).flat(),
+    ...aaveV4Spokes.map((spoke) => allAddresses.map(async (address) => {
+      try {
+        const accData = await _getAaveV4AccountData(client, network, aaveV4SpokesData[spoke.value], address);
+        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].aaveV4[spoke.value] = { error: '', data: accData };
+      } catch (error) {
+        console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
+        positions[address.toLowerCase() as EthAddress].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
+      }
+    })).flat(),
     ...morphoMarkets.map((market) => addresses.map(async (address) => {
       try {
         const [accDataPromise, earnDataPromise] = await Promise.allSettled([

package/src/savings/summerVaults/options.ts

@@ -3,7 +3,7 @@ import { SummerVault, SummerVaultType } from '../../types';
 
 export const SUMMER_VAULT_USDC_MAINNET_LR: SummerVault = {
   type: SummerVaultType.SummerVaultUSDCMainnetLR,
-  name: 'Lower Risk USDC',
+  name: 'USDC',
   address: '0x98C49e13bf99D7CAd8069faa2A370933EC9EcF17',
   asset: 'USDC',
   network: NetworkNumber.Eth,
@@ -23,7 +23,7 @@ export const SUMMER_VAULT_USDC_MAINNET_HR: SummerVault = {
 
 export const SUMMER_VAULT_USDT_MAINNET_LR: SummerVault = {
   type: SummerVaultType.SummerVaultUSDTMainnetLR,
-  name: 'Lower Risk USDT',
+  name: 'USDT',
   address: '0x17ee2d03e88b55e762c66c76ec99c3a28a54ad8d',
   asset: 'USDT',
   network: NetworkNumber.Eth,
@@ -33,7 +33,7 @@ export const SUMMER_VAULT_USDT_MAINNET_LR: SummerVault = {
 
 export const SUMMER_VAULT_ETH_MAINNET_LR: SummerVault = {
   type: SummerVaultType.SummerVaultETHMainnetLR,
-  name: 'Lower Risk ETH',
+  name: 'ETH',
   address: '0x67e536797570b3d8919df052484273815a0ab506',
   asset: 'WETH',
   network: NetworkNumber.Eth,
@@ -53,7 +53,7 @@ export const SUMMER_VAULT_ETH_MAINNET_HR: SummerVault = {
 
 export const SUMMER_VAULT_USDC_ARBITRUM_LR: SummerVault = {
   type: SummerVaultType.SummerVaultUSDCArbitrumLR,
-  name: 'Lower Risk USDC',
+  name: 'USDC',
   address: '0x71d77c39db0eb5d086611a2e950198e3077cf58a',
   asset: 'USDC',
   network: NetworkNumber.Arb,
@@ -63,7 +63,7 @@ export const SUMMER_VAULT_USDC_ARBITRUM_LR: SummerVault = {
 
 export const SUMMER_VAULT_USDT_ARBITRUM_LR: SummerVault = {
   type: SummerVaultType.SummerVaultUSDTArbitrumLR,
-  name: 'Lower Risk USDT',
+  name: 'USDT',
   address: '0x98c49e13bf99d7cad8069faa2a370933ec9ecf17',
   asset: 'USDT',
   network: NetworkNumber.Arb,
@@ -73,7 +73,7 @@ export const SUMMER_VAULT_USDT_ARBITRUM_LR: SummerVault = {
 
 export const SUMMER_VAULT_USDC_BASE_LR: SummerVault = {
   type: SummerVaultType.SummerVaultUSDCBaseLR,
-  name: 'Lower Risk USDC',
+  name: 'USDC',
   address: '0x98C49e13bf99D7CAd8069faa2A370933EC9EcF17',
   asset: 'USDC',
   network: NetworkNumber.Base,
@@ -83,7 +83,7 @@ export const SUMMER_VAULT_USDC_BASE_LR: SummerVault = {
 
 export const SUMMER_VAULT_EURC_BASE_LR: SummerVault = {
   type: SummerVaultType.SummerVaultEURCBaseLR,
-  name: 'Lower Risk EURC',
+  name: 'EURC',
   address: '0x64db8f51f1bf7064bb5a361a7265f602d348e0f0',
   asset: 'EURC',
   network: NetworkNumber.Base,
@@ -93,7 +93,7 @@ export const SUMMER_VAULT_EURC_BASE_LR: SummerVault = {
 
 export const SUMMER_VAULT_ETH_BASE_LR: SummerVault = {
   type: SummerVaultType.SummerVaultETHBaseLR,
-  name: 'Lower Risk ETH',
+  name: 'ETH',
   address: '0x2bb9ad69feba5547b7cd57aafe8457d40bf834af',
   asset: 'WETH',
   network: NetworkNumber.Base,

package/src/types/aaveV4.ts

@@ -0,0 +1,169 @@
+import {
+  EthAddress, IncentiveData, LeverageType, NetworkNumber,
+} from './common';
+
+export enum AaveV4HubsType {
+  AaveV4CoreHub = 'aave_v4_core_hub',
+  AaveV4PlusHub = 'aave_v4_plus_hub',
+  AaveV4PrimeHub = 'aave_v4_prime_hub',
+}
+
+export 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/src/types/index.ts

@@ -13,4 +13,5 @@ export * from './portfolio';
 export * from './merit';
 export * from './merkl';
 export * from './savings';
-export * from './common';
+export * from './common';
+export * from './aaveV4';

package/src/types/portfolio.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';
@@ -54,6 +55,9 @@ export interface PortfolioPositionsDataForAddress {
       [key: string]: FluidVaultData;
     };
   };
+  aaveV4: {
+    [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
+  };
 }
 
 export interface PortfolioPositionsData {