Merge pull request #701 from aave/feat/3.0.1

3.0.1 Upgrade
aave · Dec 28, 2022 · e0bfed1 · e0bfed1
2 parents f3e037b + ee7d556
commit e0bfed1
Show file tree

Hide file tree

Showing 130 changed files with 18,544 additions and 35,378 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1,2 +1,2 @@
-@aave:registry=https://npm.pkg.github.com
-engine-strict=true
+engine-strict=true
+save-exact=true
diff --git a/.prettierrc b/.prettierrc
@@ -5,6 +5,12 @@
   "singleQuote": true,
   "tabWidth": 2,
   "overrides": [
+    {
+      "files": "*.ts",
+      "options": {
+        "bracketSpacing": true
+      }
+    },
     {
       "files": "*.sol",
       "options": {

diff --git a/.solcover.js b/.solcover.js
@@ -2,7 +2,7 @@ const accounts = require(`./test-wallets.js`).accounts;
 const cp = require('child_process');
 
 module.exports = {
-  client: require('ganache-cli'),
+  configureYulOptimizer: true,
   skipFiles: ['./mocks', './interfaces', './dependencies'],
   mocha: {
     enableTimeouts: false,
@@ -12,6 +12,6 @@ module.exports = {
   },
   onCompileComplete: function () {
     console.log('onCompileComplete hook');
-    cp.execSync('. ./setup-test-env.sh', { stdio: 'inherit' });
+    cp.execSync('. ./setup-test-env.sh', {stdio: 'inherit'});
   },
 };
diff --git a/Certora/certora/harness/ATokenHarness.sol b/Certora/certora/harness/ATokenHarness.sol
@@ -18,7 +18,7 @@ contract ATokenHarness is AToken {
   /**
    * @dev Calls burn with index == 1 RAY
    * @param amount the amount being burned
-   **/
+   */
   function burn(
     address user,
     address receiverOfUnderlying,
@@ -37,7 +37,7 @@ contract ATokenHarness is AToken {
   /**
    * @dev Calls mint with index == 1 RAY
    * @param amount the amount of tokens to mint
-   **/
+   */
   function mint(
     address user,
     address onBehalfOf,

diff --git a/Certora/certora/harness/GenericLogicHarness.sol b/Certora/certora/harness/GenericLogicHarness.sol
@@ -71,7 +71,7 @@ contract GenericLogic {
    * @return The average liquidation threshold of the user
    * @return The health factor of the user
    * @return True if the ltv is zero, false otherwise
-   **/
+   */
   function calculateUserAccountData()
     public
     returns (
@@ -226,7 +226,7 @@ contract GenericLogic {
    * @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 the base currency of the used by the price feed
-   **/
+   */
   function calculateAvailableBorrows(
     uint256 totalCollateralInBaseCurrency,
     uint256 totalDebtInBaseCurrency,

diff --git a/Certora/certora/harness/PoolConfiguratorHarness.sol b/Certora/certora/harness/PoolConfiguratorHarness.sol
@@ -24,7 +24,7 @@ import {IPoolDataProvider} from '../../contracts/interfaces/IPoolDataProvider.so
  * @title PoolConfigurator
  * @author Aave
  * @dev Implements the configuration methods for the Aave protocol
- **/
+ */
 contract PoolConfiguratorHarness is VersionedInitializable, IPoolConfigurator {
   using PercentageMath for uint256;
   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;

diff --git a/Certora/certora/harness/PoolHarnessForConfigurator.sol b/Certora/certora/harness/PoolHarnessForConfigurator.sol
@@ -41,7 +41,7 @@ import {Helpers} from '../../contracts/protocol/libraries/helpers/Helpers.sol';
  * @dev To be covered by a proxy contract, owned by the PoolAddressesProvider of the specific market
  * @dev All admin functions are callable by the PoolConfigurator contract defined also in the
  *   PoolAddressesProvider
- **/
+ */
 contract PoolHarnessForConfigurator is VersionedInitializable, IPool, PoolStorage {
   using WadRayMath for uint256;
   using ReserveLogic for DataTypes.ReserveData;
@@ -88,7 +88,7 @@ contract PoolHarnessForConfigurator is VersionedInitializable, IPool, PoolStorag
    * PoolAddressesProvider of the market.
    * @dev Caching the address of the PoolAddressesProvider in order to reduce gas consumption on subsequent operations
    * @param provider The address of the PoolAddressesProvider
-   **/
+   */
   function initialize(IPoolAddressesProvider provider) external initializer {
     require(provider == _addressesProvider, Errors.PC_INVALID_CONFIGURATION);
     _maxStableRateBorrowSizePercent = 2500;

diff --git a/Certora/certora/harness/StableDebtTokenHarness.sol b/Certora/certora/harness/StableDebtTokenHarness.sol
@@ -16,7 +16,7 @@ contract StableDebtTokenHarness is StableDebtToken {
 
   /**
    Simplification: The user accumulates no interest (the balance increase is always 0).
-   **/
+   */
   function balanceOf(address account) public view override returns (uint256) {
     return IncentivizedERC20.balanceOf(account);
   }

diff --git a/Certora/certora/specs/pool.spec b/Certora/certora/specs/pool.spec
@@ -72,7 +72,7 @@ methods {
 	mintToTreasury(uint256 amount, uint256 index) => DISPATCHER(true)
 	transferOnLiquidation(address from, address to, uint256 value) => DISPATCHER(true)
 	transferUnderlyingTo(address user, uint256 amount) => DISPATCHER(true)
-	handleRepayment(address user, uint256 amount) => DISPATCHER(true)
+	handleRepayment(address user,  address onBehalfOf, uint256 amount) => DISPATCHER(true)
 	permit(address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s) => DISPATCHER(true)
 
 	//Debt Tokens

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Formal Verification
 
 ## Connect with the community
 
-You can join at the [Discord](http://aave.com/discord) channel or at the [Governance Forum](https://governance.aave.com/) for asking questions about the protocol or talk about Aave with other peers.
+You can join the [Discord](http://aave.com/discord) channel or the [Governance Forum](https://governance.aave.com/) to ask questions about the protocol or talk about Aave with other peers.
 
 ## Getting Started
 
@@ -67,7 +67,7 @@ contract Misc {
 }
 ```
 
-The JSON artifacts with the ABI and Bytecode are also included into the bundled NPM package at `artifacts/` directory.
+The JSON artifacts with the ABI and Bytecode are also included in the bundled NPM package at `artifacts/` directory.
 
 Import JSON file via Node JS `require`:
 
@@ -80,12 +80,12 @@ console.log(PoolV3Artifact.abi)
 
 ## Setup
 
-The repository uses Docker Compose to manage sensitive keys and load the configuration. Prior any action like test or deploy, you must run `docker-compose up` to start the `contracts-env` container, and then connect to the container console via `docker-compose exec contracts-env bash`.
+The repository uses Docker Compose to manage sensitive keys and load the configuration. Prior to any action like test or deploy, you must run `docker-compose up` to start the `contracts-env` container, and then connect to the container console via `docker-compose exec contracts-env bash`.
 
 Follow the next steps to setup the repository:
 
 - Install `docker` and `docker-compose`
-- Create an enviroment file named `.env` and fill the next enviroment variables
+- Create an environment file named `.env` and fill the next environment variables
 
 ```
 # Add Alchemy or Infura provider keys, alchemy takes preference at the config level

diff --git a/audits/09-12-2022_PeckShield_AaveV3-0-1.pdf b/audits/09-12-2022_PeckShield_AaveV3-0-1.pdf
diff --git a/audits/23-12-2022_SigmaPrime_AaveV3-0-1.pdf b/audits/23-12-2022_SigmaPrime_AaveV3-0-1.pdf
diff --git a/contracts/dependencies/openzeppelin/contracts/Address.sol b/contracts/dependencies/openzeppelin/contracts/Address.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 /**

diff --git a/contracts/dependencies/openzeppelin/contracts/IERC20.sol b/contracts/dependencies/openzeppelin/contracts/IERC20.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 /**

diff --git a/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol b/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 import {IERC20} from './IERC20.sol';

diff --git a/contracts/dependencies/openzeppelin/contracts/SafeMath.sol b/contracts/dependencies/openzeppelin/contracts/SafeMath.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 /// @title Optimized overflow and underflow safe math operations

diff --git a/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 import './BaseAdminUpgradeabilityProxy.sol';

diff --git a/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 import './UpgradeabilityProxy.sol';

diff --git a/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 import './Proxy.sol';

diff --git a/contracts/dependencies/openzeppelin/upgradeability/Initializable.sol b/contracts/dependencies/openzeppelin/upgradeability/Initializable.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 /**

diff --git a/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 import './BaseAdminUpgradeabilityProxy.sol';

diff --git a/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 import './BaseUpgradeabilityProxy.sol';

diff --git a/contracts/dependencies/openzeppelin/upgradeability/Proxy.sol b/contracts/dependencies/openzeppelin/upgradeability/Proxy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 /**

diff --git a/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.10;
 
 import './BaseUpgradeabilityProxy.sol';

diff --git a/contracts/deployments/ReservesSetupHelper.sol b/contracts/deployments/ReservesSetupHelper.sol
@@ -21,6 +21,7 @@ contract ReservesSetupHelper is Ownable {
     uint256 supplyCap;
     bool stableBorrowingEnabled;
     bool borrowingEnabled;
+    bool flashLoanEnabled;
   }
 
   /**
@@ -50,6 +51,7 @@ contract ReservesSetupHelper is Ownable {
           inputParams[i].stableBorrowingEnabled
         );
       }
+      configurator.setReserveFlashLoaning(inputParams[i].asset, inputParams[i].flashLoanEnabled);
       configurator.setSupplyCap(inputParams[i].asset, inputParams[i].supplyCap);
       configurator.setReserveFactor(inputParams[i].asset, inputParams[i].reserveFactor);
     }

diff --git a/contracts/flashloan/interfaces/IFlashLoanReceiver.sol b/contracts/flashloan/interfaces/IFlashLoanReceiver.sol
@@ -9,7 +9,7 @@ import {IPool} from '../../interfaces/IPool.sol';
  * @author Aave
  * @notice Defines the basic interface of a flashloan-receiver contract.
  * @dev Implement this interface to develop a flashloan-compatible flashLoanReceiver contract
- **/
+ */
 interface IFlashLoanReceiver {
   /**
    * @notice Executes an operation after receiving the flash-borrowed assets

diff --git a/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol b/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol
@@ -9,7 +9,7 @@ import {IPool} from '../../interfaces/IPool.sol';
  * @author Aave
  * @notice Defines the basic interface of a flashloan-receiver contract.
  * @dev Implement this interface to develop a flashloan-compatible flashLoanReceiver contract
- **/
+ */
 interface IFlashLoanSimpleReceiver {
   /**
    * @notice Executes an operation after receiving the flash-borrowed asset

diff --git a/contracts/interfaces/IACLManager.sol b/contracts/interfaces/IACLManager.sol
@@ -7,7 +7,7 @@ import {IPoolAddressesProvider} from './IPoolAddressesProvider.sol';
  * @title IACLManager
  * @author Aave
  * @notice Defines the basic interface for the ACL Manager
- **/
+ */
 interface IACLManager {
   /**
    * @notice Returns the contract address of the PoolAddressesProvider
@@ -123,7 +123,7 @@ interface IACLManager {
   function addFlashBorrower(address borrower) external;
 
   /**
-   * @notice Removes an admin as FlashBorrower
+   * @notice Removes an address as FlashBorrower
    * @param borrower The address of the FlashBorrower to remove
    */
   function removeFlashBorrower(address borrower) external;

diff --git a/contracts/interfaces/IAToken.sol b/contracts/interfaces/IAToken.sol
@@ -9,15 +9,15 @@ import {IInitializableAToken} from './IInitializableAToken.sol';
  * @title IAToken
  * @author Aave
  * @notice Defines the basic interface for an AToken.
- **/
+ */
 interface IAToken is IERC20, IScaledBalanceToken, IInitializableAToken {
   /**
    * @dev Emitted during the transfer action
    * @param from The user whose tokens are being transferred
    * @param to The recipient
-   * @param value The amount being transferred
+   * @param value The scaled amount being transferred
    * @param index The next liquidity index of the reserve
-   **/
+   */
   event BalanceTransfer(address indexed from, address indexed to, uint256 value, uint256 index);
 
   /**
@@ -43,7 +43,7 @@ interface IAToken is IERC20, IScaledBalanceToken, IInitializableAToken {
    * @param receiverOfUnderlying The address that will receive the underlying
    * @param amount The amount being burned
    * @param index The next liquidity index of the reserve
-   **/
+   */
   function burn(
     address from,
     address receiverOfUnderlying,
@@ -63,7 +63,7 @@ interface IAToken is IERC20, IScaledBalanceToken, IInitializableAToken {
    * @param from The address getting liquidated, current owner of the aTokens
    * @param to The recipient
    * @param value The amount of tokens getting transferred
-   **/
+   */
   function transferOnLiquidation(
     address from,
     address to,
@@ -73,20 +73,25 @@ interface IAToken is IERC20, IScaledBalanceToken, IInitializableAToken {
   /**
    * @notice Transfers the underlying asset to `target`.
    * @dev Used by the Pool to transfer assets in borrow(), withdraw() and flashLoan()
-   * @param user The recipient of the underlying
+   * @param target The recipient of the underlying
    * @param amount The amount getting transferred
-   **/
-  function transferUnderlyingTo(address user, uint256 amount) external;
+   */
+  function transferUnderlyingTo(address target, uint256 amount) external;
 
   /**
    * @notice Handles the underlying received by the aToken after the transfer has been completed.
    * @dev The default implementation is empty as with standard ERC20 tokens, nothing needs to be done after the
    * transfer is concluded. However in the future there may be aTokens that allow for example to stake the underlying
    * to receive LM rewards. In that case, `handleRepayment()` would perform the staking of the underlying asset.
    * @param user The user executing the repayment
+   * @param onBehalfOf The address of the user who will get his debt reduced/removed
    * @param amount The amount getting repaid
-   **/
-  function handleRepayment(address user, uint256 amount) external;
+   */
+  function handleRepayment(
+    address user,
+    address onBehalfOf,
+    uint256 amount
+  ) external;
 
   /**
    * @notice Allow passing a signed message to approve spending
@@ -113,13 +118,13 @@ interface IAToken is IERC20, IScaledBalanceToken, IInitializableAToken {
   /**
    * @notice Returns the address of the underlying asset of this aToken (E.g. WETH for aWETH)
    * @return The address of the underlying asset
-   **/
+   */
   function UNDERLYING_ASSET_ADDRESS() external view returns (address);
 
   /**
    * @notice Returns the address of the Aave treasury, receiving the fees on this aToken.
    * @return Address of the Aave treasury
-   **/
+   */
   function RESERVE_TREASURY_ADDRESS() external view returns (address);
 
   /**
@@ -133,7 +138,7 @@ interface IAToken is IERC20, IScaledBalanceToken, IInitializableAToken {
    * @notice Returns the nonce for owner.
    * @param owner The address of the owner
    * @return The nonce of the owner
-   **/
+   */
   function nonces(address owner) external view returns (uint256);
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ contract StableDebtTokenHarness is StableDebtToken { @@
       /**
        Simplification: The user accumulates no interest (the balance increase is always 0).
-       **/
+       */
       function balanceOf(address account) public view override returns (uint256) {
         return IncentivizedERC20.balanceOf(account);
       }
@@ Expand Down @@