@gearbox-protocol/periphery-v3 1.6.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/contracts/data/DataCompressorV3.sol +23 -16
  2. package/package.json +1 -1
package/contracts/data/DataCompressorV3.sol CHANGED
@@ -254,22 +254,29 @@ contract DataCompressorV3 is IDataCompressorV3, ContractsRegisterTrait, LinearIn
254
254
  // uint256 quotedTokensMask;
255
255
  // address[] quotedTokens;
256
256
 
257
- try creditManager.calcDebtAndCollateral(_creditAccount, CollateralCalcTask.DEBT_COLLATERAL) returns (
258
- CollateralDebtData memory collateralDebtData
259
- ) {
260
- result.accruedInterest = collateralDebtData.accruedInterest;
261
- result.accruedFees = collateralDebtData.accruedFees;
262
- result.totalDebtUSD = collateralDebtData.totalDebtUSD;
263
- result.totalValueUSD = collateralDebtData.totalValueUSD;
264
- result.twvUSD = collateralDebtData.twvUSD;
265
- result.healthFactor = collateralDebtData.totalDebtUSD != 0
266
- ? collateralDebtData.twvUSD * PERCENTAGE_FACTOR / collateralDebtData.totalDebtUSD
267
- : type(uint16).max;
268
- result.totalValue = collateralDebtData.totalValue;
269
- result.isSuccessful = true;
270
- } catch {
271
- result.priceFeedsNeeded = _getPriceFeedFailedList(_cm, result.balances);
272
- result.isSuccessful = false;
257
+ for (uint256 i = 0; i < 2;) {
258
+ try creditManager.calcDebtAndCollateral(
259
+ _creditAccount, i == 0 ? CollateralCalcTask.DEBT_ONLY : CollateralCalcTask.DEBT_COLLATERAL
260
+ ) returns (CollateralDebtData memory collateralDebtData) {
261
+ result.accruedInterest = collateralDebtData.accruedInterest;
262
+ result.accruedFees = collateralDebtData.accruedFees;
263
+
264
+ result.totalDebtUSD = collateralDebtData.totalDebtUSD;
265
+ result.totalValueUSD = collateralDebtData.totalValueUSD;
266
+ result.twvUSD = collateralDebtData.twvUSD;
267
+ result.healthFactor = collateralDebtData.totalDebtUSD != 0
268
+ ? collateralDebtData.twvUSD * PERCENTAGE_FACTOR / collateralDebtData.totalDebtUSD
269
+ : type(uint16).max;
270
+ result.totalValue = collateralDebtData.totalValue;
271
+ result.isSuccessful = true;
272
+ } catch {
273
+ result.priceFeedsNeeded = _getPriceFeedFailedList(_cm, result.balances);
274
+ result.isSuccessful = false;
275
+ }
276
+
277
+ unchecked {
278
+ ++i;
279
+ }
273
280
  }
274
281
 
275
282
  (result.debt, result.cumulativeIndexLastUpdate, result.cumulativeQuotaInterest,,,, result.since,) =
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gearbox-protocol/periphery-v3",
3
- "version": "1.6.0",
3
+ "version": "1.6.1",
4
4
  "main": "index.js",
5
5
  "repository": "git@github.com:Gearbox-protocol/periphery-v3.git",
6
6
  "author": "Mikael <26343374+0xmikko@users.noreply.github.com>",