Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: patch for v3.2 release #1

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: patch for v3.2 release #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 3 additions & 102 deletions src/periphery/contracts/misc/UiIncentiveDataProviderV3.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,57 +156,11 @@ contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
vRewardsInformation
);

// Get sTokens rewards information
IRewardsController sTokenIncentiveController = IRewardsController(
address(IncentivizedERC20(baseData.stableDebtTokenAddress).getIncentivesController())
);
// There's no sToken rewards since stable rate is deprecated
RewardInfo[] memory sRewardsInformation;
if (address(sTokenIncentiveController) != address(0)) {
address[] memory sTokenRewardAddresses = sTokenIncentiveController.getRewardsByAsset(
baseData.stableDebtTokenAddress
);
sRewardsInformation = new RewardInfo[](sTokenRewardAddresses.length);
for (uint256 j = 0; j < sTokenRewardAddresses.length; ++j) {
RewardInfo memory rewardInformation;
rewardInformation.rewardTokenAddress = sTokenRewardAddresses[j];

(
rewardInformation.tokenIncentivesIndex,
rewardInformation.emissionPerSecond,
rewardInformation.incentivesLastUpdateTimestamp,
rewardInformation.emissionEndTimestamp
) = sTokenIncentiveController.getRewardsData(
baseData.stableDebtTokenAddress,
rewardInformation.rewardTokenAddress
);

rewardInformation.precision = sTokenIncentiveController.getAssetDecimals(
baseData.stableDebtTokenAddress
);
rewardInformation.rewardTokenDecimals = IERC20Detailed(
rewardInformation.rewardTokenAddress
).decimals();
rewardInformation.rewardTokenSymbol = IERC20Detailed(rewardInformation.rewardTokenAddress)
.symbol();

// Get price of reward token from Chainlink Proxy Oracle
rewardInformation.rewardOracleAddress = sTokenIncentiveController.getRewardOracle(
rewardInformation.rewardTokenAddress
);
rewardInformation.priceFeedDecimals = IEACAggregatorProxy(
rewardInformation.rewardOracleAddress
).decimals();
rewardInformation.rewardPriceFeed = IEACAggregatorProxy(
rewardInformation.rewardOracleAddress
).latestAnswer();

sRewardsInformation[j] = rewardInformation;
}
}

reserveIncentiveData.sIncentiveData = IncentiveData(
baseData.stableDebtTokenAddress,
address(sTokenIncentiveController),
address(0),
address(0),
sRewardsInformation
);
}
Expand Down Expand Up @@ -342,59 +296,6 @@ contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
vUserRewardsInformation
);
}

// stable debt token
IRewardsController sTokenIncentiveController = IRewardsController(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have we ever had incentives on stable debt? will users be able to claim old incentives if they are eligible?

address(IncentivizedERC20(baseData.stableDebtTokenAddress).getIncentivesController())
);
if (address(sTokenIncentiveController) != address(0)) {
// get all rewards information from the asset
address[] memory sTokenRewardAddresses = sTokenIncentiveController.getRewardsByAsset(
baseData.stableDebtTokenAddress
);
UserRewardInfo[] memory sUserRewardsInformation = new UserRewardInfo[](
sTokenRewardAddresses.length
);
for (uint256 j = 0; j < sTokenRewardAddresses.length; ++j) {
UserRewardInfo memory userRewardInformation;
userRewardInformation.rewardTokenAddress = sTokenRewardAddresses[j];

userRewardInformation.tokenIncentivesUserIndex = sTokenIncentiveController
.getUserAssetIndex(
user,
baseData.stableDebtTokenAddress,
userRewardInformation.rewardTokenAddress
);

userRewardInformation.userUnclaimedRewards = sTokenIncentiveController
.getUserAccruedRewards(user, userRewardInformation.rewardTokenAddress);
userRewardInformation.rewardTokenDecimals = IERC20Detailed(
userRewardInformation.rewardTokenAddress
).decimals();
userRewardInformation.rewardTokenSymbol = IERC20Detailed(
userRewardInformation.rewardTokenAddress
).symbol();

// Get price of reward token from Chainlink Proxy Oracle
userRewardInformation.rewardOracleAddress = sTokenIncentiveController.getRewardOracle(
userRewardInformation.rewardTokenAddress
);
userRewardInformation.priceFeedDecimals = IEACAggregatorProxy(
userRewardInformation.rewardOracleAddress
).decimals();
userRewardInformation.rewardPriceFeed = IEACAggregatorProxy(
userRewardInformation.rewardOracleAddress
).latestAnswer();

sUserRewardsInformation[j] = userRewardInformation;
}

userReservesIncentivesData[i].sTokenIncentivesUserData = UserIncentiveData(
baseData.stableDebtTokenAddress,
address(aTokenIncentiveController),
sUserRewardsInformation
);
}
}

return (userReservesIncentivesData);
Expand Down
28 changes: 11 additions & 17 deletions src/periphery/contracts/misc/UiPoolDataProviderV3.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
//the current variable borrow rate. Expressed in ray
reserveData.variableBorrowRate = baseData.currentVariableBorrowRate;
//the current stable borrow rate. Expressed in ray
reserveData.stableBorrowRate = baseData.currentStableBorrowRate;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is ReserveDataLegacy struct updated in 3.2? wondering if this will be compatible

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it's the same in 3.2 for backwards compatibility

reserveData.stableBorrowRate = 0;
reserveData.lastUpdateTimestamp = baseData.lastUpdateTimestamp;
reserveData.aTokenAddress = baseData.aTokenAddress;
reserveData.stableDebtTokenAddress = baseData.stableDebtTokenAddress;
reserveData.stableDebtTokenAddress = address(0);
reserveData.variableDebtTokenAddress = baseData.variableDebtTokenAddress;
//address of the interest rate strategy
reserveData.interestRateStrategyAddress = baseData.interestRateStrategyAddress;
Expand All @@ -86,12 +86,11 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
reserveData.availableLiquidity = IERC20Detailed(reserveData.underlyingAsset).balanceOf(
reserveData.aTokenAddress
);
(
reserveData.totalPrincipalStableDebt,
,
reserveData.averageStableRate,
reserveData.stableDebtLastUpdateTimestamp
) = IStableDebtToken(reserveData.stableDebtTokenAddress).getSupplyData();

reserveData.totalPrincipalStableDebt = 0;
reserveData.averageStableRate = 0;
reserveData.stableDebtLastUpdateTimestamp = 0;

reserveData.totalScaledVariableDebt = IVariableDebtToken(reserveData.variableDebtTokenAddress)
.scaledTotalSupply();

Expand Down Expand Up @@ -237,15 +236,10 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
userReservesData[i].scaledVariableDebt = IVariableDebtToken(
baseData.variableDebtTokenAddress
).scaledBalanceOf(user);
userReservesData[i].principalStableDebt = IStableDebtToken(baseData.stableDebtTokenAddress)
.principalBalanceOf(user);
if (userReservesData[i].principalStableDebt != 0) {
userReservesData[i].stableBorrowRate = IStableDebtToken(baseData.stableDebtTokenAddress)
.getUserStableRate(user);
userReservesData[i].stableBorrowLastUpdateTimestamp = IStableDebtToken(
baseData.stableDebtTokenAddress
).getUserLastUpdated(user);
}

userReservesData[i].principalStableDebt = 0;
userReservesData[i].stableBorrowRate = 0;
userReservesData[i].stableBorrowLastUpdateTimestamp = 0;
}
}

Expand Down
Loading