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

added 0 address check in case we dont have incentives controller

Browse Source
This commit is contained in:
sendra 2021-06-07 13:39:34 +02:00
parent 5e5962372e
commit 6319733e82
2 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
contracts/misc/UiPoolDataProvider.sol
View File

@ -131,36 +131,40 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
); );
// incentives // incentives
IAaveIncentivesController.AssetData memory tokenIncentivesInfo = if (address(incentivesController) != address(0)) {
incentivesController.assets(reserveData.aTokenAddress); IAaveIncentivesController.AssetData memory tokenIncentivesInfo =
reserveData.aEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond; incentivesController.assets(reserveData.aTokenAddress);
reserveData.aIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp; reserveData.aEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond;
reserveData.aTokenIncentivesIndex = tokenIncentivesInfo.index; reserveData.aIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp;
reserveData.aTokenIncentivesIndex = tokenIncentivesInfo.index;
tokenIncentivesInfo = incentivesController.assets(reserveData.stableDebtTokenAddress); tokenIncentivesInfo = incentivesController.assets(reserveData.stableDebtTokenAddress);
reserveData.sEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond; reserveData.sEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond;
reserveData.sIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp; reserveData.sIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp;
reserveData.sTokenIncentivesIndex = tokenIncentivesInfo.index; reserveData.sTokenIncentivesIndex = tokenIncentivesInfo.index;
tokenIncentivesInfo = incentivesController.assets(reserveData.variableDebtTokenAddress);
reserveData.vEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond;
reserveData.vIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp;
reserveData.vTokenIncentivesIndex = tokenIncentivesInfo.index;
tokenIncentivesInfo = incentivesController.assets(reserveData.variableDebtTokenAddress);
reserveData.vEmissionPerSecond = tokenIncentivesInfo.emissionPerSecond;
reserveData.vIncentivesLastUpdateTimestamp = tokenIncentivesInfo.lastUpdateTimestamp;
reserveData.vTokenIncentivesIndex = tokenIncentivesInfo.index;
}
if (user != address(0)) { if (user != address(0)) {
// incentives // incentives
userReservesData[i].aTokenincentivesUserIndex = incentivesController.getUserAssetData(
user, if (address(incentivesController) != address(0)) {
reserveData.aTokenAddress userReservesData[i].aTokenincentivesUserIndex = incentivesController.getUserAssetData(
); user,
userReservesData[i].sTokenincentivesUserIndex = incentivesController.getUserAssetData( reserveData.aTokenAddress
user, );
reserveData.stableDebtTokenAddress userReservesData[i].sTokenincentivesUserIndex = incentivesController.getUserAssetData(
); user,
userReservesData[i].vTokenincentivesUserIndex = incentivesController.getUserAssetData( reserveData.stableDebtTokenAddress
user, );
reserveData.variableDebtTokenAddress userReservesData[i].vTokenincentivesUserIndex = incentivesController.getUserAssetData(
); user,
reserveData.variableDebtTokenAddress
);
}
// user reserve data // user reserve data
userReservesData[i].underlyingAsset = reserveData.underlyingAsset; userReservesData[i].underlyingAsset = reserveData.underlyingAsset;
userReservesData[i].scaledATokenBalance = IAToken(reserveData.aTokenAddress) userReservesData[i].scaledATokenBalance = IAToken(reserveData.aTokenAddress)
@ -196,13 +200,16 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
IncentivesControllerData memory incentivesControllerData; IncentivesControllerData memory incentivesControllerData;
incentivesControllerData.userUnclaimedRewards = incentivesController.getUserUnclaimedRewards(user);
// incentivesControllerData.rewardToken = incentivesController.REWARD_TOKEN();
// incentivesControllerData.rewardTokenDecimals = IERC20Detailed(incentivesControllerData.rewardToken).decimals();
// incentivesControllerData.rewardTokenSymbol = IERC20Detailed(incentivesControllerData.rewardToken).symbol();
// incentivesControllerData.precision = incentivesController.PRECISION();
incentivesControllerData.emissionEndTimestamp = incentivesController.DISTRIBUTION_END();
if (address(incentivesController) != address(0)) {
incentivesControllerData.userUnclaimedRewards = incentivesController.getUserUnclaimedRewards(user);
// incentivesControllerData.rewardToken = incentivesController.REWARD_TOKEN();
// incentivesControllerData.rewardTokenDecimals = IERC20Detailed(incentivesControllerData.rewardToken).decimals();
// incentivesControllerData.rewardTokenSymbol = IERC20Detailed(incentivesControllerData.rewardToken).symbol();
// incentivesControllerData.precision = incentivesController.PRECISION();
incentivesControllerData.emissionEndTimestamp = incentivesController.DISTRIBUTION_END();
}
return ( return (
reservesData, reservesData,
userReservesData, userReservesData,

16
tasks/deployments/deploy-UiPoolDataProvider.ts
View File

@ -11,14 +11,14 @@ task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider
} }
const addressesByNetwork = { const addressesByNetwork = {
// [eEthereumNetwork.kovan]: { [eEthereumNetwork.kovan]: {
// incentivesController: '', incentivesController: '0x0000000000000000000000000000000000000000',
// aaveOracle: '', aaveOracle: '0x8fb777d67e9945e2c01936e319057f9d41d559e6',
// }, },
// [eEthereumNetwork.main]: { [eEthereumNetwork.main]: {
// incentivesController: '', incentivesController: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5',
// aaveOracle: '0xa50ba011c48153de246e5192c8f9258a2ba79ca9', aaveOracle: '0xa50ba011c48153de246e5192c8f9258a2ba79ca9',
// }, },
[ePolygonNetwork.matic]: { [ePolygonNetwork.matic]: {
incentivesController: '0x357D51124f59836DeD84c8a1730D72B749d8BC23', incentivesController: '0x357D51124f59836DeD84c8a1730D72B749d8BC23',
aaveOracle: '0x21451bD7b528896B4AB2b9764b521D6ed641708d', aaveOracle: '0x21451bD7b528896B4AB2b9764b521D6ed641708d',