@gearbox-protocol/periphery-v3 1.7.0-next.35 → 1.7.0-next.37

package/contracts/compressors/AdapterCompressor.sol

@@ -3,13 +3,13 @@
 // (c) Gearbox Holdings, 2024
 pragma solidity ^0.8.17;
 
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
 import {AdapterType} from "@gearbox-protocol/sdk-gov/contracts/AdapterType.sol";
-import {ContractAdapter} from "../types/MarketData.sol";
+import {AdapterState} from "../types/CreditSuiteData.sol";
 import {IAdapterCompressor} from "../interfaces/IAdapterCompressor.sol";
 import {ICreditConfiguratorV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditConfiguratorV3.sol";
 import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
 import {IStateSerializer} from "../interfaces/IStateSerializer.sol";
-import {IVersion} from "../interfaces/IVersion.sol";
 
 interface ILegacyAdapter {
     function _gearboxAdapterVersion() external view returns (uint16);
@@ -58,24 +58,23 @@ contract AdapterCompressor is IAdapterCompressor {
         contractTypes[uint8(AdapterType.DAI_USDS_EXCHANGE)] = "AD_DAI_USDS_EXCHANGE";
         contractTypes[uint8(AdapterType.MELLOW_ERC4626_VAULT)] = "AD_MELLOW_ERC4626_VAULT";
         contractTypes[uint8(AdapterType.STAKING_REWARDS)] = "AD_STAKING_REWARDS";
+        // TODO: should add equalizer as well
     }
 
-    function getContractAdapters(address creditManager) external view returns (ContractAdapter[] memory adapters) {
+    function getAdapters(address creditManager) external view returns (AdapterState[] memory adapters) {
         ICreditConfiguratorV3 creditConfigurator =
             ICreditConfiguratorV3(ICreditManagerV3(creditManager).creditConfigurator());
 
         address[] memory allowedAdapters = creditConfigurator.allowedAdapters();
         uint256 len = allowedAdapters.length;
 
-        adapters = new ContractAdapter[](len);
-        bytes memory stateSerialised;
-
+        adapters = new AdapterState[](len);
         unchecked {
             for (uint256 i = 0; i < len; ++i) {
                 address adapter = allowedAdapters[i];
                 adapters[i].baseParams.addr = adapter;
-                try IVersion(adapter).contractType() returns (bytes32 adapterType) {
-                    adapters[i].baseParams.contractType = adapterType;
+                try IVersion(adapter).contractType() returns (bytes32 contractType_) {
+                    adapters[i].baseParams.contractType = contractType_;
                 } catch {
                     try ILegacyAdapter(adapter)._gearboxAdapterType() returns (uint8 adapterType) {
                         adapters[i].baseParams.contractType = contractTypes[adapterType];

package/contracts/compressors/CreditAccountCompressor.sol

@@ -3,22 +3,34 @@
 // (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.17;
 
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
-import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IContractsRegister.sol";
 import {ICreditAccountV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditAccountV3.sol";
-import {CollateralCalcTask, CollateralDebtData, ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
+import {ICreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
+import {
+    CollateralCalcTask,
+    CollateralDebtData,
+    ICreditManagerV3
+} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
 import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
-import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
 import {PERCENTAGE_FACTOR} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
 import {SanityCheckTrait} from "@gearbox-protocol/core-v3/contracts/traits/SanityCheckTrait.sol";
 import {ICreditAccountCompressor} from "../interfaces/ICreditAccountCompressor.sol";
 
-import {IAddressProviderV3_1} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3_1.sol";
-import {IMarketConfiguratorV3} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfiguratorV3.sol";
+import {IContractsRegister} from "@gearbox-protocol/governance/contracts/interfaces/extensions/IContractsRegister.sol";
+import {IAddressProvider} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProvider.sol";
+import {IMarketConfigurator} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfigurator.sol";
+import {IMarketConfiguratorFactory} from
+    "@gearbox-protocol/governance/contracts/interfaces/IMarketConfiguratorFactory.sol";
+import {
+    AP_MARKET_CONFIGURATOR_FACTORY,
+    NO_VERSION_CONTROL
+} from "@gearbox-protocol/governance/contracts/libraries/ContractLiterals.sol";
 
-import {CreditAccountData, CreditAccountFilter, MarketFilter, TokenInfo} from "../types/CreditAccountState.sol";
+import {CreditAccountData, TokenInfo} from "../types/CreditAccountState.sol";
+import {CreditAccountFilter, MarketFilter} from "../types/Filters.sol";
 
 import {Contains} from "../libraries/Contains.sol";
 
@@ -34,22 +46,23 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     bytes32 public constant override contractType = "CREDIT_ACCOUNT_COMPRESSOR";
 
     /// @notice Address provider contract address
-    address public immutable ADDRESS_PROVIDER;
+    address public immutable addressProvider;
 
-    /// @notice Thrown when address provider is not a contract or does not implement `marketConfigurators()`
+    address public immutable marketConfiguratorFactory;
+
+    /// @notice Thrown when address provider is not a contract
     error InvalidAddressProviderException();
 
     /// @notice Constructor
-    /// @param  addressProvider Address provider contract address
-    constructor(address addressProvider) nonZeroAddress(addressProvider) {
-        if (addressProvider.code.length == 0)
-            revert InvalidAddressProviderException();
-        try
-            IAddressProviderV3_1(addressProvider).marketConfigurators()
-        {} catch {
+    /// @param  addressProvider_ Address provider contract address
+    constructor(address addressProvider_) nonZeroAddress(addressProvider) {
+        if (addressProvider_.code.length == 0) {
             revert InvalidAddressProviderException();
         }
-        ADDRESS_PROVIDER = addressProvider;
+
+        addressProvider = addressProvider_;
+        marketConfiguratorFactory =
+            IAddressProvider(addressProvider_).getAddressOrRevert(AP_MARKET_CONFIGURATOR_FACTORY, NO_VERSION_CONTROL);
     }
 
     // -------- //
@@ -57,9 +70,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     // -------- //
 
     /// @notice Returns data for a particular `creditAccount`
-    function getCreditAccountData(
-        address creditAccount
-    ) external view returns (CreditAccountData memory) {
+    function getCreditAccountData(address creditAccount) external view returns (CreditAccountData memory) {
         address creditManager = ICreditAccountV3(creditAccount).creditManager();
         return _getCreditAccountData(creditAccount, creditManager);
     }
@@ -67,23 +78,13 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     /// @notice Returns data for credit accounts that match `caFilter` in credit managers matching `marketFilter`
     /// @dev    The non-zero value of `nextOffset` return variable indicates that gas supplied with a call was
     ///         insufficient to process all the accounts and next iteration starting from this value is needed
-    function getCreditAccounts(
-        MarketFilter memory marketFilter,
-        CreditAccountFilter memory caFilter,
-        uint256 offset
-    )
+    function getCreditAccounts(MarketFilter memory marketFilter, CreditAccountFilter memory caFilter, uint256 offset)
         external
         view
         returns (CreditAccountData[] memory data, uint256 nextOffset)
     {
         address[] memory creditManagers = _getCreditManagers(marketFilter);
-        return
-            _getCreditAccounts(
-                creditManagers,
-                caFilter,
-                offset,
-                type(uint256).max
-            );
+        return _getCreditAccounts(creditManagers, caFilter, offset, type(uint256).max);
     }
 
     /// @dev Same as above but with `limit` parameter that specifies the number of accounts to process
@@ -92,11 +93,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         CreditAccountFilter memory caFilter,
         uint256 offset,
         uint256 limit
-    )
-        public
-        view
-        returns (CreditAccountData[] memory data, uint256 nextOffset)
-    {
+    ) public view returns (CreditAccountData[] memory data, uint256 nextOffset) {
         address[] memory creditManagers = _getCreditManagers(marketFilter);
         return _getCreditAccounts(creditManagers, caFilter, offset, limit);
     }
@@ -104,24 +101,14 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     /// @notice Returns data for credit accounts that match `caFilter` in a given `creditManager`
     /// @dev    The non-zero value of `nextOffset` return variable indicates that gas supplied with a call was
     ///         insufficient to process all the accounts and next iteration starting from this value is needed
-    function getCreditAccounts(
-        address creditManager,
-        CreditAccountFilter memory caFilter,
-        uint256 offset
-    )
+    function getCreditAccounts(address creditManager, CreditAccountFilter memory caFilter, uint256 offset)
         external
         view
         returns (CreditAccountData[] memory data, uint256 nextOffset)
     {
         address[] memory creditManagers = new address[](1);
         creditManagers[0] = creditManager;
-        return
-            _getCreditAccounts(
-                creditManagers,
-                caFilter,
-                offset,
-                type(uint256).max
-            );
+        return _getCreditAccounts(creditManagers, caFilter, offset, type(uint256).max);
     }
 
     /// @dev Same as above but with `limit` parameter that specifies the number of accounts to process
@@ -130,11 +117,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         CreditAccountFilter memory caFilter,
         uint256 offset,
         uint256 limit
-    )
-        external
-        view
-        returns (CreditAccountData[] memory data, uint256 nextOffset)
-    {
+    ) external view returns (CreditAccountData[] memory data, uint256 nextOffset) {
         address[] memory creditManagers = new address[](1);
         creditManagers[0] = creditManager;
         return _getCreditAccounts(creditManagers, caFilter, offset, limit);
@@ -145,34 +128,24 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     // -------- //
 
     /// @notice Counts credit accounts that match `caFilter` in credit managers matching `marketFilter`
-    function countCreditAccounts(
-        MarketFilter memory marketFilter,
-        CreditAccountFilter memory caFilter
-    ) external view returns (uint256) {
+    function countCreditAccounts(MarketFilter memory marketFilter, CreditAccountFilter memory caFilter)
+        external
+        view
+        returns (uint256)
+    {
         address[] memory creditManagers = _getCreditManagers(marketFilter);
-        return
-            _countCreditAccounts(
-                creditManagers,
-                caFilter,
-                0,
-                type(uint256).max
-            );
+        return _countCreditAccounts(creditManagers, caFilter, 0, type(uint256).max);
     }
 
     /// @notice Counts credit accounts that match `caFilter` in a given `creditManager`
-    function countCreditAccounts(
-        address creditManager,
-        CreditAccountFilter memory caFilter
-    ) external view returns (uint256) {
+    function countCreditAccounts(address creditManager, CreditAccountFilter memory caFilter)
+        external
+        view
+        returns (uint256)
+    {
         address[] memory creditManagers = new address[](1);
         creditManagers[0] = creditManager;
-        return
-            _countCreditAccounts(
-                creditManagers,
-                caFilter,
-                0,
-                type(uint256).max
-            );
+        return _countCreditAccounts(creditManagers, caFilter, 0, type(uint256).max);
     }
 
     // --------- //
@@ -185,17 +158,8 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         CreditAccountFilter memory filter,
         uint256 offset,
         uint256 limit
-    )
-        internal
-        view
-        returns (CreditAccountData[] memory data, uint256 nextOffset)
-    {
-        uint256 num = _countCreditAccounts(
-            creditManagers,
-            filter,
-            offset,
-            limit
-        );
+    ) internal view returns (CreditAccountData[] memory data, uint256 nextOffset) {
+        uint256 num = _countCreditAccounts(creditManagers, filter, offset, limit);
         if (num == 0) return (data, 0);
 
         // allocating the `CreditAccountData` array might consume most of the gas leaving no room for computations,
@@ -220,8 +184,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
             }
 
             uint256 count = Math.min(len - offset, limit);
-            address[] memory creditAccounts = ICreditManagerV3(creditManager)
-                .creditAccounts(offset, count);
+            address[] memory creditAccounts = ICreditManagerV3(creditManager).creditAccounts(offset, count);
 
             // circumvent the "Stack too deep." error
             CreditAccountFilter memory filter_ = filter;
@@ -231,10 +194,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
                 if (_checkFilterMatch(creditAccount, creditManager, filter_)) {
                     uint256 gasBefore = gasleft();
 
-                    CreditAccountData memory d = _getCreditAccountData(
-                        creditAccount,
-                        creditManager
-                    );
+                    CreditAccountData memory d = _getCreditAccountData(creditAccount, creditManager);
                     ++dataOffset;
                     assembly {
                         // save the pointer to created struct
@@ -285,12 +245,10 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
                 continue;
             }
 
-            address[] memory creditAccounts = ICreditManagerV3(creditManager)
-                .creditAccounts(offset, Math.min(len - offset, limit));
+            address[] memory creditAccounts =
+                ICreditManagerV3(creditManager).creditAccounts(offset, Math.min(len - offset, limit));
             for (uint256 j; j < creditAccounts.length; ++j) {
-                if (
-                    _checkFilterMatch(creditAccounts[j], creditManager, filter)
-                ) {
+                if (_checkFilterMatch(creditAccounts[j], creditManager, filter)) {
                     ++num;
                 }
             }
@@ -302,46 +260,40 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     }
 
     /// @dev Data loading implementation
-    function _getCreditAccountData(
-        address creditAccount,
-        address creditManager
-    ) internal view returns (CreditAccountData memory data) {
+    function _getCreditAccountData(address creditAccount, address creditManager)
+        internal
+        view
+        returns (CreditAccountData memory data)
+    {
         data.creditAccount = creditAccount;
         data.creditManager = creditManager;
         data.creditFacade = ICreditManagerV3(creditManager).creditFacade();
         data.underlying = ICreditManagerV3(creditManager).underlying();
-        data.owner = ICreditManagerV3(creditManager).getBorrowerOrRevert(
-            creditAccount
-        );
+        data.owner = ICreditManagerV3(creditManager).getBorrowerOrRevert(creditAccount);
+        data.expirationDate = ICreditFacadeV3(creditManager).expirationDate();
 
-        CollateralDebtData memory cdd = ICreditManagerV3(creditManager)
-            .calcDebtAndCollateral(creditAccount, CollateralCalcTask.DEBT_ONLY);
+        CollateralDebtData memory cdd =
+            ICreditManagerV3(creditManager).calcDebtAndCollateral(creditAccount, CollateralCalcTask.DEBT_ONLY);
         data.enabledTokensMask = cdd.enabledTokensMask;
         data.debt = cdd.debt;
         data.accruedInterest = cdd.accruedInterest;
         data.accruedFees = cdd.accruedFees;
 
         // collateral is computed separately since it might revert on `balanceOf` and `latestRoundData` calls
-        try
-            ICreditManagerV3(creditManager).calcDebtAndCollateral(
-                creditAccount,
-                CollateralCalcTask.DEBT_COLLATERAL
-            )
+        try ICreditManagerV3(creditManager).calcDebtAndCollateral(creditAccount, CollateralCalcTask.DEBT_COLLATERAL)
         returns (CollateralDebtData memory cdd_) {
             data.totalDebtUSD = cdd_.totalDebtUSD;
             data.totalValueUSD = cdd_.totalValueUSD;
             data.twvUSD = cdd_.twvUSD;
             data.totalValue = cdd_.totalValue;
 
-            data.healthFactor = cdd_.twvUSD * PERCENTAGE_FACTOR >=
-                type(uint16).max * cdd_.totalDebtUSD
+            data.healthFactor = cdd_.twvUSD * PERCENTAGE_FACTOR >= type(uint16).max * cdd_.totalDebtUSD
                 ? type(uint16).max
                 : uint16((cdd_.twvUSD * PERCENTAGE_FACTOR) / cdd_.totalDebtUSD);
             data.success = true;
         } catch {}
 
-        uint256 maxTokens = ICreditManagerV3(creditManager)
-            .collateralTokensCount();
+        uint256 maxTokens = ICreditManagerV3(creditManager).collateralTokensCount();
 
         // the function is called for every account, so allocating an array of size `maxTokens` and trimming it
         // might cause issues with memory expansion and we must count the precise number of tokens in advance
@@ -350,12 +302,8 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         for (uint256 k; k < maxTokens; ++k) {
             uint256 mask = 1 << k;
             if (cdd.enabledTokensMask & mask == 0) {
-                address token = ICreditManagerV3(creditManager).getTokenByMask(
-                    mask
-                );
-                try IERC20(token).balanceOf(creditAccount) returns (
-                    uint256 balance
-                ) {
+                address token = ICreditManagerV3(creditManager).getTokenByMask(mask);
+                try IERC20(token).balanceOf(creditAccount) returns (uint256 balance) {
                     if (balance <= 1) continue;
                 } catch {
                     continue;
@@ -368,25 +316,19 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         data.tokens = new TokenInfo[](numTokens);
         uint256 i;
         while (returnedTokensMask != 0) {
-            uint256 mask = returnedTokensMask &
-                uint256(-int256(returnedTokensMask));
-            address token = ICreditManagerV3(creditManager).getTokenByMask(
-                mask
-            );
+            uint256 mask = returnedTokensMask & uint256(-int256(returnedTokensMask));
+            address token = ICreditManagerV3(creditManager).getTokenByMask(mask);
             data.tokens[i].token = token;
             data.tokens[i].mask = mask;
 
-            try IERC20(token).balanceOf(creditAccount) returns (
-                uint256 balance
-            ) {
+            try IERC20(token).balanceOf(creditAccount) returns (uint256 balance) {
                 data.tokens[i].balance = balance;
                 data.tokens[i].success = true;
             } catch {}
 
             if (IPoolQuotaKeeperV3(cdd._poolQuotaKeeper).isQuotedToken(token)) {
-                (data.tokens[i].quota, ) = IPoolQuotaKeeperV3(
-                    cdd._poolQuotaKeeper
-                ).getQuotaAndOutstandingInterest(creditAccount, token);
+                (data.tokens[i].quota,) =
+                    IPoolQuotaKeeperV3(cdd._poolQuotaKeeper).getQuotaAndOutstandingInterest(creditAccount, token);
             }
 
             returnedTokensMask ^= mask;
@@ -395,50 +337,30 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     }
 
     /// @dev Credit account filtering implementation
-    function _checkFilterMatch(
-        address creditAccount,
-        address creditManager,
-        CreditAccountFilter memory filter
-    ) internal view returns (bool) {
+    function _checkFilterMatch(address creditAccount, address creditManager, CreditAccountFilter memory filter)
+        internal
+        view
+        returns (bool)
+    {
         if (filter.owner != address(0)) {
-            address owner = ICreditManagerV3(creditManager).getBorrowerOrRevert(
-                creditAccount
-            );
+            address owner = ICreditManagerV3(creditManager).getBorrowerOrRevert(creditAccount);
             if (owner != filter.owner) return false;
         }
 
         if (!filter.includeZeroDebt) {
-            (uint256 debt, , , , , , , ) = ICreditManagerV3(creditManager)
-                .creditAccountInfo(creditAccount);
+            (uint256 debt,,,,,,,) = ICreditManagerV3(creditManager).creditAccountInfo(creditAccount);
             if (debt == 0) return false;
         }
 
-        if (
-            filter.minHealthFactor != 0 ||
-            filter.maxHealthFactor != 0 ||
-            filter.reverting
-        ) {
-            try
-                ICreditManagerV3(creditManager).calcDebtAndCollateral(
-                    creditAccount,
-                    CollateralCalcTask.DEBT_COLLATERAL
-                )
+        if (filter.minHealthFactor != 0 || filter.maxHealthFactor != 0 || filter.reverting) {
+            try ICreditManagerV3(creditManager).calcDebtAndCollateral(creditAccount, CollateralCalcTask.DEBT_COLLATERAL)
             returns (CollateralDebtData memory cdd) {
                 if (filter.reverting) return false;
-                uint16 healthFactor = cdd.twvUSD * PERCENTAGE_FACTOR >=
-                    type(uint16).max * cdd.totalDebtUSD
+                uint16 healthFactor = cdd.twvUSD * PERCENTAGE_FACTOR >= type(uint16).max * cdd.totalDebtUSD
                     ? type(uint16).max
-                    : uint16(
-                        (cdd.twvUSD * PERCENTAGE_FACTOR) / cdd.totalDebtUSD
-                    );
-                if (
-                    filter.minHealthFactor != 0 &&
-                    healthFactor < filter.minHealthFactor
-                ) return false;
-                if (
-                    filter.maxHealthFactor != 0 &&
-                    healthFactor > filter.maxHealthFactor
-                ) return false;
+                    : uint16((cdd.twvUSD * PERCENTAGE_FACTOR) / cdd.totalDebtUSD);
+                if (filter.minHealthFactor != 0 && healthFactor < filter.minHealthFactor) return false;
+                if (filter.maxHealthFactor != 0 && healthFactor > filter.maxHealthFactor) return false;
             } catch {
                 if (!filter.reverting) return false;
             }
@@ -448,17 +370,15 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     }
 
     /// @dev Credit managers discovery
-    function _getCreditManagers(
-        MarketFilter memory filter
-    ) internal view returns (address[] memory creditManagers) {
-        address[] memory configurators = IAddressProviderV3_1(ADDRESS_PROVIDER)
-            .marketConfigurators();
+    function _getCreditManagers(MarketFilter memory filter) internal view returns (address[] memory creditManagers) {
+        address[] memory configurators = filter.configurators.length != 0
+            ? filter.configurators
+            : IMarketConfiguratorFactory(marketConfiguratorFactory).getMarketConfigurators();
 
         // rough estimate of maximum number of credit managers
         uint256 max;
         for (uint256 i; i < configurators.length; ++i) {
-            address cr = IMarketConfiguratorV3(configurators[i])
-                .contractsRegister();
+            address cr = IMarketConfigurator(configurators[i]).contractsRegister();
             max += IContractsRegister(cr).getCreditManagers().length;
         }
 
@@ -467,39 +387,17 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         creditManagers = new address[](max);
         uint256 num;
         for (uint256 i; i < configurators.length; ++i) {
-            if (filter.curators.length != 0) {
-                if (
-                    !filter.curators.contains(
-                        IMarketConfiguratorV3(configurators[i]).owner()
-                    )
-                ) continue;
-            }
-
-            address cr = IMarketConfiguratorV3(configurators[i])
-                .contractsRegister();
-            address[] memory managers = IContractsRegister(cr)
-                .getCreditManagers();
+            address cr = IMarketConfigurator(configurators[i]).contractsRegister();
+            address[] memory managers = IContractsRegister(cr).getCreditManagers();
             for (uint256 j; j < managers.length; ++j) {
-                // we're only concerned with v3 contracts
-                uint256 ver = IVersion(managers[j]).version();
-                if (ver < 3_00 || ver > 3_99) continue;
-
-                if (filter.pools.length != 0) {
-                    if (
-                        !filter.pools.contains(
-                            ICreditManagerV3(managers[j]).pool()
-                        )
-                    ) continue;
-                }
-
-                if (filter.underlying != address(0)) {
-                    if (
-                        ICreditManagerV3(managers[j]).underlying() !=
-                        filter.underlying
-                    ) continue;
+                address manager = managers[j];
+                // FIXME: there's room for optimization that allows to avoid scanning over all configurators
+                if (filter.pools.length != 0 && !filter.pools.contains(ICreditManagerV3(manager).pool())) continue;
+                if (filter.underlying != address(0) && ICreditManagerV3(manager).underlying() != filter.underlying) {
+                    continue;
                 }
 
-                creditManagers[num++] = managers[j];
+                creditManagers[num++] = manager;
             }
         }
 

package/contracts/compressors/CreditSuiteCompressor.sol

@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {ICreditConfiguratorV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditConfiguratorV3.sol";
+import {CreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditFacadeV3.sol";
+import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
+
+import {BaseLib} from "../libraries/BaseLib.sol";
+
+import {BaseParams, BaseState} from "../types/BaseState.sol";
+import {CreditFacadeState} from "../types/CreditFacadeState.sol";
+import {CollateralToken, CreditManagerState} from "../types/CreditManagerState.sol";
+import {CreditSuiteData} from "../types/CreditSuiteData.sol";
+
+import {AdapterCompressor} from "./AdapterCompressor.sol";
+
+contract CreditSuiteCompressor {
+    AdapterCompressor adapterCompressor;
+
+    constructor() {
+        adapterCompressor = new AdapterCompressor();
+    }
+
+    function getCreditSuiteData(address creditManager) public view returns (CreditSuiteData memory result) {
+        result.creditManager = getCreditManagerState(creditManager);
+        result.creditFacade = getCreditFacadeState(ICreditManagerV3(creditManager).creditFacade());
+        result.creditConfigurator = BaseLib.getBaseState(
+            ICreditManagerV3(creditManager).creditConfigurator(), "CREDIT_CONFIGURATOR", address(0)
+        );
+
+        result.adapters = adapterCompressor.getAdapters(creditManager);
+    }
+
+    /// @dev Returns CreditManagerData for a particular _cm
+    /// @param _cm CreditManager address
+    function getCreditManagerState(address _cm) public view returns (CreditManagerState memory result) {
+        ICreditManagerV3 creditManager = ICreditManagerV3(_cm);
+        ICreditConfiguratorV3 creditConfigurator = ICreditConfiguratorV3(creditManager.creditConfigurator());
+        CreditFacadeV3 creditFacade = CreditFacadeV3(creditManager.creditFacade());
+
+        result.baseParams = BaseLib.getBaseParams(_cm, "CREDIT_MANAGER", address(0));
+        // string name;
+        result.name = ICreditManagerV3(_cm).name();
+
+        // address accountFactory;
+        result.accountFactory = creditManager.accountFactory();
+        // address underlying;
+        result.underlying = creditManager.underlying();
+        // address pool;
+        result.pool = creditManager.pool();
+        // address creditFacade;
+        result.creditFacade = address(creditFacade);
+        // address creditConfigurator;
+        result.creditConfigurator = address(creditConfigurator);
+        // uint8 maxEnabledTokens;
+        result.maxEnabledTokens = creditManager.maxEnabledTokens();
+
+        uint256 collateralTokensCount = creditManager.collateralTokensCount();
+        result.collateralTokens = new CollateralToken[](collateralTokensCount);
+        for (uint256 i; i < collateralTokensCount; ++i) {
+            (address token, uint16 lt) = creditManager.collateralTokenByMask(1 << i);
+            result.collateralTokens[i] = CollateralToken(token, lt);
+        }
+
+        (
+            result.feeInterest,
+            result.feeLiquidation,
+            result.liquidationDiscount,
+            result.feeLiquidationExpired,
+            result.liquidationDiscountExpired
+        ) = creditManager.fees();
+    }
+
+    /// @dev Returns CreditManagerData for a particular _cm
+    /// @param _cf CreditFacade address
+    function getCreditFacadeState(address _cf) public view returns (CreditFacadeState memory result) {
+        CreditFacadeV3 creditFacade = CreditFacadeV3(_cf);
+
+        result.baseParams = BaseLib.getBaseParams(_cf, "CREDIT_FACADE", address(0));
+        result.expirable = creditFacade.expirable();
+        result.degenNFT = creditFacade.degenNFT();
+        result.expirationDate = creditFacade.expirationDate();
+        result.maxDebtPerBlockMultiplier = creditFacade.maxDebtPerBlockMultiplier();
+        result.botList = creditFacade.botList();
+        (result.minDebt, result.maxDebt) = creditFacade.debtLimits();
+        result.forbiddenTokenMask = creditFacade.forbiddenTokenMask();
+        result.isPaused = creditFacade.paused();
+    }
+}