@defisaver/positions-sdk 2.1.160-shifter-v2-dev → 2.1.161-portfolio-api-dev

package/src/liquity/index.ts

@@ -18,7 +18,6 @@ import { ZERO_ADDRESS } from '../constants';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import { getEthAmountForDecimals } from '../services/utils';
 import { getExposure } from '../moneymarket';
-import { calculateNetApyFromRates } from '../staking';
 
 export const LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 export const LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
@@ -90,15 +89,6 @@ export const _getLiquityTroveInfo = async (provider: Client, network: NetworkNum
   ]);
 
   const recoveryMode = troveInfo[6];
-  const minCollateralRatio = recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO;
-  const collateral = assetAmountInEth(troveInfo[1].toString());
-  const debtInAsset = assetAmountInEth(troveInfo[2].toString());
-  const collateralUsd = new Dec(collateral).mul(assetAmountInEth(assetPrice.toString())).toString();
-  const collRatio = +debtInAsset ? new Dec(collateralUsd).div(debtInAsset).mul(100).toString() : '0';
-
-  // LUSD debt is interest free (only a one-off borrowing fee on issuance) and ETH collateral earns no yield,
-  // so a trove's net APY is always 0. It is exposed for parity with the other protocols.
-  const { netApy, totalInterestUsd, incentiveUsd } = calculateNetApyFromRates({ suppliedUsd: collateralUsd, borrowedUsd: debtInAsset });
 
   const payload = {
     troveStatus: LIQUITY_TROVE_STATUS_ENUM[+(troveInfo[0].toString())],
@@ -112,15 +102,10 @@ export const _getLiquityTroveInfo = async (provider: Client, network: NetworkNum
     totalETH: totalETH.toString(),
     totalLUSD: totalLUSD.toString(),
     debtInFront: debtInFront.toString(),
-    minCollateralRatio,
-    // Collateral ratio rebased so 100 sits on the trove's minimum collateral ratio (normalised safety ratio).
-    safetyRatio: +minCollateralRatio > 0 ? new Dec(collRatio).div(minCollateralRatio).mul(100).toString() : '0',
+    minCollateralRatio: recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO,
     priceForRecovery: new Dec(recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
       .toString(),
-    exposure: getExposure(debtInAsset, collateralUsd),
-    netApy,
-    totalInterestUsd,
-    incentiveUsd,
+    exposure: getExposure(assetAmountInEth(troveInfo[2].toString()), new Dec(assetAmountInEth(troveInfo[1].toString())).mul(assetPrice).toString()),
   };
 
   return payload;

package/src/maker/index.ts

@@ -1,22 +1,19 @@
 import Dec from 'decimal.js';
 import {
-  assetAmountInEth, bytesToString, getAssetInfo, ilkToAsset, stringToBytes,
+  assetAmountInEth, bytesToString, getAssetInfo, ilkToAsset,
 } from '@defisaver/tokens';
 import { Client, PublicClient } from 'viem';
 import {
-  Blockish, EthAddress, EthereumProvider, HexString, NetworkNumber, PositionBalances,
+  Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances,
 } from '../types/common';
 import {
   getConfigContractAddress, McdDogContractViem, McdGetCdpsContractViem, McdJugContractViem, McdSpotterContractViem, McdVatContractViem, McdViewContractViem,
 } from '../contracts';
-import {
-  CdpData, CdpInfo, CdpType, IlkInfo,
-} from '../types';
+import { CdpData, CdpInfo, CdpType } from '../types';
 import { wethToEth } from '../services/utils';
 import { parseCollateralInfo } from '../helpers/makerHelpers';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import { getExposure } from '../moneymarket';
-import { calculateNetApyFromRates, getStakingApy, STAKING_ASSETS } from '../staking';
 
 export const _getMakerAccountBalances = async (provider: PublicClient, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress): Promise<PositionBalances> => {
   let balances: PositionBalances = {
@@ -51,7 +48,7 @@ export const _getMakerAccountBalances = async (provider: PublicClient, network:
   const [
     par,
     [_, mat],
-    [artGlobal, rate, spot, line, dust],
+    [artGlobal, rate, spot, line],
     [duty],
     futureRate,
     chop,
@@ -72,7 +69,6 @@ export const _getMakerAccountBalances = async (provider: PublicClient, network:
     rate.toString(),
     spot.toString(),
     line.toString(),
-    dust.toString(),
     duty.toString(),
     futureRate.toString(),
     chop.toString(),
@@ -133,73 +129,44 @@ export const getUserCdps = async (
   userAddress: EthAddress,
 ): Promise<CdpInfo[]> => _getUserCdps(getViemProvider(provider, network), network, userAddress);
 
-export const _getMakerIlksData = async (provider: Client, network: NetworkNumber, ilkLabels: string[]): Promise<Record<string, IlkInfo>> => {
+export const _getMakerCdpData = async (provider: Client, network: NetworkNumber, cdp: CdpInfo): Promise<CdpData> => {
   const vatContract = McdVatContractViem(provider, network);
   const spotterContract = McdSpotterContractViem(provider, network);
   const dogContract = McdDogContractViem(provider, network);
   const jugContract = McdJugContractViem(provider, network);
 
-  const par = await spotterContract.read.par();
-
-  const ilksInfo = await Promise.all(ilkLabels.map(async (ilkLabel) => {
-    const ilk = stringToBytes(ilkLabel) as HexString;
-    const [
-      [_, mat],
-      [artGlobal, rate, spot, line, dust],
-      [duty],
-      futureRate,
-      chop,
-    ] = await Promise.all([
-      spotterContract.read.ilks([ilk]),
-      vatContract.read.ilks([ilk]),
-      jugContract.read.ilks([ilk]),
-      jugContract.read.drip([ilk]),
-      dogContract.read.chop([ilk]),
-    ]);
-
-    return parseCollateralInfo(
-      ilk,
-      par.toString(),
-      mat.toString(),
-      artGlobal.toString(),
-      rate.toString(),
-      spot.toString(),
-      line.toString(),
-      dust.toString(),
-      duty.toString(),
-      futureRate.toString(),
-      chop.toString(),
-    );
-  }));
-
-  return Object.fromEntries(ilksInfo.map((ilkInfo) => [ilkInfo.ilkLabel, ilkInfo]));
-};
-
-export const getMakerIlksData = async (
-  provider: EthereumProvider,
-  network: NetworkNumber,
-  ilkLabels: string[],
-): Promise<Record<string, IlkInfo>> => _getMakerIlksData(getViemProvider(provider, network, { batch: { multicall: true } }), network, ilkLabels);
-
-/**
- * @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
- */
-export const _getMakerCdpData = async (provider: Client, network: NetworkNumber, cdp: CdpInfo, ilkInfo?: IlkInfo): Promise<CdpData> => {
-  const vatContract = McdVatContractViem(provider, network);
-
   const [
     [ink, art],
     coll,
-    fetchedIlkInfo,
-    collStakingApy,
+    par,
+    [_, mat],
+    [artGlobal, rate, spot, line],
+    [duty],
+    futureRate,
+    chop,
   ] = await Promise.all([
     vatContract.read.urns([cdp.ilk, cdp.urn]),
     vatContract.read.gem([cdp.ilk, cdp.urn]),
-    ilkInfo || _getMakerIlksData(provider, network, [cdp.ilkLabel]).then((ilks) => ilks[cdp.ilkLabel]),
-    STAKING_ASSETS.includes(cdp.asset) ? getStakingApy(cdp.asset) : Promise.resolve('0'),
+    spotterContract.read.par(),
+    spotterContract.read.ilks([cdp.ilk]),
+    vatContract.read.ilks([cdp.ilk]),
+    jugContract.read.ilks([cdp.ilk]),
+    jugContract.read.drip([cdp.ilk]),
+    dogContract.read.chop([cdp.ilk]),
   ]);
 
-  const collInfo = fetchedIlkInfo;
+  const collInfo = parseCollateralInfo(
+    cdp.ilk,
+    par.toString(),
+    mat.toString(),
+    artGlobal.toString(),
+    rate.toString(),
+    spot.toString(),
+    line.toString(),
+    duty.toString(),
+    futureRate.toString(),
+    chop.toString(),
+  );
 
   const collateral = assetAmountInEth(ink.toString(), `MCD-${cdp.asset}`);
 
@@ -213,20 +180,9 @@ export const _getMakerCdpData = async (provider: Client, network: NetworkNumber,
   let ratio = new Dec(ink).times(collInfo.assetPrice).div(debt).times(100)
     .toString();
   if (new Dec(debt).eq(0)) ratio = '0';
-  // Collateral ratio rebased so 100 sits on the ilk's liquidation ratio (normalised safety ratio).
-  const safetyRatio = +collInfo.liqPercent > 0 ? new Dec(ratio).div(collInfo.liqPercent).mul(100).toString() : '0';
 
   const debtTooLow = new Dec(debt).gt(0) && new Dec(assetAmountInEth(debt, 'DAI')).lt(collInfo.minDebt);
 
-  // DAI debt accrues the ilk's stability fee. Collateral earns nothing inside the vault, except for the
-  // native yield of staked collateral (e.g. wstETH), which is tracked as an incentive.
-  const { netApy, totalInterestUsd, incentiveUsd } = calculateNetApyFromRates({
-    suppliedUsd: collateralUsd,
-    borrowedUsd: assetAmountInEth(debt, 'DAI'),
-    borrowRate: collInfo.stabilityFee.toString(),
-    incentives: [{ apy: collStakingApy, amountUsd: collateralUsd }],
-  });
-
   return {
     owner: cdp.owner,
     id: cdp.id.toString(),
@@ -245,7 +201,6 @@ export const _getMakerCdpData = async (provider: Client, network: NetworkNumber,
     debtAssetMarketPrice: '1',
     liquidationPrice,
     ratio,
-    safetyRatio,
     liqRatio: collInfo.liqRatio.toString(),
     liqPercent: parseFloat(collInfo.liqPercent.toString()),
     assetPrice: collInfo.assetPrice,
@@ -261,9 +216,6 @@ export const _getMakerCdpData = async (provider: Client, network: NetworkNumber,
     liquidationFee: collInfo.liquidationFee,
     lastUpdated: Date.now(),
     exposure: getExposure(assetAmountInEth(debt, 'DAI'), collateralUsd),
-    netApy,
-    totalInterestUsd,
-    incentiveUsd,
   };
 };
 

package/src/markets/index.ts

@@ -30,5 +30,4 @@ export {
   getFTokenAddress,
   getFluidMarketInfoByAddress,
 } from './fluid';
-export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';
-export { MakerActiveIlks } from './maker';
+export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';

package/src/portfolio/index.ts

@@ -7,7 +7,6 @@ import {
   CrvUsdMarkets,
   LiquityV2Markets,
   LlamaLendMarkets,
-  MakerActiveIlks,
   MorphoBlueMarkets,
   MorphoMidnightMarkets,
   SparkMarkets,
@@ -28,7 +27,6 @@ import {
   LlamaLendGlobalMarketData,
   MorphoBlueMarketInfo,
   MorphoMidnightMarketInfo,
-  PortfolioMarketsData,
   PortfolioPositionsData,
   SparkMarketsData,
 } from '../types';
@@ -38,13 +36,13 @@ import { _getCurveUsdGlobalData, _getCurveUsdUserData } from '../curveUsd';
 import { _getLlamaLendGlobalData, _getLlamaLendUserData } from '../llamaLend';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
 import { ZERO_ADDRESS } from '../constants';
-import { _getMakerCdpData, _getMakerIlksData, _getUserCdps } from '../maker';
+import { _getMakerCdpData, _getUserCdps } from '../maker';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getCompoundV2AccountData, _getCompoundV2MarketsData } from '../compoundV2';
 import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
 import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
-import { _getAllFluidMarketDataPortfolio, _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
+import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getUmbrellaData } from '../umbrella';
 import { getMerklUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
@@ -508,7 +506,9 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         positions[address.toLowerCase() as EthAddress].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
       }
     })).flat(),
-    ...addresses.map(async (address) => makerCdps[address.toLowerCase() as EthAddress]?.map(async (cdpInfo) => {
+    // flatMap, not map: each CDP's fetch has to be one of the awaited promises, or getPortfolioData can return
+    // before a vault's data lands and the vault is missing from the result.
+    ...addresses.flatMap((address) => (makerCdps[address.toLowerCase() as EthAddress] ?? []).map(async (cdpInfo) => {
       try {
         const cdpData = await _getMakerCdpData(client, network, cdpInfo);
         if (cdpData) {
@@ -518,7 +518,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
         positions[address.toLowerCase() as EthAddress].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
       }
-    })).flat(),
+    })),
     ...aaveV2Markets.map((market) => addresses.map(async (address) => {
       try {
         const accData = await _getAaveV2AccountData(client, network, address, aaveV2MarketsData[market.value].assetsData, market);
@@ -549,9 +549,9 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     }),
     ...crvUsdMarkets.map((market) => addresses.map(async (address) => {
       try {
-        const accData = await _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand, crvUsdMarketsData[market.value].borrowRate);
+        const accData = await _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
         if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-          positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = { error: '', data: accData };
+          positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = { error: '', data: { ...accData, borrowRate: crvUsdMarketsData[market.value].borrowRate } };
         }
       } catch (error) {
         console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
@@ -593,257 +593,4 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   };
 }
 
-
-export async function getShifterPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim = false): Promise<{
-  positions: PortfolioPositionsData;
-  markets: PortfolioMarketsData;
-}> {
-  const isMainnet = network === NetworkNumber.Eth;
-  const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
-
-  const morphoMarkets = Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network));
-  const compoundV3Markets = Object.values(CompoundMarkets(network)).filter((market) => market.chainIds.includes(network) && market.value !== CompoundVersions.CompoundV2);
-  const sparkMarkets = Object.values(SparkMarkets(network)).filter((market) => market.chainIds.includes(network));
-  const aaveV3Markets = [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-  const aaveV2Markets = [AaveVersions.AaveV2].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-  const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-  const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
-  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 aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
-
-  const args: [NetworkNumber, any?] = [network, { batch: { multicall: { batchSize: isSim ? 2_000 : 2_500_000 } } }];
-  const client = getViemProvider(provider, ...args);
-  const defaultClient = getViemProvider(defaultProvider, ...args);
-
-  const markets: PortfolioMarketsData = {
-    morphoMarketsData: {},
-    morphoMidnightMarketsData: {}, // Morpho Midnight is not fetched for the shifter; key kept so the payload shape is stable
-    compoundV3MarketsData: {},
-    sparkMarketsData: {},
-    aaveV3MarketsData: {},
-    aaveV2MarketsData: {},
-    compoundV2MarketsData: {},
-    crvUsdMarketsData: {},
-    llamaLendMarketsData: {},
-    liquityV2MarketsData: {},
-    aaveV4SpokesData: {},
-    fluidMarketsData: {},
-    makerMarketsData: {},
-  };
-  const makerCdps: Record<string, CdpInfo[]> = {};
-
-  const positions: PortfolioPositionsData = {};
-
-  for (const address of addresses) {
-    positions[address.toLowerCase() as EthAddress] = {
-      aaveV3: {},
-      aaveV4: {},
-      morphoBlue: {},
-      morphoMidnight: {}, // not fetched for the shifter (see markets above)
-      compoundV3: {},
-      spark: {},
-      maker: {},
-      aaveV2: {},
-      compoundV2: {},
-      liquity: {},
-      crvUsd: {},
-      llamaLend: {},
-      fluid: {
-        error: '',
-        data: {},
-      },
-    };
-  }
-
-  await Promise.allSettled([
-    // === MARKET DATA (needs to be fetched first) ===
-    ...morphoMarkets.map(async (market) => {
-      markets.morphoMarketsData[market.value] = await _getMorphoBluePortfolioMarketData(client, network, market);
-    }),
-    ...compoundV3Markets.map(async (market) => {
-      markets.compoundV3MarketsData[market.value] = await _getCompoundV3MarketsData(client, network, market, defaultClient);
-    }),
-    ...sparkMarkets.map(async (market) => {
-      markets.sparkMarketsData[market.value] = await _getSparkMarketsData(client, network, market);
-    }),
-    ...aaveV3Markets.map(async (market) => {
-      markets.aaveV3MarketsData[market.value] = await _getAaveV3MarketData(client, network, market);
-    }),
-    ...aaveV4Spokes.map(async (spoke) => {
-      markets.aaveV4SpokesData[spoke.value] = await _getAaveV4SpokeData(client, network, spoke);
-    }),
-    ...aaveV2Markets.map(async (market) => {
-      markets.aaveV2MarketsData[market.value] = await _getAaveV2MarketsData(client, network, market);
-    }),
-    ...compoundV2Markets.map(async (market) => {
-      markets.compoundV2MarketsData[market.value] = await _getCompoundV2MarketsData(client, network);
-    }),
-    ...crvUsdMarkets.map(async (market) => {
-      markets.crvUsdMarketsData[market.value] = await _getCurveUsdGlobalData(client, network, market);
-    }),
-    ...llamaLendMarkets.map(async (market) => {
-      markets.llamaLendMarketsData[market.value] = await _getLlamaLendGlobalData(client, network, market);
-    }),
-    ...liquityV2Markets.map(async (market) => {
-      markets.liquityV2MarketsData[market.value] = await _getLiquityV2MarketData(client, network, market);
-    }),
-    (async () => {
-      if (!isFluidSupported) return;
-      try {
-        markets.fluidMarketsData = await _getAllFluidMarketDataPortfolio(client, network);
-      } catch (error) {
-        console.error('Error fetching Fluid markets data:', error);
-      }
-    })(),
-    (async () => {
-      if (!isMainnet) return; // Maker CDPs are only available on mainnet
-      try {
-        markets.makerMarketsData = await _getMakerIlksData(client, network, MakerActiveIlks);
-      } catch (error) {
-        console.error('Error fetching Maker ilks data:', error);
-      }
-    })(),
-
-    // === INDEPENDENT USER DATA (doesn't depend on market data) ===
-    ...addresses.map(async (address) => {
-      if (!isMainnet) return; // Maker CDPs are only available on mainnet
-      const makerCdp = await _getUserCdps(client, network, address);
-      makerCdps[address.toLowerCase() as EthAddress] = makerCdp;
-    }),
-    ...addresses.map(async (address) => {
-      try {
-        if (!isFluidSupported) return; // Fluid is not available on Optimism
-        const userPositions = (await _getUserPositionsPortfolio(client, network, address));
-        for (const position of userPositions) {
-          if (position.userData && new Dec(position.userData.suppliedUsd).gt(0)) {
-            positions[address.toLowerCase() as EthAddress].fluid.data[position.userData.nftId] = position.userData;
-          }
-        }
-      } catch (error) {
-        console.error(`Error fetching Fluid positions for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].fluid = {
-          error: `Error fetching Fluid positions for address ${address}`,
-          data: {},
-        };
-      }
-    }),
-  ]);
-
-  await Promise.all([
-    ...aaveV3Markets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getAaveV3AccountData(client, network, address, { selectedMarket: market, ...markets.aaveV3MarketsData[market.value] });
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].aaveV3[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching AaveV3 account data for address ${address} on market ${market.value}:`, error);
-        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) => addresses.map(async (address) => {
-      try {
-        const accData = await _getAaveV4AccountData(client, network, markets.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 accData = await _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value]);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].morphoBlue[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...compoundV3Markets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData });
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].compoundV3[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching CompoundV3 account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].compoundV3[market.value] = { error: `Error fetching CompoundV3 account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...sparkMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].spark[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...addresses.map(async (address) => makerCdps[address.toLowerCase() as EthAddress]?.map(async (cdpInfo) => {
-      try {
-        // reuse ilk data fetched for the markets payload; ilks outside the active set are fetched on demand
-        const cdpData = await _getMakerCdpData(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]);
-        if (cdpData) {
-          positions[address.toLowerCase() as EthAddress].maker[cdpInfo.id] = { error: '', data: cdpData };
-        }
-      } catch (error) {
-        console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
-        positions[address.toLowerCase() as EthAddress].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
-      }
-    })).flat(),
-    ...aaveV2Markets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].aaveV2[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching AaveV2 account data for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].aaveV2[market.value] = { error: `Error fetching AaveV2 account data for address ${address}`, data: null };
-      }
-    })).flat(),
-    ...compoundV2Markets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].compoundV2[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching CompoundV2 account data for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].compoundV2[market.value] = { error: `Error fetching CompoundV2 account data for address ${address}`, data: null };
-      }
-    })).flat(),
-    ...addresses.map(async (address) => {
-      try {
-        if (!isMainnet) return; // Liquity trove info is only available on mainnet
-        const troveInfo = await _getLiquityTroveInfo(client, network, address);
-        if (new Dec(troveInfo.collateral).gt(0)) positions[address.toLowerCase() as EthAddress].liquity = { error: '', data: troveInfo };
-      } catch (error) {
-        console.error(`Error fetching Liquity trove info for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].liquity = { error: `Error fetching Liquity trove info for address ${address}`, data: null };
-      }
-    }),
-    ...crvUsdMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate);
-        if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-          positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = { error: '', data: accData };
-        }
-      } catch (error) {
-        console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = { error: `Error fetching Curve USD account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...llamaLendMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value]);
-        if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-          positions[address.toLowerCase() as EthAddress].llamaLend[market.value] = { error: '', data: { ...accData, borrowRate: markets.llamaLendMarketsData[market.value].borrowRate } };
-        }
-      } catch (error) {
-        console.error(`Error fetching LlamaLend account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-  ]);
-
-  return {
-    positions,
-    markets,
-  };
-}
-
 export * from './discovery';

package/src/staking/staking.ts

@@ -137,34 +137,6 @@ export const calculateInterestEarned = (principal: string, interest: string, typ
   return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
 };
 
-/**
- * Net APY for positions that have a single known borrow rate (and optionally a single supply rate)
- * instead of per-asset `assetsData` to feed into `calculateNetApy` (Maker, crvUSD, Liquity v1).
- * All rates are yearly percentages that are already compounded. `incentives` are extra yields
- * (e.g. the native staking yield of the collateral) applied to their own USD base and summed into `incentiveUsd`.
- */
-export const calculateNetApyFromRates = ({
-  suppliedUsd, borrowedUsd, supplyRate = '0', borrowRate = '0', incentives = [],
-}: {
-  suppliedUsd: string,
-  borrowedUsd: string,
-  supplyRate?: string,
-  borrowRate?: string,
-  incentives?: { apy: string, amountUsd: string }[],
-}) => {
-  const supplyInterest = new Dec(calculateInterestEarned(suppliedUsd, supplyRate, 'year', true));
-  const borrowInterest = new Dec(calculateInterestEarned(borrowedUsd, borrowRate, 'year', true));
-  const incentiveUsd = incentives
-    .reduce((acc, { apy, amountUsd }) => acc.add(calculateInterestEarned(amountUsd, apy, 'year', true)), new Dec(0))
-    .toString();
-
-  const totalInterestUsd = supplyInterest.sub(borrowInterest).add(incentiveUsd).toString();
-  const balance = new Dec(suppliedUsd).sub(borrowedUsd);
-  const netApy = balance.isZero() ? '0' : new Dec(totalInterestUsd).div(balance).times(100).toString();
-
-  return { netApy, totalInterestUsd, incentiveUsd };
-};
-
 export const calculateNetApy = ({
   usedAssets, assetsData, optionalData,
 }: { usedAssets: MMUsedAssets, assetsData: MMAssetsData, optionalData?: any }) => {

package/src/types/aave.ts

@@ -1,4 +1,5 @@
 import {
+  EthAddress,
   IncentiveData,
   LeverageType,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
@@ -96,6 +97,9 @@ export interface AaveV3AssetData extends AaveAssetData {
   liquidationBonus: string,
   supplyIncentives: IncentiveData[];
   borrowIncentives: IncentiveData[];
+  // Set by _getAaveV3MarketData. Optional, so objects built by hand still type-check.
+  aTokenAddress?: EthAddress,
+  vTokenAddress?: EthAddress,
 }
 
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
@@ -137,14 +141,20 @@ export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
 
 export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
 
-export interface AavePositionData extends MMPositionData {
+/**
+ * Fields aaveAnyGetAggregatedPositionData adds to every Aave V2/V3 position at runtime, on top of those declared
+ * below. Optional, so code that builds a position by hand keeps compiling.
+ */
+export type AavePositionAggregatedFields = Partial<Omit<AaveV3AggregatedPositionData,
+| keyof MMPositionData | 'ratio' | 'collRatio' | 'safetyRatioWithLtvZeroFallback' | 'suppliedUsd' | 'borrowedUsd'
+| 'borrowLimitUsd' | 'suppliedCollateralUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
+
+export interface AavePositionData extends MMPositionData, AavePositionAggregatedFields {
   ratio: string,
   minRatio: string,
   collRatio: string,
   // Safety ratio as evaluated by automation bots (LTV-0 collateral credited at LLTV - 5%). Aave v3 only.
   safetyRatioWithLtvZeroFallback?: string,
-  // Normalised safety ratio (100 = liquidation on every protocol). Aave v3: the LTV-0 fallback ratio, Aave v2: `ratio`.
-  safetyRatio?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,
@@ -158,6 +168,11 @@ export interface AavePositionData extends MMPositionData {
 
 export interface AaveV2PositionData extends AavePositionData {
   usedAssets: AaveV2UsedAssets,
+  // Always their empty values: _getAaveV2AccountData starts from Aave V3's EMPTY_AAVE_DATA, which carries them.
+  eModeCategory?: number,
+  isInIsolationMode?: boolean,
+  isInSiloedMode?: boolean,
+  eModeCategories?: { [key: number]: EModeCategoryDataMapping },
 }
 
 export interface AaveV3PositionData extends AavePositionData {
@@ -179,7 +194,6 @@ export interface AaveV3AggregatedPositionData {
   collRatio: string,
   borrowLimitWithLtvZeroFallbackUsd: string,
   safetyRatioWithLtvZeroFallback: string,
-  safetyRatio: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,

package/src/types/aaveV4.ts

@@ -183,7 +183,6 @@ export interface AaveV4AggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
-  safetyRatio: string,
   liqRatio: string,
   liqPercent: string,
   leveragedType: LeverageType,