@gearbox-protocol/periphery-v3 1.0.4 → 1.0.6

package/contracts/data/DataCompressor_2_1.sol

@@ -4,6 +4,8 @@
 pragma solidity ^0.8.10;
 pragma experimental ABIEncoderV2;
 
+import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
+
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol";
 
@@ -177,11 +179,12 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait, Li
         {
             result.pool = creditManagerV2.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;
 
+            (uint128 currentTotalDebt, uint128 totalDebtLimit) = creditFacade.totalDebt();
+            result.availableToBorrow = pool.creditManagersCanBorrow(_creditManager)
+                ? Math.min(pool.availableLiquidity(), totalDebtLimit - currentTotalDebt)
+                : 0;
             result.lirm = getLIRMData(address(pool.interestRateModel()));
         }
 
@@ -244,8 +247,7 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait, Li
 
     /// @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) {
         PoolService pool = PoolService(_pool);
 

package/contracts/data/Types.sol

@@ -160,3 +160,79 @@ struct GaugeVote {
     uint96 totalVotesLpSide;
     uint96 totalVotesCaSide;
 }
+
+struct CreditManagerDataV2 {
+    address addr;
+    address underlying;
+    address pool;
+    bool isWETH;
+    bool canBorrow;
+    uint256 borrowRate;
+    uint256 minAmount;
+    uint256 maxAmount;
+    uint256 maxLeverageFactor; // for V1 only
+    uint256 availableLiquidity;
+    address[] collateralTokens;
+    ContractAdapter[] adapters;
+    uint256[] liquidationThresholds;
+    uint8 version;
+    address creditFacade; // V2 only: address of creditFacade
+    address creditConfigurator; // V2 only: address of creditConfigurator
+    bool isDegenMode; // V2 only: true if contract is in Degen mode
+    address degenNFT; // V2 only: degenNFT, address(0) if not in degen mode
+    bool isIncreaseDebtForbidden; // V2 only: true if increasing debt is forbidden
+    uint256 forbiddenTokenMask; // V2 only: mask which forbids some particular tokens
+    uint8 maxEnabledTokensLength; // V2 only: in V1 as many tokens as the CM can support (256)
+    uint16 feeInterest; // Interest fee protocol charges: fee = interest accrues * feeInterest
+    uint16 feeLiquidation; // Liquidation fee protocol charges: fee = totalValue * feeLiquidation
+    uint16 liquidationDiscount; // Miltiplier to get amount which liquidator should pay: amount = totalValue * liquidationDiscount
+    uint16 feeLiquidationExpired; // Liquidation fee protocol charges on expired accounts
+    uint16 liquidationDiscountExpired; // Multiplier for the amount the liquidator has to pay when closing an expired account
+}
+
+struct CreditAccountDataV2 {
+    address addr;
+    address borrower;
+    bool inUse;
+    address creditManager;
+    address underlying;
+    uint256 borrowedAmountPlusInterest;
+    uint256 borrowedAmountPlusInterestAndFees;
+    uint256 totalValue;
+    uint256 healthFactor;
+    uint256 borrowRate;
+    TokenBalance[] balances;
+    uint256 repayAmount; // for v1 accounts only
+    uint256 liquidationAmount; // for v1 accounts only
+    bool canBeClosed; // for v1 accounts only
+    uint256 borrowedAmount;
+    uint256 cumulativeIndexAtOpen;
+    uint256 since;
+    uint8 version;
+    uint256 enabledTokenMask;
+}
+
+struct PoolDataV2 {
+    address addr;
+    bool isWETH;
+    address underlying;
+    address dieselToken;
+    uint256 linearCumulativeIndex;
+    uint256 availableLiquidity;
+    uint256 expectedLiquidity;
+    uint256 expectedLiquidityLimit;
+    uint256 totalBorrowed;
+    uint256 depositAPY_RAY;
+    uint256 borrowAPY_RAY;
+    uint256 dieselRate_RAY;
+    uint256 withdrawFee;
+    uint256 cumulativeIndex_RAY;
+    uint256 timestampLU;
+    uint8 version;
+}
+
+struct TokenInfoV2 {
+    address addr;
+    string symbol;
+    uint8 decimals;
+}

package/contracts/interfaces/IDataCompressorV2.sol

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Holdings, 2022
+pragma solidity ^0.8.10;
+
+import {CreditAccountDataV2, CreditManagerDataV2, PoolDataV2, TokenInfoV2} from "../data/Types.sol";
+import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.sol";
+
+interface IDataCompressorV2Exceptions {
+    /// @dev Thrown if attempting to get data on a contract that is not a registered
+    ///      Credit Manager
+    error NotCreditManagerException();
+
+    /// @dev Thrown if attempting the get data on a contract that is not a registered
+    ///      pool
+    error NotPoolException();
+}
+
+interface IDataCompressorV2 is IDataCompressorV2Exceptions, IVersion {
+    /// @dev Returns CreditAccountData for all opened accounts for particular borrower
+    /// @param borrower Borrower address
+    function getCreditAccountList(address borrower) external view returns (CreditAccountDataV2[] memory);
+
+    /// @dev Returns whether the borrower has an open credit account with the credit manager
+    /// @param creditManager Credit manager to check
+    /// @param borrower Borrower to check
+    function hasOpenedCreditAccount(address creditManager, address borrower) external view returns (bool);
+
+    /// @dev Returns CreditAccountData for a particular Credit Account account, based on creditManager and borrower
+    /// @param _creditManager Credit manager address
+    /// @param borrower Borrower address
+    function getCreditAccountData(address _creditManager, address borrower)
+        external
+        view
+        returns (CreditAccountDataV2 memory);
+
+    /// @dev Returns CreditManagerData for all Credit Managers
+    function getCreditManagersList() external view returns (CreditManagerDataV2[] memory);
+
+    /// @dev Returns CreditManagerData for a particular _creditManager
+    /// @param _creditManager CreditManager address
+    function getCreditManagerData(address _creditManager) external view returns (CreditManagerDataV2 memory);
+
+    /// @dev Returns PoolData for a particular pool
+    /// @param _pool Pool address
+    function getPoolData(address _pool) external view returns (PoolDataV2 memory);
+
+    /// @dev Returns PoolData for all registered pools
+    function getPoolsList() external view returns (PoolDataV2[] memory);
+
+    /// @dev Returns the adapter address for a particular creditManager and targetContract
+    function getAdapter(address _creditManager, address _allowedContract) external view returns (address adapter);
+}

package/package.json

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