PR changes

This commit is contained in:
Josh Stevens 2021-09-13 13:44:50 +01:00
parent b25c7a0ad5
commit 96a54e4f92

View File

@ -53,57 +53,62 @@ contract UiIncentiveDataProvider is IUiIncentiveDataProvider {
IAaveIncentivesController aTokenIncentiveController = IAaveIncentivesController aTokenIncentiveController =
IAToken(baseData.aTokenAddress).getIncentivesController(); IAToken(baseData.aTokenAddress).getIncentivesController();
if (address(aTokenIncentiveController) != address(0)) {
(
uint256 aTokenIncentivesIndex,
uint256 aEmissionPerSecond,
uint256 aIncentivesLastUpdateTimestamp
) = aTokenIncentiveController.getAssetData(baseData.aTokenAddress);
( reserveIncentiveData.aIncentiveData = IncentiveData(
uint256 aTokenIncentivesIndex, aEmissionPerSecond,
uint256 aEmissionPerSecond, aIncentivesLastUpdateTimestamp,
uint256 aIncentivesLastUpdateTimestamp aTokenIncentivesIndex,
) = aTokenIncentiveController.getAssetData(baseData.aTokenAddress); aTokenIncentiveController.DISTRIBUTION_END(),
baseData.aTokenAddress,
reserveIncentiveData.aIncentiveData = IncentiveData( aTokenIncentiveController.REWARD_TOKEN()
aEmissionPerSecond, );
aIncentivesLastUpdateTimestamp, }
aTokenIncentivesIndex,
aTokenIncentiveController.DISTRIBUTION_END(),
baseData.aTokenAddress,
aTokenIncentiveController.REWARD_TOKEN()
);
IAaveIncentivesController sTokenIncentiveController = IAaveIncentivesController sTokenIncentiveController =
IStableDebtToken(baseData.stableDebtTokenAddress).getIncentivesController(); IStableDebtToken(baseData.stableDebtTokenAddress).getIncentivesController();
( if (address(sTokenIncentiveController) != address(0)) {
uint256 sTokenIncentivesIndex, (
uint256 sEmissionPerSecond, uint256 sTokenIncentivesIndex,
uint256 sIncentivesLastUpdateTimestamp uint256 sEmissionPerSecond,
) = sTokenIncentiveController.getAssetData(baseData.stableDebtTokenAddress); uint256 sIncentivesLastUpdateTimestamp
) = sTokenIncentiveController.getAssetData(baseData.stableDebtTokenAddress);
reserveIncentiveData.sIncentiveData = IncentiveData( reserveIncentiveData.sIncentiveData = IncentiveData(
sEmissionPerSecond, sEmissionPerSecond,
sIncentivesLastUpdateTimestamp, sIncentivesLastUpdateTimestamp,
sTokenIncentivesIndex, sTokenIncentivesIndex,
sTokenIncentiveController.DISTRIBUTION_END(), sTokenIncentiveController.DISTRIBUTION_END(),
baseData.stableDebtTokenAddress, baseData.stableDebtTokenAddress,
sTokenIncentiveController.REWARD_TOKEN() sTokenIncentiveController.REWARD_TOKEN()
); );
}
IAaveIncentivesController vTokenIncentiveController = IAaveIncentivesController vTokenIncentiveController =
IVariableDebtToken(baseData.variableDebtTokenAddress).getIncentivesController(); IVariableDebtToken(baseData.variableDebtTokenAddress).getIncentivesController();
( if (address(vTokenIncentiveController) != address(0)) {
uint256 vTokenIncentivesIndex, (
uint256 vEmissionPerSecond, uint256 vTokenIncentivesIndex,
uint256 vIncentivesLastUpdateTimestamp uint256 vEmissionPerSecond,
) = vTokenIncentiveController.getAssetData(baseData.variableDebtTokenAddress); uint256 vIncentivesLastUpdateTimestamp
) = vTokenIncentiveController.getAssetData(baseData.variableDebtTokenAddress);
reserveIncentiveData.vIncentiveData = IncentiveData( reserveIncentiveData.vIncentiveData = IncentiveData(
vEmissionPerSecond, vEmissionPerSecond,
vIncentivesLastUpdateTimestamp, vIncentivesLastUpdateTimestamp,
vTokenIncentivesIndex, vTokenIncentivesIndex,
vTokenIncentiveController.DISTRIBUTION_END(), vTokenIncentiveController.DISTRIBUTION_END(),
baseData.variableDebtTokenAddress, baseData.variableDebtTokenAddress,
vTokenIncentiveController.REWARD_TOKEN() vTokenIncentiveController.REWARD_TOKEN()
); );
}
} }
return (reservesIncentiveData); return (reservesIncentiveData);