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

Merge branch 'fix/wrong-controller-order' of github.com:aave/protocol-v2 into feat/188-avalanche-market

Browse Source
This commit is contained in:
kartojal 2021-10-04 18:56:57 +02:00
commit dab9f72a42
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/misc/UiPoolDataProvider.sol
View File

@ -315,22 +315,22 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
// incentives // incentives
if (address(0) != address(incentivesController)) { if (address(0) != address(incentivesController)) {
( (
reserveData.aTokenIncentivesIndex,
reserveData.aEmissionPerSecond, reserveData.aEmissionPerSecond,
reserveData.aTokenIncentivesIndex,
reserveData.aIncentivesLastUpdateTimestamp reserveData.aIncentivesLastUpdateTimestamp
// ) = incentivesController.getAssetData(reserveData.aTokenAddress); TODO: temp fix // ) = incentivesController.getAssetData(reserveData.aTokenAddress); TODO: temp fix
) = incentivesController.assets(reserveData.aTokenAddress); ) = incentivesController.assets(reserveData.aTokenAddress);
( (
reserveData.sTokenIncentivesIndex,
reserveData.sEmissionPerSecond, reserveData.sEmissionPerSecond,
reserveData.sTokenIncentivesIndex,
reserveData.sIncentivesLastUpdateTimestamp reserveData.sIncentivesLastUpdateTimestamp
// ) = incentivesController.getAssetData(reserveData.stableDebtTokenAddress); TODO: temp fix // ) = incentivesController.getAssetData(reserveData.stableDebtTokenAddress); TODO: temp fix
) = incentivesController.assets(reserveData.stableDebtTokenAddress); ) = incentivesController.assets(reserveData.stableDebtTokenAddress);
( (
reserveData.vTokenIncentivesIndex,
reserveData.vEmissionPerSecond, reserveData.vEmissionPerSecond,
reserveData.vTokenIncentivesIndex,
reserveData.vIncentivesLastUpdateTimestamp reserveData.vIncentivesLastUpdateTimestamp
// ) = incentivesController.getAssetData(reserveData.variableDebtTokenAddress); TODO: temp fix // ) = incentivesController.getAssetData(reserveData.variableDebtTokenAddress); TODO: temp fix
) = incentivesController.assets(reserveData.variableDebtTokenAddress); ) = incentivesController.assets(reserveData.variableDebtTokenAddress);