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

initial fix

Browse Source
This commit is contained in:
The3D 2020-09-24 18:20:17 +02:00
parent 12d97f9f13
commit 6e7787d23c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,8 @@ import {UserConfiguration} from '../configuration/UserConfiguration.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 {IPriceOracleGetter} from '../../interfaces/IPriceOracleGetter.sol'; import {IPriceOracleGetter} from '../../interfaces/IPriceOracleGetter.sol';
import "@nomiclabs/buidler/console.sol";
/** /**
* @title GenericLogic library * @title GenericLogic library
@ -29,11 +31,10 @@ library GenericLogic {
struct balanceDecreaseAllowedLocalVars { struct balanceDecreaseAllowedLocalVars {
uint256 decimals; uint256 decimals;
uint256 ltv; uint256 liquidationThreshold;
uint256 collateralBalanceETH; uint256 collateralBalanceETH;
uint256 borrowBalanceETH; uint256 borrowBalanceETH;
uint256 currentLiquidationThreshold; uint256 avgLiquidationThreshold;
uint256 reserveLiquidationThreshold;
uint256 amountToDecreaseETH; uint256 amountToDecreaseETH;
uint256 collateralBalancefterDecrease; uint256 collateralBalancefterDecrease;
uint256 liquidationThresholdAfterDecrease; uint256 liquidationThresholdAfterDecrease;
@ -71,9 +72,10 @@ library GenericLogic {
balanceDecreaseAllowedLocalVars memory vars; balanceDecreaseAllowedLocalVars memory vars;
(vars.ltv, , , vars.decimals) = reservesData[asset].configuration.getParams();
if (vars.ltv == 0) { (, vars.liquidationThreshold, , vars.decimals) = reservesData[asset].configuration.getParams();
if (vars.liquidationThreshold == 0) {
return true; //if reserve is not used as collateral, no reasons to block the transfer return true; //if reserve is not used as collateral, no reasons to block the transfer
} }
@ -81,7 +83,7 @@ library GenericLogic {
vars.collateralBalanceETH, vars.collateralBalanceETH,
vars.borrowBalanceETH, vars.borrowBalanceETH,
, ,
vars.currentLiquidationThreshold, vars.avgLiquidationThreshold,
) = calculateUserAccountData(user, reservesData, userConfig, reserves, oracle); ) = calculateUserAccountData(user, reservesData, userConfig, reserves, oracle);
@ -102,8 +104,8 @@ library GenericLogic {
vars.liquidationThresholdAfterDecrease = vars vars.liquidationThresholdAfterDecrease = vars
.collateralBalanceETH .collateralBalanceETH
.mul(vars.currentLiquidationThreshold) .mul(vars.avgLiquidationThreshold)
.sub(vars.amountToDecreaseETH.mul(vars.reserveLiquidationThreshold)) .sub(vars.amountToDecreaseETH.mul(vars.liquidationThreshold))
.div(vars.collateralBalancefterDecrease); .div(vars.collateralBalancefterDecrease);
uint256 healthFactorAfterDecrease = calculateHealthFactorFromBalances( uint256 healthFactorAfterDecrease = calculateHealthFactorFromBalances(