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-fix: finishing resolving conflicts: naming convention. Fix: removed transfer aToken origin check from lendingPool to Validation Logic

Browse Source
This commit is contained in:
Hadrien Charlanes 2021-05-31 10:34:10 +02:00
parent a9ac7a3b2f
commit 15a1d1608a
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/protocol/lendingpool/LendingPool.sol
View File

@ -718,8 +718,6 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
uint256 balanceFromBefore, uint256 balanceFromBefore,
uint256 balanceToBefore uint256 balanceToBefore
) external override whenNotPaused { ) external override whenNotPaused {
require(msg.sender == _reserves[asset].aTokenAddress, Errors.LP_CALLER_MUST_BE_AN_ATOKEN);
ValidationLogic.validateTransfer(_reserves[asset]); ValidationLogic.validateTransfer(_reserves[asset]);
uint256 reserveId = _reserves[asset].id; uint256 reserveId = _reserves[asset].id;

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

@ -48,8 +48,8 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
modifier onlyEmergencyOrPoolAdmin { modifier onlyEmergencyOrPoolAdmin {
require( require(
addressesProvider.getEmergencyAdmin() == msg.sender || _addressesProvider.getEmergencyAdmin() == msg.sender ||
addressesProvider.getPoolAdmin() == msg.sender, _addressesProvider.getPoolAdmin() == msg.sender,
Errors.LPC_CALLER_NOT_EMERGENCY_OR_POOL_ADMIN Errors.LPC_CALLER_NOT_EMERGENCY_OR_POOL_ADMIN
); );
_; _;
@ -391,7 +391,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
} }
/// @inheritdoc ILendingPoolConfigurator /// @inheritdoc ILendingPoolConfigurator
function pauseReserve(address asset) external onlyEmergencyOrPoolAdmin { function pauseReserve(address asset) external override onlyEmergencyOrPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
currentConfig.setPaused(true); currentConfig.setPaused(true);
@ -402,7 +402,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
} }
/// @inheritdoc ILendingPoolConfigurator /// @inheritdoc ILendingPoolConfigurator
function unpauseReserve(address asset) external onlyEmergencyOrPoolAdmin { function unpauseReserve(address asset) external override onlyEmergencyOrPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
currentConfig.setPaused(false); currentConfig.setPaused(false);
@ -413,7 +413,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
} }
/// @inheritdoc ILendingPoolConfigurator /// @inheritdoc ILendingPoolConfigurator
function setReserveFactor(address asset, uint256 reserveFactor) external onlyPoolAdmin { function setReserveFactor(address asset, uint256 reserveFactor) external override onlyPoolAdmin {
DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset); DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
currentConfig.setReserveFactor(reserveFactor); currentConfig.setReserveFactor(reserveFactor);

2
contracts/protocol/libraries/helpers/Errors.sol
View File

@ -86,7 +86,7 @@ library Errors {
string public constant LP_FAILED_COLLATERAL_SWAP = '60'; string public constant LP_FAILED_COLLATERAL_SWAP = '60';
string public constant LP_INVALID_EQUAL_ASSETS_TO_SWAP = '61'; string public constant LP_INVALID_EQUAL_ASSETS_TO_SWAP = '61';
string public constant LP_REENTRANCY_NOT_ALLOWED = '62'; string public constant LP_REENTRANCY_NOT_ALLOWED = '62';
string public constant LP_CALLER_MUST_BE_AN_ATOKEN = '63'; string public constant VL_CALLER_MUST_BE_AN_ATOKEN = '63';
string public constant LP_IS_PAUSED = '64'; // 'Pool is paused' string public constant LP_IS_PAUSED = '64'; // 'Pool is paused'
string public constant LP_NO_MORE_RESERVES_ALLOWED = '65'; string public constant LP_NO_MORE_RESERVES_ALLOWED = '65';
string public constant LP_INVALID_FLASH_LOAN_EXECUTOR_RETURN = '66'; string public constant LP_INVALID_FLASH_LOAN_EXECUTOR_RETURN = '66';

1
contracts/protocol/libraries/logic/ValidationLogic.sol
View File

@ -475,6 +475,7 @@ library ValidationLogic {
* @param reserve The reserve object * @param reserve The reserve object
*/ */
function validateTransfer(DataTypes.ReserveData storage reserve) internal view { function validateTransfer(DataTypes.ReserveData storage reserve) internal view {
require(msg.sender == reserve.aTokenAddress, Errors.VL_CALLER_MUST_BE_AN_ATOKEN);
require(!reserve.configuration.getPaused(), Errors.VL_RESERVE_PAUSED); require(!reserve.configuration.getPaused(), Errors.VL_RESERVE_PAUSED);
} }
} }

2
helpers/types.ts
View File

@ -167,7 +167,7 @@ export enum ProtocolErrors {
LP_FAILED_COLLATERAL_SWAP = '60', LP_FAILED_COLLATERAL_SWAP = '60',
LP_INVALID_EQUAL_ASSETS_TO_SWAP = '61', LP_INVALID_EQUAL_ASSETS_TO_SWAP = '61',
LP_REENTRANCY_NOT_ALLOWED = '62', LP_REENTRANCY_NOT_ALLOWED = '62',
LP_CALLER_MUST_BE_AN_ATOKEN = '63', VL_CALLER_MUST_BE_AN_ATOKEN = '63',
LP_IS_PAUSED = '64', // 'Pool is paused' LP_IS_PAUSED = '64', // 'Pool is paused'
LP_NO_MORE_RESERVES_ALLOWED = '65', LP_NO_MORE_RESERVES_ALLOWED = '65',
LP_INVALID_FLASH_LOAN_EXECUTOR_RETURN = '66', LP_INVALID_FLASH_LOAN_EXECUTOR_RETURN = '66',