From 8c03180f89eea25e98356b80d8187cb0f12f29cd Mon Sep 17 00:00:00 2001 From: The3D Date: Fri, 20 Nov 2020 11:41:58 +0100 Subject: [PATCH] Updated solidity version --- Dockerfile | 2 +- buidler.config.ts | 2 +- .../LendingPoolAddressesProvider.sol | 2 +- .../LendingPoolAddressesProviderRegistry.sol | 2 +- .../openzeppelin/contracts/Address.sol | 2 +- .../openzeppelin/contracts/Context.sol | 2 +- .../openzeppelin/contracts/IERC20.sol | 2 +- .../openzeppelin/contracts/IERC20Detailed.sol | 2 +- .../openzeppelin/contracts/SafeERC20.sol | 2 +- .../openzeppelin/contracts/SafeMath.sol | 2 +- .../AdminUpgradeabilityProxy.sol | 2 +- .../BaseAdminUpgradeabilityProxy.sol | 2 +- .../BaseUpgradeabilityProxy.sol | 2 +- .../InitializableAdminUpgradeabilityProxy.sol | 2 +- .../InitializableUpgradeabilityProxy.sol | 2 +- .../upgradeability/UpgradeabilityProxy.sol | 2 +- .../deployments/ATokensAndRatesHelper.sol | 2 +- .../StableAndVariableTokensHelper.sol | 2 +- .../flashloan/base/FlashLoanReceiverBase.sol | 2 +- .../interfaces/IFlashLoanReceiver.sol | 2 +- .../interfaces/IAaveIncentivesController.sol | 2 +- contracts/interfaces/IChainlinkAggregator.sol | 2 +- contracts/interfaces/IExchangeAdapter.sol | 2 +- contracts/interfaces/ILendingPool.sol | 2 +- .../ILendingPoolAddressesProvider.sol | 2 +- .../ILendingPoolAddressesProviderRegistry.sol | 2 +- contracts/interfaces/ILendingRateOracle.sol | 2 +- contracts/interfaces/IPriceOracle.sol | 2 +- contracts/interfaces/IPriceOracleGetter.sol | 2 +- .../IReserveInterestRateStrategy.sol | 2 +- contracts/interfaces/IUniswapExchange.sol | 2 +- .../DefaultReserveInterestRateStrategy.sol | 2 +- contracts/lendingpool/LendingPool.sol | 2 +- .../LendingPoolCollateralManager.sol | 2 +- .../lendingpool/LendingPoolConfigurator.sol | 2 +- contracts/lendingpool/LendingPoolStorage.sol | 2 +- .../BaseImmutableAdminUpgradeabilityProxy.sol | 2 +- ...zableImmutableAdminUpgradeabilityProxy.sol | 2 +- .../VersionedInitializable.sol | 2 +- .../configuration/ReserveConfiguration.sol | 2 +- .../configuration/UserConfiguration.sol | 2 +- contracts/libraries/helpers/Errors.sol | 2 +- contracts/libraries/helpers/Helpers.sol | 2 +- contracts/libraries/helpers/StringLib.sol | 2 +- contracts/libraries/logic/GenericLogic.sol | 2 +- contracts/libraries/logic/ReserveLogic.sol | 2 +- contracts/libraries/logic/ValidationLogic.sol | 2 +- contracts/libraries/math/MathUtils.sol | 2 +- contracts/libraries/math/PercentageMath.sol | 2 +- contracts/libraries/math/WadRayMath.sol | 2 +- contracts/misc/AaveOracle.sol | 2 +- contracts/misc/AaveProtocolDataProvider.sol | 2 +- contracts/misc/UiPoolDataProvider.sol | 2 +- contracts/misc/WETHGateway.sol | 2 +- contracts/misc/WalletBalanceProvider.sol | 2 +- .../misc/interfaces/IERC20DetailedBytes.sol | 2 +- .../misc/interfaces/IUiPoolDataProvider.sol | 2 +- contracts/misc/interfaces/IWETH.sol | 2 +- contracts/misc/interfaces/IWETHGateway.sol | 2 +- .../mocks/attacks/SefldestructTransfer.sol | 2 +- contracts/mocks/dependencies/weth/WETH9.sol | 2 +- .../mocks/flashloan/MockFlashLoanReceiver.sol | 2 +- .../oracle/CLAggregators/MockAggregator.sol | 2 +- .../mocks/oracle/ChainlinkUSDETHOracleI.sol | 2 +- contracts/mocks/oracle/GenericOracleI.sol | 2 +- .../mocks/oracle/IExtendedPriceAggregator.sol | 2 +- contracts/mocks/oracle/LendingRateOracle.sol | 2 +- contracts/mocks/oracle/PriceOracle.sol | 2 +- .../mocks/tokens/MintableDelegationERC20.sol | 2 +- contracts/mocks/tokens/MintableERC20.sol | 2 +- contracts/mocks/tokens/WETH9Mocked.sol | 2 +- contracts/mocks/upgradeability/MockAToken.sol | 2 +- .../upgradeability/MockStableDebtToken.sol | 2 +- .../upgradeability/MockVariableDebtToken.sol | 2 +- contracts/tokenization/AToken.sol | 2 +- .../tokenization/DelegationAwareAToken.sol | 2 +- contracts/tokenization/IncentivizedERC20.sol | 2 +- contracts/tokenization/StableDebtToken.sol | 2 +- contracts/tokenization/VariableDebtToken.sol | 2 +- contracts/tokenization/base/DebtTokenBase.sol | 2 +- contracts/tokenization/interfaces/IAToken.sol | 2 +- .../interfaces/IScaledBalanceToken.sol | 2 +- .../interfaces/IStableDebtToken.sol | 2 +- .../interfaces/IVariableDebtToken.sol | 2 +- hardhat.config.ts | 2 +- package-lock.json | 46 ++++++++++++++++--- ...LendingPoolHarnessForVariableDebtToken.sol | 2 +- specs/harness/StableDebtTokenHarness.sol | 2 +- specs/harness/UserConfigurationHarness.sol | 2 +- 89 files changed, 128 insertions(+), 94 deletions(-) diff --git a/Dockerfile b/Dockerfile index c354ddf5..d16d99b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/solc:0.6.8 as build-deps +FROM ethereum/solc:0.6.12 as build-deps FROM node:14 COPY --from=build-deps /usr/bin/solc /usr/bin/solc diff --git a/buidler.config.ts b/buidler.config.ts index 6e15ca7f..3823dc00 100644 --- a/buidler.config.ts +++ b/buidler.config.ts @@ -49,7 +49,7 @@ const getCommonNetworkConfig = (networkName: eEthereumNetwork, networkId: number const buidlerConfig: any = { solc: { - version: '0.6.8', + version: '0.6.12', optimizer: {enabled: true, runs: 200}, evmVersion: 'istanbul', }, diff --git a/contracts/configuration/LendingPoolAddressesProvider.sol b/contracts/configuration/LendingPoolAddressesProvider.sol index 43796d36..3e78f357 100644 --- a/contracts/configuration/LendingPoolAddressesProvider.sol +++ b/contracts/configuration/LendingPoolAddressesProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol'; diff --git a/contracts/configuration/LendingPoolAddressesProviderRegistry.sol b/contracts/configuration/LendingPoolAddressesProviderRegistry.sol index 4be6e034..fd7741b6 100644 --- a/contracts/configuration/LendingPoolAddressesProviderRegistry.sol +++ b/contracts/configuration/LendingPoolAddressesProviderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol'; import { diff --git a/contracts/dependencies/openzeppelin/contracts/Address.sol b/contracts/dependencies/openzeppelin/contracts/Address.sol index be5026db..3e0c92ac 100644 --- a/contracts/dependencies/openzeppelin/contracts/Address.sol +++ b/contracts/dependencies/openzeppelin/contracts/Address.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity 0.6.8; +pragma solidity 0.6.12; /** * @dev Collection of functions related to the address type diff --git a/contracts/dependencies/openzeppelin/contracts/Context.sol b/contracts/dependencies/openzeppelin/contracts/Context.sol index fb4afa42..cfce1bfc 100644 --- a/contracts/dependencies/openzeppelin/contracts/Context.sol +++ b/contracts/dependencies/openzeppelin/contracts/Context.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.6.8; +pragma solidity 0.6.12; /* * @dev Provides information about the current execution context, including the diff --git a/contracts/dependencies/openzeppelin/contracts/IERC20.sol b/contracts/dependencies/openzeppelin/contracts/IERC20.sol index af94806b..3d69bffc 100644 --- a/contracts/dependencies/openzeppelin/contracts/IERC20.sol +++ b/contracts/dependencies/openzeppelin/contracts/IERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity 0.6.8; +pragma solidity 0.6.12; /** * @dev Interface of the ERC20 standard as defined in the EIP. diff --git a/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol b/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol index db0fbb98..ff29e97a 100644 --- a/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol +++ b/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {IERC20} from './IERC20.sol'; diff --git a/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol b/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol index b543f016..0a27559b 100644 --- a/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol +++ b/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.6.8; +pragma solidity 0.6.12; import {IERC20} from './IERC20.sol'; import {SafeMath} from './SafeMath.sol'; diff --git a/contracts/dependencies/openzeppelin/contracts/SafeMath.sol b/contracts/dependencies/openzeppelin/contracts/SafeMath.sol index 0b251214..80f7d679 100644 --- a/contracts/dependencies/openzeppelin/contracts/SafeMath.sol +++ b/contracts/dependencies/openzeppelin/contracts/SafeMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity 0.6.8; +pragma solidity 0.6.12; /** * @dev Wrappers over Solidity's arithmetic operations with added overflow diff --git a/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol index 6acd1bd2..11e8a150 100644 --- a/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol +++ b/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import './BaseAdminUpgradeabilityProxy.sol'; diff --git a/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol index fb446a3f..66f906a3 100644 --- a/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol +++ b/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import './UpgradeabilityProxy.sol'; diff --git a/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol index a60ad10c..ac3b2044 100644 --- a/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol +++ b/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import './Proxy.sol'; import '../contracts/Address.sol'; diff --git a/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol index 2643b4af..62763643 100644 --- a/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol +++ b/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import './BaseAdminUpgradeabilityProxy.sol'; import './InitializableUpgradeabilityProxy.sol'; diff --git a/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol index 1bc49d59..1fde4526 100644 --- a/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol +++ b/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import './BaseUpgradeabilityProxy.sol'; diff --git a/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol b/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol index 268861c2..5d5ef99e 100644 --- a/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol +++ b/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import './BaseUpgradeabilityProxy.sol'; diff --git a/contracts/deployments/ATokensAndRatesHelper.sol b/contracts/deployments/ATokensAndRatesHelper.sol index 2420310f..5a35e0dd 100644 --- a/contracts/deployments/ATokensAndRatesHelper.sol +++ b/contracts/deployments/ATokensAndRatesHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {LendingPool} from '../lendingpool/LendingPool.sol'; diff --git a/contracts/deployments/StableAndVariableTokensHelper.sol b/contracts/deployments/StableAndVariableTokensHelper.sol index 9722424e..08a93e1d 100644 --- a/contracts/deployments/StableAndVariableTokensHelper.sol +++ b/contracts/deployments/StableAndVariableTokensHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {StableDebtToken} from '../tokenization/StableDebtToken.sol'; diff --git a/contracts/flashloan/base/FlashLoanReceiverBase.sol b/contracts/flashloan/base/FlashLoanReceiverBase.sol index 01cfb3fc..9df49e5a 100644 --- a/contracts/flashloan/base/FlashLoanReceiverBase.sol +++ b/contracts/flashloan/base/FlashLoanReceiverBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol'; import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol'; diff --git a/contracts/flashloan/interfaces/IFlashLoanReceiver.sol b/contracts/flashloan/interfaces/IFlashLoanReceiver.sol index af9e384f..021c1dbe 100644 --- a/contracts/flashloan/interfaces/IFlashLoanReceiver.sol +++ b/contracts/flashloan/interfaces/IFlashLoanReceiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** * @title IFlashLoanReceiver interface diff --git a/contracts/interfaces/IAaveIncentivesController.sol b/contracts/interfaces/IAaveIncentivesController.sol index 83f1769c..c049bd77 100644 --- a/contracts/interfaces/IAaveIncentivesController.sol +++ b/contracts/interfaces/IAaveIncentivesController.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity 0.6.8; +pragma solidity 0.6.12; pragma experimental ABIEncoderV2; interface IAaveIncentivesController { diff --git a/contracts/interfaces/IChainlinkAggregator.sol b/contracts/interfaces/IChainlinkAggregator.sol index b25b688d..0dc7982e 100644 --- a/contracts/interfaces/IChainlinkAggregator.sol +++ b/contracts/interfaces/IChainlinkAggregator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface IChainlinkAggregator { function latestAnswer() external view returns (int256); diff --git a/contracts/interfaces/IExchangeAdapter.sol b/contracts/interfaces/IExchangeAdapter.sol index 1bc0dcdf..80bd66c1 100644 --- a/contracts/interfaces/IExchangeAdapter.sol +++ b/contracts/interfaces/IExchangeAdapter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol'; diff --git a/contracts/interfaces/ILendingPool.sol b/contracts/interfaces/ILendingPool.sol index 17be5799..cbe95389 100644 --- a/contracts/interfaces/ILendingPool.sol +++ b/contracts/interfaces/ILendingPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol'; import {UserConfiguration} from '../libraries/configuration/UserConfiguration.sol'; diff --git a/contracts/interfaces/ILendingPoolAddressesProvider.sol b/contracts/interfaces/ILendingPoolAddressesProvider.sol index c1a7ab78..3eb51e61 100644 --- a/contracts/interfaces/ILendingPoolAddressesProvider.sol +++ b/contracts/interfaces/ILendingPoolAddressesProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** @title ILendingPoolAddressesProvider interface diff --git a/contracts/interfaces/ILendingPoolAddressesProviderRegistry.sol b/contracts/interfaces/ILendingPoolAddressesProviderRegistry.sol index 87c0c651..623659d6 100644 --- a/contracts/interfaces/ILendingPoolAddressesProviderRegistry.sol +++ b/contracts/interfaces/ILendingPoolAddressesProviderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** * @title ILendingPoolAddressesProvider interface diff --git a/contracts/interfaces/ILendingRateOracle.sol b/contracts/interfaces/ILendingRateOracle.sol index a3fd1407..c6befeed 100644 --- a/contracts/interfaces/ILendingRateOracle.sol +++ b/contracts/interfaces/ILendingRateOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** * @title ILendingRateOracle interface diff --git a/contracts/interfaces/IPriceOracle.sol b/contracts/interfaces/IPriceOracle.sol index a6452d78..964eff5e 100644 --- a/contracts/interfaces/IPriceOracle.sol +++ b/contracts/interfaces/IPriceOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /************ @title IPriceOracle interface diff --git a/contracts/interfaces/IPriceOracleGetter.sol b/contracts/interfaces/IPriceOracleGetter.sol index fdb64279..5c6ad25c 100644 --- a/contracts/interfaces/IPriceOracleGetter.sol +++ b/contracts/interfaces/IPriceOracleGetter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** * @title IPriceOracleGetter interface diff --git a/contracts/interfaces/IReserveInterestRateStrategy.sol b/contracts/interfaces/IReserveInterestRateStrategy.sol index e04edbe5..43c451d9 100644 --- a/contracts/interfaces/IReserveInterestRateStrategy.sol +++ b/contracts/interfaces/IReserveInterestRateStrategy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** @title IReserveInterestRateStrategyInterface interface diff --git a/contracts/interfaces/IUniswapExchange.sol b/contracts/interfaces/IUniswapExchange.sol index 8a7927fd..f6130eaf 100644 --- a/contracts/interfaces/IUniswapExchange.sol +++ b/contracts/interfaces/IUniswapExchange.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface IUniswapExchange { event TokenPurchase( diff --git a/contracts/lendingpool/DefaultReserveInterestRateStrategy.sol b/contracts/lendingpool/DefaultReserveInterestRateStrategy.sol index 822200bd..75912daf 100644 --- a/contracts/lendingpool/DefaultReserveInterestRateStrategy.sol +++ b/contracts/lendingpool/DefaultReserveInterestRateStrategy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {SafeMath} from '../dependencies/openzeppelin/contracts/SafeMath.sol'; import {IReserveInterestRateStrategy} from '../interfaces/IReserveInterestRateStrategy.sol'; diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol index 54015687..b59ea493 100644 --- a/contracts/lendingpool/LendingPool.sol +++ b/contracts/lendingpool/LendingPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {SafeMath} from '../dependencies/openzeppelin/contracts/SafeMath.sol'; diff --git a/contracts/lendingpool/LendingPoolCollateralManager.sol b/contracts/lendingpool/LendingPoolCollateralManager.sol index bf207110..b6255e36 100644 --- a/contracts/lendingpool/LendingPoolCollateralManager.sol +++ b/contracts/lendingpool/LendingPoolCollateralManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {SafeMath} from '../dependencies/openzeppelin/contracts//SafeMath.sol'; import {IERC20} from '../dependencies/openzeppelin/contracts//IERC20.sol'; diff --git a/contracts/lendingpool/LendingPoolConfigurator.sol b/contracts/lendingpool/LendingPoolConfigurator.sol index b24f2cbc..a00c900f 100644 --- a/contracts/lendingpool/LendingPoolConfigurator.sol +++ b/contracts/lendingpool/LendingPoolConfigurator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {SafeMath} from '../dependencies/openzeppelin/contracts/SafeMath.sol'; diff --git a/contracts/lendingpool/LendingPoolStorage.sol b/contracts/lendingpool/LendingPoolStorage.sol index 5ea45c6e..c56be53f 100644 --- a/contracts/lendingpool/LendingPoolStorage.sol +++ b/contracts/lendingpool/LendingPoolStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {UserConfiguration} from '../libraries/configuration/UserConfiguration.sol'; import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol'; diff --git a/contracts/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol b/contracts/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol index d953dc06..0a528f49 100644 --- a/contracts/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol +++ b/contracts/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import '../../dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol'; diff --git a/contracts/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol b/contracts/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol index 64036408..d06afb90 100644 --- a/contracts/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol +++ b/contracts/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import './BaseImmutableAdminUpgradeabilityProxy.sol'; import '../../dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol'; diff --git a/contracts/libraries/aave-upgradeability/VersionedInitializable.sol b/contracts/libraries/aave-upgradeability/VersionedInitializable.sol index 54c43ce6..410d1cf0 100644 --- a/contracts/libraries/aave-upgradeability/VersionedInitializable.sol +++ b/contracts/libraries/aave-upgradeability/VersionedInitializable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity 0.6.8; +pragma solidity 0.6.12; /** * @title VersionedInitializable diff --git a/contracts/libraries/configuration/ReserveConfiguration.sol b/contracts/libraries/configuration/ReserveConfiguration.sol index 71c64bde..75195a5b 100644 --- a/contracts/libraries/configuration/ReserveConfiguration.sol +++ b/contracts/libraries/configuration/ReserveConfiguration.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {Errors} from '../helpers/Errors.sol'; diff --git a/contracts/libraries/configuration/UserConfiguration.sol b/contracts/libraries/configuration/UserConfiguration.sol index 8679390e..7a9db342 100644 --- a/contracts/libraries/configuration/UserConfiguration.sol +++ b/contracts/libraries/configuration/UserConfiguration.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {Errors} from '../helpers/Errors.sol'; /** diff --git a/contracts/libraries/helpers/Errors.sol b/contracts/libraries/helpers/Errors.sol index bf468fd3..ac03e6c1 100644 --- a/contracts/libraries/helpers/Errors.sol +++ b/contracts/libraries/helpers/Errors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** * @title Errors library diff --git a/contracts/libraries/helpers/Helpers.sol b/contracts/libraries/helpers/Helpers.sol index ba8be90c..c128d99e 100644 --- a/contracts/libraries/helpers/Helpers.sol +++ b/contracts/libraries/helpers/Helpers.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {DebtTokenBase} from '../../tokenization/base/DebtTokenBase.sol'; import {ReserveLogic} from '../logic/ReserveLogic.sol'; diff --git a/contracts/libraries/helpers/StringLib.sol b/contracts/libraries/helpers/StringLib.sol index fd4584a0..f163cbc1 100644 --- a/contracts/libraries/helpers/StringLib.sol +++ b/contracts/libraries/helpers/StringLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; library StringLib { function concat(string memory a, string memory b) internal pure returns (string memory) { diff --git a/contracts/libraries/logic/GenericLogic.sol b/contracts/libraries/logic/GenericLogic.sol index 28d91927..5a6fe20a 100644 --- a/contracts/libraries/logic/GenericLogic.sol +++ b/contracts/libraries/logic/GenericLogic.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol'; diff --git a/contracts/libraries/logic/ReserveLogic.sol b/contracts/libraries/logic/ReserveLogic.sol index 6774cd6e..4d3c4768 100644 --- a/contracts/libraries/logic/ReserveLogic.sol +++ b/contracts/libraries/logic/ReserveLogic.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol'; import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol'; diff --git a/contracts/libraries/logic/ValidationLogic.sol b/contracts/libraries/logic/ValidationLogic.sol index 4388d9c2..8105cf1a 100644 --- a/contracts/libraries/logic/ValidationLogic.sol +++ b/contracts/libraries/logic/ValidationLogic.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol'; diff --git a/contracts/libraries/math/MathUtils.sol b/contracts/libraries/math/MathUtils.sol index e99a7ccc..2aa0f282 100644 --- a/contracts/libraries/math/MathUtils.sol +++ b/contracts/libraries/math/MathUtils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol'; import {WadRayMath} from './WadRayMath.sol'; diff --git a/contracts/libraries/math/PercentageMath.sol b/contracts/libraries/math/PercentageMath.sol index c0556011..33de922c 100644 --- a/contracts/libraries/math/PercentageMath.sol +++ b/contracts/libraries/math/PercentageMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {Errors} from '../helpers/Errors.sol'; diff --git a/contracts/libraries/math/WadRayMath.sol b/contracts/libraries/math/WadRayMath.sol index 64d2e511..10ddf448 100644 --- a/contracts/libraries/math/WadRayMath.sol +++ b/contracts/libraries/math/WadRayMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {Errors} from '../helpers/Errors.sol'; diff --git a/contracts/misc/AaveOracle.sol b/contracts/misc/AaveOracle.sol index 91168d13..c2e00da4 100644 --- a/contracts/misc/AaveOracle.sol +++ b/contracts/misc/AaveOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol'; import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol'; diff --git a/contracts/misc/AaveProtocolDataProvider.sol b/contracts/misc/AaveProtocolDataProvider.sol index f34b219f..75258ef4 100644 --- a/contracts/misc/AaveProtocolDataProvider.sol +++ b/contracts/misc/AaveProtocolDataProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol'; diff --git a/contracts/misc/UiPoolDataProvider.sol b/contracts/misc/UiPoolDataProvider.sol index ff731fff..2ee26e83 100644 --- a/contracts/misc/UiPoolDataProvider.sol +++ b/contracts/misc/UiPoolDataProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol'; diff --git a/contracts/misc/WETHGateway.sol b/contracts/misc/WETHGateway.sol index a976bb0e..4d55def4 100644 --- a/contracts/misc/WETHGateway.sol +++ b/contracts/misc/WETHGateway.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {IWETH} from './interfaces/IWETH.sol'; diff --git a/contracts/misc/WalletBalanceProvider.sol b/contracts/misc/WalletBalanceProvider.sol index c3f5dd7f..29ec1ab1 100644 --- a/contracts/misc/WalletBalanceProvider.sol +++ b/contracts/misc/WalletBalanceProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; diff --git a/contracts/misc/interfaces/IERC20DetailedBytes.sol b/contracts/misc/interfaces/IERC20DetailedBytes.sol index 05fe0ab9..8f5c41db 100644 --- a/contracts/misc/interfaces/IERC20DetailedBytes.sol +++ b/contracts/misc/interfaces/IERC20DetailedBytes.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; contract IERC20DetailedBytes { bytes32 public name; diff --git a/contracts/misc/interfaces/IUiPoolDataProvider.sol b/contracts/misc/interfaces/IUiPoolDataProvider.sol index d1ca0269..74b69a0c 100644 --- a/contracts/misc/interfaces/IUiPoolDataProvider.sol +++ b/contracts/misc/interfaces/IUiPoolDataProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {ILendingPoolAddressesProvider} from '../../interfaces/ILendingPoolAddressesProvider.sol'; diff --git a/contracts/misc/interfaces/IWETH.sol b/contracts/misc/interfaces/IWETH.sol index cb661927..b5d9b2fe 100644 --- a/contracts/misc/interfaces/IWETH.sol +++ b/contracts/misc/interfaces/IWETH.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface IWETH { function deposit() external payable; diff --git a/contracts/misc/interfaces/IWETHGateway.sol b/contracts/misc/interfaces/IWETHGateway.sol index fae7a1e8..c0a383db 100644 --- a/contracts/misc/interfaces/IWETHGateway.sol +++ b/contracts/misc/interfaces/IWETHGateway.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface IWETHGateway { function depositETH(address onBehalfOf, uint16 referralCode) external payable; diff --git a/contracts/mocks/attacks/SefldestructTransfer.sol b/contracts/mocks/attacks/SefldestructTransfer.sol index 5c8750c1..4e372684 100644 --- a/contracts/mocks/attacks/SefldestructTransfer.sol +++ b/contracts/mocks/attacks/SefldestructTransfer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; contract SelfdestructTransfer { function destroyAndTransfer(address payable to) external payable { diff --git a/contracts/mocks/dependencies/weth/WETH9.sol b/contracts/mocks/dependencies/weth/WETH9.sol index 1907b736..b4b16281 100644 --- a/contracts/mocks/dependencies/weth/WETH9.sol +++ b/contracts/mocks/dependencies/weth/WETH9.sol @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -pragma solidity >=0.4.22 <=0.6.8; +pragma solidity >=0.4.22 <=0.6.12; contract WETH9 { string public name = 'Wrapped Ether'; diff --git a/contracts/mocks/flashloan/MockFlashLoanReceiver.sol b/contracts/mocks/flashloan/MockFlashLoanReceiver.sol index cfd16c28..71b73089 100644 --- a/contracts/mocks/flashloan/MockFlashLoanReceiver.sol +++ b/contracts/mocks/flashloan/MockFlashLoanReceiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol'; import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol'; diff --git a/contracts/mocks/oracle/CLAggregators/MockAggregator.sol b/contracts/mocks/oracle/CLAggregators/MockAggregator.sol index e0950e04..64c6f7df 100644 --- a/contracts/mocks/oracle/CLAggregators/MockAggregator.sol +++ b/contracts/mocks/oracle/CLAggregators/MockAggregator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; contract MockAggregator { int256 private _latestAnswer; diff --git a/contracts/mocks/oracle/ChainlinkUSDETHOracleI.sol b/contracts/mocks/oracle/ChainlinkUSDETHOracleI.sol index 76e4e3fe..660065f4 100644 --- a/contracts/mocks/oracle/ChainlinkUSDETHOracleI.sol +++ b/contracts/mocks/oracle/ChainlinkUSDETHOracleI.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface ChainlinkUSDETHOracleI { event AnswerUpdated(int256 indexed current, uint256 indexed answerId); diff --git a/contracts/mocks/oracle/GenericOracleI.sol b/contracts/mocks/oracle/GenericOracleI.sol index 6617df06..08409930 100644 --- a/contracts/mocks/oracle/GenericOracleI.sol +++ b/contracts/mocks/oracle/GenericOracleI.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface GenericOracleI { // ganache diff --git a/contracts/mocks/oracle/IExtendedPriceAggregator.sol b/contracts/mocks/oracle/IExtendedPriceAggregator.sol index 5b5427e6..578606cc 100644 --- a/contracts/mocks/oracle/IExtendedPriceAggregator.sol +++ b/contracts/mocks/oracle/IExtendedPriceAggregator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface IExtendedPriceAggregator { event AnswerUpdated(int256 indexed current, uint256 indexed roundId, uint256 timestamp); diff --git a/contracts/mocks/oracle/LendingRateOracle.sol b/contracts/mocks/oracle/LendingRateOracle.sol index 0062380d..b8b3d5ff 100644 --- a/contracts/mocks/oracle/LendingRateOracle.sol +++ b/contracts/mocks/oracle/LendingRateOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {ILendingRateOracle} from '../../interfaces/ILendingRateOracle.sol'; import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol'; diff --git a/contracts/mocks/oracle/PriceOracle.sol b/contracts/mocks/oracle/PriceOracle.sol index 20d576f2..1249a3eb 100644 --- a/contracts/mocks/oracle/PriceOracle.sol +++ b/contracts/mocks/oracle/PriceOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {IPriceOracle} from '../../interfaces/IPriceOracle.sol'; diff --git a/contracts/mocks/tokens/MintableDelegationERC20.sol b/contracts/mocks/tokens/MintableDelegationERC20.sol index 1b3088d5..90cbb98f 100644 --- a/contracts/mocks/tokens/MintableDelegationERC20.sol +++ b/contracts/mocks/tokens/MintableDelegationERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {ERC20} from '../../dependencies/openzeppelin/contracts/ERC20.sol'; diff --git a/contracts/mocks/tokens/MintableERC20.sol b/contracts/mocks/tokens/MintableERC20.sol index 2c79d971..ce7ed1f3 100644 --- a/contracts/mocks/tokens/MintableERC20.sol +++ b/contracts/mocks/tokens/MintableERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {ERC20} from '../../dependencies/openzeppelin/contracts/ERC20.sol'; diff --git a/contracts/mocks/tokens/WETH9Mocked.sol b/contracts/mocks/tokens/WETH9Mocked.sol index edcb1ca5..74154fe9 100644 --- a/contracts/mocks/tokens/WETH9Mocked.sol +++ b/contracts/mocks/tokens/WETH9Mocked.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.22 <=0.6.8; +pragma solidity >=0.4.22 <=0.6.12; import {WETH9} from '../dependencies/weth/WETH9.sol'; diff --git a/contracts/mocks/upgradeability/MockAToken.sol b/contracts/mocks/upgradeability/MockAToken.sol index 3e6a39b8..213abb0c 100644 --- a/contracts/mocks/upgradeability/MockAToken.sol +++ b/contracts/mocks/upgradeability/MockAToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {AToken} from '../../tokenization/AToken.sol'; import {LendingPool} from '../../lendingpool/LendingPool.sol'; diff --git a/contracts/mocks/upgradeability/MockStableDebtToken.sol b/contracts/mocks/upgradeability/MockStableDebtToken.sol index 13a42bde..4254ed05 100644 --- a/contracts/mocks/upgradeability/MockStableDebtToken.sol +++ b/contracts/mocks/upgradeability/MockStableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {StableDebtToken} from '../../tokenization/StableDebtToken.sol'; diff --git a/contracts/mocks/upgradeability/MockVariableDebtToken.sol b/contracts/mocks/upgradeability/MockVariableDebtToken.sol index 2bae798f..444d9e71 100644 --- a/contracts/mocks/upgradeability/MockVariableDebtToken.sol +++ b/contracts/mocks/upgradeability/MockVariableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {VariableDebtToken} from '../../tokenization/VariableDebtToken.sol'; diff --git a/contracts/tokenization/AToken.sol b/contracts/tokenization/AToken.sol index 5138ddeb..9e3d31c7 100644 --- a/contracts/tokenization/AToken.sol +++ b/contracts/tokenization/AToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {IncentivizedERC20} from './IncentivizedERC20.sol'; import {ILendingPool} from '../interfaces/ILendingPool.sol'; diff --git a/contracts/tokenization/DelegationAwareAToken.sol b/contracts/tokenization/DelegationAwareAToken.sol index 794fd4f5..c6ced3a5 100644 --- a/contracts/tokenization/DelegationAwareAToken.sol +++ b/contracts/tokenization/DelegationAwareAToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {AToken} from './AToken.sol'; import {ILendingPool} from '../interfaces/ILendingPool.sol'; diff --git a/contracts/tokenization/IncentivizedERC20.sol b/contracts/tokenization/IncentivizedERC20.sol index 097a298f..5acaee90 100644 --- a/contracts/tokenization/IncentivizedERC20.sol +++ b/contracts/tokenization/IncentivizedERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity 0.6.8; +pragma solidity 0.6.12; import {Context} from '../dependencies/openzeppelin/contracts/Context.sol'; import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol'; diff --git a/contracts/tokenization/StableDebtToken.sol b/contracts/tokenization/StableDebtToken.sol index cb53afdc..86bdcbec 100644 --- a/contracts/tokenization/StableDebtToken.sol +++ b/contracts/tokenization/StableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {DebtTokenBase} from './base/DebtTokenBase.sol'; import {MathUtils} from '../libraries/math/MathUtils.sol'; diff --git a/contracts/tokenization/VariableDebtToken.sol b/contracts/tokenization/VariableDebtToken.sol index 4d45831f..41787d6c 100644 --- a/contracts/tokenization/VariableDebtToken.sol +++ b/contracts/tokenization/VariableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {DebtTokenBase} from './base/DebtTokenBase.sol'; import {WadRayMath} from '../libraries/math/WadRayMath.sol'; diff --git a/contracts/tokenization/base/DebtTokenBase.sol b/contracts/tokenization/base/DebtTokenBase.sol index 3cf38019..78f468cb 100644 --- a/contracts/tokenization/base/DebtTokenBase.sol +++ b/contracts/tokenization/base/DebtTokenBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {ILendingPool} from '../../interfaces/ILendingPool.sol'; import { diff --git a/contracts/tokenization/interfaces/IAToken.sol b/contracts/tokenization/interfaces/IAToken.sol index 13cf6cb7..d8dd5040 100644 --- a/contracts/tokenization/interfaces/IAToken.sol +++ b/contracts/tokenization/interfaces/IAToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol'; import {IScaledBalanceToken} from './IScaledBalanceToken.sol'; diff --git a/contracts/tokenization/interfaces/IScaledBalanceToken.sol b/contracts/tokenization/interfaces/IScaledBalanceToken.sol index ee1a132c..28157140 100644 --- a/contracts/tokenization/interfaces/IScaledBalanceToken.sol +++ b/contracts/tokenization/interfaces/IScaledBalanceToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; interface IScaledBalanceToken { /** diff --git a/contracts/tokenization/interfaces/IStableDebtToken.sol b/contracts/tokenization/interfaces/IStableDebtToken.sol index af71aab2..94a5d7e8 100644 --- a/contracts/tokenization/interfaces/IStableDebtToken.sol +++ b/contracts/tokenization/interfaces/IStableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; /** * @title interface IStableDebtToken diff --git a/contracts/tokenization/interfaces/IVariableDebtToken.sol b/contracts/tokenization/interfaces/IVariableDebtToken.sol index c01b50ce..909393f6 100644 --- a/contracts/tokenization/interfaces/IVariableDebtToken.sol +++ b/contracts/tokenization/interfaces/IVariableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: agpl-3.0 -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {IScaledBalanceToken} from './IScaledBalanceToken.sol'; diff --git a/hardhat.config.ts b/hardhat.config.ts index 42302c19..fafa0eff 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -71,7 +71,7 @@ const mainnetFork = MAINNET_FORK const buidlerConfig: HardhatUserConfig = { solidity: { - version: '0.6.8', + version: '0.6.12', settings: { optimizer: {enabled: true, runs: 200}, evmVersion: 'istanbul', diff --git a/package-lock.json b/package-lock.json index 76ca7a65..4696fda0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9529,6 +9529,14 @@ "prr": "~1.0.1", "semver": "~5.4.1", "xtend": "~4.0.0" + }, + "dependencies": { + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + } } }, "merkle-patricia-tree": { @@ -9918,6 +9926,14 @@ "prr": "~1.0.1", "semver": "~5.4.1", "xtend": "~4.0.0" + }, + "dependencies": { + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + } } }, "merkle-patricia-tree": { @@ -10209,6 +10225,14 @@ "prr": "~1.0.1", "semver": "~5.4.1", "xtend": "~4.0.0" + }, + "dependencies": { + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + } } }, "merkle-patricia-tree": { @@ -10460,6 +10484,14 @@ "prr": "~1.0.1", "semver": "~5.4.1", "xtend": "~4.0.0" + }, + "dependencies": { + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + } } }, "merkle-patricia-tree": { @@ -14247,12 +14279,6 @@ "integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==", "dev": true }, - "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", - "dev": true - }, "semver-greatest-satisfied-range": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz", @@ -16296,6 +16322,14 @@ "prr": "~1.0.1", "semver": "~5.4.1", "xtend": "~4.0.0" + }, + "dependencies": { + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + } } }, "merkle-patricia-tree": { diff --git a/specs/harness/LendingPoolHarnessForVariableDebtToken.sol b/specs/harness/LendingPoolHarnessForVariableDebtToken.sol index f5ea9be1..78823f5d 100644 --- a/specs/harness/LendingPoolHarnessForVariableDebtToken.sol +++ b/specs/harness/LendingPoolHarnessForVariableDebtToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import { diff --git a/specs/harness/StableDebtTokenHarness.sol b/specs/harness/StableDebtTokenHarness.sol index 3daf2261..e473cc96 100644 --- a/specs/harness/StableDebtTokenHarness.sol +++ b/specs/harness/StableDebtTokenHarness.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; import {StableDebtToken} from '../../contracts/tokenization/StableDebtToken.sol'; import {IncentivizedERC20} from '../../contracts/tokenization/IncentivizedERC20.sol'; diff --git a/specs/harness/UserConfigurationHarness.sol b/specs/harness/UserConfigurationHarness.sol index 0ab1c495..69cf56b4 100644 --- a/specs/harness/UserConfigurationHarness.sol +++ b/specs/harness/UserConfigurationHarness.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.8; +pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; import {UserConfiguration} from '../../contracts/libraries/configuration/UserConfiguration.sol';