Merge branch 'dev' of github.com:morpho-dao/morpho-v1 into fix/staked…

…-eth
morpho-org · Sep 20, 2022 · 27ecd34 · 27ecd34
2 parents c9ffd06 + 1a56fcb
commit 27ecd34
Show file tree

Hide file tree

Showing 56 changed files with 725 additions and 65 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Morpho Core Protocol V1
 
-[![Test](https://github.com/morpho-labs/morpho-contracts/actions/workflows/ci-foundry.yml/badge.svg)](https://github.com/morpho-labs/morpho-contracts/actions/workflows/ci-foundry.yml)
+[![Test](https://github.com/morpho-labs/morpho-contracts/actions/workflows/ci-foundry.yml/badge.svg)](https://github.com/morpho-dao/morpho-v1/actions/workflows/ci-foundry.yml)
 
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/uLq5V14.png">
@@ -22,8 +22,6 @@ TL;DR: Instead of borrowing or lending on your favorite pool like Compound or Aa
 
 ## Contracts overview
 
-In this repository.
-
 The Morpho protocol is designed at its core with a set of contracts delegating calls to implementation contracts (to overcome the contract size limit).
 
 Here is a brief overview of the Morpho protocol's contracts interactions:
@@ -173,4 +171,4 @@ For any question or feedback you can send an email to [[email protected]](mailto
 
 ## Licensing
 
-The code is under the GNU General Public License v3.0 license, see [`LICENSE`](https://github.com/morphodao/morpho-core-v1/blob/main/LICENSE).
+The code is under the GNU AFFERO GENERAL PUBLIC LICENSE v3.0, see [`LICENSE`](./LICENSE).
diff --git a/config/avalanche-mainnet/aave-v3/Config.sol b/config/avalanche-mainnet/aave-v3/Config.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity 0.8.10;
+pragma solidity >=0.8.0;
 
 contract Config {
     address constant aave = 0x63a72806098Bd3D9520cC43356dD78afe5D386D9;

diff --git a/config/eth-mainnet/BaseConfig.sol b/config/eth-mainnet/BaseConfig.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity 0.8.13;
+pragma solidity >=0.8.0;
 
 contract BaseConfig {
     address constant aave = 0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9;

diff --git a/config/eth-mainnet/aave-v2/Config.sol b/config/eth-mainnet/aave-v2/Config.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity 0.8.13;
+pragma solidity >=0.8.0;
 
 import {ILendingPool} from "@contracts/aave-v2/interfaces/aave/ILendingPool.sol";
 import {IPriceOracleGetter} from "@contracts/aave-v2/interfaces/aave/IPriceOracleGetter.sol";

diff --git a/config/eth-mainnet/compound/Config.sol b/config/eth-mainnet/compound/Config.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity 0.8.13;
+pragma solidity >=0.8.0;
 
 import "@contracts/compound/interfaces/compound/ICompound.sol";
 import {IIncentivesVault} from "@contracts/compound/interfaces/IIncentivesVault.sol";

diff --git a/config/goerli/compound/Config.sol b/config/goerli/compound/Config.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity 0.8.13;
+pragma solidity >=0.8.0;
 
 import "@contracts/compound/libraries/Types.sol";
 

diff --git a/config/polygon-mainnet/aave-v3/Config.sol b/config/polygon-mainnet/aave-v3/Config.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity 0.8.10;
+pragma solidity >=0.8.0;
 
 contract Config {
     address constant aave = 0xD6DF932A45C0f255f85145f286eA0b292B21C90B;

diff --git a/config/polygon-mumbai/aave-v2/Config.sol b/config/polygon-mumbai/aave-v2/Config.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 
 import "@contracts/aave-v2/libraries/Types.sol";
 

diff --git a/config/ropsten/compound/Config.sol b/config/ropsten/compound/Config.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity 0.8.13;
+pragma solidity >=0.8.0;
 
 import "@contracts/compound/libraries/Types.sol";
 

diff --git a/contracts/aave-v2/interfaces/IEntryPositionsManager.sol b/contracts/aave-v2/interfaces/IEntryPositionsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IEntryPositionsManager {
     function supplyLogic(

diff --git a/contracts/aave-v2/interfaces/IExitPositionsManager.sol b/contracts/aave-v2/interfaces/IExitPositionsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IExitPositionsManager {
     function withdrawLogic(

diff --git a/contracts/aave-v2/interfaces/IGetterUnderlyingAsset.sol b/contracts/aave-v2/interfaces/IGetterUnderlyingAsset.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IGetterUnderlyingAsset {
     function UNDERLYING_ASSET_ADDRESS() external view returns (address);

diff --git a/contracts/aave-v2/interfaces/IIncentivesVault.sol b/contracts/aave-v2/interfaces/IIncentivesVault.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./IOracle.sol";
 

diff --git a/contracts/aave-v2/interfaces/IInterestRatesManager.sol b/contracts/aave-v2/interfaces/IInterestRatesManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IInterestRatesManager {
     function ST_ETH() external view returns (address);

diff --git a/contracts/aave-v2/interfaces/ILens.sol b/contracts/aave-v2/interfaces/ILens.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./aave/IPriceOracleGetter.sol";
 import "./aave/ILendingPool.sol";

diff --git a/contracts/aave-v2/interfaces/IMorpho.sol b/contracts/aave-v2/interfaces/IMorpho.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./aave/ILendingPoolAddressesProvider.sol";
 import "./aave/ILendingPool.sol";

diff --git a/contracts/aave-v2/interfaces/IOracle.sol b/contracts/aave-v2/interfaces/IOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IOracle {
     function consult(uint256 _amountIn) external returns (uint256);

diff --git a/contracts/aave-v2/interfaces/IRewardsManager.sol b/contracts/aave-v2/interfaces/IRewardsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./aave/IAaveIncentivesController.sol";
 

diff --git a/contracts/aave-v2/interfaces/aave/IAToken.sol b/contracts/aave-v2/interfaces/aave/IAToken.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 
 import {IERC20} from "./IERC20.sol";
 import {IScaledBalanceToken} from "./IScaledBalanceToken.sol";

diff --git a/contracts/aave-v2/interfaces/aave/IAaveIncentivesController.sol b/contracts/aave-v2/interfaces/aave/IAaveIncentivesController.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 
 interface IAaveDistributionManager {
     event AssetConfigUpdated(address indexed asset, uint256 emission);

diff --git a/contracts/aave-v2/interfaces/aave/IERC20.sol b/contracts/aave-v2/interfaces/aave/IERC20.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.

diff --git a/contracts/aave-v2/interfaces/aave/ILendingPool.sol b/contracts/aave-v2/interfaces/aave/ILendingPool.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 pragma experimental ABIEncoderV2;
 
 import {ILendingPoolAddressesProvider} from "./ILendingPoolAddressesProvider.sol";

diff --git a/contracts/aave-v2/interfaces/aave/ILendingPoolAddressesProvider.sol b/contracts/aave-v2/interfaces/aave/ILendingPoolAddressesProvider.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 
 /**
  * @title LendingPoolAddressesProvider contract

diff --git a/contracts/aave-v2/interfaces/aave/IPriceOracleGetter.sol b/contracts/aave-v2/interfaces/aave/IPriceOracleGetter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 /************
 @title IPriceOracleGetter interface

diff --git a/contracts/aave-v2/interfaces/aave/IScaledBalanceToken.sol b/contracts/aave-v2/interfaces/aave/IScaledBalanceToken.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 
 interface IScaledBalanceToken {
     /**

diff --git a/contracts/aave-v2/interfaces/aave/IVariableDebtToken.sol b/contracts/aave-v2/interfaces/aave/IVariableDebtToken.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity >=0.8.0;
 
 import {IScaledBalanceToken} from "./IScaledBalanceToken.sol";
 

diff --git a/contracts/aave-v2/lens/IndexesLens.sol b/contracts/aave-v2/lens/IndexesLens.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity 0.8.13;
 
 import "../interfaces/IInterestRatesManager.sol";
 import "../interfaces/lido/ILido.sol";

diff --git a/contracts/aave-v2/lens/Lens.sol b/contracts/aave-v2/lens/Lens.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity 0.8.13;
 
 import "./MarketsLens.sol";
 

diff --git a/contracts/aave-v2/lens/LensStorage.sol b/contracts/aave-v2/lens/LensStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity 0.8.13;
 
 import "../interfaces/aave/IPriceOracleGetter.sol";
 import "../interfaces/aave/ILendingPool.sol";

diff --git a/contracts/aave-v2/lens/MarketsLens.sol b/contracts/aave-v2/lens/MarketsLens.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity 0.8.13;
 
 import "./RatesLens.sol";
 

diff --git a/contracts/aave-v2/lens/RatesLens.sol b/contracts/aave-v2/lens/RatesLens.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity 0.8.13;
 
 import "../interfaces/aave/IVariableDebtToken.sol";
 

diff --git a/contracts/aave-v2/lens/UsersLens.sol b/contracts/aave-v2/lens/UsersLens.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity 0.8.13;
 
 import {ERC20} from "@rari-capital/solmate/src/utils/SafeTransferLib.sol";
 

diff --git a/contracts/aave-v2/libraries/aave/DataTypes.sol b/contracts/aave-v2/libraries/aave/DataTypes.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
 library DataTypes {

diff --git a/contracts/aave-v2/libraries/aave/Errors.sol b/contracts/aave-v2/libraries/aave/Errors.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
 /**

diff --git a/contracts/aave-v2/libraries/aave/ReserveConfiguration.sol b/contracts/aave-v2/libraries/aave/ReserveConfiguration.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
 import {Errors} from "./Errors.sol";

diff --git a/contracts/aave-v3/interfaces/IEntryPositionsManager.sol b/contracts/aave-v3/interfaces/IEntryPositionsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IEntryPositionsManager {
     function supplyLogic(

diff --git a/contracts/aave-v3/interfaces/IExitPositionsManager.sol b/contracts/aave-v3/interfaces/IExitPositionsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IExitPositionsManager {
     function withdrawLogic(

diff --git a/contracts/aave-v3/interfaces/IIncentivesVault.sol b/contracts/aave-v3/interfaces/IIncentivesVault.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./IOracle.sol";
 

diff --git a/contracts/aave-v3/interfaces/IInterestRatesManager.sol b/contracts/aave-v3/interfaces/IInterestRatesManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IInterestRatesManager {
     function updateIndexes(address _marketAddress) external;

diff --git a/contracts/aave-v3/interfaces/IMorpho.sol b/contracts/aave-v3/interfaces/IMorpho.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "@aave/periphery-v3/contracts/rewards/interfaces/IRewardsController.sol";
 import "./aave/IPool.sol";

diff --git a/contracts/aave-v3/interfaces/IOracle.sol b/contracts/aave-v3/interfaces/IOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IOracle {
     function consult(uint256 _amountIn, address _tokenIn) external returns (uint256);

diff --git a/contracts/aave-v3/interfaces/IRewardsManager.sol b/contracts/aave-v3/interfaces/IRewardsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "@aave/periphery-v3/contracts/rewards/interfaces/IRewardsController.sol";
 

diff --git a/contracts/aave-v3/interfaces/aave/IPool.sol b/contracts/aave-v3/interfaces/aave/IPool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import {IPoolAddressesProvider} from "./IPoolAddressesProvider.sol";
 import {DataTypes} from "../../libraries/aave/DataTypes.sol";

diff --git a/contracts/aave-v3/interfaces/aave/IPoolAddressesProvider.sol b/contracts/aave-v3/interfaces/aave/IPoolAddressesProvider.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IPoolAddressesProvider {
     function getPool() external view returns (address);

diff --git a/contracts/aave-v3/interfaces/aave/IPoolToken.sol b/contracts/aave-v3/interfaces/aave/IPoolToken.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IPoolToken {
     function UNDERLYING_ASSET_ADDRESS() external view returns (address);

diff --git a/contracts/compound/interfaces/IIncentivesVault.sol b/contracts/compound/interfaces/IIncentivesVault.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./IOracle.sol";
 

diff --git a/contracts/compound/interfaces/IInterestRatesManager.sol b/contracts/compound/interfaces/IInterestRatesManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IInterestRatesManager {
     function updateP2PIndexes(address _marketAddress) external;

diff --git a/contracts/compound/interfaces/ILens.sol b/contracts/compound/interfaces/ILens.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./compound/ICompound.sol";
 import "./IRewardsManager.sol";

diff --git a/contracts/compound/interfaces/IMorpho.sol b/contracts/compound/interfaces/IMorpho.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./IInterestRatesManager.sol";
 import "./IPositionsManager.sol";

diff --git a/contracts/compound/interfaces/IOracle.sol b/contracts/compound/interfaces/IOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IOracle {
     function consult(uint256 _amountIn) external returns (uint256);

diff --git a/contracts/compound/interfaces/IPositionsManager.sol b/contracts/compound/interfaces/IPositionsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IPositionsManager {
     function supplyLogic(

diff --git a/contracts/compound/interfaces/IRewardsManager.sol b/contracts/compound/interfaces/IRewardsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 import "./compound/ICompound.sol";
 

diff --git a/contracts/compound/interfaces/IWETH.sol b/contracts/compound/interfaces/IWETH.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface IWETH {
     function deposit() external payable;

diff --git a/contracts/compound/interfaces/compound/ICompound.sol b/contracts/compound/interfaces/compound/ICompound.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.0;
+pragma solidity >=0.8.0;
 
 interface ICEth {
     function accrueInterest() external returns (uint256);