@defisaver/positions-sdk 2.1.49 → 2.1.51-aave-v4-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,8 +51,9 @@ 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[], summerFiAddresses: EthAddress[]): Promise<{
+export async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim = false): Promise<{
   positions: PortfolioPositionsData;
   stakingPositions: any;
   rewardsData: any;
@@ -71,21 +74,11 @@ 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 client = getViemProvider(provider, network, {
-    batch: {
-      multicall: {
-        batchSize: 2500000,
-      },
-    },
-  });
-  const defaultClient = getViemProvider(defaultProvider, network, {
-    batch: {
-      multicall: {
-        batchSize: 2500000,
-      },
-    },
-  });
+  const args: [NetworkNumber, any?] = [network, { batch: { multicall: { batchSize: isSim ? 500_000 : 2_500_000 } } }];
+  const client = getViemProvider(provider, ...args);
+  const defaultClient = getViemProvider(defaultProvider, ...args);
 
   const morphoMarketsData: Record<string, MorphoBlueMarketInfo> = {};
   const compoundV3MarketsData: Record<string, CompoundV3MarketsData> = {};
@@ -98,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,
@@ -110,16 +104,18 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     crvUsdMarketsData,
     llamaLendMarketsData,
     liquityV2MarketsData,
+    aaveV4SpokesData,
   };
 
   const positions: PortfolioPositionsData = {};
   const stakingPositions: any = {};
   const rewardsData: any = {};
-  const allAddresses = [...addresses, ...summerFiAddresses];
+  const allAddresses = [...addresses];
 
   for (const address of allAddresses) {
     positions[address.toLowerCase() as EthAddress] = {
       aaveV3: {},
+      aaveV4: {},
       morphoBlue: {},
       compoundV3: {},
       spark: {},
@@ -188,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;
@@ -430,7 +430,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     })(),
   ]);
 
-
   await Promise.all([
     ...aaveV3Markets.map((market) => allAddresses.map(async (address) => {
       try {
@@ -441,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/services/viem.ts

@@ -1,4 +1,9 @@
-import { createPublicClient, custom } from 'viem';
+import {
+  createPublicClient,
+  custom,
+  encodeFunctionData,
+  type Abi,
+} from 'viem';
 import {
   arbitrum, base, mainnet, optimism, linea, plasma,
 } from 'viem/chains';
@@ -32,4 +37,21 @@ export const getViemProvider = (provider: EthereumProvider, network: NetworkNumb
 export const setViemBlockNumber = (block: Blockish) => {
   if (block === 'latest') return {};
   return { blockNumber: BigInt(block) };
-};
+};
+
+/**
+ * Utility function to return callData
+ * Useful for Tenderly simulation
+ *
+ * @param contract
+ * @param functionName
+ * @param args
+ */
+export function encodeCalldata(
+  contract: { abi: Abi },
+  functionName: string,
+  args?: readonly unknown[],
+): `0x${string}` {
+  const callDescriptor = { abi: contract.abi, functionName } as const;
+  return encodeFunctionData((args ? { ...callDescriptor, args } : callDescriptor) as any);
+}

package/src/types/aaveV4.ts

@@ -0,0 +1,142 @@
+import { EthAddress, IncentiveData, NetworkNumber } from './common';
+
+export enum AaveV4SpokesType {
+  AaveV4CoreSpoke = 'aave_v4_core_spoke',
+}
+
+export enum AaveV4HubsType {
+  AaveV4CoreHub = 'aave_v4_core_hub',
+}
+
+export interface AaveV4SpokeInfo {
+  chainIds: NetworkNumber[],
+  label: string,
+  value: AaveV4SpokesType,
+  url: string,
+  address: EthAddress,
+  hubs: 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,
+  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,
+  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: string,
+  leveragedAsset: string,
+  liquidationPrice: string,
+  leveragedLsdAssetRatio?: string,
+  minCollRatio: string,
+  collLiquidationRatio: string,
+  minHealthRatio: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+}
+
+export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
+
+export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
+  usedAssets: AaveV4UsedReserveAssets,
+  healthFactor: string,
+}

package/src/types/index.ts

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

package/src/types/morphoBlue.ts

@@ -44,6 +44,8 @@ export enum MorphoBlueVersions {
   MorphoBlueUSDeDAI_860 = 'morphoblueusdedai_860',
   MorphoBlueUSDeDAI_915 = 'morphoblueusdedai_915',
 
+  MorphoBlueMORPHOUSDC_625 = 'morphobluemorphousdc_625',
+
   // BASE
   MorphoBlueCbEthUSDC_860_Base = 'morphobluecbethusdc_860_base',
   MorphoBlueCbEthUSDC_860_Base_1c21c59d = 'morphobluecbethusdc_860_base_1c21c59d',

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 {