fix(morpho): Fix regressions on APY calculations (#3053)

src/apps/morpho/ethereum/morpho.morpho-aave-v2.contract-position-fetcher.ts

@@ -7,11 +7,16 @@ import { ZERO_ADDRESS } from '~app-toolkit/constants/address';
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import {
   MorphoContractPositionDataProps,
+  MorphoContractPositionDefinition,
   MorphoSupplyContractPositionFetcher,
 } from '~apps/morpho/common/morpho.supply.contract-position-fetcher';
 import { MorphoViemContractFactory } from '~apps/morpho/contracts';
 import { isViemMulticallUnderlyingError } from '~multicall/errors';
-import { GetDefinitionsParams, GetTokenBalancesParams } from '~position/template/contract-position.template.types';
+import {
+  GetDataPropsParams,
+  GetDefinitionsParams,
+  GetTokenBalancesParams,
+} from '~position/template/contract-position.template.types';
 
 import { MorphoAaveV2 } from '../contracts/viem';
 
@@ -56,7 +61,11 @@ export class EthereumMorphoAaveV2SupplyContractPositionFetcher extends MorphoSup
     );
   }
 
-  async getDataProps({ contractPosition, multicall, definition }) {
+  async getDataProps({
+    contractPosition,
+    multicall,
+    definition,
+  }: GetDataPropsParams<MorphoAaveV2, MorphoContractPositionDataProps, MorphoContractPositionDefinition>) {
     const lens = this.contractFactory.morphoAaveV2Lens({ address: this.lensAddress, network: this.network });
     const lensContract = multicall.wrap(lens);
     const marketAddress = definition.marketAddress;
@@ -71,17 +80,17 @@ export class EthereumMorphoAaveV2SupplyContractPositionFetcher extends MorphoSup
       ]);
 
     const secondsPerYear = 3600 * 24 * 365;
-    const supplyRate = supplyRateRaw.avgSupplyRatePerYear;
-    const borrowRate = borrowRateRaw.avgBorrowRatePerYear;
+    const supplyRate = BigNumber.from(supplyRateRaw[0]);
+    const borrowRate = BigNumber.from(borrowRateRaw[0]);
     const supplyApy = Math.pow(1 + +formatUnits(supplyRate.div(secondsPerYear), 27), secondsPerYear) - 1;
     const borrowApy = Math.pow(1 + +formatUnits(borrowRate.div(secondsPerYear), 27), secondsPerYear) - 1;
-    const p2pDisabled = marketConfiguration.isP2PDisabled;
+    const p2pDisabled = marketConfiguration[2];
 
     const underlyingToken = contractPosition.tokens[0];
-    const supplyRaw = totalMarketSupplyRaw.p2pSupplyAmount.add(totalMarketSupplyRaw.poolSupplyAmount);
+    const supplyRaw = BigNumber.from(totalMarketSupplyRaw[0]).add(totalMarketSupplyRaw[1]);
     const supply = +formatUnits(supplyRaw, underlyingToken.decimals);
     const supplyUSD = supply * underlyingToken.price;
-    const borrowRaw = totalMarketBorrowRaw.p2pBorrowAmount.add(totalMarketBorrowRaw.poolBorrowAmount);
+    const borrowRaw = BigNumber.from(totalMarketBorrowRaw[0]).add(totalMarketBorrowRaw[1]);
     const matchedUSD = +formatUnits(borrowRaw, underlyingToken.decimals) * underlyingToken.price;
     const borrow = +formatUnits(borrowRaw, underlyingToken.decimals);
     const borrowUSD = borrow * underlyingToken.price;

src/apps/morpho/ethereum/morpho.morpho-aave-v3.contract-position-fetcher.ts

@@ -155,7 +155,7 @@ export class EthereumMorphoAaveV3SupplyContractPositionFetcher extends MorphoSup
       ? BigNumber.from(currentLiquidityRate)
       : p2pSupplyRate.mul(supplyInP2P).add(BigNumber.from(currentLiquidityRate).mul(supplyOnPool)).div(totalSupply);
     const borrowRate = totalBorrow.isZero()
-      ? currentVariableBorrowRate
+      ? BigNumber.from(currentVariableBorrowRate)
       : p2pBorrowRate
           .mul(borrowInP2P)
           .add(BigNumber.from(currentVariableBorrowRate).mul(borrowOnPool))

src/apps/morpho/utils/P2PInterestRates.ts

@@ -137,7 +137,7 @@ export default class P2PInterestRates {
     proportionIdle,
     delta,
   }: RateParams) {
-    let p2pSupplyRate;
+    let p2pSupplyRate: BigNumber;
 
     if (poolSupplyRatePerYear.gt(poolBorrowRatePerYear)) p2pSupplyRate = poolBorrowRatePerYear;
     else {
@@ -173,7 +173,7 @@ export default class P2PInterestRates {
     proportionIdle,
     delta,
   }: RateParams) {
-    let p2pBorrowRate;
+    let p2pBorrowRate: BigNumber;
 
     if (poolSupplyRatePerYear.gt(poolBorrowRatePerYear)) p2pBorrowRate = poolBorrowRatePerYear;
     else {