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

refactor: improved variables naming

Browse Source
This commit is contained in:
The3D 2021-04-27 17:21:36 +02:00
parent ada4994c7f
commit 45acc0b854
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
contracts/protocol/libraries/logic/GenericLogic.sol
View File

@ -117,10 +117,12 @@ library GenericLogic {
} }
struct CalculateUserAccountDataVars { struct CalculateUserAccountDataVars {
uint256 reserveUnitPrice; uint256 assetPrice;
uint256 tokenUnit; uint256 assetUnit;
uint256 compoundedLiquidityBalance; uint256 userBalance;
uint256 compoundedBorrowBalance; uint256 userBalanceETH;
uint256 userDebt;
uint256 userDebtETH;
uint256 decimals; uint256 decimals;
uint256 ltv; uint256 ltv;
uint256 liquidationThreshold; uint256 liquidationThreshold;
@ -185,44 +187,41 @@ library GenericLogic {
.configuration .configuration
.getParams(); .getParams();
vars.tokenUnit = 10**vars.decimals; vars.assetUnit = 10**vars.decimals;
vars.reserveUnitPrice = IPriceOracleGetter(oracle).getAssetPrice(vars.currentReserveAddress); vars.assetPrice = IPriceOracleGetter(oracle).getAssetPrice(vars.currentReserveAddress);
if (vars.liquidationThreshold != 0 && userConfig.isUsingAsCollateral(vars.i)) { if (vars.liquidationThreshold != 0 && userConfig.isUsingAsCollateral(vars.i)) {
vars.compoundedLiquidityBalance = IScaledBalanceToken(currentReserve.aTokenAddress).scaledBalanceOf(user); vars.userBalance = IScaledBalanceToken(currentReserve.aTokenAddress).scaledBalanceOf(user);
if(vars.compoundedLiquidityBalance > 0){ if (vars.userBalance > 0) {
vars.normalizedIncome = currentReserve.getNormalizedIncome(); vars.normalizedIncome = currentReserve.getNormalizedIncome();
vars.compoundedLiquidityBalance = vars.compoundedLiquidityBalance.rayMul(vars.normalizedIncome); vars.userBalance = vars.userBalance.rayMul(vars.normalizedIncome);
} }
uint256 liquidityBalanceETH = vars.userBalanceETH = vars.assetPrice.mul(vars.userBalance).div(vars.assetUnit);
vars.reserveUnitPrice.mul(vars.compoundedLiquidityBalance).div(vars.tokenUnit);
vars.totalCollateralInETH = vars.totalCollateralInETH.add(liquidityBalanceETH); vars.totalCollateralInETH = vars.totalCollateralInETH.add(vars.userBalanceETH);
vars.avgLtv = vars.avgLtv.add(liquidityBalanceETH.mul(vars.ltv)); vars.avgLtv = vars.avgLtv.add(vars.userBalanceETH.mul(vars.ltv));
vars.avgLiquidationThreshold = vars.avgLiquidationThreshold.add( vars.avgLiquidationThreshold = vars.avgLiquidationThreshold.add(
liquidityBalanceETH.mul(vars.liquidationThreshold) vars.userBalanceETH.mul(vars.liquidationThreshold)
); );
} }
if (userConfig.isBorrowing(vars.i)) { if (userConfig.isBorrowing(vars.i)) {
vars.compoundedBorrowBalance = vars.userDebt = IScaledBalanceToken(currentReserve.variableDebtTokenAddress)
IScaledBalanceToken(currentReserve.variableDebtTokenAddress).scaledBalanceOf(user); .scaledBalanceOf(user);
if(vars.compoundedBorrowBalance > 0) { if (vars.userDebt > 0) {
vars.normalizedDebt = currentReserve.getNormalizedDebt(); vars.normalizedDebt = currentReserve.getNormalizedDebt();
vars.compoundedLiquidityBalance = vars.compoundedBorrowBalance.rayMul(vars.normalizedDebt); vars.userDebt = vars.userDebt.rayMul(vars.normalizedDebt);
} }
vars.compoundedBorrowBalance = vars.compoundedBorrowBalance.add(IERC20(currentReserve.stableDebtTokenAddress).balanceOf( vars.userDebt = vars.userDebt.add(
user IERC20(currentReserve.stableDebtTokenAddress).balanceOf(user)
));
vars.totalDebtInETH = vars.totalDebtInETH.add(
vars.reserveUnitPrice.mul(vars.compoundedBorrowBalance).div(vars.tokenUnit)
); );
vars.userDebtETH = vars.assetPrice.mul(vars.userDebt).div(vars.assetUnit);
vars.totalDebtInETH = vars.totalDebtInETH.add(vars.userDebtETH);
} }
} }