Merge branch 'main' of github.com:Gearbox-protocol/periphery-v3

Author: 0xmikko

contracts/data/DataCompressor_2_1.sol

@@ -116,6 +116,7 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait, Li
 
         address pool = creditManagerV2.pool();
         result.baseBorrowRate = IPoolService(pool).borrowAPY_RAY();
+        result.aggregatedBorrowRate = result.baseBorrowRate;
 
         uint256 collateralTokenCount = creditManagerV2.collateralTokensCount();
 

contracts/data/DataCompressor_3_0.sol

@@ -4,6 +4,7 @@
 pragma solidity ^0.8.10;
 pragma experimental ABIEncoderV2;
 
+import "@gearbox-protocol/core-v3/contracts/interfaces/IAddressProviderV3.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {PERCENTAGE_FACTOR, RAY} from "@gearbox-protocol/core-v2/contracts/libraries/Constants.sol";
 
@@ -38,6 +39,7 @@ import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.
 
 import {AddressProvider} from "@gearbox-protocol/core-v2/contracts/core/AddressProvider.sol";
 import {IDataCompressorV3_00, PriceOnDemand} from "../interfaces/IDataCompressorV3_00.sol";
+import {IZapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IZapper.sol";
 
 import {
     COUNT,
@@ -51,12 +53,14 @@ import {
     GaugeInfo,
     GaugeQuotaParams,
     CreditManagerDebtParams,
-    GaugeVote
+    GaugeVote,
+    ZapperInfo
 } from "./Types.sol";
 
 // EXCEPTIONS
 import "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
 import {LinearInterestModelHelper} from "./LinearInterestModelHelper.sol";
+import {ZapperRegister} from "./ZapperRegister.sol";
 
 /// @title Data compressor 3.0.
 /// @notice Collects data from various contracts for use in the dApp
@@ -65,9 +69,14 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
     // Contract version
     uint256 public constant version = 3_00;
 
+    ZapperRegister public zapperRegister;
+
     error CreditManagerIsNotV3Exception();
 
-    constructor(address _addressProvider) ContractsRegisterTrait(_addressProvider) {}
+    constructor(address _addressProvider) ContractsRegisterTrait(_addressProvider) {
+        zapperRegister =
+            ZapperRegister(IAddressProviderV3(_addressProvider).getAddressOrRevert("ZAPPER_REGISTER", 3_00));
+    }
 
     /// @dev Returns CreditAccountData for all opened accounts for particular borrower
     /// @param borrower Borrower address
@@ -194,6 +203,8 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         result.enabledTokensMask = creditManager.enabledTokensMaskOf(_creditAccount);
 
         result.balances = new TokenBalance[](collateralTokenCount);
+
+        uint256 quotaRevenue = 0;
         {
             uint256 forbiddenTokenMask = creditFacade.forbiddenTokenMask();
             uint256 quotedTokensMask = creditManager.quotedTokensMask();
@@ -215,13 +226,17 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
                     if (balance.isQuoted) {
                         (balance.quota,) = pqk.getQuota(_creditAccount, balance.token);
                         balance.quotaRate = pqk.getQuotaRate(balance.token);
+
+                        quotaRevenue += balance.quota * balance.quotaRate;
                     }
 
                     result.balances[i] = balance;
                 }
             }
         }
 
+        result.aggregatedBorrowRate = result.baseBorrowRate + RAY * quotaRevenue / PERCENTAGE_FACTOR / result.debt;
+
         // uint256 debt;
         // uint256 cumulativeIndexNow;
         // uint256 cumulativeIndexLastUpdate;
@@ -441,6 +456,20 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         result.lirm = getLIRMData(pool.interestRateModel());
         result.isPaused = pool.paused();
 
+        address[] memory zappers = zapperRegister.zappers(address(pool));
+        len = zappers.length;
+        result.zappers = new ZapperInfo[](len);
+
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                address tokenFrom = IZapper(zappers[i]).unwrappedToken();
+                result.zappers[i] = ZapperInfo({tokenFrom: tokenFrom, zapper: zappers[i]});
+            }
+        }
+
+        result.poolQuotaKeeper = pool.poolQuotaKeeper();
+        result.gauge = IPoolQuotaKeeperV3(result.poolQuotaKeeper).gauge();
+
         return result;
     }
 

contracts/data/Types.sol

@@ -32,6 +32,11 @@ struct ContractAdapter {
     address adapter;
 }
 
+struct ZapperInfo {
+    address tokenFrom;
+    address zapper;
+}
+
 struct CreditAccountData {
     // if not successful, priceFeedsNeeded are filled with the data
     bool isSuccessful;
@@ -137,7 +142,10 @@ struct PoolData {
     uint256 cumulativeIndex_RAY;
     uint256 baseInterestIndexLU;
     uint256 version;
+    address poolQuotaKeeper;
+    address gauge;
     QuotaInfo[] quotas;
+    ZapperInfo[] zappers;
     LinearModel lirm;
     bool isPaused;
 }