Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/162' into 'master'

Browse Source 
Resolve "Review LendingPoolConfigurator"

Closes #162

See merge request aave-tech/protocol-v2!185
This commit is contained in:
Ernesto Boado 2020-11-25 15:48:15 +00:00
commit 7cabecafe3
1 changed files with 111 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

231
contracts/protocol/lendingpool/LendingPoolConfigurator.sol
View File

@ -19,21 +19,21 @@ import {DataTypes} from '../libraries/types/DataTypes.sol';
/** /**
* @title LendingPoolConfigurator contract * @title LendingPoolConfigurator contract
* @author Aave * @author Aave
* @notice Executes configuration methods on the LendingPoolCore contract. Allows to enable/disable reserves * @dev Implements the configuration methods for the Aave protocol
* and set different protocol parameters.
**/ **/
contract LendingPoolConfigurator is VersionedInitializable { contract LendingPoolConfigurator is VersionedInitializable {
using SafeMath for uint256; using SafeMath for uint256;
using PercentageMath for uint256;
using ReserveConfiguration for DataTypes.ReserveConfigurationMap; using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
/** /**
* @dev emitted when a reserve is initialized. * @dev Emitted when a reserve is initialized.
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param aToken the address of the overlying aToken contract * @param aToken The address of the associated aToken contract
* @param stableDebtToken the address of the associated stable rate debt token * @param stableDebtToken The address of the associated stable rate debt token
* @param variableDebtToken the address of the associated variable rate debt token * @param variableDebtToken The address of the associated variable rate debt token
* @param interestRateStrategyAddress the address of the interest rate strategy for the reserve * @param interestRateStrategyAddress The address of the interest rate strategy for the reserve
**/ **/
event ReserveInitialized( event ReserveInitialized(
address indexed asset, address indexed asset,
@ -44,24 +44,24 @@ contract LendingPoolConfigurator is VersionedInitializable {
); );
/** /**
* @dev emitted when borrowing is enabled on a reserve * @dev Emitted when borrowing is enabled on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param stableRateEnabled true if stable rate borrowing is enabled, false otherwise * @param stableRateEnabled True if stable rate borrowing is enabled, false otherwise
**/ **/
event BorrowingEnabledOnReserve(address indexed asset, bool stableRateEnabled); event BorrowingEnabledOnReserve(address indexed asset, bool stableRateEnabled);
/** /**
* @dev emitted when borrowing is disabled on a reserve * @dev Emitted when borrowing is disabled on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
event BorrowingDisabledOnReserve(address indexed asset); event BorrowingDisabledOnReserve(address indexed asset);
/** /**
* @dev emitted when a a reserve collateralization risk parameters are updated. * @dev Emitted when the collateralization risk parameters for the specified asset are updated.
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param ltv the loan to value of the asset when used as collateral * @param ltv The loan to value of the asset when used as collateral
* @param liquidationThreshold the threshold at which loans using this asset as collateral will be considered undercollateralized * @param liquidationThreshold The threshold at which loans using this asset as collateral will be considered undercollateralized
* @param liquidationBonus the bonus liquidators receive to liquidate this asset * @param liquidationBonus The bonus liquidators receive to liquidate this asset
**/ **/
event CollateralConfigurationChanged( event CollateralConfigurationChanged(
address indexed asset, address indexed asset,
@ -71,67 +71,67 @@ contract LendingPoolConfigurator is VersionedInitializable {
); );
/** /**
* @dev emitted when stable rate borrowing is enabled on a reserve * @dev Emitted when stable rate borrowing is enabled on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
event StableRateEnabledOnReserve(address indexed asset); event StableRateEnabledOnReserve(address indexed asset);
/** /**
* @dev emitted when stable rate borrowing is disabled on a reserve * @dev Emitted when stable rate borrowing is disabled on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
event StableRateDisabledOnReserve(address indexed asset); event StableRateDisabledOnReserve(address indexed asset);
/** /**
* @dev emitted when a reserve is activated * @dev Emitted when a reserve is activated
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
event ReserveActivated(address indexed asset); event ReserveActivated(address indexed asset);
/** /**
* @dev emitted when a reserve is deactivated * @dev Emitted when a reserve is deactivated
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
event ReserveDeactivated(address indexed asset); event ReserveDeactivated(address indexed asset);
/** /**
* @dev emitted when a reserve is frozen * @dev Emitted when a reserve is frozen
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
event ReserveFrozen(address indexed asset); event ReserveFrozen(address indexed asset);
/** /**
* @dev emitted when a reserve is unfrozen * @dev Emitted when a reserve is unfrozen
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
event ReserveUnfrozen(address indexed asset); event ReserveUnfrozen(address indexed asset);
/** /**
* @dev emitted when a reserve factor is updated * @dev Emitted when a reserve factor is updated
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param factor the new reserve factor * @param factor The new reserve factor
**/ **/
event ReserveFactorChanged(address indexed asset, uint256 factor); event ReserveFactorChanged(address indexed asset, uint256 factor);
/** /**
* @dev emitted when the reserve decimals are updated * @dev Emitted when the reserve decimals are updated
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param decimals the new decimals * @param decimals The new decimals
**/ **/
event ReserveDecimalsChanged(address indexed asset, uint256 decimals); event ReserveDecimalsChanged(address indexed asset, uint256 decimals);
/** /**
* @dev emitted when a reserve interest strategy contract is updated * @dev Emitted when a reserve interest strategy contract is updated
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param strategy the new address of the interest strategy contract * @param strategy The new address of the interest strategy contract
**/ **/
event ReserveInterestRateStrategyChanged(address indexed asset, address strategy); event ReserveInterestRateStrategyChanged(address indexed asset, address strategy);
/** /**
* @dev emitted when an aToken implementation is upgraded * @dev Emitted when an aToken implementation is upgraded
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param proxy the aToken proxy address * @param proxy The aToken proxy address
* @param implementation the new aToken implementation * @param implementation The new aToken implementation
**/ **/
event ATokenUpgraded( event ATokenUpgraded(
address indexed asset, address indexed asset,
@ -140,10 +140,10 @@ contract LendingPoolConfigurator is VersionedInitializable {
); );
/** /**
* @dev emitted when the implementation of a stable debt token is upgraded * @dev Emitted when the implementation of a stable debt token is upgraded
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param proxy the stable debt token proxy address * @param proxy The stable debt token proxy address
* @param implementation the new aToken implementation * @param implementation The new aToken implementation
**/ **/
event StableDebtTokenUpgraded( event StableDebtTokenUpgraded(
address indexed asset, address indexed asset,
@ -152,10 +152,10 @@ contract LendingPoolConfigurator is VersionedInitializable {
); );
/** /**
* @dev emitted when the implementation of a variable debt token is upgraded * @dev Emitted when the implementation of a variable debt token is upgraded
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param proxy the variable debt token proxy address * @param proxy The variable debt token proxy address
* @param implementation the new aToken implementation * @param implementation The new aToken implementation
**/ **/
event VariableDebtTokenUpgraded( event VariableDebtTokenUpgraded(
address indexed asset, address indexed asset,
@ -166,17 +166,11 @@ contract LendingPoolConfigurator is VersionedInitializable {
ILendingPoolAddressesProvider internal addressesProvider; ILendingPoolAddressesProvider internal addressesProvider;
ILendingPool internal pool; ILendingPool internal pool;
/**
* @dev only the pool admin can call functions affected by this modifier
**/
modifier onlyPoolAdmin { modifier onlyPoolAdmin {
require(addressesProvider.getPoolAdmin() == msg.sender, Errors.CALLER_NOT_POOL_ADMIN); require(addressesProvider.getPoolAdmin() == msg.sender, Errors.CALLER_NOT_POOL_ADMIN);
_; _;
} }
/**
* @dev only the emergency admin can call functions affected by this modifier
**/
modifier onlyEmergencyAdmin { modifier onlyEmergencyAdmin {
require( require(
addressesProvider.getEmergencyAdmin() == msg.sender, addressesProvider.getEmergencyAdmin() == msg.sender,
@ -185,7 +179,7 @@ contract LendingPoolConfigurator is VersionedInitializable {
_; _;
} }
uint256 internal constant CONFIGURATOR_REVISION = 0x3; uint256 internal constant CONFIGURATOR_REVISION = 0x1;
function getRevision() internal pure override returns (uint256) { function getRevision() internal pure override returns (uint256) {
return CONFIGURATOR_REVISION; return CONFIGURATOR_REVISION;
@ -197,12 +191,12 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev initializes a reserve * @dev Initializes a reserve
* @param aTokenImpl the address of the aToken contract implementation * @param aTokenImpl The address of the aToken contract implementation
* @param stableDebtTokenImpl the address of the stable debt token contract * @param stableDebtTokenImpl The address of the stable debt token contract
* @param variableDebtTokenImpl the address of the variable debt token contract * @param variableDebtTokenImpl The address of the variable debt token contract
* @param underlyingAssetDecimals the decimals of the reserve underlying asset * @param underlyingAssetDecimals The decimals of the reserve underlying asset
* @param interestRateStrategyAddress the address of the interest rate strategy contract for this reserve * @param interestRateStrategyAddress The address of the interest rate strategy contract for this reserve
**/ **/
function initReserve( function initReserve(
address aTokenImpl, address aTokenImpl,
@ -269,9 +263,9 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev updates the aToken implementation for the asset * @dev Updates the aToken implementation for the reserve
* @param asset the address of the reserve to be updated * @param asset The address of the underlying asset of the reserve to be updated
* @param implementation the address of the new aToken implementation * @param implementation The address of the new aToken implementation
**/ **/
function updateAToken(address asset, address implementation) external onlyPoolAdmin { function updateAToken(address asset, address implementation) external onlyPoolAdmin {
DataTypes.ReserveData memory reserveData = pool.getReserveData(asset); DataTypes.ReserveData memory reserveData = pool.getReserveData(asset);
@ -282,9 +276,9 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev updates the stable debt token implementation for the asset * @dev Updates the stable debt token implementation for the reserve
* @param asset the address of the reserve to be updated * @param asset The address of the underlying asset of the reserve to be updated
* @param implementation the address of the new aToken implementation * @param implementation The address of the new aToken implementation
**/ **/
function updateStableDebtToken(address asset, address implementation) external onlyPoolAdmin { function updateStableDebtToken(address asset, address implementation) external onlyPoolAdmin {
DataTypes.ReserveData memory reserveData = pool.getReserveData(asset); DataTypes.ReserveData memory reserveData = pool.getReserveData(asset);
@ -295,9 +289,9 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev updates the variable debt token implementation for the asset * @dev Updates the variable debt token implementation for the asset
* @param asset the address of the reserve to be updated * @param asset The address of the underlying asset of the reserve to be updated
* @param implementation the address of the new aToken implementation * @param implementation The address of the new aToken implementation
**/ **/
function updateVariableDebtToken(address asset, address implementation) external onlyPoolAdmin { function updateVariableDebtToken(address asset, address implementation) external onlyPoolAdmin {
DataTypes.ReserveData memory reserveData = pool.getReserveData(asset); DataTypes.ReserveData memory reserveData = pool.getReserveData(asset);
@ -308,9 +302,9 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev enables borrowing on a reserve * @dev Enables borrowing on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param stableBorrowRateEnabled true if stable borrow rate needs to be enabled by default on this reserve * @param stableBorrowRateEnabled True if stable borrow rate needs to be enabled by default on this reserve
**/ **/
function enableBorrowingOnReserve(address asset, bool stableBorrowRateEnabled) function enableBorrowingOnReserve(address asset, bool stableBorrowRateEnabled)
external external
@ -327,8 +321,8 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev disables borrowing on a reserve * @dev Disables borrowing on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
function disableBorrowingOnReserve(address asset) external onlyPoolAdmin { function disableBorrowingOnReserve(address asset) external onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset);
@ -340,12 +334,12 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev configures the reserve collateralization parameters. * @dev Configures the reserve collateralization parameters
* all the values are expressed in percentages with two decimals of precision. A valid value is 10000, which means 100.00% * all the values are expressed in percentages with two decimals of precision. A valid value is 10000, which means 100.00%
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param ltv the loan to value of the asset when used as collateral * @param ltv The loan to value of the asset when used as collateral
* @param liquidationThreshold the threshold at which loans using this asset as collateral will be considered undercollateralized * @param liquidationThreshold The threshold at which loans using this asset as collateral will be considered undercollateralized
* @param liquidationBonus the bonus liquidators receive to liquidate this asset. The values is always above 100%. A value of 105% * @param liquidationBonus The bonus liquidators receive to liquidate this asset. The values is always above 100%. A value of 105%
* means the liquidator will receive a 5% bonus * means the liquidator will receive a 5% bonus
**/ **/
function configureReserveAsCollateral( function configureReserveAsCollateral(
@ -363,15 +357,16 @@ contract LendingPoolConfigurator is VersionedInitializable {
if (liquidationThreshold != 0) { if (liquidationThreshold != 0) {
//liquidation bonus must be bigger than 100.00%, otherwise the liquidator would receive less //liquidation bonus must be bigger than 100.00%, otherwise the liquidator would receive less
//collateral than needed to cover the debt. //collateral than needed to cover the debt
uint256 absoluteBonus =
liquidationBonus.sub(PercentageMath.PERCENTAGE_FACTOR, Errors.LPC_INVALID_CONFIGURATION);
require(absoluteBonus > 0, Errors.LPC_INVALID_CONFIGURATION);
//we also need to require that the liq threshold is lower or equal than the liquidation bonus, to ensure that
//there is always enough margin for liquidators to receive the bonus.
require( require(
liquidationThreshold.add(absoluteBonus) <= PercentageMath.PERCENTAGE_FACTOR, liquidationBonus > PercentageMath.PERCENTAGE_FACTOR,
Errors.LPC_INVALID_CONFIGURATION
);
//if threshold * bonus is less than PERCENTAGE_FACTOR, it's guaranteed that at the moment
//a loan is taken there is enough collateral available to cover the liquidation bonus
require(
liquidationThreshold.percentMul(liquidationBonus) <= PercentageMath.PERCENTAGE_FACTOR,
Errors.LPC_INVALID_CONFIGURATION Errors.LPC_INVALID_CONFIGURATION
); );
} else { } else {
@ -392,8 +387,8 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev enable stable rate borrowing on a reserve * @dev Enable stable rate borrowing on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
function enableReserveStableRate(address asset) external onlyPoolAdmin { function enableReserveStableRate(address asset) external onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset);
@ -406,8 +401,8 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev disable stable rate borrowing on a reserve * @dev Disable stable rate borrowing on a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
function disableReserveStableRate(address asset) external onlyPoolAdmin { function disableReserveStableRate(address asset) external onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset);
@ -420,8 +415,8 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev activates a reserve * @dev Activates a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
function activateReserve(address asset) external onlyPoolAdmin { function activateReserve(address asset) external onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset);
@ -434,8 +429,8 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev deactivates a reserve * @dev Deactivates a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
function deactivateReserve(address asset) external onlyPoolAdmin { function deactivateReserve(address asset) external onlyPoolAdmin {
_checkNoLiquidity(asset); _checkNoLiquidity(asset);
@ -450,8 +445,9 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev freezes a reserve. A frozen reserve doesn't accept any new deposit, borrow or rate swap, but can accept repayments, liquidations, rate rebalances and redeems * @dev Freezes a reserve. A frozen reserve doesn't allow any new deposit, borrow or rate swap
* @param asset the address of the reserve * but allows repayments, liquidations, rate rebalances and withdrawals
* @param asset The address of the underlying asset of the reserve
**/ **/
function freezeReserve(address asset) external onlyPoolAdmin { function freezeReserve(address asset) external onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset);
@ -464,8 +460,8 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev unfreezes a reserve * @dev Unfreezes a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
**/ **/
function unfreezeReserve(address asset) external onlyPoolAdmin { function unfreezeReserve(address asset) external onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset);
@ -478,9 +474,9 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev updates the reserve factor of a reserve * @dev Updates the reserve factor of a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param reserveFactor the new reserve factor of the reserve * @param reserveFactor The new reserve factor of the reserve
**/ **/
function setReserveFactor(address asset, uint256 reserveFactor) external onlyPoolAdmin { function setReserveFactor(address asset, uint256 reserveFactor) external onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = pool.getConfiguration(asset);
@ -493,9 +489,9 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev sets the interest rate strategy of a reserve * @dev Sets the interest rate strategy of a reserve
* @param asset the address of the reserve * @param asset The address of the underlying asset of the reserve
* @param rateStrategyAddress the new address of the interest strategy contract * @param rateStrategyAddress The new address of the interest strategy contract
**/ **/
function setReserveInterestRateStrategyAddress(address asset, address rateStrategyAddress) function setReserveInterestRateStrategyAddress(address asset, address rateStrategyAddress)
external external
@ -506,10 +502,13 @@ contract LendingPoolConfigurator is VersionedInitializable {
} }
/** /**
* @dev initializes a token with a proxy and a specific implementation * @dev pauses or unpauses all the actions of the protocol, including aToken transfers
* @param implementation the address of the implementation * @param val true if protocol needs to be paused, false otherwise
* @param decimals the decimals of the token
**/ **/
function setPoolPause(bool val) external onlyEmergencyAdmin {
pool.setPause(val);
}
function _initTokenWithProxy(address implementation, uint8 decimals) internal returns (address) { function _initTokenWithProxy(address implementation, uint8 decimals) internal returns (address) {
InitializableImmutableAdminUpgradeabilityProxy proxy = InitializableImmutableAdminUpgradeabilityProxy proxy =
new InitializableImmutableAdminUpgradeabilityProxy(address(this)); new InitializableImmutableAdminUpgradeabilityProxy(address(this));
@ -550,14 +549,6 @@ contract LendingPoolConfigurator is VersionedInitializable {
proxy.upgradeToAndCall(implementation, params); proxy.upgradeToAndCall(implementation, params);
} }
/**
* @dev pauses or unpauses LendingPool actions
* @param val the boolean value to set the current pause state of LendingPool
**/
function setPoolPause(bool val) external onlyEmergencyAdmin {
pool.setPause(val);
}
function _checkNoLiquidity(address asset) internal view { function _checkNoLiquidity(address asset) internal view {
DataTypes.ReserveData memory reserveData = pool.getReserveData(asset); DataTypes.ReserveData memory reserveData = pool.getReserveData(asset);