@defisaver/positions-sdk 2.1.51 → 2.1.52-aave-v4-1-dev

package/src/helpers/fluidHelpers/index.ts

@@ -9,7 +9,7 @@ import {
 } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-import { MMAssetsData } from '../../types/common';
+import { LeverageType, MMAssetsData } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
 
 const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }: { marketData: InnerFluidMarketData, suppliedUsd: string, borrowedUsd: string }) => {
@@ -84,12 +84,21 @@ borrowShares?: string,
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === 'lsd-leverage') {
-      // Treat ETH like a stablecoin in a long stETH position
-      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as FluidUsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
+      const borrowedAssetPrice = assetsData[borrowedAsset!.symbol].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(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
 
   payload.minCollRatio = new Dec(payload.suppliedUsd).div(payload.borrowLimitUsd).mul(100).toString();

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/helpers/morphoBlueHelpers/index.ts

@@ -5,7 +5,7 @@ import {
 } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import {
-  EthereumProvider, MMAssetsData, MMUsedAssets, NetworkNumber,
+  EthereumProvider, LeverageType, MMAssetsData, MMUsedAsset, MMUsedAssets, NetworkNumber,
 } from '../../types/common';
 import {
   MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo,
@@ -58,12 +58,21 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === 'lsd-leverage') {
-      // Treat ETH like a stablecoin in a long stETH position
-      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as MMUsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
+      const borrowedAssetPrice = assetsData[borrowedAsset!.symbol].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(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    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();

package/src/helpers/sparkHelpers/index.ts

@@ -5,12 +5,14 @@ import {
 } from '../../moneymarket';
 import {
   SparkAggregatedPositionData,
-  SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAssets,
+  SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAsset, SparkUsedAssets,
 } from '../../types';
 import { calculateNetApy } from '../../staking';
 import { ethToWeth, getNativeAssetFromWrapped, wethToEth } from '../../services/utils';
 import { SparkViewContractViem } from '../../contracts';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import {
+  EthAddress, EthereumProvider, LeverageType, NetworkNumber,
+} from '../../types/common';
 import { borrowOperations } from '../../constants';
 import { getViemProvider } from '../../services/viem';
 
@@ -105,12 +107,21 @@ export const sparkGetAggregatedPositionData = ({
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-    if (leveragedType === 'lsd-leverage') {
-      // Treat ETH like a stablecoin in a long stETH position
-      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as SparkUsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
+      const borrowedAssetPrice = data.assetsData[borrowedAsset!.symbol].price;
+      const leveragedAssetPrice = data.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(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    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();

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,68 @@
+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: '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
+});
+
+export const AAVE_V4_YIELD_SEEKING_HUB = (networkId: NetworkNumber): AaveV4HubInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Yield Seeking Hub',
+  value: AaveV4HubsType.AaveV4YieldSeekingHub,
+  address: '0x86F37ba3b480c5fE22A7eb1ba2B2D49c94089FBB',
+});
+
+export const AaveV4Hubs = (networkId: NetworkNumber) => ({
+  [AaveV4HubsType.AaveV4CoreHub]: AAVE_V4_CORE_HUB(networkId),
+  [AaveV4HubsType.AaveV4YieldSeekingHub]: AAVE_V4_YIELD_SEEKING_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_CORE_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Core Spoke',
+  value: AaveV4SpokesType.AaveV4CoreSpoke,
+  url: 'core',
+  address: '0xBa97c5E52cd5BC3D7950Ae70779F8FfE92d40CdC',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AAVE_V4_YIELD_SEEKING_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Yield Seeking Spoke',
+  value: AaveV4SpokesType.AaveV4YieldSeekingSpoke,
+  url: 'yield-seeking',
+  address: '0x2559e4e04f2ca7180e5f20c2872d22ec89601b56',
+  hubs: [
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_YIELD_SEEKING_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
+export const AaveV4Spokes = (networkId: NetworkNumber) => ({
+  [AaveV4SpokesType.AaveV4CoreSpoke]: AAVE_V4_CORE_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4YieldSeekingSpoke]: AAVE_V4_YIELD_SEEKING_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/moneymarket/moneymarketCommonService.ts

@@ -1,6 +1,6 @@
 import Dec from 'decimal.js';
 import { BLOCKS_IN_A_YEAR } from '../constants';
-import { MMUsedAssets } from '../types/common';
+import { LeverageType, MMUsedAssets } from '../types/common';
 
 export const getAssetsTotal = (assets: object, filter: any, transform: any) => (Object.values(assets) as any)
   .filter(filter)
@@ -11,9 +11,9 @@ export const getAssetsTotal = (assets: object, filter: any, transform: any) => (
 export const calcLongLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).mul(borrowedUsd).div(borrowLimitUsd).toString();
 export const calcShortLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).div(borrowedUsd).mul(borrowLimitUsd).toString();
 
-export const calcLeverageLiqPrice = (leverageType: string, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => {
-  if (leverageType === 'short') return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-  if (leverageType === 'long' || leverageType === 'lsd-leverage') return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
+export const calcLeverageLiqPrice = (leverageType: LeverageType, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => {
+  if (leverageType === LeverageType.Short || leverageType === LeverageType.VolatilePairReverse) return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
+  if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair) return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
   console.error('invalid leverageType', leverageType);
   return '0';
 };
@@ -52,28 +52,27 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   });
   const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
   const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-  // lsd -> liquid staking derivative
-  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
+  const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
   if (isLong) {
     return {
-      leveragedType: 'long',
+      leveragedType: LeverageType.Long,
       leveragedAsset: longAsset,
     };
   }
   if (isShort) {
     return {
-      leveragedType: 'short',
+      leveragedType: LeverageType.Short,
       leveragedAsset: shortAsset,
     };
   }
-  if (isLsdLeveraged) {
+  if (isVolatilePair) {
     return {
-      leveragedType: 'lsd-leverage',
+      leveragedType: LeverageType.VolatilePair,
       leveragedAsset: longAsset,
     };
   }
   return {
-    leveragedType: '',
+    leveragedType: LeverageType.None,
     leveragedAsset: '',
   };
 };

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/types/aave.ts

@@ -1,5 +1,6 @@
 import {
   IncentiveData,
+  LeverageType,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
 } from './common';
 
@@ -177,14 +178,14 @@ export interface AaveV3AggregatedPositionData {
   totalInterestUsd: string,
   liqRatio: string,
   liqPercent: string,
-  leveragedType: string,
+  leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,
   minCollRatio?: string,
   collLiquidationRatio?: string,
   healthRatio?: string,
   minHealthRatio?: string,
+  currentVolatilePairRatio?: string,
 }
 
 export interface AaveHelperCommon {

package/src/types/aaveV4.ts

@@ -0,0 +1,155 @@
+import {
+  EthAddress, IncentiveData, LeverageType, NetworkNumber,
+} from './common';
+
+export enum AaveV4SpokesType {
+  AaveV4CoreSpoke = 'aave_v4_core_spoke',
+  AaveV4YieldSeekingSpoke = 'aave_v4_yield_seeking_spoke',
+}
+
+export enum AaveV4HubsType {
+  AaveV4CoreHub = 'aave_v4_core_hub',
+  AaveV4YieldSeekingHub = 'aave_v4_yield_seeking_hub',
+}
+
+export interface AaveV4SpokeInfo {
+  chainIds: NetworkNumber[],
+  label: string,
+  value: AaveV4SpokesType,
+  url: string,
+  address: EthAddress,
+  hubs: EthAddress[],
+}
+
+export interface AaveV4HubInfo {
+  chainIds: NetworkNumber[],
+  label: string,
+  value: AaveV4HubsType,
+  address: EthAddress,
+}
+
+export interface AaveV4HubAssetOnChainData {
+  assetId: number,
+  drawnRate: bigint,
+}
+
+export interface AaveV4HubOnChainData {
+  assets: Record<number, AaveV4HubAssetOnChainData>,
+}
+
+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,
+  spokePaused: 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,
+  spokePaused: boolean,
+  drawnRate: string,
+  supplyRate: string,
+  supplyIncentives: IncentiveData[];
+  borrowIncentives: IncentiveData[];
+  canBeBorrowed: boolean;
+  canBeSupplied: boolean;
+  canBeWithdrawn: boolean;
+  canBePayBacked: boolean;
+  utilization: string;
+}
+
+export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
+
+export interface AaveV4SpokeData {
+  assetsData: AaveV4AssetsData,
+  oracle: EthAddress,
+  oracleDecimals: number,
+  address: EthAddress,
+}
+
+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,
+}

package/src/types/common.ts

@@ -4,12 +4,20 @@ export enum IncentiveKind {
 }
 
 export enum IncentiveEligibilityId {
-  AaveV3EthenaLiquidLeverage = '0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL',
+  AaveV3EthenaLiquidLeverage = '0x8014e0076e5393e62c49a7134070d8fccc922e46BORROW_BL',
   AaveV3ArbitrumEthSupply = '0x5d16261c6715a653248269861bbacf68a9774cde',
   AaveV3ArbitrumETHLSBorrow = '0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351',
   AaveV3EthenaLiquidLeveragePlasma = '0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL',
 }
 
+export enum LeverageType {
+  Long = 'long',
+  Short = 'short',
+  VolatilePair = 'volatile-pair',
+  VolatilePairReverse = 'volatile-pair-reverse',
+  None = '',
+}
+
 export interface IncentiveData {
   token: string,
   apy: string,

package/src/types/compound.ts

@@ -1,5 +1,6 @@
 import {
   EthAddress,
+  LeverageType,
   MMAssetData,
   MMPositionData,
   MMUsedAsset,
@@ -113,9 +114,9 @@ export interface CompoundAggregatedPositionData {
   totalInterestUsd: string,
   liqRatio: string,
   liqPercent: string,
-  leveragedType: string,
+  leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   liquidationPrice?: string,
   minRatio: string,
   debtTooLow: boolean,

package/src/types/curveUsd.ts

@@ -1,4 +1,4 @@
-import { EthAddress, NetworkNumber } from './common';
+import { EthAddress, LeverageType, NetworkNumber } from './common';
 
 export enum CrvUSDVersions {
   'crvUSDwstETH' = 'wstETH',
@@ -78,7 +78,7 @@ export interface CrvUSDAggregatedPositionData {
   borrowLimitUsd: string,
   minAllowedRatio: number,
   collFactor: string,
-  leveragedType: string,
+  leveragedType: LeverageType,
   leveragedAsset?: string,
   liquidationPrice?: string,
 }

package/src/types/euler.ts

@@ -1,6 +1,7 @@
 import {
   EthAddress,
   IncentiveData,
+  LeverageType,
   MMPositionData, NetworkNumber,
 } from './common';
 
@@ -165,9 +166,9 @@ export interface EulerV2AggregatedPositionData {
   totalInterestUsd: string,
   liqRatio: string,
   liqPercent: string,
-  leveragedType: string,
+  leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   liquidationPrice?: string,
   minRatio: string,
   minDebt: string,

package/src/types/fluid.ts

@@ -1,4 +1,6 @@
-import { EthAddress, IncentiveData, NetworkNumber } from './common';
+import {
+  EthAddress, IncentiveData, LeverageType, NetworkNumber,
+} from './common';
 
 export interface FluidMarketInfo {
   chainIds: number[]
@@ -342,10 +344,10 @@ export interface FluidAggregatedVaultData {
   collRatio: string,
   minRatio: string
   totalInterestUsd: string,
-  leveragedType?: string,
+  leveragedType?: LeverageType,
   leveragedAsset?: string,
   liquidationPrice?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   minCollRatio?: string,
   collLiquidationRatio?: string,
 }

package/src/types/index.ts

@@ -12,4 +12,6 @@ export * from './fluid';
 export * from './portfolio';
 export * from './merit';
 export * from './merkl';
-export * from './savings';
+export * from './savings';
+export * from './common';
+export * from './aaveV4';