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

PR change fixes

Browse Source
This commit is contained in:
Josh Stevens 2021-09-13 13:00:01 +01:00
parent c786b246cc
commit 5f33163983
2 changed files with 69 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
contracts/misc/UiIncentiveDataProvider.sol
View File

@ -55,10 +55,10 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
IAToken(baseData.aTokenAddress).getIncentivesController(); IAToken(baseData.aTokenAddress).getIncentivesController();
( (
uint256 aTokenIncentivesIndex,
uint256 aEmissionPerSecond, uint256 aEmissionPerSecond,
uint256 aIncentivesLastUpdateTimestamp, uint256 aIncentivesLastUpdateTimestamp
uint256 aTokenIncentivesIndex ) = aTokenIncentiveController.getAssetData(baseData.aTokenAddress);
) = aTokenIncentiveController.assets(baseData.aTokenAddress);
reserveIncentiveData.aIncentiveData = IncentiveData( reserveIncentiveData.aIncentiveData = IncentiveData(
aEmissionPerSecond, aEmissionPerSecond,
@ -73,10 +73,10 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
IStableDebtToken(baseData.stableDebtTokenAddress).getIncentivesController(); IStableDebtToken(baseData.stableDebtTokenAddress).getIncentivesController();
( (
uint256 sTokenIncentivesIndex,
uint256 sEmissionPerSecond, uint256 sEmissionPerSecond,
uint256 sIncentivesLastUpdateTimestamp, uint256 sIncentivesLastUpdateTimestamp
uint256 sTokenIncentivesIndex ) = sTokenIncentiveController.getAssetData(baseData.stableDebtTokenAddress);
) = sTokenIncentiveController.assets(baseData.stableDebtTokenAddress);
reserveIncentiveData.sIncentiveData = IncentiveData( reserveIncentiveData.sIncentiveData = IncentiveData(
sEmissionPerSecond, sEmissionPerSecond,
@ -91,10 +91,10 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
IVariableDebtToken(baseData.variableDebtTokenAddress).getIncentivesController(); IVariableDebtToken(baseData.variableDebtTokenAddress).getIncentivesController();
( (
uint256 vTokenIncentivesIndex,
uint256 vEmissionPerSecond, uint256 vEmissionPerSecond,
uint256 vIncentivesLastUpdateTimestamp, uint256 vIncentivesLastUpdateTimestamp
uint256 vTokenIncentivesIndex ) = vTokenIncentiveController.getAssetData(baseData.variableDebtTokenAddress);
) = vTokenIncentiveController.assets(baseData.variableDebtTokenAddress);
reserveIncentiveData.vIncentiveData = IncentiveData( reserveIncentiveData.vIncentiveData = IncentiveData(
vEmissionPerSecond, vEmissionPerSecond,
@ -135,10 +135,12 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
// user reserve data // user reserve data
userReservesIncentivesData[i].underlyingAsset = reserves[i]; userReservesIncentivesData[i].underlyingAsset = reserves[i];
IUiIncentiveDataProvider.UserIncentiveData memory aUserIncentiveData;
if (baseData.aTokenAddress != address(0)) {
IAaveIncentivesController aTokenIncentiveController = IAaveIncentivesController aTokenIncentiveController =
IAToken(baseData.aTokenAddress).getIncentivesController(); IAToken(baseData.aTokenAddress).getIncentivesController();
IUiIncentiveDataProvider.UserIncentiveData memory aUserIncentiveData;
aUserIncentiveData.tokenincentivesUserIndex = aTokenIncentiveController.getUserAssetData( aUserIncentiveData.tokenincentivesUserIndex = aTokenIncentiveController.getUserAssetData(
user, user,
baseData.aTokenAddress baseData.aTokenAddress
@ -148,12 +150,21 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
); );
aUserIncentiveData.tokenAddress = baseData.aTokenAddress; aUserIncentiveData.tokenAddress = baseData.aTokenAddress;
aUserIncentiveData.rewardTokenAddress = aTokenIncentiveController.REWARD_TOKEN(); aUserIncentiveData.rewardTokenAddress = aTokenIncentiveController.REWARD_TOKEN();
} else {
aUserIncentiveData.tokenincentivesUserIndex = uint256(0);
aUserIncentiveData.userUnclaimedRewards = uint256(0);
aUserIncentiveData.tokenAddress = baseData.aTokenAddress;
aUserIncentiveData.rewardTokenAddress = address(0);
}
userReservesIncentivesData[i].aTokenIncentivesUserData = aUserIncentiveData; userReservesIncentivesData[i].aTokenIncentivesUserData = aUserIncentiveData;
UserIncentiveData memory vUserIncentiveData;
if (baseData.variableDebtTokenAddress != address(0)) {
IAaveIncentivesController vTokenIncentiveController = IAaveIncentivesController vTokenIncentiveController =
IVariableDebtToken(baseData.variableDebtTokenAddress).getIncentivesController(); IVariableDebtToken(baseData.variableDebtTokenAddress).getIncentivesController();
UserIncentiveData memory vUserIncentiveData;
vUserIncentiveData.tokenincentivesUserIndex = vTokenIncentiveController.getUserAssetData( vUserIncentiveData.tokenincentivesUserIndex = vTokenIncentiveController.getUserAssetData(
user, user,
baseData.variableDebtTokenAddress baseData.variableDebtTokenAddress
@ -163,12 +174,21 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
); );
vUserIncentiveData.tokenAddress = baseData.variableDebtTokenAddress; vUserIncentiveData.tokenAddress = baseData.variableDebtTokenAddress;
vUserIncentiveData.rewardTokenAddress = vTokenIncentiveController.REWARD_TOKEN(); vUserIncentiveData.rewardTokenAddress = vTokenIncentiveController.REWARD_TOKEN();
} else {
vUserIncentiveData.tokenincentivesUserIndex = uint256(0);
vUserIncentiveData.userUnclaimedRewards = uint256(0);
vUserIncentiveData.tokenAddress = baseData.variableDebtTokenAddress;
vUserIncentiveData.rewardTokenAddress = address(0);
}
userReservesIncentivesData[i].vTokenIncentivesUserData = vUserIncentiveData; userReservesIncentivesData[i].vTokenIncentivesUserData = vUserIncentiveData;
UserIncentiveData memory sUserIncentiveData;
if (baseData.stableDebtTokenAddress != address(0)) {
IAaveIncentivesController sTokenIncentiveController = IAaveIncentivesController sTokenIncentiveController =
IStableDebtToken(baseData.stableDebtTokenAddress).getIncentivesController(); IStableDebtToken(baseData.stableDebtTokenAddress).getIncentivesController();
UserIncentiveData memory sUserIncentiveData;
sUserIncentiveData.tokenincentivesUserIndex = sTokenIncentiveController.getUserAssetData( sUserIncentiveData.tokenincentivesUserIndex = sTokenIncentiveController.getUserAssetData(
user, user,
baseData.stableDebtTokenAddress baseData.stableDebtTokenAddress
@ -178,6 +198,12 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
); );
sUserIncentiveData.tokenAddress = baseData.stableDebtTokenAddress; sUserIncentiveData.tokenAddress = baseData.stableDebtTokenAddress;
sUserIncentiveData.rewardTokenAddress = sTokenIncentiveController.REWARD_TOKEN(); sUserIncentiveData.rewardTokenAddress = sTokenIncentiveController.REWARD_TOKEN();
} else {
sUserIncentiveData.tokenincentivesUserIndex = uint256(0);
sUserIncentiveData.userUnclaimedRewards = uint256(0);
sUserIncentiveData.tokenAddress = baseData.stableDebtTokenAddress;
sUserIncentiveData.rewardTokenAddress = address(0);
}
userReservesIncentivesData[i].sTokenIncentivesUserData = sUserIncentiveData; userReservesIncentivesData[i].sTokenIncentivesUserData = sUserIncentiveData;
} }

5
contracts/misc/interfaces/IUiPoolDataProvider.sol
View File

@ -54,11 +54,6 @@ interface IUiPoolDataProvider {
uint256 stableBorrowLastUpdateTimestamp; uint256 stableBorrowLastUpdateTimestamp;
} }
struct IncentivesControllerData {
uint256 userUnclaimedRewards;
uint256 emissionEndTimestamp;
}
function getReservesList(ILendingPoolAddressesProvider provider) function getReservesList(ILendingPoolAddressesProvider provider)
external external
view view