Skip to content

Commit 12896ff

Browse files
kyzia551kyzia551
committed
add more functions to the UI data provider
1 parent 4e3701c commit 12896ff

File tree

2 files changed

+203
-2
lines changed

2 files changed

+203
-2
lines changed

‎contracts/misc/UiPoolDataProvider.sol‎

Lines changed: 181 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,185 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
5151
);
5252
}
5353

54+
function getReservesList(ILendingPoolAddressesProvider provider)
55+
public
56+
view
57+
override
58+
returns (address[] memory)
59+
{
60+
ILendingPool lendingPool = ILendingPool(provider.getLendingPool());
61+
return lendingPool.getReservesList();
62+
}
63+
64+
function getSimpleReservesData(ILendingPoolAddressesProvider provider)
65+
public
66+
view
67+
override
68+
returns (
69+
AggregatedReserveData[] memory,
70+
uint256,
71+
uint256
72+
)
73+
{
74+
ILendingPool lendingPool = ILendingPool(provider.getLendingPool());
75+
address[] memory reserves = lendingPool.getReservesList();
76+
AggregatedReserveData[] memory reservesData = new AggregatedReserveData[](reserves.length);
77+
78+
for (uint256 i = 0; i < reserves.length; i++) {
79+
AggregatedReserveData memory reserveData = reservesData[i];
80+
reserveData.underlyingAsset = reserves[i];
81+
82+
// reserve current state
83+
DataTypes.ReserveData memory baseData =
84+
lendingPool.getReserveData(reserveData.underlyingAsset);
85+
reserveData.liquidityIndex = baseData.liquidityIndex;
86+
reserveData.variableBorrowIndex = baseData.variableBorrowIndex;
87+
reserveData.liquidityRate = baseData.currentLiquidityRate;
88+
reserveData.variableBorrowRate = baseData.currentVariableBorrowRate;
89+
reserveData.stableBorrowRate = baseData.currentStableBorrowRate;
90+
reserveData.lastUpdateTimestamp = baseData.lastUpdateTimestamp;
91+
reserveData.aTokenAddress = baseData.aTokenAddress;
92+
reserveData.stableDebtTokenAddress = baseData.stableDebtTokenAddress;
93+
reserveData.variableDebtTokenAddress = baseData.variableDebtTokenAddress;
94+
reserveData.interestRateStrategyAddress = baseData.interestRateStrategyAddress;
95+
reserveData.priceInEth = oracle.getAssetPrice(reserveData.underlyingAsset);
96+
97+
reserveData.availableLiquidity = IERC20Detailed(reserveData.underlyingAsset).balanceOf(
98+
reserveData.aTokenAddress
99+
);
100+
(
101+
reserveData.totalPrincipalStableDebt,
102+
,
103+
reserveData.averageStableRate,
104+
reserveData.stableDebtLastUpdateTimestamp
105+
) = IStableDebtToken(reserveData.stableDebtTokenAddress).getSupplyData();
106+
reserveData.totalScaledVariableDebt = IVariableDebtToken(reserveData.variableDebtTokenAddress)
107+
.scaledTotalSupply();
108+
109+
// reserve configuration
110+
111+
// we're getting this info from the aToken, because some of assets can be not compliant with ETC20Detailed
112+
reserveData.symbol = IERC20Detailed(reserveData.aTokenAddress).symbol();
113+
reserveData.name = '';
114+
115+
(
116+
reserveData.baseLTVasCollateral,
117+
reserveData.reserveLiquidationThreshold,
118+
reserveData.reserveLiquidationBonus,
119+
reserveData.decimals,
120+
reserveData.reserveFactor
121+
) = baseData.configuration.getParamsMemory();
122+
(
123+
reserveData.isActive,
124+
reserveData.isFrozen,
125+
reserveData.borrowingEnabled,
126+
reserveData.stableBorrowRateEnabled
127+
) = baseData.configuration.getFlagsMemory();
128+
reserveData.usageAsCollateralEnabled = reserveData.baseLTVasCollateral != 0;
129+
(
130+
reserveData.variableRateSlope1,
131+
reserveData.variableRateSlope2,
132+
reserveData.stableRateSlope1,
133+
reserveData.stableRateSlope2
134+
) = getInterestRateStrategySlopes(
135+
DefaultReserveInterestRateStrategy(reserveData.interestRateStrategyAddress)
136+
);
137+
138+
// incentives
139+
if (address(0) != address(incentivesController)) {
140+
(
141+
reserveData.aEmissionPerSecond,
142+
reserveData.aIncentivesLastUpdateTimestamp,
143+
reserveData.aTokenIncentivesIndex
144+
) = incentivesController.getAssetData(reserveData.aTokenAddress);
145+
146+
(
147+
reserveData.sEmissionPerSecond,
148+
reserveData.sIncentivesLastUpdateTimestamp,
149+
reserveData.sTokenIncentivesIndex
150+
) = incentivesController.getAssetData(reserveData.stableDebtTokenAddress);
151+
152+
(
153+
reserveData.vEmissionPerSecond,
154+
reserveData.vIncentivesLastUpdateTimestamp,
155+
reserveData.vTokenIncentivesIndex
156+
) = incentivesController.getAssetData(reserveData.variableDebtTokenAddress);
157+
}
158+
}
159+
160+
uint256 emissionEndTimestamp;
161+
if (address(0) != address(incentivesController)) {
162+
emissionEndTimestamp = incentivesController.DISTRIBUTION_END();
163+
}
164+
165+
return (reservesData, oracle.getAssetPrice(MOCK_USD_ADDRESS), emissionEndTimestamp);
166+
}
167+
168+
function getUserReservesData(ILendingPoolAddressesProvider provider, address user)
169+
external
170+
view
171+
override
172+
returns (UserReserveData[] memory, uint256)
173+
{
174+
ILendingPool lendingPool = ILendingPool(provider.getLendingPool());
175+
address[] memory reserves = lendingPool.getReservesList();
176+
DataTypes.UserConfigurationMap memory userConfig = lendingPool.getUserConfiguration(user);
177+
178+
UserReserveData[] memory userReservesData =
179+
new UserReserveData[](user != address(0) ? reserves.length : 0);
180+
181+
for (uint256 i = 0; i < reserves.length; i++) {
182+
DataTypes.ReserveData memory baseData = lendingPool.getReserveData(reserves[i]);
183+
// incentives
184+
if (address(0) != address(incentivesController)) {
185+
userReservesData[i].aTokenincentivesUserIndex = incentivesController.getUserAssetData(
186+
user,
187+
baseData.aTokenAddress
188+
);
189+
userReservesData[i].vTokenincentivesUserIndex = incentivesController.getUserAssetData(
190+
user,
191+
baseData.variableDebtTokenAddress
192+
);
193+
userReservesData[i].sTokenincentivesUserIndex = incentivesController.getUserAssetData(
194+
user,
195+
baseData.stableDebtTokenAddress
196+
);
197+
}
198+
// user reserve data
199+
userReservesData[i].underlyingAsset = reserves[i];
200+
userReservesData[i].scaledATokenBalance = IAToken(baseData.aTokenAddress).scaledBalanceOf(
201+
user
202+
);
203+
userReservesData[i].usageAsCollateralEnabledOnUser = userConfig.isUsingAsCollateral(i);
204+
205+
if (userConfig.isBorrowing(i)) {
206+
userReservesData[i].scaledVariableDebt = IVariableDebtToken(
207+
baseData
208+
.variableDebtTokenAddress
209+
)
210+
.scaledBalanceOf(user);
211+
userReservesData[i].principalStableDebt = IStableDebtToken(baseData.stableDebtTokenAddress)
212+
.principalBalanceOf(user);
213+
if (userReservesData[i].principalStableDebt != 0) {
214+
userReservesData[i].stableBorrowRate = IStableDebtToken(baseData.stableDebtTokenAddress)
215+
.getUserStableRate(user);
216+
userReservesData[i].stableBorrowLastUpdateTimestamp = IStableDebtToken(
217+
baseData
218+
.stableDebtTokenAddress
219+
)
220+
.getUserLastUpdated(user);
221+
}
222+
}
223+
}
224+
225+
uint256 userUnclaimedRewards;
226+
if (address(0) != address(incentivesController)) {
227+
userUnclaimedRewards = incentivesController.getUserUnclaimedRewards(user);
228+
}
229+
230+
return (userReservesData, userUnclaimedRewards);
231+
}
232+
54233
function getReservesData(ILendingPoolAddressesProvider provider, address user)
55234
external
56235
view
@@ -200,12 +379,12 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
200379
}
201380
}
202381

203-
204382
IncentivesControllerData memory incentivesControllerData;
205383

206384
if (address(0) != address(incentivesController)) {
207385
if (user != address(0)) {
208-
incentivesControllerData.userUnclaimedRewards = incentivesController.getUserUnclaimedRewards(user);
386+
incentivesControllerData.userUnclaimedRewards = incentivesController
387+
.getUserUnclaimedRewards(user);
209388
}
210389
incentivesControllerData.emissionEndTimestamp = incentivesController.DISTRIBUTION_END();
211390
}

‎contracts/misc/interfaces/IUiPoolDataProvider.sol‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,29 @@ interface IUiPoolDataProvider {
7373
uint256 emissionEndTimestamp;
7474
}
7575

76+
function getReservesList(ILendingPoolAddressesProvider provider)
77+
external
78+
view
79+
returns (address[] memory);
80+
81+
function getSimpleReservesData(ILendingPoolAddressesProvider provider)
82+
external
83+
view
84+
returns (
85+
AggregatedReserveData[] memory,
86+
uint256, // usd price eth
87+
uint256 // emission end timestamp
88+
);
89+
90+
function getUserReservesData(ILendingPoolAddressesProvider provider, address user)
91+
external
92+
view
93+
returns (
94+
UserReserveData[] memory,
95+
uint256 // user unclaimed rewards
96+
);
7697

98+
// generic method with full data
7799
function getReservesData(ILendingPoolAddressesProvider provider, address user)
78100
external
79101
view

0 commit comments

Comments
 (0)