Merge pull request #193 from aave/feat/2.5-refactor-getuseraccountdata

Protocol 2.5 - Refactor calculateUserAccountData and AaveOracle

contracts/interfaces/ILendingPool.sol

@@ -366,9 +366,9 @@ interface ILendingPool {
   /**
    * @dev Returns the user account data across all the reserves
    * @param user The address of the user
-   * @return totalCollateralETH the total collateral in ETH of the user
+   * @return totalCollateralBase the total collateral of the user in the base currency used by the price feed
-   * @return totalDebtETH the total debt in ETH of the user
+   * @return totalDebtBase the total debt of the user in the base currency used by the price feed
-   * @return availableBorrowsETH the borrowing power left of the user
+   * @return availableBorrowsBase the borrowing power left of the user in the base currency used by the price feed
    * @return currentLiquidationThreshold the liquidation threshold of the user
    * @return ltv the loan to value of the user
    * @return healthFactor the current health factor of the user
@@ -377,9 +377,9 @@ interface ILendingPool {
     external
     view
     returns (
-      uint256 totalCollateralETH,
+      uint256 totalCollateralBase,
-      uint256 totalDebtETH,
+      uint256 totalDebtBase,
-      uint256 availableBorrowsETH,
+      uint256 availableBorrowsBase,
       uint256 currentLiquidationThreshold,
       uint256 ltv,
       uint256 healthFactor

contracts/misc/AaveOracle.sol

@@ -18,29 +18,34 @@ import {SafeERC20} from '../dependencies/openzeppelin/contracts/SafeERC20.sol';
 contract AaveOracle is IPriceOracleGetter, Ownable {
   using SafeERC20 for IERC20;
 
-  event WethSet(address indexed weth);
+  event BaseCurrencySet(address indexed baseCurrency, uint256 baseCurrencyUnit);
   event AssetSourceUpdated(address indexed asset, address indexed source);
   event FallbackOracleUpdated(address indexed fallbackOracle);
 
   mapping(address => IChainlinkAggregator) private assetsSources;
   IPriceOracleGetter private _fallbackOracle;
-  address public immutable WETH;
+  address public immutable BASE_CURRENCY;
+  uint256 public immutable BASE_CURRENCY_UNIT;
 
   /// @notice Constructor
   /// @param assets The addresses of the assets
   /// @param sources The address of the source of each asset
   /// @param fallbackOracle The address of the fallback oracle to use if the data of an
   ///        aggregator is not consistent
+  /// @param baseCurrency the base currency used for the price quotes. If USD is used, base currency is 0x0
+  /// @param baseCurrencyUnit the unit of the base currency
   constructor(
     address[] memory assets,
     address[] memory sources,
     address fallbackOracle,
-    address weth
+    address baseCurrency,
+    uint256 baseCurrencyUnit
   ) public {
     _setFallbackOracle(fallbackOracle);
     _setAssetsSources(assets, sources);
-    WETH = weth;
+    BASE_CURRENCY = baseCurrency;
-    emit WethSet(weth);
+    BASE_CURRENCY_UNIT = baseCurrencyUnit;
+    emit BaseCurrencySet(baseCurrency, baseCurrencyUnit);
   }
 
   /// @notice External function called by the Aave governance to set or replace sources of assets
@@ -83,8 +88,8 @@ contract AaveOracle is IPriceOracleGetter, Ownable {
   function getAssetPrice(address asset) public view override returns (uint256) {
     IChainlinkAggregator source = assetsSources[asset];
 
-    if (asset == WETH) {
+    if (asset == BASE_CURRENCY) {
-      return 1 ether;
+      return BASE_CURRENCY_UNIT;
     } else if (address(source) == address(0)) {
       return _fallbackOracle.getAssetPrice(asset);
     } else {

contracts/protocol/lendingpool/LendingPool.sol

@@ -473,17 +473,17 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
     view
     override
     returns (
-      uint256 totalCollateralETH,
+      uint256 totalCollateralBase,
-      uint256 totalDebtETH,
+      uint256 totalDebtBase,
-      uint256 availableBorrowsETH,
+      uint256 availableBorrowsBase,
       uint256 currentLiquidationThreshold,
       uint256 ltv,
       uint256 healthFactor
     )
   {
     (
-      totalCollateralETH,
+      totalCollateralBase,
-      totalDebtETH,
+      totalDebtBase,
       ltv,
       currentLiquidationThreshold,
       healthFactor,
@@ -497,9 +497,9 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
       _addressesProvider.getPriceOracle()
     );
 
-    availableBorrowsETH = GenericLogic.calculateAvailableBorrowsETH(
+    availableBorrowsBase = GenericLogic.calculateAvailableBorrows(
-      totalCollateralETH,
+      totalCollateralBase,
-      totalDebtETH,
+      totalDebtBase,
       ltv
     );
   }

contracts/protocol/libraries/logic/GenericLogic.sol

@@ -32,17 +32,17 @@ library GenericLogic {
     uint256 assetPrice;
     uint256 assetUnit;
     uint256 userBalance;
-    uint256 userBalanceETH;
+    uint256 userBalanceInBaseCurrency;
     uint256 userDebt;
     uint256 userStableDebt;
-    uint256 userDebtETH;
+    uint256 userDebtInBaseCurrency;
     uint256 decimals;
     uint256 ltv;
     uint256 liquidationThreshold;
     uint256 i;
     uint256 healthFactor;
-    uint256 totalCollateralInETH;
+    uint256 totalCollateralInBaseCurrency;
-    uint256 totalDebtInETH;
+    uint256 totalDebtInBaseCurrency;
     uint256 avgLtv;
     uint256 avgLiquidationThreshold;
     uint256 normalizedIncome;
@@ -53,14 +53,15 @@ library GenericLogic {
 
   /**
    * @dev Calculates the user data across the reserves.
-   * this includes the total liquidity/collateral/borrow balances in ETH,
+   * this includes the total liquidity/collateral/borrow balances in the base currency used by the price feed,
    * the average Loan To Value, the average Liquidation Ratio, and the Health factor.
    * @param user The address of the user
    * @param reservesData Data of all the reserves
    * @param userConfig The configuration of the user
    * @param reserves The list of the available reserves
    * @param oracle The price oracle address
-   * @return The total collateral and total debt of the user in ETH, the avg ltv, liquidation threshold, the HF and the uncapped avg ltv
+   * @return The total collateral and total debt of the user in the base currency used by the price feed,
+   *         the avg ltv, liquidation threshold, the HF and the uncapped avg ltv
    **/
   function calculateUserAccountData(
     address user,
@@ -109,13 +110,16 @@ library GenericLogic {
         vars.userBalance = IScaledBalanceToken(currentReserve.aTokenAddress).scaledBalanceOf(user);
         vars.userBalance = vars.userBalance.rayMul(vars.normalizedIncome);
 
-        vars.userBalanceETH = vars.assetPrice.mul(vars.userBalance).div(vars.assetUnit);
+        vars.userBalanceInBaseCurrency = vars.assetPrice.mul(vars.userBalance).div(vars.assetUnit);
-        vars.totalCollateralInETH = vars.totalCollateralInETH.add(vars.userBalanceETH);
+        vars.totalCollateralInBaseCurrency = vars.totalCollateralInBaseCurrency.add(
+          vars.userBalanceInBaseCurrency
+        );
 
-        vars.avgLtv = vars.avgLtv.add(vars.userBalanceETH.mul(vars.ltv));
+        vars.avgLtv = vars.avgLtv.add(vars.userBalanceInBaseCurrency.mul(vars.ltv));
         vars.hasZeroLtvCollateral = vars.hasZeroLtvCollateral || vars.ltv == 0;
+
         vars.avgLiquidationThreshold = vars.avgLiquidationThreshold.add(
-          vars.userBalanceETH.mul(vars.liquidationThreshold)
+          vars.userBalanceInBaseCurrency.mul(vars.liquidationThreshold)
         );
       }
 
@@ -129,24 +133,28 @@ library GenericLogic {
           vars.userDebt = vars.userDebt.rayMul(vars.normalizedDebt);
         }
         vars.userDebt = vars.userDebt.add(vars.userStableDebt);
-        vars.userDebtETH = vars.assetPrice.mul(vars.userDebt).div(vars.assetUnit);
+        vars.userDebtInBaseCurrency = vars.assetPrice.mul(vars.userDebt).div(vars.assetUnit);
-        vars.totalDebtInETH = vars.totalDebtInETH.add(vars.userDebtETH);
+        vars.totalDebtInBaseCurrency = vars.totalDebtInBaseCurrency.add(
+          vars.userDebtInBaseCurrency
+        );
       }
     }
 
-    vars.avgLtv = vars.totalCollateralInETH > 0 ? vars.avgLtv.div(vars.totalCollateralInETH) : 0;
+    vars.avgLtv = vars.totalCollateralInBaseCurrency > 0
-    vars.avgLiquidationThreshold = vars.totalCollateralInETH > 0
+      ? vars.avgLtv.div(vars.totalCollateralInBaseCurrency)
-      ? vars.avgLiquidationThreshold.div(vars.totalCollateralInETH)
+      : 0;
+    vars.avgLiquidationThreshold = vars.totalCollateralInBaseCurrency > 0
+      ? vars.avgLiquidationThreshold.div(vars.totalCollateralInBaseCurrency)
       : 0;
 
     vars.healthFactor = calculateHealthFactorFromBalances(
-      vars.totalCollateralInETH,
+      vars.totalCollateralInBaseCurrency,
-      vars.totalDebtInETH,
+      vars.totalDebtInBaseCurrency,
       vars.avgLiquidationThreshold
     );
     return (
-      vars.totalCollateralInETH,
+      vars.totalCollateralInBaseCurrency,
-      vars.totalDebtInETH,
+      vars.totalDebtInBaseCurrency,
       vars.avgLtv,
       vars.avgLiquidationThreshold,
       vars.healthFactor,
@@ -156,43 +164,46 @@ library GenericLogic {
 
   /**
    * @dev Calculates the health factor from the corresponding balances
-   * @param totalCollateralInETH The total collateral in ETH
+   * @param totalCollateralInBaseCurrency The total collateral in the base currency used by the price feed
-   * @param totalDebtInETH The total debt in ETH
+   * @param totalDebtInBaseCurrency The total debt in the base currency used by the price feed
    * @param liquidationThreshold The avg liquidation threshold
    * @return The health factor calculated from the balances provided
    **/
   function calculateHealthFactorFromBalances(
-    uint256 totalCollateralInETH,
+    uint256 totalCollateralInBaseCurrency,
-    uint256 totalDebtInETH,
+    uint256 totalDebtInBaseCurrency,
     uint256 liquidationThreshold
   ) internal pure returns (uint256) {
-    if (totalDebtInETH == 0) return uint256(-1);
+    if (totalDebtInBaseCurrency == 0) return uint256(-1);
 
-    return (totalCollateralInETH.percentMul(liquidationThreshold)).wadDiv(totalDebtInETH);
+    return
+      (totalCollateralInBaseCurrency.percentMul(liquidationThreshold)).wadDiv(
+        totalDebtInBaseCurrency
+      );
   }
 
   /**
-   * @dev Calculates the equivalent amount in ETH that an user can borrow, depending on the available collateral and the
+   * @dev Calculates the maximum amount that can be borrowed depending on the available collateral, the total debt and the
    * average Loan To Value
-   * @param totalCollateralInETH The total collateral in ETH
+   * @param totalCollateralInBaseCurrency The total collateral in the base currency used by the price feed
-   * @param totalDebtInETH The total borrow balance
+   * @param totalDebtInBaseCurrency The total borrow balance in the base currency used by the price feed
    * @param ltv The average loan to value
-   * @return the amount available to borrow in ETH for the user
+   * @return the amount available to borrow in the base currency of the used by the price feed
    **/
 
-  function calculateAvailableBorrowsETH(
+  function calculateAvailableBorrows(
-    uint256 totalCollateralInETH,
+    uint256 totalCollateralInBaseCurrency,
-    uint256 totalDebtInETH,
+    uint256 totalDebtInBaseCurrency,
     uint256 ltv
   ) internal pure returns (uint256) {
-    uint256 availableBorrowsETH = totalCollateralInETH.percentMul(ltv);
+    uint256 availableBorrowsInBaseCurrency = totalCollateralInBaseCurrency.percentMul(ltv);
 
-    if (availableBorrowsETH < totalDebtInETH) {
+    if (availableBorrowsInBaseCurrency < totalDebtInBaseCurrency) {
       return 0;
     }
 
-    availableBorrowsETH = availableBorrowsETH.sub(totalDebtInETH);
+    availableBorrowsInBaseCurrency = availableBorrowsInBaseCurrency.sub(totalDebtInBaseCurrency);
-    return availableBorrowsETH;
+    return availableBorrowsInBaseCurrency;
   }
 
   /**

contracts/protocol/libraries/logic/ValidationLogic.sol

@@ -92,16 +92,16 @@ library ValidationLogic {
   struct ValidateBorrowLocalVars {
     uint256 currentLtv;
     uint256 currentLiquidationThreshold;
-    uint256 amountOfCollateralNeededETH;
+    uint256 collateralNeededInBaseCurrency;
-    uint256 userCollateralBalanceETH;
+    uint256 userCollateralInBaseCurrency;
-    uint256 userBorrowBalanceETH;
+    uint256 userDebtInBaseCurrency;
     uint256 availableLiquidity;
     uint256 healthFactor;
     uint256 totalDebt;
     uint256 totalSupplyVariableDebt;
     uint256 reserveDecimals;
     uint256 borrowCap;
-    uint256 amountInETH;
+    uint256 amountInBaseCurrency;
     bool isActive;
     bool isFrozen;
     bool isPaused;
@@ -181,8 +181,8 @@ library ValidationLogic {
     }
 
     (
-      vars.userCollateralBalanceETH,
+      vars.userCollateralInBaseCurrency,
-      vars.userBorrowBalanceETH,
+      vars.userDebtInBaseCurrency,
       vars.currentLtv,
       vars.currentLiquidationThreshold,
       vars.healthFactor,
@@ -196,23 +196,23 @@ library ValidationLogic {
       oracle
     );
 
-    require(vars.userCollateralBalanceETH > 0, Errors.VL_COLLATERAL_BALANCE_IS_0);
+    require(vars.userCollateralInBaseCurrency > 0, Errors.VL_COLLATERAL_BALANCE_IS_0);
 
     require(
       vars.healthFactor > GenericLogic.HEALTH_FACTOR_LIQUIDATION_THRESHOLD,
       Errors.VL_HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD
     );
 
-    vars.amountInETH = IPriceOracleGetter(oracle).getAssetPrice(asset);
+    vars.amountInBaseCurrency = IPriceOracleGetter(oracle).getAssetPrice(asset);
-    vars.amountInETH = vars.amountInETH.mul(amount).div(10**vars.reserveDecimals);
+    vars.amountInBaseCurrency = vars.amountInBaseCurrency.mul(amount).div(10**vars.reserveDecimals);
 
     //add the current already borrowed amount to the amount requested to calculate the total collateral needed.
-    vars.amountOfCollateralNeededETH = vars.userBorrowBalanceETH.add(vars.amountInETH).percentDiv(
+    vars.collateralNeededInBaseCurrency = vars.userDebtInBaseCurrency.add(vars.amountInBaseCurrency).percentDiv(
       vars.currentLtv
     ); //LTV is calculated in percentage
 
     require(
-      vars.amountOfCollateralNeededETH <= vars.userCollateralBalanceETH,
+      vars.collateralNeededInBaseCurrency <= vars.userCollateralInBaseCurrency,
       Errors.VL_COLLATERAL_CANNOT_COVER_NEW_BORROW
     );
 

helpers/contracts-deployments.ts

@@ -1,4 +1,4 @@
-import { Contract } from 'ethers';
+import { BigNumberish, Contract } from 'ethers';
 import { DRE } from './misc-utils';
 import {
   tEthereumAddress,
@@ -188,8 +188,8 @@ export const deployAaveLibraries = async (
   return {
     ['__$de8c0cf1a7d7c36c802af9a64fb9d86036$__']: validationLogic.address,
     ['__$22cd43a9dda9ce44e9b92ba393b88fb9ac$__']: reserveLogic.address,
-    ["__$52a8a86ab43135662ff256bbc95497e8e3$__"]: genericLogic.address,
+    ['__$52a8a86ab43135662ff256bbc95497e8e3$__']: genericLogic.address,
-  }
+  };
 };
 
 export const deployLendingPool = async (verify?: boolean) => {
@@ -224,7 +224,7 @@ export const deployMockAggregator = async (price: tStringTokenSmallUnits, verify
   );
 
 export const deployAaveOracle = async (
-  args: [tEthereumAddress[], tEthereumAddress[], tEthereumAddress, tEthereumAddress],
+  args: [tEthereumAddress[], tEthereumAddress[], tEthereumAddress, tEthereumAddress, string],
   verify?: boolean
 ) =>
   withSaveAndVerify(

specs/harness/LendingPoolHarnessForVariableDebtToken.sol

@@ -100,9 +100,9 @@ contract LendingPoolHarnessForVariableDebtToken is ILendingPool {
     view
     override
     returns (
-      uint256 totalCollateralETH,
+      uint256 totalCollateralBase,
-      uint256 totalDebtETH,
+      uint256 totalDebtBase,
-      uint256 availableBorrowsETH,
+      uint256 availableBorrowsBase,
       uint256 currentLiquidationThreshold,
       uint256 ltv,
       uint256 healthFactor

tasks/dev/4_oracles.ts

@@ -18,6 +18,7 @@ import {
   getLendingPoolAddressesProvider,
   getPairsTokenAggregator,
 } from '../../helpers/contracts-getters';
+import { ethers } from 'ethers';
 
 task('dev:deploy-oracles', 'Deploy oracles for dev enviroment')
   .addFlag('verify', 'Verify contracts at Etherscan')
@@ -58,7 +59,13 @@ task('dev:deploy-oracles', 'Deploy oracles for dev enviroment')
     );
 
     await deployAaveOracle(
-      [tokens, aggregators, fallbackOracle.address, await getWethAddress(poolConfig)],
+      [
+        tokens,
+        aggregators,
+        fallbackOracle.address,
+        await getWethAddress(poolConfig),
+        ethers.constants.WeiPerEther.toString(),
+      ],
       verify
     );
     await waitForTx(await addressesProvider.setPriceOracle(fallbackOracle.address));

tasks/full/3_oracles.ts

@@ -18,6 +18,7 @@ import {
   getPairsTokenAggregator,
 } from '../../helpers/contracts-getters';
 import { AaveOracle, LendingRateOracle } from '../../types';
+import { ethers } from 'ethers';
 
 task('full:deploy-oracles', 'Deploy oracles for dev enviroment')
   .addFlag('verify', 'Verify contracts at Etherscan')
@@ -55,7 +56,13 @@ task('full:deploy-oracles', 'Deploy oracles for dev enviroment')
         aaveOracle = await await getAaveOracle(aaveOracleAddress);
       } else {
         aaveOracle = await deployAaveOracle(
-          [tokens, aggregators, fallbackOracleAddress, await getWethAddress(poolConfig)],
+          [
+            tokens,
+            aggregators,
+            fallbackOracleAddress,
+            await getWethAddress(poolConfig),
+            ethers.constants.WeiPerEther.toString(),
+          ],
           verify
         );
         await waitForTx(await aaveOracle.setAssetSources(tokens, aggregators));

test-suites/test-aave/__setup.spec.ts

@@ -30,7 +30,7 @@ import {
   authorizeWETHGateway,
 } from '../../helpers/contracts-deployments';
 import { eEthereumNetwork } from '../../helpers/types';
-import { Signer } from 'ethers';
+import { ethers, Signer } from 'ethers';
 import { TokenContractId, eContractid, tEthereumAddress, AavePools } from '../../helpers/types';
 import { MintableERC20 } from '../../types/MintableERC20';
 import {
@@ -215,7 +215,13 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   const [tokens, aggregators] = getPairsTokenAggregator(allTokenAddresses, allAggregatorsAddresses);
 
-  await deployAaveOracle([tokens, aggregators, fallbackOracle.address, mockTokens.WETH.address]);
+  await deployAaveOracle([
+    tokens,
+    aggregators,
+    fallbackOracle.address,
+    mockTokens.WETH.address,
+    ethers.constants.WeiPerEther.toString(),
+  ]);
   await waitForTx(await addressesProvider.setPriceOracle(fallbackOracle.address));
 
   const lendingRateOracle = await deployLendingRateOracle();
@@ -243,12 +249,8 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   const config = loadPoolConfig(ConfigNames.Aave);
 
-  const {
+  const { ATokenNamePrefix, StableDebtTokenNamePrefix, VariableDebtTokenNamePrefix, SymbolPrefix } =
-    ATokenNamePrefix,
+    config;
-    StableDebtTokenNamePrefix,
-    VariableDebtTokenNamePrefix,
-    SymbolPrefix,
-  } = config;
   const treasuryAddress = await getTreasuryAddress(config);
 
   await initReservesByHelper(

test-suites/test-aave/liquidation-atoken.spec.ts

@@ -55,7 +55,7 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
 
     const amountDAIToBorrow = await convertToCurrencyDecimals(
       dai.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(daiPrice.toString())
         .multipliedBy(0.95)
         .toFixed(0)
@@ -269,7 +269,7 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
 
     const amountUSDCToBorrow = await convertToCurrencyDecimals(
       usdc.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(usdcPrice.toString())
         .multipliedBy(0.9502)
         .toFixed(0)

test-suites/test-aave/liquidation-underlying.spec.ts

@@ -83,7 +83,7 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
 
     const amountDAIToBorrow = await convertToCurrencyDecimals(
       dai.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(daiPrice.toString())
         .multipliedBy(0.95)
         .toFixed(0)
@@ -267,7 +267,7 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
 
     const amountUSDCToBorrow = await convertToCurrencyDecimals(
       usdc.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(usdcPrice.toString())
         .multipliedBy(0.9502)
         .toFixed(0)

test-suites/test-aave/pausable-functions.spec.ts

@@ -224,7 +224,7 @@ makeSuite('Pausable Pool', (testEnv: TestEnv) => {
 
     const amountUSDCToBorrow = await convertToCurrencyDecimals(
       usdc.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(usdcPrice.toString())
         .multipliedBy(0.9502)
         .toFixed(0)

test-suites/test-aave/reserve-pause.spec.ts

@@ -224,7 +224,7 @@ makeSuite('Pause One Reserve', (testEnv: TestEnv) => {
 
     const amountUSDCToBorrow = await convertToCurrencyDecimals(
       usdc.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(usdcPrice.toString())
         .multipliedBy(0.9502)
         .toFixed(0)

test-suites/test-aave/uniswapAdapters.flashLiquidation.spec.ts

@@ -61,7 +61,7 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
 
     const amountDAIToBorrow = await convertToCurrencyDecimals(
       dai.address,
-      new BigNumber(userGlobalDataBefore.availableBorrowsETH.toString())
+      new BigNumber(userGlobalDataBefore.availableBorrowsBase.toString())
         .div(daiPrice.toString())
         .multipliedBy(0.95)
         .toFixed(0)
@@ -128,7 +128,7 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
 
     const amountDAIToBorrow = await convertToCurrencyDecimals(
       dai.address,
-      new BigNumber(userGlobalDataBefore.availableBorrowsETH.toString())
+      new BigNumber(userGlobalDataBefore.availableBorrowsBase.toString())
         .div(daiPrice.toString())
         .multipliedBy(0.8)
         .toFixed(0)
@@ -141,7 +141,7 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
 
     const userGlobalDataBefore2 = await pool.getUserAccountData(borrower.address);
 
-    const amountWETHToBorrow = new BigNumber(userGlobalDataBefore2.availableBorrowsETH.toString())
+    const amountWETHToBorrow = new BigNumber(userGlobalDataBefore2.availableBorrowsBase.toString())
       .multipliedBy(0.8)
       .toFixed(0);
 

test-suites/test-amm/__setup.spec.ts

@@ -29,7 +29,7 @@ import {
   deployFlashLiquidationAdapter,
   authorizeWETHGateway,
 } from '../../helpers/contracts-deployments';
-import { Signer } from 'ethers';
+import { ethers, Signer } from 'ethers';
 import { TokenContractId, eContractid, tEthereumAddress, AavePools } from '../../helpers/types';
 import { MintableERC20 } from '../../types/MintableERC20';
 import {
@@ -212,7 +212,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   const [tokens, aggregators] = getPairsTokenAggregator(allTokenAddresses, allAggregatorsAddresses);
 
-  await deployAaveOracle([tokens, aggregators, fallbackOracle.address, mockTokens.WETH.address]);
+  await deployAaveOracle([tokens, aggregators, fallbackOracle.address, mockTokens.WETH.address, ethers.constants.WeiPerEther.toString()]);
   await waitForTx(await addressesProvider.setPriceOracle(fallbackOracle.address));
 
   const lendingRateOracle = await deployLendingRateOracle();

test-suites/test-amm/liquidation-atoken.spec.ts

@@ -55,7 +55,7 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
 
     const amountDAIToBorrow = await convertToCurrencyDecimals(
       dai.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(daiPrice.toString())
         .multipliedBy(0.95)
         .toFixed(0)
@@ -269,7 +269,7 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
 
     const amountUSDCToBorrow = await convertToCurrencyDecimals(
       usdc.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(usdcPrice.toString())
         .multipliedBy(0.9502)
         .toFixed(0)

test-suites/test-amm/liquidation-underlying.spec.ts

@@ -83,7 +83,7 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
 
     const amountDAIToBorrow = await convertToCurrencyDecimals(
       dai.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(daiPrice.toString())
         .multipliedBy(0.95)
         .toFixed(0)
@@ -267,7 +267,7 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
 
     const amountUSDCToBorrow = await convertToCurrencyDecimals(
       usdc.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(usdcPrice.toString())
         .multipliedBy(0.9502)
         .toFixed(0)

test-suites/test-amm/pausable-functions.spec.ts

@@ -224,7 +224,7 @@ makeSuite('Pausable Pool', (testEnv: TestEnv) => {
 
     const amountUSDCToBorrow = await convertToCurrencyDecimals(
       usdc.address,
-      new BigNumber(userGlobalData.availableBorrowsETH.toString())
+      new BigNumber(userGlobalData.availableBorrowsBase.toString())
         .div(usdcPrice.toString())
         .multipliedBy(0.9502)
         .toFixed(0)