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

package/src/helpers/aaveV4Helpers/index.ts

@@ -0,0 +1,128 @@
+import Dec from 'decimal.js';
+import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS } from '../../moneymarket';
+import {
+  AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets,
+} from '../../types';
+import { LeverageType, NetworkNumber } from '../../types/common';
+
+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/aave/marketAssets.ts

@@ -20,7 +20,7 @@ export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH',
 
 export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC', 'mUSD'];
 
-export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'XPL', 'PT USDe Apr', 'PT sUSDe Apr'];
+export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'XPL', 'PT USDe Apr', 'PT sUSDe Apr', 'GHO'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const aaveV3AssetsDefaultMarket = {

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: '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_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/staking/eligibility.ts

@@ -1,29 +1,80 @@
 import Dec from 'decimal.js';
 import { IncentiveEligibilityId, MMUsedAssets } from '../types/common';
 
-export const isEligibleForEthenaUSDeRewards = (usedAssets: MMUsedAssets, { healthRatio }: { healthRatio: string }) => {
-  const USDeUSDAmountSupplied = usedAssets.USDe?.suppliedUsd || '0';
-  const sUSDeUSDAmountSupplied = usedAssets.sUSDe?.suppliedUsd || '0';
-  const anythingElseSupplied = Object.values(usedAssets).some((asset) => asset.symbol !== 'USDe' && asset.symbol !== 'sUSDe' && asset.isSupplied);
+type EthenaPairEligibilityConfig = {
+  baseSymbol: string;
+  pairSymbol: string;
+  allowedBorrowAssets: string[];
+  maxHealthRatio: string; // exclusive upper bound
+  rewardSymbol: string;
+};
+
+const isEligibleForEthenaPairRewards = (
+  usedAssets: MMUsedAssets,
+  { healthRatio }: { healthRatio: string },
+  {
+    baseSymbol,
+    pairSymbol,
+    allowedBorrowAssets,
+    maxHealthRatio,
+    rewardSymbol,
+  }: EthenaPairEligibilityConfig,
+) => {
+  const baseSuppliedUsd = usedAssets[baseSymbol]?.suppliedUsd || '0';
+  const pairSuppliedUsd = usedAssets[pairSymbol]?.suppliedUsd || '0';
+
+  const anythingElseSupplied = Object.values(usedAssets).some(
+    (asset) => asset.isSupplied && asset.symbol !== baseSymbol && asset.symbol !== pairSymbol,
+  );
   if (anythingElseSupplied) return { isEligible: false, eligibleUSDAmount: '0' };
-  const totalAmountSupplied = new Dec(USDeUSDAmountSupplied).add(sUSDeUSDAmountSupplied).toString();
-  const percentageInUSDe = new Dec(USDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
-  if (percentageInUSDe < 0.45 || percentageInUSDe > 0.55) return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in USDe
-  const percentageInSUSDe = new Dec(sUSDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
-  if (percentageInSUSDe < 0.45 || percentageInSUSDe > 0.55) return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in sUSDe
 
-  const allowedBorrowAssets = ['USDC', 'USDT', 'USDS'];
-  const anythingBorrowedNotAllowed = Object.values(usedAssets).some((asset) => asset.isBorrowed && !allowedBorrowAssets.includes(asset.symbol));
+  const totalAmountSupplied = new Dec(baseSuppliedUsd).add(pairSuppliedUsd);
+  if (totalAmountSupplied.eq(0)) return { isEligible: false, eligibleUSDAmount: '0' };
+
+  const percentageInBase = new Dec(baseSuppliedUsd).div(totalAmountSupplied).toNumber();
+  if (percentageInBase < 0.45 || percentageInBase > 0.55) return { isEligible: false, eligibleUSDAmount: '0' };
+
+  const percentageInPair = new Dec(pairSuppliedUsd).div(totalAmountSupplied).toNumber();
+  if (percentageInPair < 0.45 || percentageInPair > 0.55) return { isEligible: false, eligibleUSDAmount: '0' };
+
+  const anythingBorrowedNotAllowed = Object.values(usedAssets).some(
+    (asset) => asset.isBorrowed && !allowedBorrowAssets.includes(asset.symbol),
+  );
   if (anythingBorrowedNotAllowed) return { isEligible: false, eligibleUSDAmount: '0' };
 
-  if (new Dec(healthRatio).gte(2.5)) return { isEligible: false, eligibleUSDAmount: '0' }; // health ratio must be below 2.5
+  if (new Dec(healthRatio).gte(maxHealthRatio)) return { isEligible: false, eligibleUSDAmount: '0' };
 
-  const halfAmountSupplied = new Dec(totalAmountSupplied).div(2).toString();
-  const USDeAmountEligibleForRewards = Dec.min(USDeUSDAmountSupplied, halfAmountSupplied).toString(); // rewards are given to amount of USDe supplied up to half of total amount supplied
+  const halfAmountSupplied = totalAmountSupplied.div(2);
+  const rewardSuppliedUsd = usedAssets[rewardSymbol]?.suppliedUsd || '0';
+  const eligibleUSDAmount = Dec.min(rewardSuppliedUsd, halfAmountSupplied).toString();
 
-  return { isEligible: true, eligibleUSDAmount: USDeAmountEligibleForRewards };
+  return { isEligible: true, eligibleUSDAmount };
 };
 
+export const isEligibleForEthenaUSDeRewards = (usedAssets: MMUsedAssets, { healthRatio }: { healthRatio: string }) => isEligibleForEthenaPairRewards(
+  usedAssets,
+  { healthRatio },
+  {
+    baseSymbol: 'USDe',
+    pairSymbol: 'sUSDe',
+    allowedBorrowAssets: ['USDC', 'USDT', 'USDS'],
+    maxHealthRatio: '2.5',
+    rewardSymbol: 'USDe',
+  },
+);
+
+export const isEligibleForEthenaGHORewards = (usedAssets: MMUsedAssets, { healthRatio }: { healthRatio: string }) => isEligibleForEthenaPairRewards(
+  usedAssets,
+  { healthRatio },
+  {
+    baseSymbol: 'syrupUSDT',
+    pairSymbol: 'GHO',
+    allowedBorrowAssets: ['USDT'],
+    maxHealthRatio: '2',
+    rewardSymbol: 'GHO',
+  },
+);
+
 export const isEligibleForAaveV3ArbitrumEthSupply = (usedAssets: MMUsedAssets) => {
   const ETHAmountSupplied = usedAssets.ETH?.suppliedUsd || '0';
   const ETHAmountBorrowed = usedAssets.ETH?.borrowedUsd || '0';
@@ -51,4 +102,5 @@ export const EligibilityMapping: { [key in IncentiveEligibilityId]: (usedAssets:
   [IncentiveEligibilityId.AaveV3ArbitrumEthSupply]: isEligibleForAaveV3ArbitrumEthSupply,
   [IncentiveEligibilityId.AaveV3ArbitrumETHLSBorrow]: isEligibleForAaveV3ArbitrumETHLSBorrow,
   [IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasma]: isEligibleForEthenaUSDeRewards,
+  [IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasmaGHO]: isEligibleForEthenaGHORewards,
 };

package/src/staking/staking.ts

@@ -64,7 +64,7 @@ export const STAKING_ASSETS = [
   'cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH',
   'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep',
   'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
-  'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr',
+  'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'GHO',
 ];
 
 export const getStakingApy = memoize(async (asset: string, network: number = NetworkNumber.Eth) => {
@@ -89,7 +89,7 @@ export const getStakingApy = memoize(async (asset: string, network: number = Net
     if (asset === 'PT sUSDe Sep') return await getApyFromDfsApi('PT sUSDe Sep', network);
     if (asset === 'PT USDe Sep') return await getApyFromDfsApi('PT USDe Sep', network);
     if (asset === 'tETH') return await getApyFromDfsApi('tETH');
-    if (asset === 'USDe') return await getApyFromDfsApi('USDe');
+    if (asset === 'USDe') return await getApyFromDfsApi('USDe', network);
     if (asset === 'PT sUSDe Nov') return await getApyFromDfsApi('PT sUSDe Nov', network);
     if (asset === 'PT USDe Nov') return await getApyFromDfsApi('PT USDe Nov', network);
     if (asset === 'PT USDe Jan') return await getApyFromDfsApi('PT USDe Jan', network);
@@ -104,6 +104,7 @@ export const getStakingApy = memoize(async (asset: string, network: number = Net
     if (asset === 'PT sUSDe May') return await getApyFromDfsApi('PT sUSDe May', network);
     if (asset === 'PT USDe May') return await getApyFromDfsApi('PT USDe May', network);
     if (asset === 'PT srUSDe Apr') return await getApyFromDfsApi('PT srUSDe Apr', network);
+    if (asset === 'GHO') return await getApyFromDfsApi('GHO', network);
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
   }