diff --git a/contracts/aave-v2/interfaces/IEntryPositionsManager.sol b/contracts/aave-v2/interfaces/IEntryPositionsManager.sol index c5478af7f..88f5519c5 100644 --- 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 index 4b14b8492..419e0dcbd 100644 --- 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 index 893fbb01d..1b18c16d2 100644 --- 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 index c0a38c3df..febeba642 100644 --- 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 index 311fd42ec..598a4891c 100644 --- 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 updateIndexes(address _marketAddress) external; diff --git a/contracts/aave-v2/interfaces/ILens.sol b/contracts/aave-v2/interfaces/ILens.sol index e83073e29..20eaf0698 100644 --- 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 index f9803f5f7..d85b72af2 100644 --- 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"; @@ -64,13 +64,13 @@ interface IMorpho { function setTreasuryVault(address _newTreasuryVaultAddress) external; function setIncentivesVault(address _newIncentivesVault) external; function setRewardsManager(address _rewardsManagerAddress) external; - function setIsP2PDisabled(address _poolToken, bool _isP2PDisabled) external; + function setP2PDisabledStatus(address _poolToken, bool _isP2PDisabled) external; function setReserveFactor(address _poolToken, uint256 _newReserveFactor) external; function setP2PIndexCursor(address _poolToken, uint16 _p2pIndexCursor) external; - function setIsPausedForAllMarkets(bool _isPaused) external; - function setIsClaimRewardsPaused(bool _isPaused) external; - function setPauseStatus(address _poolToken, bool _isPaused) external; - function setPartialPauseStatus(address _poolToken, bool _isPaused) external; + function setPauseStatusForAllMarkets(bool _newStatus) external; + function setClaimRewardsPauseStatus(bool _newStatus) external; + function setPauseStatus(address _poolToken, bool _newStatus) external; + function setPartialPauseStatus(address _poolToken, bool _newStatus) external; function setExitPositionsManager(IExitPositionsManager _exitPositionsManager) external; function setEntryPositionsManager(IEntryPositionsManager _entryPositionsManager) external; function setInterestRatesManager(IInterestRatesManager _interestRatesManager) external; diff --git a/contracts/aave-v2/interfaces/IOracle.sol b/contracts/aave-v2/interfaces/IOracle.sol index 57ad8744a..22f465867 100644 --- 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 index 950a6d4ff..34b520879 100644 --- 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 index d2b5ce35b..38aaad6a4 100644 --- a/contracts/aave-v2/interfaces/aave/IAToken.sol +++ b/contracts/aave-v2/interfaces/aave/IAToken.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GNU AGPLv3 -pragma solidity >=0.8.0; +// SPDX-License-Identifier: agpl-3.0 +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 index 67820aad1..bc61009b2 100644 --- a/contracts/aave-v2/interfaces/aave/IAaveIncentivesController.sol +++ b/contracts/aave-v2/interfaces/aave/IAaveIncentivesController.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GNU AGPLv3 -pragma solidity >=0.8.0; +// SPDX-License-Identifier: agpl-3.0 +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 index 27d677316..f68ed2bce 100644 --- a/contracts/aave-v2/interfaces/aave/IERC20.sol +++ b/contracts/aave-v2/interfaces/aave/IERC20.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GNU AGPLv3 -pragma solidity >=0.8.0; +// SPDX-License-Identifier: agpl-3.0 +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 index b7afb1749..0d8f56d86 100644 --- a/contracts/aave-v2/interfaces/aave/ILendingPool.sol +++ b/contracts/aave-v2/interfaces/aave/ILendingPool.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GNU AGPLv3 -pragma solidity >=0.8.0; +// SPDX-License-Identifier: agpl-3.0 +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 index 8280312c9..daab1180c 100644 --- a/contracts/aave-v2/interfaces/aave/ILendingPoolAddressesProvider.sol +++ b/contracts/aave-v2/interfaces/aave/ILendingPoolAddressesProvider.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GNU AGPLv3 -pragma solidity >=0.8.0; +// SPDX-License-Identifier: agpl-3.0 +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 index 81ba2fdde..572a1e147 100644 --- 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 index 2d8f66b31..8ba23e0b3 100644 --- a/contracts/aave-v2/interfaces/aave/IScaledBalanceToken.sol +++ b/contracts/aave-v2/interfaces/aave/IScaledBalanceToken.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GNU AGPLv3 -pragma solidity >=0.8.0; +// SPDX-License-Identifier: agpl-3.0 +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 index 1e5a3326b..f6bd7322e 100644 --- a/contracts/aave-v2/interfaces/aave/IVariableDebtToken.sol +++ b/contracts/aave-v2/interfaces/aave/IVariableDebtToken.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GNU AGPLv3 -pragma solidity >=0.8.0; +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.8.0; import {IScaledBalanceToken} from "./IScaledBalanceToken.sol"; @@ -69,10 +69,4 @@ interface IVariableDebtToken is IScaledBalanceToken { uint256 amount, uint256 index ) external; - - /** - * @dev Returns the debt balance of the user - * @return The debt balance of the user. - **/ - function balanceOf(address user) external view returns (uint256); } diff --git a/contracts/aave-v2/libraries/aave/DataTypes.sol b/contracts/aave-v2/libraries/aave/DataTypes.sol index 0e3bd739c..8f9354a18 100644 --- a/contracts/aave-v2/libraries/aave/DataTypes.sol +++ b/contracts/aave-v2/libraries/aave/DataTypes.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GNU AGPLv3 +// SPDX-License-Identifier: agpl-3.0 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 index 44573ab0a..36fde0f80 100644 --- a/contracts/aave-v2/libraries/aave/Errors.sol +++ b/contracts/aave-v2/libraries/aave/Errors.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GNU AGPLv3 +// SPDX-License-Identifier: agpl-3.0 pragma solidity ^0.8.0; /** diff --git a/contracts/aave-v2/libraries/aave/ReserveConfiguration.sol b/contracts/aave-v2/libraries/aave/ReserveConfiguration.sol index 063a8740b..6c5659720 100644 --- a/contracts/aave-v2/libraries/aave/ReserveConfiguration.sol +++ b/contracts/aave-v2/libraries/aave/ReserveConfiguration.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GNU AGPLv3 +// SPDX-License-Identifier: agpl-3.0 pragma solidity ^0.8.0; import {Errors} from "./Errors.sol";