From 52771975e845df70d27575a746caeb0e639f1169 Mon Sep 17 00:00:00 2001 From: 0xgareth Date: Tue, 9 Aug 2022 19:40:36 +0100 Subject: [PATCH 1/3] modify interface versions to support all minor 8.x.x vers --- contracts/flashloan/interfaces/IFlashLoanReceiver.sol | 2 +- contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol | 2 +- contracts/interfaces/IACLManager.sol | 2 +- contracts/interfaces/IAToken.sol | 2 +- contracts/interfaces/IAaveIncentivesController.sol | 2 +- contracts/interfaces/IAaveOracle.sol | 2 +- contracts/interfaces/ICreditDelegationToken.sol | 2 +- contracts/interfaces/IDelegationToken.sol | 2 +- contracts/interfaces/IERC20WithPermit.sol | 2 +- contracts/interfaces/IInitializableAToken.sol | 2 +- contracts/interfaces/IInitializableDebtToken.sol | 2 +- contracts/interfaces/IL2Pool.sol | 2 +- contracts/interfaces/IPool.sol | 2 +- contracts/interfaces/IPoolAddressesProvider.sol | 2 +- contracts/interfaces/IPoolAddressesProviderRegistry.sol | 2 +- contracts/interfaces/IPoolConfigurator.sol | 2 +- contracts/interfaces/IPoolDataProvider.sol | 2 +- contracts/interfaces/IPriceOracle.sol | 2 +- contracts/interfaces/IPriceOracleGetter.sol | 2 +- contracts/interfaces/IPriceOracleSentinel.sol | 2 +- contracts/interfaces/IReserveInterestRateStrategy.sol | 2 +- contracts/interfaces/IScaledBalanceToken.sol | 2 +- contracts/interfaces/ISequencerOracle.sol | 2 +- contracts/interfaces/IStableDebtToken.sol | 2 +- contracts/interfaces/IVariableDebtToken.sol | 2 +- contracts/misc/interfaces/IWETH.sol | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/contracts/flashloan/interfaces/IFlashLoanReceiver.sol b/contracts/flashloan/interfaces/IFlashLoanReceiver.sol index 132c54779..144cc6eac 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.8.10; +pragma solidity ^0.8.0; import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol'; import {IPool} from '../../interfaces/IPool.sol'; diff --git a/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol b/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol index 46236f5e4..b13a299a9 100644 --- a/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol +++ b/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol'; import {IPool} from '../../interfaces/IPool.sol'; diff --git a/contracts/interfaces/IACLManager.sol b/contracts/interfaces/IACLManager.sol index 4bb6e645b..b71f76086 100644 --- a/contracts/interfaces/IACLManager.sol +++ b/contracts/interfaces/IACLManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IPoolAddressesProvider} from './IPoolAddressesProvider.sol'; diff --git a/contracts/interfaces/IAToken.sol b/contracts/interfaces/IAToken.sol index 21726c8e3..dc3b48a0b 100644 --- a/contracts/interfaces/IAToken.sol +++ b/contracts/interfaces/IAToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol'; import {IScaledBalanceToken} from './IScaledBalanceToken.sol'; diff --git a/contracts/interfaces/IAaveIncentivesController.sol b/contracts/interfaces/IAaveIncentivesController.sol index d0663cd30..3ae73deef 100644 --- a/contracts/interfaces/IAaveIncentivesController.sol +++ b/contracts/interfaces/IAaveIncentivesController.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IAaveIncentivesController diff --git a/contracts/interfaces/IAaveOracle.sol b/contracts/interfaces/IAaveOracle.sol index 0ad9b47fc..0d4aa3130 100644 --- a/contracts/interfaces/IAaveOracle.sol +++ b/contracts/interfaces/IAaveOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IPriceOracleGetter} from './IPriceOracleGetter.sol'; import {IPoolAddressesProvider} from './IPoolAddressesProvider.sol'; diff --git a/contracts/interfaces/ICreditDelegationToken.sol b/contracts/interfaces/ICreditDelegationToken.sol index a06de1f86..34dfa52d3 100644 --- a/contracts/interfaces/ICreditDelegationToken.sol +++ b/contracts/interfaces/ICreditDelegationToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title ICreditDelegationToken diff --git a/contracts/interfaces/IDelegationToken.sol b/contracts/interfaces/IDelegationToken.sol index 288f1e55d..e32599fb3 100644 --- a/contracts/interfaces/IDelegationToken.sol +++ b/contracts/interfaces/IDelegationToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IDelegationToken diff --git a/contracts/interfaces/IERC20WithPermit.sol b/contracts/interfaces/IERC20WithPermit.sol index 3c67e56e8..2f0a704ff 100644 --- a/contracts/interfaces/IERC20WithPermit.sol +++ b/contracts/interfaces/IERC20WithPermit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol'; diff --git a/contracts/interfaces/IInitializableAToken.sol b/contracts/interfaces/IInitializableAToken.sol index ba0ca82ee..d34bdd8d8 100644 --- a/contracts/interfaces/IInitializableAToken.sol +++ b/contracts/interfaces/IInitializableAToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IAaveIncentivesController} from './IAaveIncentivesController.sol'; import {IPool} from './IPool.sol'; diff --git a/contracts/interfaces/IInitializableDebtToken.sol b/contracts/interfaces/IInitializableDebtToken.sol index 740cb8c7d..45c48b5b4 100644 --- a/contracts/interfaces/IInitializableDebtToken.sol +++ b/contracts/interfaces/IInitializableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IAaveIncentivesController} from './IAaveIncentivesController.sol'; import {IPool} from './IPool.sol'; diff --git a/contracts/interfaces/IL2Pool.sol b/contracts/interfaces/IL2Pool.sol index 27ac223e7..7823e864a 100644 --- a/contracts/interfaces/IL2Pool.sol +++ b/contracts/interfaces/IL2Pool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IL2Pool diff --git a/contracts/interfaces/IPool.sol b/contracts/interfaces/IPool.sol index 7f64b4ab4..0bea9aad0 100644 --- a/contracts/interfaces/IPool.sol +++ b/contracts/interfaces/IPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IPoolAddressesProvider} from './IPoolAddressesProvider.sol'; import {DataTypes} from '../protocol/libraries/types/DataTypes.sol'; diff --git a/contracts/interfaces/IPoolAddressesProvider.sol b/contracts/interfaces/IPoolAddressesProvider.sol index 01a126bd4..c3c8617f9 100644 --- a/contracts/interfaces/IPoolAddressesProvider.sol +++ b/contracts/interfaces/IPoolAddressesProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IPoolAddressesProvider diff --git a/contracts/interfaces/IPoolAddressesProviderRegistry.sol b/contracts/interfaces/IPoolAddressesProviderRegistry.sol index a48ff2074..f3867d06b 100644 --- a/contracts/interfaces/IPoolAddressesProviderRegistry.sol +++ b/contracts/interfaces/IPoolAddressesProviderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IPoolAddressesProviderRegistry diff --git a/contracts/interfaces/IPoolConfigurator.sol b/contracts/interfaces/IPoolConfigurator.sol index d84454a70..db7022b2d 100644 --- a/contracts/interfaces/IPoolConfigurator.sol +++ b/contracts/interfaces/IPoolConfigurator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {ConfiguratorInputTypes} from '../protocol/libraries/types/ConfiguratorInputTypes.sol'; diff --git a/contracts/interfaces/IPoolDataProvider.sol b/contracts/interfaces/IPoolDataProvider.sol index 331653a2f..0c7b34c35 100644 --- a/contracts/interfaces/IPoolDataProvider.sol +++ b/contracts/interfaces/IPoolDataProvider.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; interface IPoolDataProvider { /** diff --git a/contracts/interfaces/IPriceOracle.sol b/contracts/interfaces/IPriceOracle.sol index 1f51f1843..b86cc1d17 100644 --- a/contracts/interfaces/IPriceOracle.sol +++ b/contracts/interfaces/IPriceOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IPriceOracle diff --git a/contracts/interfaces/IPriceOracleGetter.sol b/contracts/interfaces/IPriceOracleGetter.sol index 92c1c4668..40e59954f 100644 --- a/contracts/interfaces/IPriceOracleGetter.sol +++ b/contracts/interfaces/IPriceOracleGetter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IPriceOracleGetter diff --git a/contracts/interfaces/IPriceOracleSentinel.sol b/contracts/interfaces/IPriceOracleSentinel.sol index 6d05bf0f9..7a49b717c 100644 --- a/contracts/interfaces/IPriceOracleSentinel.sol +++ b/contracts/interfaces/IPriceOracleSentinel.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IPoolAddressesProvider} from './IPoolAddressesProvider.sol'; diff --git a/contracts/interfaces/IReserveInterestRateStrategy.sol b/contracts/interfaces/IReserveInterestRateStrategy.sol index 5c9cbdce0..1aaf63343 100644 --- a/contracts/interfaces/IReserveInterestRateStrategy.sol +++ b/contracts/interfaces/IReserveInterestRateStrategy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {DataTypes} from '../protocol/libraries/types/DataTypes.sol'; diff --git a/contracts/interfaces/IScaledBalanceToken.sol b/contracts/interfaces/IScaledBalanceToken.sol index 901e87516..89ccddfd8 100644 --- a/contracts/interfaces/IScaledBalanceToken.sol +++ b/contracts/interfaces/IScaledBalanceToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title IScaledBalanceToken diff --git a/contracts/interfaces/ISequencerOracle.sol b/contracts/interfaces/ISequencerOracle.sol index afb4896e9..a01a3d27b 100644 --- a/contracts/interfaces/ISequencerOracle.sol +++ b/contracts/interfaces/ISequencerOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; /** * @title ISequencerOracle diff --git a/contracts/interfaces/IStableDebtToken.sol b/contracts/interfaces/IStableDebtToken.sol index ad5cdb45f..82352f091 100644 --- a/contracts/interfaces/IStableDebtToken.sol +++ b/contracts/interfaces/IStableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IInitializableDebtToken} from './IInitializableDebtToken.sol'; diff --git a/contracts/interfaces/IVariableDebtToken.sol b/contracts/interfaces/IVariableDebtToken.sol index 59facb7be..cc61f6c68 100644 --- a/contracts/interfaces/IVariableDebtToken.sol +++ b/contracts/interfaces/IVariableDebtToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IScaledBalanceToken} from './IScaledBalanceToken.sol'; import {IInitializableDebtToken} from './IInitializableDebtToken.sol'; diff --git a/contracts/misc/interfaces/IWETH.sol b/contracts/misc/interfaces/IWETH.sol index 2ab87dae3..32eac0e5e 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.8.10; +pragma solidity ^0.8.0; interface IWETH { function deposit() external payable; From 0311475614ed7a6c4befba99a7567ee27454f942 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Tue, 6 Sep 2022 18:14:41 +0200 Subject: [PATCH 2/3] fix: make InterestRateStrategy contract inheritable --- .../protocol/pool/DefaultReserveInterestRateStrategy.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/protocol/pool/DefaultReserveInterestRateStrategy.sol b/contracts/protocol/pool/DefaultReserveInterestRateStrategy.sol index 7d082a960..9937ce237 100644 --- a/contracts/protocol/pool/DefaultReserveInterestRateStrategy.sol +++ b/contracts/protocol/pool/DefaultReserveInterestRateStrategy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BUSL-1.1 -pragma solidity 0.8.10; +pragma solidity ^0.8.0; import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol'; import {WadRayMath} from '../libraries/math/WadRayMath.sol'; @@ -191,8 +191,8 @@ contract DefaultReserveInterestRateStrategy is IReserveInterestRateStrategy { } /// @inheritdoc IReserveInterestRateStrategy - function calculateInterestRates(DataTypes.CalculateInterestRatesParams calldata params) - external + function calculateInterestRates(DataTypes.CalculateInterestRatesParams memory params) + public view override returns ( From d6f38595186d35d1d8c0e5a44c5b7983488bd9ea Mon Sep 17 00:00:00 2001 From: Bojidar00 Date: Wed, 19 Oct 2022 15:41:19 +0300 Subject: [PATCH 3/3] fix: typo --- contracts/interfaces/IPool.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/interfaces/IPool.sol b/contracts/interfaces/IPool.sol index 0bea9aad0..02634cae3 100644 --- a/contracts/interfaces/IPool.sol +++ b/contracts/interfaces/IPool.sol @@ -562,7 +562,7 @@ interface IPool { returns (DataTypes.UserConfigurationMap memory); /** - * @notice Returns the normalized income normalized income of the reserve + * @notice Returns the normalized income of the reserve * @param asset The address of the underlying asset of the reserve * @return The reserve's normalized income */