Merge branch 'master' into feat/101-add-supply-function

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: release-please
 on:
   push:
     branches:
-      - main
+      - master
 jobs:
   release-please:
     runs-on: ubuntu-latest

.gitignore

@@ -16,4 +16,3 @@ coverage
 .coverage_cache
 .coverage_contracts
 coverage.json
-

contracts/deployments/RateOracleSetupHelper.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: agpl-3.0
+pragma solidity 0.8.7;
+
+import {RateOracle} from '../mocks/oracle/RateOracle.sol';
+import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
+
+/**
+ * @title RateOracleSetupHelper
+ * @author Aave
+ * @notice Deployment helper to setup initial borrow rates of multiple assets in one transaction.
+ * @dev The RateOracle owner must transfer the ownership to RateOracleSetupHelper before calling to setOracleBorrowRates.
+ * @dev The RateOracleSetupHelper is an Ownable contract, so only the deployer or future owners can call this contract.
+ */
+contract RateOracleSetupHelper is Ownable {
+
+  /**
+   * @notice External function called by the owner account to set the initial borrow rates of the assets
+   * @param assets The addresses of the assets
+   * @param rates The interest rates of each asset
+   * @param oracle The address of the RateOracle contract
+   */
+  function setOracleBorrowRates(
+    address[] calldata assets,
+    uint256[] calldata rates,
+    address oracle
+  ) external onlyOwner {
+    require(assets.length == rates.length, 'Arrays not same length');
+
+    for (uint256 i = 0; i < assets.length; i++) {
+      // RateOracle owner must be this contract
+      RateOracle(oracle).setMarketBorrowRate(assets[i], rates[i]);
+    }
+  }
+
+   /**
+   * @notice External function called by the deployer account to give ownership of the RateOracle back to the corresponding owner address.
+   * @param oracle The address of the RateOracle contract
+   * @param admin The corresponding owner address
+   */
+  function setOracleOwnership(address oracle, address admin) external onlyOwner {
+    require(admin != address(0), 'owner can not be zero');
+    require(RateOracle(oracle).owner() == address(this), 'helper is not owner');
+    RateOracle(oracle).transferOwnership(admin);
+  }
+}

contracts/deployments/ReservesSetupHelper.sol

@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: agpl-3.0
+pragma solidity 0.8.7;
+
+import {PoolConfigurator} from '../protocol/pool/PoolConfigurator.sol';
+import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
+
+/**
+ * @title ReservesSetupHelper
+ * @author Aave
+ * @notice Deployment helper to setup the assets risk parameters at PoolConfigurator in batch.
+ * @dev The Pool admin or risk admin must transfer the ownership to ReservesSetupHelper before calling to setOracleBorrowRates.
+ * @dev The ReservesSetupHelper is an Ownable contract, so only the deployer or future owners can call this contract.
+ */
+contract ReservesSetupHelper is Ownable {
+  struct ConfigureReserveInput {
+    address asset;
+    uint256 baseLTV;
+    uint256 liquidationThreshold;
+    uint256 liquidationBonus;
+    uint256 reserveFactor;
+    uint256 borrowCap;
+    uint256 supplyCap;
+    bool stableBorrowingEnabled;
+    bool borrowingEnabled;
+  }
+
+  /**
+   * @notice External function called by the owner account to setup the assets risk parameters in batch.
+   * @param configurator The address of PoolConfigurator contract
+   * @param inputParams An array of ConfigureReserveInput struct that contains the assets and their risk parameters
+   */
+  function configureReserves(
+    PoolConfigurator configurator,
+    ConfigureReserveInput[] calldata inputParams
+  ) external onlyOwner {
+    for (uint256 i = 0; i < inputParams.length; i++) {
+      configurator.configureReserveAsCollateral(
+        inputParams[i].asset,
+        inputParams[i].baseLTV,
+        inputParams[i].liquidationThreshold,
+        inputParams[i].liquidationBonus
+      );
+
+      if (inputParams[i].borrowingEnabled) {
+        configurator.enableBorrowingOnReserve(
+          inputParams[i].asset,
+          inputParams[i].borrowCap,
+          inputParams[i].stableBorrowingEnabled
+        );
+      }
+      configurator.setSupplyCap(inputParams[i].asset, inputParams[i].supplyCap);
+      configurator.setReserveFactor(inputParams[i].asset, inputParams[i].reserveFactor);
+    }
+  }
+}

contracts/interfaces/IScaledBalanceToken.sol

@@ -28,4 +28,11 @@ interface IScaledBalanceToken {
    * @return The scaled total supply
    **/
   function scaledTotalSupply() external view returns (uint256);
+
+  /**
+   * @notice Returns last index interest was accrued to the user's balance
+   * @param user The address of the user
+   * @return The last index interest was accrued to the user's balance
+   **/
+  function getPreviousIndex(address user) external view returns (uint256);
 }

contracts/misc/AaveProtocolDataProvider.sol

@@ -112,10 +112,9 @@ contract AaveProtocolDataProvider {
       .getConfiguration(asset);
 
     (ltv, liquidationThreshold, liquidationBonus, decimals, reserveFactor) = configuration
-      .getParamsMemory();
+      .getParams();
 
-    (isActive, isFrozen, borrowingEnabled, stableBorrowRateEnabled, ) = configuration
-      .getFlagsMemory();
+    (isActive, isFrozen, borrowingEnabled, stableBorrowRateEnabled, ) = configuration.getFlags();
 
     usageAsCollateralEnabled = liquidationThreshold > 0;
   }
@@ -131,9 +130,7 @@ contract AaveProtocolDataProvider {
     view
     returns (uint256 borrowCap, uint256 supplyCap)
   {
-    (borrowCap, supplyCap) = IPool(ADDRESSES_PROVIDER.getPool())
-      .getConfiguration(asset)
-      .getCapsMemory();
+    (borrowCap, supplyCap) = IPool(ADDRESSES_PROVIDER.getPool()).getConfiguration(asset).getCaps();
   }
 
   /**
@@ -142,9 +139,7 @@ contract AaveProtocolDataProvider {
    * @return isPaused True if the pool is paused, false otherwise
    **/
   function getPaused(address asset) external view returns (bool isPaused) {
-    (, , , , isPaused) = IPool(ADDRESSES_PROVIDER.getPool())
-      .getConfiguration(asset)
-      .getFlagsMemory();
+    (, , , , isPaused) = IPool(ADDRESSES_PROVIDER.getPool()).getConfiguration(asset).getFlags();
   }
 
   /**
@@ -153,8 +148,7 @@ contract AaveProtocolDataProvider {
    * @return The protocol fee on liquidation
    **/
   function getLiquidationProtocolFee(address asset) external view returns (uint256) {
-    return
-      IPool(ADDRESSES_PROVIDER.getPool()).getConfiguration(asset).getLiquidationProtocolFeeMemory();
+    return IPool(ADDRESSES_PROVIDER.getPool()).getConfiguration(asset).getLiquidationProtocolFee();
   }
 
   /**