Merge branch 'master' into docs/319-improve-emodelogic-configuratiorlogic

Author: LHerskind

contracts/deployments/ReservesSetupHelper.sol

@@ -42,9 +42,11 @@ contract ReservesSetupHelper is Ownable {
       );
 
       if (inputParams[i].borrowingEnabled) {
-        configurator.enableBorrowingOnReserve(
+        configurator.setReserveBorrowing(inputParams[i].asset, true);
+
+        configurator.setBorrowCap(inputParams[i].asset, inputParams[i].borrowCap);
+        configurator.setReserveStableRateBorrowing(
           inputParams[i].asset,
-          inputParams[i].borrowCap,
           inputParams[i].stableBorrowingEnabled
         );
       }

contracts/interfaces/IPool.sol

@@ -100,7 +100,7 @@ interface IPool {
    * @notice Emitted on swapBorrowRateMode()
    * @param reserve The address of the underlying asset of the reserve
    * @param user The address of the user swapping his rate mode
-   * @param rateMode The rate mode that the user wants to swap to
+   * @param rateMode The current interest rate mode of the position being swapped.
    **/
   event Swap(address indexed reserve, address indexed user, uint256 rateMode);
 
@@ -591,10 +591,10 @@ interface IPool {
   function getReservesList() external view returns (address[] memory);
 
   /**
-   * @notice Returns the cached PoolAddressesProvider connected to this contract
+   * @notice Returns the PoolAddressesProvider connected to this contract
    * @return The address of the PoolAddressesProvider
    **/
-  function getAddressesProvider() external view returns (IPoolAddressesProvider);
+  function ADDRESSES_PROVIDER() external view returns (IPoolAddressesProvider);
 
   /**
    * @notice Updates the protocol fee on the bridging

contracts/interfaces/IPoolConfigurator.sol

@@ -26,17 +26,11 @@ interface IPoolConfigurator {
   );
 
   /**
-   * @notice Emitted when borrowing is enabled on a reserve
+   * @notice Emitted when borrowing is enabled or disabled on a reserve
    * @param asset The address of the underlying asset of the reserve
-   * @param stableRateEnabled True if stable rate borrowing is enabled, false otherwise
+   * @param enabled True if borrowing is enabled, false otherwise
    **/
-  event BorrowingEnabledOnReserve(address indexed asset, bool stableRateEnabled);
-
-  /**
-   * @notice Emitted when borrowing is disabled on a reserve
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  event BorrowingDisabledOnReserve(address indexed asset);
+  event ReserveBorrowing(address indexed asset, bool enabled);
 
   /**
    * @notice Emitted when the collateralization risk parameters for the specified asset are updated.
@@ -53,52 +47,32 @@ interface IPoolConfigurator {
   );
 
   /**
-   * @notice Emitted when stable rate borrowing is enabled on a reserve
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  event StableRateEnabledOnReserve(address indexed asset);
-
-  /**
-   * @notice Emitted when stable rate borrowing is disabled on a reserve
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  event StableRateDisabledOnReserve(address indexed asset);
-
-  /**
-   * @notice Emitted when a reserve is activated
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  event ReserveActivated(address indexed asset);
-
-  /**
-   * @notice Emitted when a reserve is deactivated
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  event ReserveDeactivated(address indexed asset);
-
-  /**
-   * @notice Emitted when a reserve is frozen
+   * @notice Emitted when stable rate borrowing state is changed on a reserve
    * @param asset The address of the underlying asset of the reserve
+   * @param enabled True if stable rate borrowing is enabled, false otherwise
    **/
-  event ReserveFrozen(address indexed asset);
+  event ReserveStableRateBorrowing(address indexed asset, bool enabled);
 
   /**
-   * @notice Emitted when a reserve is unfrozen
+   * @notice Emitted when a reserve is activated or deactivated
    * @param asset The address of the underlying asset of the reserve
+   * @param active True if reserve is active, false otherwise
    **/
-  event ReserveUnfrozen(address indexed asset);
+  event ReserveActive(address indexed asset, bool active);
 
   /**
-   * @notice Emitted when a reserve is paused
+   * @notice Emitted when a reserve is frozen or unfrozen
    * @param asset The address of the underlying asset of the reserve
+   * @param frozen True if reserve is frozen, false otherwise
    **/
-  event ReservePaused(address indexed asset);
+  event ReserveFrozen(address indexed asset, bool frozen);
 
   /**
-   * @notice Emitted when a reserve is unpaused
+   * @notice Emitted when a reserve is paused or unpaused
    * @param asset The address of the underlying asset of the reserve
+   * @param paused True if reserve is paused, false otherwise
    **/
-  event ReserveUnpaused(address indexed asset);
+  event ReservePaused(address indexed asset, bool paused);
 
   /**
    * @notice Emitted when a reserve is dropped
@@ -286,22 +260,11 @@ interface IPoolConfigurator {
     external;
 
   /**
-   * @notice Enables borrowing on a reserve
-   * @param asset The address of the underlying asset of the reserve
-   * @param borrowCap The borrow cap for this specific asset, in absolute units of tokens
-   * @param stableBorrowRateEnabled True if stable borrow rate needs to be enabled by default on this reserve
-   **/
-  function enableBorrowingOnReserve(
-    address asset,
-    uint256 borrowCap,
-    bool stableBorrowRateEnabled
-  ) external;
-
-  /**
-   * @notice Disables borrowing on a reserve
+   * @notice Configures borrowing on a reserve
    * @param asset The address of the underlying asset of the reserve
+   * @param enabled True if borrowing needs to be enabled, false otherwise
    **/
-  function disableBorrowingOnReserve(address asset) external;
+  function setReserveBorrowing(address asset, bool enabled) external;
 
   /**
    * @notice Configures the reserve collateralization parameters
@@ -320,41 +283,26 @@ interface IPoolConfigurator {
   ) external;
 
   /**
-   * @notice Enable stable rate borrowing on a reserve
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  function enableReserveStableRate(address asset) external;
-
-  /**
-   * @notice Disable stable rate borrowing on a reserve
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  function disableReserveStableRate(address asset) external;
-
-  /**
-   * @notice Activates a reserve
-   * @param asset The address of the underlying asset of the reserve
-   **/
-  function activateReserve(address asset) external;
-
-  /**
-   * @notice Deactivates a reserve
+   * @notice Enable or disable stable rate borrowing on a reserve
    * @param asset The address of the underlying asset of the reserve
+   * @param enabled True if stable rate borrowing needs to be enabled, false otherwise
    **/
-  function deactivateReserve(address asset) external;
+  function setReserveStableRateBorrowing(address asset, bool enabled) external;
 
   /**
-   * @notice Freezes a reserve. A frozen reserve doesn't allow any new supply, borrow or rate swap
-   *  but allows repayments, liquidations, rate rebalances and withdrawals
+   * @notice Activate or deactivate a reserve
    * @param asset The address of the underlying asset of the reserve
+   * @param active True if the reserve needs to be active, false otherwise
    **/
-  function freezeReserve(address asset) external;
+  function setReserveActive(address asset, bool active) external;
 
   /**
-   * @notice Unfreezes a reserve
+   * @notice Freeze or unfreeze a reserve. A frozen reserve doesn't allow any new supply, borrow
+   * or rate swap but allows repayments, liquidations, rate rebalances and withdrawals
    * @param asset The address of the underlying asset of the reserve
+   * @param freeze True if the reserve needs to be frozen, false otherwise
    **/
-  function unfreezeReserve(address asset) external;
+  function setReseveFreeze(address asset, bool freeze) external;
 
   /**
    * @notice Sets the borrowable in isolation flag for the reserve

contracts/interfaces/NewChainlink.sol

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+// 	0x6Df09E975c830ECae5bd4eD9d90f3A95a4f88012
+// AAVE / USD	8	0x547a514d5e3769680Ce22B2361c10Ea13619e8a9
+
+interface AggregatorInterface {
+  function latestAnswer() external view returns (int256);
+
+  function latestTimestamp() external view returns (uint256);
+
+  function latestRound() external view returns (uint256);
+
+  function getAnswer(uint256 roundId) external view returns (int256);
+
+  function getTimestamp(uint256 roundId) external view returns (uint256);
+
+  event AnswerUpdated(int256 indexed current, uint256 indexed roundId, uint256 updatedAt);
+
+  event NewRound(uint256 indexed roundId, address indexed startedBy, uint256 startedAt);
+}
+
+interface AggregatorV3Interface {
+  function decimals() external view returns (uint8);
+
+  function description() external view returns (string memory);
+
+  function version() external view returns (uint256);
+
+  // getRoundData and latestRoundData should both raise "No data present"
+  // if they do not have data to report, instead of returning unset values
+  // which could be misinterpreted as actual reported values.
+  function getRoundData(uint80 _roundId)
+    external
+    view
+    returns (
+      uint80 roundId,
+      int256 answer,
+      uint256 startedAt,
+      uint256 updatedAt,
+      uint80 answeredInRound
+    );
+
+  function latestRoundData()
+    external
+    view
+    returns (
+      uint80 roundId,
+      int256 answer,
+      uint256 startedAt,
+      uint256 updatedAt,
+      uint80 answeredInRound
+    );
+}
+
+interface AggregatorV2V3Interface is AggregatorInterface, AggregatorV3Interface {}

contracts/mocks/flashloan/MockFlashLoanReceiver.sol

@@ -10,8 +10,6 @@ import {MintableERC20} from '../tokens/MintableERC20.sol';
 contract MockFlashLoanReceiver is FlashLoanReceiverBase {
   using SafeERC20 for IERC20;
 
-  IPoolAddressesProvider internal _provider;
-
   event ExecutedWithFail(address[] _assets, uint256[] _amounts, uint256[] _premiums);
   event ExecutedWithSuccess(address[] _assets, uint256[] _amounts, uint256[] _premiums);
 
@@ -45,12 +43,9 @@ contract MockFlashLoanReceiver is FlashLoanReceiverBase {
     address[] memory assets,
     uint256[] memory amounts,
     uint256[] memory premiums,
-    address initiator,
-    bytes memory params
+    address, // initiator
+    bytes memory // params
   ) public override returns (bool) {
-    params;
-    initiator;
-
     if (_failExecution) {
       emit ExecutedWithFail(assets, amounts, premiums);
       return !_simulateEOA;

contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol

@@ -13,10 +13,8 @@ contract MockFlashLoanSimpleReceiver is FlashLoanSimpleReceiverBase {
   using SafeERC20 for IERC20;
   using SafeMath for uint256;
 
-  IPoolAddressesProvider internal _provider;
-
-  event ExecutedWithFail(address _asset, uint256 _amount, uint256 _premium);
-  event ExecutedWithSuccess(address _asset, uint256 _amount, uint256 _premium);
+  event ExecutedWithFail(address asset, uint256 amount, uint256 premium);
+  event ExecutedWithSuccess(address asset, uint256 amount, uint256 premium);
 
   bool _failExecution;
   uint256 _amountToApprove;
@@ -36,7 +34,7 @@ contract MockFlashLoanSimpleReceiver is FlashLoanSimpleReceiverBase {
     _simulateEOA = flag;
   }
 
-  function amountToApprove() public view returns (uint256) {
+  function getAmountToApprove() public view returns (uint256) {
     return _amountToApprove;
   }
 
@@ -48,12 +46,9 @@ contract MockFlashLoanSimpleReceiver is FlashLoanSimpleReceiverBase {
     address asset,
     uint256 amount,
     uint256 premium,
-    address initiator,
-    bytes memory params
+    address, // initiator
+    bytes memory // params
   ) public override returns (bool) {
-    params;
-    initiator;
-
     if (_failExecution) {
       emit ExecutedWithFail(asset, amount, premium);
       return !_simulateEOA;

contracts/mocks/helpers/MockPool.sol

@@ -15,8 +15,8 @@ contract MockPool {
     _addressesProvider = provider;
   }
 
-  function addReserveToReservesList(address _reserve) external {
-    _reserveList.push(_reserve);
+  function addReserveToReservesList(address reserve) external {
+    _reserveList.push(reserve);
   }
 
   function getReservesList() external view returns (address[] memory) {

contracts/mocks/oracle/CLAggregators/MockAggregator.sol

@@ -6,9 +6,9 @@ contract MockAggregator {
 
   event AnswerUpdated(int256 indexed current, uint256 indexed roundId, uint256 timestamp);
 
-  constructor(int256 _initialAnswer) {
-    _latestAnswer = _initialAnswer;
-    emit AnswerUpdated(_initialAnswer, 0, block.timestamp);
+  constructor(int256 initialAnswer) {
+    _latestAnswer = initialAnswer;
+    emit AnswerUpdated(initialAnswer, 0, block.timestamp);
   }
 
   function latestAnswer() external view returns (int256) {

contracts/mocks/oracle/PriceOracle.sol

@@ -7,24 +7,24 @@ contract PriceOracle is IPriceOracle {
   mapping(address => uint256) prices;
   uint256 ethPriceUsd;
 
-  event AssetPriceUpdated(address _asset, uint256 _price, uint256 timestamp);
-  event EthPriceUpdated(uint256 _price, uint256 timestamp);
+  event AssetPriceUpdated(address asset, uint256 price, uint256 timestamp);
+  event EthPriceUpdated(uint256 price, uint256 timestamp);
 
-  function getAssetPrice(address _asset) external view override returns (uint256) {
-    return prices[_asset];
+  function getAssetPrice(address asset) external view override returns (uint256) {
+    return prices[asset];
   }
 
-  function setAssetPrice(address _asset, uint256 _price) external override {
-    prices[_asset] = _price;
-    emit AssetPriceUpdated(_asset, _price, block.timestamp);
+  function setAssetPrice(address asset, uint256 price) external override {
+    prices[asset] = price;
+    emit AssetPriceUpdated(asset, price, block.timestamp);
   }
 
   function getEthUsdPrice() external view returns (uint256) {
     return ethPriceUsd;
   }
 
-  function setEthUsdPrice(uint256 _price) external {
-    ethPriceUsd = _price;
-    emit EthPriceUpdated(_price, block.timestamp);
+  function setEthUsdPrice(uint256 price) external {
+    ethPriceUsd = price;
+    emit EthPriceUpdated(price, block.timestamp);
   }
 }

contracts/mocks/tests/FlashloanAttacker.sol

@@ -40,12 +40,9 @@ contract FlashloanAttacker is FlashLoanSimpleReceiverBase {
     address asset,
     uint256 amount,
     uint256 premium,
-    address initiator,
-    bytes memory params
+    address, // initiator
+    bytes memory // params
   ) public override returns (bool) {
-    params;
-    initiator;
-
     MintableERC20 token = MintableERC20(asset);
     uint256 amountToReturn = amount.add(premium);