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/55' into 'master'

Browse Source 
Resolve "On `GenericLogic.balanceDecreaseAllowed()`, change HF validation to `>=`"

Closes #55

See merge request aave-tech/protocol-v2!98
This commit is contained in:
Ernesto Boado 2020-10-27 15:59:00 +00:00
commit 7aca8679df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/libraries/logic/GenericLogic.sol
View File

@ -33,7 +33,7 @@ library GenericLogic {
uint256 borrowBalanceETH; uint256 borrowBalanceETH;
uint256 avgLiquidationThreshold; uint256 avgLiquidationThreshold;
uint256 amountToDecreaseETH; uint256 amountToDecreaseETH;
uint256 collateralBalancefterDecrease; uint256 collateralBalanceAfterDecrease;
uint256 liquidationThresholdAfterDecrease; uint256 liquidationThresholdAfterDecrease;
uint256 healthFactorAfterDecrease; uint256 healthFactorAfterDecrease;
bool reserveUsageAsCollateralEnabled; bool reserveUsageAsCollateralEnabled;
@ -91,10 +91,10 @@ library GenericLogic {
10**vars.decimals 10**vars.decimals
); );
vars.collateralBalancefterDecrease = vars.collateralBalanceETH.sub(vars.amountToDecreaseETH); vars.collateralBalanceAfterDecrease = vars.collateralBalanceETH.sub(vars.amountToDecreaseETH);
//if there is a borrow, there can't be 0 collateral //if there is a borrow, there can't be 0 collateral
if (vars.collateralBalancefterDecrease == 0) { if (vars.collateralBalanceAfterDecrease == 0) {
return false; return false;
} }
@ -110,7 +110,7 @@ library GenericLogic {
vars.liquidationThresholdAfterDecrease vars.liquidationThresholdAfterDecrease
); );
return healthFactorAfterDecrease > GenericLogic.HEALTH_FACTOR_LIQUIDATION_THRESHOLD; return healthFactorAfterDecrease >= GenericLogic.HEALTH_FACTOR_LIQUIDATION_THRESHOLD;
} }
struct CalculateUserAccountDataVars { struct CalculateUserAccountDataVars {