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

fix bad merge mistakes

Browse Source
This commit is contained in:
andyk 2020-11-02 15:00:24 +03:00
parent 438ab0fca1
commit f5d7d0192d
2 changed files with 1211 additions and 6120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/misc/UiPoolDataProvider.sol
View File

@ -92,12 +92,8 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
, ,
reserveData.averageStableRate, reserveData.averageStableRate,
reserveData.stableDebtLastUpdateTimestamp reserveData.stableDebtLastUpdateTimestamp
) = IStableDebtToken(reserveData.baseData.stableDebtTokenAddress).getSupplyData(); ) = IStableDebtToken(reserveData.stableDebtTokenAddress).getSupplyData();
reserveData.totalScaledVariableDebt = IVariableDebtToken( reserveData.totalScaledVariableDebt = IVariableDebtToken(reserveData.variableDebtTokenAddress)
reserveData
.baseData
.variableDebtTokenAddress
)
.scaledTotalSupply(); .scaledTotalSupply();
// reserve configuration // reserve configuration
@ -132,7 +128,7 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
if (user != address(0)) { if (user != address(0)) {
// user reserve data // user reserve data
userReservesData[i].underlyingAsset = reserveData.underlyingAsset; userReservesData[i].underlyingAsset = reserveData.underlyingAsset;
userReservesData[i].principalATokenBalance = IAToken(reserveData.aTokenAddress) userReservesData[i].scaledATokenBalance = IAToken(reserveData.aTokenAddress)
.scaledBalanceOf(user); .scaledBalanceOf(user);
userReservesData[i].usageAsCollateralEnabledOnUser = userConfig.isUsingAsCollateral(i); userReservesData[i].usageAsCollateralEnabledOnUser = userConfig.isUsingAsCollateral(i);

7321
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff