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

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}`);
   }

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/common.ts

@@ -8,6 +8,7 @@ export enum IncentiveEligibilityId {
   AaveV3ArbitrumEthSupply = '0x5d16261c6715a653248269861bbacf68a9774cde',
   AaveV3ArbitrumETHLSBorrow = '0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351',
   AaveV3EthenaLiquidLeveragePlasma = '0xeefac321069fbecc9d6b2aed2948f6d5503d8633BORROW_BL',
+  AaveV3EthenaLiquidLeveragePlasmaGHO = 'replace_when_known',
 }
 
 export enum LeverageType {

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 {