@gearbox-protocol/periphery-v3 1.0.2 → 1.0.4

package/contracts/data/DataCompressor_2_1.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 // Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2022
+// (c) Gearbox Holdings, 2023
 pragma solidity ^0.8.10;
 pragma experimental ABIEncoderV2;
 
@@ -17,6 +17,7 @@ import {ICreditFacadeV2} from "@gearbox-protocol/core-v2/contracts/interfaces/IC
 import {ICreditConfiguratorV2} from "@gearbox-protocol/core-v2/contracts/interfaces/ICreditConfiguratorV2.sol";
 import {ICreditAccount} from "@gearbox-protocol/core-v2/contracts/interfaces/ICreditAccount.sol";
 import {IPoolService} from "@gearbox-protocol/core-v2/contracts/interfaces/IPoolService.sol";
+import {PoolService} from "@gearbox-protocol/core-v2/contracts/pool/PoolService.sol";
 
 import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.sol";
 
@@ -27,11 +28,12 @@ import {CreditAccountData, CreditManagerData, PoolData, TokenBalance, ContractAd
 
 // EXCEPTIONS
 import {ZeroAddressException} from "@gearbox-protocol/core-v2/contracts/interfaces/IErrors.sol";
+import {LinearInterestModelHelper} from "./LinearInterestModelHelper.sol";
 
 /// @title Data compressor 2.1.
 /// @notice Collects data from various contracts for use in the dApp
 /// Do not use for data from data compressor for state-changing functions
-contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait {
+contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait, LinearInterestModelHelper {
     // Contract version
     uint256 public constant version = 2_10;
 
@@ -174,10 +176,13 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait {
 
         {
             result.pool = creditManagerV2.pool();
-            IPoolService pool = IPoolService(result.pool);
+            PoolService pool = PoolService(result.pool);
             // result.canBorrow =;
             result.baseBorrowRate = pool.borrowAPY_RAY();
+            // TODO: add limit calculation
             result.availableToBorrow = pool.creditManagersCanBorrow(_creditManager) ? pool.availableLiquidity() : 0;
+
+            result.lirm = getLIRMData(address(pool.interestRateModel()));
         }
 
         (result.minDebt, result.maxDebt) = creditFacade.limits();
@@ -239,8 +244,10 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait {
 
     /// @dev Returns PoolData for a particular pool
     /// @param _pool Pool address
+    // TODO: add isPaused()
+    // TODO: add interestRateModel address / data
     function getPoolData(address _pool) public view registeredPoolOnly(_pool) returns (PoolData memory result) {
-        IPoolService pool = IPoolService(_pool);
+        PoolService pool = PoolService(_pool);
 
         result.addr = _pool;
         result.expectedLiquidity = pool.expectedLiquidity();
@@ -264,6 +271,9 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait {
                 / PERCENTAGE_FACTOR;
 
         result.version = uint8(pool.version());
+        result.lirm = getLIRMData(address(pool.interestRateModel()));
+
+        result.isPaused = pool.paused();
 
         return result;
     }

package/contracts/data/DataCompressor_3_0.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 // Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2022
+// (c) Gearbox Holdings, 2023
 pragma solidity ^0.8.10;
 pragma experimental ABIEncoderV2;
 
@@ -22,6 +22,7 @@ import {IPriceOracleV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPr
 import {ICreditAccountV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditAccountV3.sol";
 import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
 import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
+import {PoolV3} from "@gearbox-protocol/core-v3/contracts/pool/PoolV3.sol";
 
 import {CreditManagerV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditManagerV3.sol";
 
@@ -53,6 +54,7 @@ import {
 
 // EXCEPTIONS
 import "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
+import {LinearInterestModelHelper} from "./LinearInterestModelHelper.sol";
 
 uint256 constant COUNT = 0;
 uint256 constant QUERY = 1;
@@ -60,7 +62,7 @@ uint256 constant QUERY = 1;
 /// @title Data compressor 3.0.
 /// @notice Collects data from various contracts for use in the dApp
 /// Do not use for data from data compressor for state-changing functions
-contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait {
+contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, LinearInterestModelHelper {
     // Contract version
     uint256 public constant version = 3_00;
 
@@ -334,6 +336,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait {
             IPoolV3 pool = IPoolV3(result.pool);
             result.baseBorrowRate = pool.baseInterestRate();
             result.availableToBorrow = pool.creditManagerBorrowable(_pool);
+            result.lirm = getLIRMData(pool.interestRateModel());
         }
 
         (result.minDebt, result.maxDebt) = creditFacade.debtLimits();
@@ -391,7 +394,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait {
     /// @dev Returns PoolData for a particular pool
     /// @param _pool Pool address
     function getPoolData(address _pool) public view registeredPoolOnly(_pool) returns (PoolData memory result) {
-        IPoolV3 pool = IPoolV3(_pool);
+        PoolV3 pool = PoolV3(_pool);
 
         result.addr = _pool;
         result.expectedLiquidity = pool.expectedLiquidity();
@@ -436,6 +439,8 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait {
         result.version = uint8(pool.version());
 
         result.quotas = _getQuotas(_pool);
+        result.lirm = getLIRMData(pool.interestRateModel());
+        result.isPaused = pool.paused();
 
         return result;
     }

package/contracts/data/LinearInterestModelHelper.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Holdings, 2023
+pragma solidity ^0.8.17;
+
+import {LinearInterestRateModelV3} from "@gearbox-protocol/core-v3/contracts/pool/LinearInterestRateModelV3.sol";
+import {LinearModel} from "./Types.sol";
+
+contract LinearInterestModelHelper {
+    function getLIRMData(address _model) internal view returns (LinearModel memory irm) {
+        irm.interestModel = _model;
+
+        (irm.U_1, irm.U_2, irm.R_base, irm.R_slope1, irm.R_slope2, irm.R_slope3) =
+            LinearInterestRateModelV3(_model).getModelParameters();
+    }
+}

package/contracts/data/Types.sol

@@ -62,6 +62,16 @@ struct CreditAccountData {
     ScheduledWithdrawal[2] schedultedWithdrawals;
 }
 
+struct LinearModel {
+    address interestModel;
+    uint16 U_1;
+    uint16 U_2;
+    uint16 R_base;
+    uint16 R_slope1;
+    uint16 R_slope2;
+    uint16 R_slope3;
+}
+
 struct CreditManagerData {
     address addr;
     uint256 cfVersion;
@@ -89,8 +99,10 @@ struct CreditManagerData {
     uint16 liquidationDiscountExpired; // Multiplier for the amount the liquidator has to pay when closing an expired account
     // V3 Fileds
     QuotaInfo[] quotas;
+    LinearModel lirm;
     bool isPaused;
 }
+// LIR
 
 struct CreditManagerDebtParams {
     address creditManager;
@@ -121,6 +133,8 @@ struct PoolData {
     uint256 baseInterestIndexLU;
     uint256 version;
     QuotaInfo[] quotas;
+    LinearModel lirm;
+    bool isPaused;
 }
 
 struct GaugeQuotaParams {

package/contracts/interfaces/IDataCompressorV2_10.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2022
+// (c) Gearbox Holdings, 2023
 pragma solidity ^0.8.10;
 
 import {CreditAccountData, CreditManagerData, PoolData} from "../data/Types.sol";

package/contracts/interfaces/IDataCompressorV3_00.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2022
+// (c) Gearbox Holdings, 2023
 pragma solidity ^0.8.10;
 
 import {CreditAccountData, CreditManagerData, PoolData} from "../data/Types.sol";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/periphery-v3",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "index.js",
   "repository": "git@github.com:Gearbox-protocol/periphery-v3.git",
   "author": "Mikael <26343374+0xmikko@users.noreply.github.com>",