pulled from master, and solved conflicts

Author: sendra

.github/workflows/node.js.yml

@@ -0,0 +1,51 @@
+name: Build
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+      - name: Install dependencies
+        run: npm ci
+      - name: Test
+        run: npm run ci:test
+      - name: Dev deployment
+        run: npm run aave:evm:dev:migration
+      - name: Mainnet deployment at Mainnet fork
+        run: npm run aave:fork:main
+        env:
+          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
+      - name: Amm deployment at Mainnet fork
+        run: npm run amm:fork:main
+        env:
+          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
+      - name: Aave deployment at Kovan fork
+        run: npm run aave:fork:kovan
+        env:
+          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
+      # - name: Coverage
+      #   run: npm run coverage
+      # - uses: codecov/codecov-action@v1
+      #   with:
+      #     fail_ci_if_error: true

README.md

@@ -1,3 +1,5 @@
+[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
+[![Build pass](https://github.com/AAVE/protocol-v2/actions/workflows/node.js.yml/badge.svg)](https://github.com/aave/protocol-v2/actions/workflows/node.js.yml)
 ```
         .///.                .///.     //.            .//  `/////////////-
        `++:++`              .++:++`    :++`          `++:  `++:......---.`
@@ -53,8 +55,8 @@ import {ILendingPool} from "@aave/protocol-v2/contracts/interfaces/ILendingPool.
 
 contract Misc {
 
-  function deposit(address pool, address token, address user, uint256 amount) {
-    ILendingPool(pool).deposit(token, amount, user, '0');
+  function deposit(address pool, address token, address user, uint256 amount) public {
+    ILendingPool(pool).deposit(token, amount, user, 0);
     {...}
   }
 }

aave-v2-whitepaper.pdf

@@ -32,6 +32,7 @@ contract ATokensAndRatesHelper is Ownable {
     uint256 liquidationBonus;
     uint256 reserveFactor;
     bool stableBorrowingEnabled;
+    bool borrowingEnabled;
   }
 
   constructor(
@@ -73,10 +74,12 @@ contract ATokensAndRatesHelper is Ownable {
         inputParams[i].liquidationBonus
       );
 
-      configurator.enableBorrowingOnReserve(
-        inputParams[i].asset,
-        inputParams[i].stableBorrowingEnabled
-      );
+      if (inputParams[i].borrowingEnabled) {
+        configurator.enableBorrowingOnReserve(
+          inputParams[i].asset,
+          inputParams[i].stableBorrowingEnabled
+        );
+      }
       configurator.setReserveFactor(inputParams[i].asset, inputParams[i].reserveFactor);
     }
   }

contracts/deployments/ATokensAndRatesHelper.sol

@@ -99,4 +99,9 @@ interface IAToken is IERC20, IScaledBalanceToken, IInitializableAToken {
    * @dev Returns the address of the incentives controller contract
    **/
   function getIncentivesController() external view returns (IAaveIncentivesController);
+
+  /**
+   * @dev Returns the address of the underlying asset of this aToken (E.g. WETH for aWETH)
+   **/
+  function UNDERLYING_ASSET_ADDRESS() external view returns (address);
 }

contracts/interfaces/IAToken.sol

@@ -3,32 +3,131 @@ pragma solidity 0.6.12;
 pragma experimental ABIEncoderV2;
 
 interface IAaveIncentivesController {
-  struct AssetData {
-    uint128 emissionPerSecond;
-    uint128 lastUpdateTimestamp;
-    uint256 index;
-  }
+  event RewardsAccrued(address indexed user, uint256 amount);
 
-  function REWARD_TOKEN() external view returns (address rewardToken);
+  event RewardsClaimed(address indexed user, address indexed to, uint256 amount);
 
-  function PRECISION() external view returns (uint8);
+  event RewardsClaimed(
+    address indexed user,
+    address indexed to,
+    address indexed claimer,
+    uint256 amount
+  );
 
-  function DISTRIBUTION_END() external view returns (uint256);
+  event ClaimerSet(address indexed user, address indexed claimer);
+
+  /*
+   * @dev Returns the configuration of the distribution for a certain asset
+   * @param asset The address of the reference asset of the distribution
+   * @return The asset index, the emission per second and the last updated timestamp
+   **/
+  function getAssetData(address asset)
+    external
+    view
+    returns (
+      uint256,
+      uint256,
+      uint256
+    );
+
+  /**
+   * @dev Whitelists an address to claim the rewards on behalf of another address
+   * @param user The address of the user
+   * @param claimer The address of the claimer
+   */
+  function setClaimer(address user, address claimer) external;
 
-  function assets(address underlying) external view returns (AssetData memory assets);
+  /**
+   * @dev Returns the whitelisted claimer for a certain address (0x0 if not set)
+   * @param user The address of the user
+   * @return The claimer address
+   */
+  function getClaimer(address user) external view returns (address);
 
+  /**
+   * @dev Configure assets for a certain rewards emission
+   * @param assets The assets to incentivize
+   * @param emissionsPerSecond The emission for each asset
+   */
+  function configureAssets(address[] calldata assets, uint256[] calldata emissionsPerSecond)
+    external;
+
+  /**
+   * @dev Called by the corresponding asset on any update that affects the rewards distribution
+   * @param asset The address of the user
+   * @param userBalance The balance of the user of the asset in the lending pool
+   * @param totalSupply The total supply of the asset in the lending pool
+   **/
   function handleAction(
-    address user,
+    address asset,
     uint256 userBalance,
     uint256 totalSupply
   ) external;
 
+  /**
+   * @dev Returns the total of rewards of an user, already accrued + not yet accrued
+   * @param user The address of the user
+   * @return The rewards
+   **/
   function getRewardsBalance(address[] calldata assets, address user)
     external
     view
     returns (uint256);
 
-  function getUserUnclaimedRewards(address _user) external view returns (uint256);
+  /**
+   * @dev Claims reward for an user, on all the assets of the lending pool, accumulating the pending rewards
+   * @param amount Amount of rewards to claim
+   * @param to Address that will be receiving the rewards
+   * @return Rewards claimed
+   **/
+  function claimRewards(
+    address[] calldata assets,
+    uint256 amount,
+    address to
+  ) external returns (uint256);
 
+  /**
+   * @dev Claims reward for an user on behalf, on all the assets of the lending pool, accumulating the pending rewards. The caller must
+   * be whitelisted via "allowClaimOnBehalf" function by the RewardsAdmin role manager
+   * @param amount Amount of rewards to claim
+   * @param user Address to check and claim rewards
+   * @param to Address that will be receiving the rewards
+   * @return Rewards claimed
+   **/
+  function claimRewardsOnBehalf(
+    address[] calldata assets,
+    uint256 amount,
+    address user,
+    address to
+  ) external returns (uint256);
+
+  /**
+   * @dev returns the unclaimed rewards of the user
+   * @param user the address of the user
+   * @return the unclaimed user rewards
+   */
+  function getUserUnclaimedRewards(address user) external view returns (uint256);
+
+  /**
+   * @dev returns the unclaimed rewards of the user
+   * @param user the address of the user
+   * @param asset The asset to incentivize
+   * @return the user index for the asset
+   */
   function getUserAssetData(address user, address asset) external view returns (uint256);
+
+  /**
+   * @dev for backward compatibility with previous implementation of the Incentives controller
+   */
+  function REWARD_TOKEN() external view returns (address);
+
+  /**
+   * @dev for backward compatibility with previous implementation of the Incentives controller
+   */
+  function PRECISION() external view returns (uint8);
+
+  /**
+   * @dev for backward compatibility with previous implementation of the Incentives controller
+   */
+  function DISTRIBUTION_END() external view returns (uint256);
 }

contracts/interfaces/IAaveIncentivesController.sol

@@ -131,39 +131,41 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
       );
 
       // incentives
-      if (address(incentivesController) != address(0)) {
-        IAaveIncentivesController.AssetData memory tokenIncentivesInfo =
-          incentivesController.assets(reserveData.aTokenAddress);
-        reserveData.aEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond;
-        reserveData.aIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp;
-        reserveData.aTokenIncentivesIndex = tokenIncentivesInfo.index;
-
-        tokenIncentivesInfo = incentivesController.assets(reserveData.stableDebtTokenAddress);
-        reserveData.sEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond;
-        reserveData.sIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp;
-        reserveData.sTokenIncentivesIndex = tokenIncentivesInfo.index;
-
-        tokenIncentivesInfo = incentivesController.assets(reserveData.variableDebtTokenAddress);
-        reserveData.vEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond;
-        reserveData.vIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp;
-        reserveData.vTokenIncentivesIndex = tokenIncentivesInfo.index;
+      if (address(0) != address(incentivesController)) {
+        (
+          reserveData.aEmissionPerSecond,
+          reserveData.aIncentivesLastUpdateTimestamp,
+          reserveData.aTokenIncentivesIndex
+        ) = incentivesController.getAssetData(reserveData.aTokenAddress);
+
+        (
+          reserveData.sEmissionPerSecond,
+          reserveData.sIncentivesLastUpdateTimestamp,
+          reserveData.sTokenIncentivesIndex
+        ) = incentivesController.getAssetData(reserveData.stableDebtTokenAddress);
+
+        (
+          reserveData.vEmissionPerSecond,
+          reserveData.vIncentivesLastUpdateTimestamp,
+          reserveData.vTokenIncentivesIndex
+        ) = incentivesController.getAssetData(reserveData.variableDebtTokenAddress);
       }
+
       if (user != address(0)) {
         // incentives
-
-        if (address(incentivesController) != address(0)) {
+        if (address(0) != address(incentivesController)) {
           userReservesData[i].aTokenincentivesUserIndex = incentivesController.getUserAssetData(
             user,
             reserveData.aTokenAddress
           );
-          userReservesData[i].sTokenincentivesUserIndex = incentivesController.getUserAssetData(
-            user,
-            reserveData.stableDebtTokenAddress
-          );
           userReservesData[i].vTokenincentivesUserIndex = incentivesController.getUserAssetData(
             user,
             reserveData.variableDebtTokenAddress
           );
+          userReservesData[i].sTokenincentivesUserIndex = incentivesController.getUserAssetData(
+            user,
+            reserveData.stableDebtTokenAddress
+          );
         }
         // user reserve data
         userReservesData[i].underlyingAsset = reserveData.underlyingAsset;
@@ -201,15 +203,11 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
 
     IncentivesControllerData memory incentivesControllerData;
 
-    if (address(incentivesController) != address(0)) {
+    if (address(0) != address(incentivesController)) {
       incentivesControllerData.userUnclaimedRewards = incentivesController.getUserUnclaimedRewards(user);
-      // incentivesControllerData.rewardToken = incentivesController.REWARD_TOKEN();
-      // incentivesControllerData.rewardTokenDecimals = IERC20Detailed(incentivesControllerData.rewardToken).decimals();
-      // incentivesControllerData.rewardTokenSymbol = IERC20Detailed(incentivesControllerData.rewardToken).symbol();
-      // incentivesControllerData.precision = incentivesController.PRECISION();
       incentivesControllerData.emissionEndTimestamp = incentivesController.DISTRIBUTION_END();
     }
-    
+
     return (
       reservesData,
       userReservesData,

contracts/misc/UiPoolDataProvider.sol

@@ -43,9 +43,9 @@ interface IUiPoolDataProvider {
     uint256 stableRateSlope1;
     uint256 stableRateSlope2;
     // incentives
-    uint128 aEmissionPerSecond;
-    uint128 vEmissionPerSecond;
-    uint128 sEmissionPerSecond;
+    uint256 aEmissionPerSecond;
+    uint256 vEmissionPerSecond;
+    uint256 sEmissionPerSecond;
     uint256 aIncentivesLastUpdateTimestamp;
     uint256 vIncentivesLastUpdateTimestamp;
     uint256 sIncentivesLastUpdateTimestamp;
@@ -70,10 +70,6 @@ interface IUiPoolDataProvider {
 
   struct IncentivesControllerData {
     uint256 userUnclaimedRewards;
-    // address rewardToken;
-    // uint256 rewardTokenDecimals;
-    // string rewardTokenSymbol;
-    // uint8 precision;
     uint256 emissionEndTimestamp;
   }
 

contracts/misc/interfaces/IUiPoolDataProvider.sol

@@ -8,7 +8,6 @@ import {PercentageMath} from '../libraries/math/PercentageMath.sol';
 import {ILendingPoolAddressesProvider} from '../../interfaces/ILendingPoolAddressesProvider.sol';
 import {ILendingRateOracle} from '../../interfaces/ILendingRateOracle.sol';
 import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
-import 'hardhat/console.sol';
 
 /**
  * @title DefaultReserveInterestRateStrategy contract

contracts/protocol/lendingpool/DefaultReserveInterestRateStrategy.sol

@@ -273,7 +273,7 @@ contract AToken is
   /**
    * @dev Returns the address of the underlying asset of this aToken (E.g. WETH for aWETH)
    **/
-  function UNDERLYING_ASSET_ADDRESS() public view returns (address) {
+  function UNDERLYING_ASSET_ADDRESS() public override view returns (address) {
     return _underlyingAsset;
   }