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 exposure cap logic in calculateUserAccountData

Browse Source
This commit is contained in:
Hadrien Charlanes 2021-06-03 11:53:04 +02:00
parent 5a8572d568
commit 68ff74a3a6
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,7 @@ library Errors {
string public constant VL_RESERVE_PAUSED = '86'; string public constant VL_RESERVE_PAUSED = '86';
string public constant LPC_CALLER_NOT_RISK_OR_POOL_ADMIN = '87'; string public constant LPC_CALLER_NOT_RISK_OR_POOL_ADMIN = '87';
string public constant RC_INVALID_EXPOSURE_CAP = '88'; string public constant RC_INVALID_EXPOSURE_CAP = '88';
string public constant VL_COLLATERAL_EXPOSURE_CAP_EXCEEDED = '89';
enum CollateralManagerErrors { enum CollateralManagerErrors {
NO_ERROR, NO_ERROR,

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

@ -47,10 +47,12 @@ library GenericLogic {
uint256 reservesLength; uint256 reservesLength;
uint256 normalizedIncome; uint256 normalizedIncome;
uint256 normalizedDebt; uint256 normalizedDebt;
uint256 exposureCap;
bool healthFactorBelowThreshold; bool healthFactorBelowThreshold;
address currentReserveAddress; address currentReserveAddress;
bool usageAsCollateralEnabled; bool usageAsCollateralEnabled;
bool userUsesReserveAsCollateral; bool userUsesReserveAsCollateral;
bool exposureCapped;
} }
/** /**
@ -112,8 +114,14 @@ library GenericLogic {
vars.userBalanceETH = vars.assetPrice.mul(vars.userBalance).div(vars.assetUnit); vars.userBalanceETH = vars.assetPrice.mul(vars.userBalance).div(vars.assetUnit);
vars.totalCollateralInETH = vars.totalCollateralInETH.add(vars.userBalanceETH); vars.totalCollateralInETH = vars.totalCollateralInETH.add(vars.userBalanceETH);
vars.exposureCap = currentReserve.configuration.getExposureCap();
vars.avgLtv = vars.avgLtv.add(vars.userBalanceETH.mul(vars.ltv)); vars.exposureCapped =
IERC20(currentReserve.stableDebtTokenAddress)
.totalSupply()
.add(IERC20(currentReserve.variableDebtTokenAddress).totalSupply())
.div(10**vars.decimals) >
vars.exposureCap;
vars.avgLtv = vars.avgLtv.add(vars.exposureCapped ? 0 : vars.userBalanceETH.mul(vars.ltv));
vars.avgLiquidationThreshold = vars.avgLiquidationThreshold.add( vars.avgLiquidationThreshold = vars.avgLiquidationThreshold.add(
vars.userBalanceETH.mul(vars.liquidationThreshold) vars.userBalanceETH.mul(vars.liquidationThreshold)
); );
@ -132,7 +140,7 @@ library GenericLogic {
IERC20(currentReserve.stableDebtTokenAddress).balanceOf(user) IERC20(currentReserve.stableDebtTokenAddress).balanceOf(user)
); );
vars.userDebtETH = vars.assetPrice.mul(vars.userDebt).div(vars.assetUnit); vars.userDebtETH = vars.assetPrice.mul(vars.userDebt).div(vars.assetUnit);
vars.totalDebtInETH = vars.totalDebtInETH.add(vars.userDebtETH); vars.totalDebtInETH = vars.totalDebtInETH.add(vars.userDebtETH);
} }
} }

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

@ -480,7 +480,7 @@ library ValidationLogic {
exposureCap == 0 || exposureCap == 0 ||
ltv == 0 || ltv == 0 ||
totalSupplyStableDebt.add(totalSupplyVariableDebt).div(10**reserveDecimals) < exposureCap, totalSupplyStableDebt.add(totalSupplyVariableDebt).div(10**reserveDecimals) < exposureCap,
Errors.VL_SUPPLY_CAP_EXCEEDED Errors.VL_COLLATERAL_EXPOSURE_CAP_EXCEEDED
); );
} }

2
helpers/types.ts
View File

@ -184,6 +184,8 @@ export enum ProtocolErrors {
LPC_CALLER_NOT_EMERGENCY_OR_POOL_ADMIN = '85', LPC_CALLER_NOT_EMERGENCY_OR_POOL_ADMIN = '85',
VL_RESERVE_PAUSED = '86', VL_RESERVE_PAUSED = '86',
LPC_CALLER_NOT_RISK_OR_POOL_ADMIN = '87', LPC_CALLER_NOT_RISK_OR_POOL_ADMIN = '87',
RC_INVALID_EXPOSURE_CAP = '88',
VL_COLLATERAL_EXPOSURE_CAP_EXCEEDED = '89',
// old // old