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

feat: Added validate Repay check to revert if borrow/repay in same tx

Browse Source
This commit is contained in:
Hadrien Charlanes 2021-06-15 16:14:58 +02:00
parent 4b12f1916c
commit a792d5500f
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,8 @@ library Errors {
string public constant RL_ATOKEN_SUPPLY_NOT_ZERO = '88'; string public constant RL_ATOKEN_SUPPLY_NOT_ZERO = '88';
string public constant RL_STABLE_DEBT_NOT_ZERO = '89'; string public constant RL_STABLE_DEBT_NOT_ZERO = '89';
string public constant RL_VARIABLE_DEBT_SUPPLY_NOT_ZERO = '90'; string public constant RL_VARIABLE_DEBT_SUPPLY_NOT_ZERO = '90';
string public constant VL_SAME_BLOCK_REPAY_AS_LAST_ACTION = '91';
string public constant VL_NO_DEBT_ACCRUED_BY_CONTRACT = '92';
enum CollateralManagerErrors { enum CollateralManagerErrors {
NO_ERROR, NO_ERROR,

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

@ -9,6 +9,7 @@ import {GenericLogic} from './GenericLogic.sol';
import {WadRayMath} from '../math/WadRayMath.sol'; import {WadRayMath} from '../math/WadRayMath.sol';
import {PercentageMath} from '../math/PercentageMath.sol'; import {PercentageMath} from '../math/PercentageMath.sol';
import {SafeERC20} from '../../../dependencies/openzeppelin/contracts/SafeERC20.sol'; import {SafeERC20} from '../../../dependencies/openzeppelin/contracts/SafeERC20.sol';
import {Address} from '../../../dependencies/openzeppelin/contracts/Address.sol';
import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol'; import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
import {UserConfiguration} from '../configuration/UserConfiguration.sol'; import {UserConfiguration} from '../configuration/UserConfiguration.sol';
import {Errors} from '../helpers/Errors.sol'; import {Errors} from '../helpers/Errors.sol';
@ -32,6 +33,7 @@ library ValidationLogic {
using WadRayMath for uint256; using WadRayMath for uint256;
using PercentageMath for uint256; using PercentageMath for uint256;
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
using Address for address;
using ReserveConfiguration for DataTypes.ReserveConfigurationMap; using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
using UserConfiguration for DataTypes.UserConfigurationMap; using UserConfiguration for DataTypes.UserConfigurationMap;
@ -259,20 +261,33 @@ library ValidationLogic {
address onBehalfOf, address onBehalfOf,
uint256 stableDebt, uint256 stableDebt,
uint256 variableDebt uint256 variableDebt
) internal view { ) external view {
(bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlagsMemory(); (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlagsMemory();
require(isActive, Errors.VL_NO_ACTIVE_RESERVE); require(isActive, Errors.VL_NO_ACTIVE_RESERVE);
require(!isPaused, Errors.VL_RESERVE_PAUSED); require(!isPaused, Errors.VL_RESERVE_PAUSED);
require(amountSent > 0, Errors.VL_INVALID_AMOUNT); require(amountSent > 0, Errors.VL_INVALID_AMOUNT);
require( if (DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.STABLE) {
(stableDebt > 0 && require(stableDebt > 0, Errors.VL_NO_DEBT_OF_SELECTED_TYPE);
DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.STABLE) ||
(variableDebt > 0 && require(
DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.VARIABLE), IStableDebtToken(reserveCache.stableDebtTokenAddress).getUserLastUpdated(onBehalfOf) <
Errors.VL_NO_DEBT_OF_SELECTED_TYPE uint40(block.timestamp),
); Errors.VL_SAME_BLOCK_REPAY_AS_LAST_ACTION
);
} else if (DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.VARIABLE) {
require(variableDebt > 0, Errors.VL_NO_DEBT_OF_SELECTED_TYPE);
require(
!onBehalfOf.isContract() ||
IERC20(reserveCache.variableDebtTokenAddress).balanceOf(onBehalfOf) >
IVariableDebtToken(reserveCache.variableDebtTokenAddress)
.scaledBalanceOf(onBehalfOf)
.rayMul(reserveCache.currVariableBorrowIndex),
Errors.VL_NO_DEBT_ACCRUED_BY_CONTRACT
);
}
require( require(
amountSent != uint256(-1) || msg.sender == onBehalfOf, amountSent != uint256(-1) || msg.sender == onBehalfOf,
@ -283,7 +298,7 @@ library ValidationLogic {
/** /**
* @dev Validates a swap of borrow rate mode. * @dev Validates a swap of borrow rate mode.
* @param reserve The reserve state on which the user is swapping the rate * @param reserve The reserve state on which the user is swapping the rate
* @param reserveCache The cached data of the reserve * @param reserveCache The cached data of the reserve
* @param userConfig The user reserves configuration * @param userConfig The user reserves configuration
* @param stableDebt The stable debt of the user * @param stableDebt The stable debt of the user
* @param variableDebt The variable debt of the user * @param variableDebt The variable debt of the user