@gearbox-protocol/periphery-v3 1.7.0-next.36 → 1.7.0-next.38

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);
@@ -61,22 +61,20 @@ contract AdapterCompressor is IAdapterCompressor {
         // 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

@@ -7,19 +7,19 @@ 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 {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 {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
@@ -29,7 +29,8 @@ import {
     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";
 
@@ -49,12 +50,12 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
 
     address public immutable marketConfiguratorFactory;
 
-    /// @notice Thrown when address provider is not a contract or does not implement `marketConfigurators()`
+    /// @notice Thrown when address provider is not a contract
     error InvalidAddressProviderException();
 
     /// @notice Constructor
     /// @param  addressProvider_ Address provider contract address
-    constructor(address addressProvider_) nonZeroAddress(addressProvider) {
+    constructor(address addressProvider_) nonZeroAddress(addressProvider_) {
         if (addressProvider_.code.length == 0) {
             revert InvalidAddressProviderException();
         }
@@ -269,6 +270,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         data.creditFacade = ICreditManagerV3(creditManager).creditFacade();
         data.underlying = ICreditManagerV3(creditManager).underlying();
         data.owner = ICreditManagerV3(creditManager).getBorrowerOrRevert(creditAccount);
+        data.expirationDate = ICreditFacadeV3(creditManager).expirationDate();
 
         CollateralDebtData memory cdd =
             ICreditManagerV3(creditManager).calcDebtAndCollateral(creditAccount, CollateralCalcTask.DEBT_ONLY);
@@ -369,7 +371,9 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
 
     /// @dev Credit managers discovery
     function _getCreditManagers(MarketFilter memory filter) internal view returns (address[] memory creditManagers) {
-        address[] memory configurators = IMarketConfiguratorFactory(marketConfiguratorFactory).getMarketConfigurators();
+        address[] memory configurators = filter.configurators.length != 0
+            ? filter.configurators
+            : IMarketConfiguratorFactory(marketConfiguratorFactory).getMarketConfigurators();
 
         // rough estimate of maximum number of credit managers
         uint256 max;
@@ -383,26 +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(Ownable(configurators[i]).owner())) continue;
-            }
-
             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();
+    }
+}

package/contracts/compressors/MarketCompressor.sol

@@ -5,31 +5,37 @@ pragma solidity ^0.8.17;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
 import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
-import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
 import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
-import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IContractsRegister.sol";
-import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
+import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
 
+import {IACL} from "@gearbox-protocol/governance/contracts/interfaces/extensions/IACL.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
+    NO_VERSION_CONTROL,
+    ROLE_EMERGENCY_LIQUIDATOR,
+    ROLE_PAUSABLE_ADMIN,
+    ROLE_UNPAUSABLE_ADMIN
 } from "@gearbox-protocol/governance/contracts/libraries/ContractLiterals.sol";
 
 import {Contains} from "../libraries/Contains.sol";
 
-import {MarketFilter} from "../types/CreditAccountState.sol";
+import {MarketFilter} from "../types/Filters.sol";
 
-import {PoolCompressorV3} from "./PoolCompressor.sol";
+import {CreditSuiteCompressor} from "./CreditSuiteCompressor.sol";
+import {PoolCompressor} from "./PoolCompressor.sol";
 import {PriceFeedCompressor} from "./PriceFeedCompressor.sol";
 import {TokenCompressor} from "./TokenCompressor.sol";
 
 import {BaseParams} from "../types/BaseState.sol";
-import {MarketData, CreditManagerData} from "../types/MarketData.sol";
+import {CreditSuiteData} from "../types/CreditSuiteData.sol";
+import {MarketData} from "../types/MarketData.sol";
 import {TokenData} from "../types/TokenData.sol";
 import {PoolState} from "../types/PoolState.sol";
 import {PriceOracleState} from "../types/PriceOracleState.sol";
@@ -45,33 +51,35 @@ contract MarketCompressor is IMarketCompressor {
     uint256 public constant version = 3_10;
     bytes32 public constant contractType = "MARKET_COMPRESSOR";
 
-    /// @notice Address provider contract address
     address public immutable addressProvider;
-
     address public immutable marketConfiguratorFactory;
 
+    PoolCompressor poolCompressor;
     TokenCompressor tokenCompressor;
     PriceFeedCompressor priceOracleCompressor;
-    PoolCompressorV3 poolCompressor;
+    CreditSuiteCompressor creditSuiteCompressor;
 
-    error CreditManagerIsNotV3Exception();
+    struct Pool {
+        address addr;
+        address configurator;
+    }
 
     constructor(address addressProvider_, address priceOracleCompressorAddress) {
         addressProvider = addressProvider_;
         marketConfiguratorFactory =
             IAddressProvider(addressProvider_).getAddressOrRevert(AP_MARKET_CONFIGURATOR_FACTORY, NO_VERSION_CONTROL);
 
+        poolCompressor = new PoolCompressor();
         tokenCompressor = new TokenCompressor();
-        poolCompressor = new PoolCompressorV3();
+        creditSuiteCompressor = new CreditSuiteCompressor();
         priceOracleCompressor = PriceFeedCompressor(priceOracleCompressorAddress);
     }
 
     function getMarkets(MarketFilter memory filter) external view returns (MarketData[] memory result) {
-        address[] memory pools = _getPools(filter);
+        Pool[] memory pools = _getPools(filter);
         result = new MarketData[](pools.length);
-
-        for (uint256 i = 0; i < pools.length; i++) {
-            result[i] = getMarketData(pools[i]);
+        for (uint256 i; i < pools.length; ++i) {
+            result[i] = getMarketData(pools[i].addr, pools[i].configurator);
         }
     }
 
@@ -80,13 +88,13 @@ contract MarketCompressor is IMarketCompressor {
         view
         returns (BaseParams[] memory updatablePriceFeeds)
     {
-        address[] memory pools = _getPools(filter);
+        Pool[] memory pools = _getPools(filter);
         uint256 numPools = pools.length;
         PriceOracleState[] memory poStates = new PriceOracleState[](numPools);
         uint256 numUpdatable;
         for (uint256 i; i < numPools; ++i) {
-            address[] memory tokens = _getTokens(pools[i]);
-            address priceOracle = _getPriceOracle(poolCompressor.getPoolState(pools[i]));
+            address[] memory tokens = _getTokens(pools[i].addr);
+            address priceOracle = _getPriceOracle(pools[i].addr, pools[i].configurator);
             poStates[i] = priceOracleCompressor.getPriceOracleState(priceOracle, tokens);
             for (uint256 j; j < poStates[i].priceFeedStructure.length; ++j) {
                 if (poStates[i].priceFeedStructure[j].updatable) ++numUpdatable;
@@ -104,8 +112,17 @@ contract MarketCompressor is IMarketCompressor {
         }
     }
 
-    function getMarketData(address pool) public view returns (MarketData memory result) {
-        result.acl = IPoolV3(pool).acl();
+    function getMarketData(address pool) external view returns (MarketData memory result) {
+        // After full migration to v3.1.x governance system, pool's market configurator will be the owner of its ACL.
+        // Before that, however, there's no way to recover it unless it is provided directly or with market filter.
+        return getMarketData(pool, Ownable(IPoolV3(pool).acl()).owner());
+    }
+
+    function getMarketData(address pool, address configurator) public view returns (MarketData memory result) {
+        result.acl = IMarketConfigurator(configurator).acl();
+        result.contractsRegister = IMarketConfigurator(configurator).contractsRegister();
+        result.treasury = IMarketConfigurator(configurator).treasury();
+
         result.pool = poolCompressor.getPoolState(pool);
         result.poolQuotaKeeper = poolCompressor.getPoolQuotaKeeperState(result.pool.poolQuotaKeeper);
         result.rateKeeper = poolCompressor.getRateKeeperState(result.poolQuotaKeeper.rateKeeper);
@@ -117,20 +134,25 @@ contract MarketCompressor is IMarketCompressor {
             result.tokens[i] = tokenCompressor.getTokenInfo(tokens[i]);
         }
 
-        // creditManager
-        uint256 len = result.pool.creditManagerDebtParams.length;
-        result.creditManagers = new CreditManagerData[](len);
-        for (uint256 i = 0; i < len; i++) {
-            result.creditManagers[i] =
-                poolCompressor.getCreditManagerData(result.pool.creditManagerDebtParams[i].creditManager);
+        address[] memory creditManagers = IContractsRegister(result.contractsRegister).getCreditManagers(pool);
+        uint256 numCreditManagers = creditManagers.length;
+        result.creditManagers = new CreditSuiteData[](numCreditManagers);
+        for (uint256 i; i < numCreditManagers; ++i) {
+            result.creditManagers[i] = creditSuiteCompressor.getCreditSuiteData(creditManagers[i]);
         }
 
-        address priceOracle = _getPriceOracle(result.pool);
-        result.priceOracleData = priceOracleCompressor.getPriceOracleState(priceOracle, tokens);
+        result.priceOracleData = priceOracleCompressor.getPriceOracleState(_getPriceOracle(pool, configurator), tokens);
+        result.lossPolicy = poolCompressor.getLossPolicyState(_getLossPolicy(pool, configurator));
+
+        result.configurator = configurator;
+        result.pausableAdmins = IACL(result.acl).getRoleHolders(ROLE_PAUSABLE_ADMIN);
+        result.unpausableAdmins = IACL(result.acl).getRoleHolders(ROLE_UNPAUSABLE_ADMIN);
+        result.emergencyLiquidators = IACL(result.acl).getRoleHolders(ROLE_EMERGENCY_LIQUIDATOR);
+
+        // TODO: add zappers
     }
 
     function _getTokens(address pool) internal view returns (address[] memory tokens) {
-        // under proper configuration, equivalent to price oracle's `getTokens`
         address quotaKeeper = IPoolV3(pool).poolQuotaKeeper();
         address[] memory quotedTokens = IPoolQuotaKeeperV3(quotaKeeper).quotedTokens();
         uint256 numTokens = quotedTokens.length;
@@ -141,18 +163,21 @@ contract MarketCompressor is IMarketCompressor {
         }
     }
 
-    function _getPriceOracle(PoolState memory ps) internal view returns (address) {
-        // TODO: read from market configurator instead once structure is known
-        if (ps.creditManagerDebtParams.length == 0) {
-            return address(0);
-        }
+    function _getPriceOracle(address pool, address configurator) internal view returns (address) {
+        address contractsRegister = IMarketConfigurator(configurator).contractsRegister();
+        return IContractsRegister(contractsRegister).getPriceOracle(pool);
+    }
 
-        return ICreditManagerV3(ps.creditManagerDebtParams[0].creditManager).priceOracle();
+    function _getLossPolicy(address pool, address configurator) internal view returns (address) {
+        address contractsRegister = IMarketConfigurator(configurator).contractsRegister();
+        return IContractsRegister(contractsRegister).getLossLiquidator(pool);
     }
 
     /// @dev Pools discovery
-    function _getPools(MarketFilter memory filter) internal view returns (address[] memory pools) {
-        address[] memory configurators = IMarketConfiguratorFactory(marketConfiguratorFactory).getMarketConfigurators();
+    function _getPools(MarketFilter memory filter) internal view returns (Pool[] memory pools) {
+        address[] memory configurators = filter.configurators.length != 0
+            ? filter.configurators
+            : IMarketConfiguratorFactory(marketConfiguratorFactory).getMarketConfigurators();
 
         // rough estimate of maximum number of credit pools
         uint256 max;
@@ -163,29 +188,18 @@ contract MarketCompressor is IMarketCompressor {
 
         // allocate the array with maximum potentially needed size (total number of credit pools can be assumed
         // to be relatively small and the function is only called once, so memory expansion cost is not an issue)
-        pools = new address[](max);
+        pools = new Pool[](max);
         uint256 num;
 
         for (uint256 i; i < configurators.length; ++i) {
-            if (filter.curators.length != 0) {
-                if (!filter.curators.contains(Ownable(configurators[i]).owner())) continue;
-            }
-
             address contractsRegister = IMarketConfigurator(configurators[i]).contractsRegister();
             address[] memory poolsMC = IContractsRegister(contractsRegister).getPools();
             for (uint256 j; j < poolsMC.length; ++j) {
-                address currentPool = poolsMC[j];
-                if (filter.pools.length != 0) {
-                    if (!filter.pools.contains(currentPool)) continue;
-                }
-
-                if (filter.underlying != address(0)) {
-                    if (IPoolV3(currentPool).asset() != filter.underlying) {
-                        continue;
-                    }
-                }
-
-                pools[num++] = currentPool;
+                address pool = poolsMC[j];
+                // FIXME: that's kinda weird to filter pools by pools
+                if (filter.pools.length != 0 && !filter.pools.contains(pool)) continue;
+                if (filter.underlying != address(0) && IPoolV3(pool).asset() != filter.underlying) continue;
+                pools[num++] = Pool({addr: pool, configurator: configurators[i]});
             }
         }
 

package/contracts/compressors/PoolCompressor.sol

@@ -1,16 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 // Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2023
-pragma solidity ^0.8.10;
-pragma experimental ABIEncoderV2;
+// (c) Gearbox Holdings, 2024
+pragma solidity ^0.8.23;
 
 import {PoolV3} from "@gearbox-protocol/core-v3/contracts/pool/PoolV3.sol";
 import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
 import {IGaugeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IGaugeV3.sol";
-import {IVersion} from "../interfaces/IVersion.sol";
-import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
-import {ICreditConfiguratorV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditConfiguratorV3.sol";
-import {CreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditFacadeV3.sol";
 
 // State & Params
 import {BaseParams, BaseState} from "../types/BaseState.sol";
@@ -18,25 +13,18 @@ import {PoolState, CreditManagerDebtParams} from "../types/PoolState.sol";
 import {PoolQuotaKeeperState, QuotaTokenParams} from "../types/PoolQuotaKeeperState.sol";
 import {RateKeeperState, Rate} from "../types/RateKeeperState.sol";
 
-import {CreditManagerData} from "../types/MarketData.sol";
-import {CreditManagerState} from "../types/CreditManagerState.sol";
-import {CreditFacadeState} from "../types/CreditFacadeState.sol";
-
-import {PERCENTAGE_FACTOR, RAY} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
+import {RAY} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
 import {IRateKeeper} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IRateKeeper.sol";
 
 // Serializers
 import {BaseLib} from "../libraries/BaseLib.sol";
-
 import {GaugeSerializer} from "../serializers/pool/GaugeSerializer.sol";
 import {LinearInterestRateModelSerializer} from "../serializers/pool/LinearInterestRateModelSerializer.sol";
 
-import {AdapterCompressor} from "./AdapterCompressor.sol";
-
 /// @title Pool compressor
 /// @notice Collects data from pool related contracts
 /// Do not use for data from data compressor for state-changing functions
-contract PoolCompressorV3 {
+contract PoolCompressor {
     // Contract version
     uint256 public constant version = 3_10;
     bytes32 public constant contractType = "POOL_COMPRESSOR";
@@ -44,12 +32,9 @@ contract PoolCompressorV3 {
     address public immutable gaugeSerializer;
     address public immutable linearInterestRateModelSerializer;
 
-    AdapterCompressor adapterCompressor;
-
     constructor() {
         gaugeSerializer = address(new GaugeSerializer());
         linearInterestRateModelSerializer = address(new LinearInterestRateModelSerializer());
-        adapterCompressor = new AdapterCompressor();
     }
 
     function getPoolState(address pool) public view returns (PoolState memory result) {
@@ -76,7 +61,6 @@ contract PoolCompressorV3 {
         // address interestRateModel;
         result.interestRateModel = _pool.interestRateModel();
 
-        result.treasury = _pool.treasury();
         //
         // address underlying;
         result.underlying = _pool.underlyingToken();
@@ -93,16 +77,10 @@ contract PoolCompressorV3 {
         // uint256 dieselRate;
         result.dieselRate = _pool.convertToAssets(RAY);
 
-        // uint256 totalBorrowed;
-        result.totalBorrowed = _pool.totalBorrowed();
-        // uint256 totalAssets;
-        result.totalAssets = _pool.totalAssets();
         // uint256 supplyRate;
         result.supplyRate = _pool.supplyRate();
         // uint256 withdrawFee;
         result.withdrawFee = _pool.withdrawFee();
-        // uint256 totalDebtLimit;
-        result.totalDebtLimit = _pool.totalDebtLimit();
 
         // updates
         // uint256 baseInterestIndexLU;
@@ -122,21 +100,26 @@ contract PoolCompressorV3 {
         // uint256 baseInterestIndexLU;
         result.baseInterestIndexLU = _pool.baseInterestIndexLU();
 
+        // uint256 totalBorrowed;
+        result.totalBorrowed = _pool.totalBorrowed();
+        // uint256 totalDebtLimit;
+        result.totalDebtLimit = _pool.totalDebtLimit();
+
         // CreditManagerDebtParams[] creditManagerDebtParams;
         address[] memory creditManagers = _pool.creditManagers();
         uint256 len = creditManagers.length;
         result.creditManagerDebtParams = new CreditManagerDebtParams[](len);
 
-        unchecked {
-            for (uint256 i; i < len; ++i) {
-                address creditManager = creditManagers[i];
-                result.creditManagerDebtParams[i] = CreditManagerDebtParams({
-                    creditManager: creditManager,
-                    borrowed: _pool.creditManagerBorrowed(creditManager),
-                    limit: _pool.creditManagerDebtLimit(creditManager)
-                });
-            }
+        for (uint256 i; i < len; ++i) {
+            address creditManager = creditManagers[i];
+            result.creditManagerDebtParams[i] = CreditManagerDebtParams({
+                creditManager: creditManager,
+                borrowed: _pool.creditManagerBorrowed(creditManager),
+                limit: _pool.creditManagerDebtLimit(creditManager),
+                available: _pool.creditManagerBorrowable(creditManager)
+            });
         }
+
         // bool isPaused;
         result.isPaused = _pool.paused();
     }
@@ -192,109 +175,11 @@ contract PoolCompressorV3 {
         }
     }
 
-    /// @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);
-        // address priceOracle;
-        result.priceOracle = creditManager.priceOracle();
-        // uint8 maxEnabledTokens;
-        result.maxEnabledTokens = creditManager.maxEnabledTokens();
-        // address[] collateralTokens;
-        // uint16[] liquidationThresholds;
-        {
-            uint256 collateralTokenCount = creditManager.collateralTokensCount();
-
-            result.collateralTokens = new address[](collateralTokenCount);
-            result.liquidationThresholds = new uint16[](collateralTokenCount);
-
-            unchecked {
-                for (uint256 i = 0; i < collateralTokenCount; ++i) {
-                    (result.collateralTokens[i], result.liquidationThresholds[i]) =
-                        creditManager.collateralTokenByMask(1 << i);
-                }
-            }
-        }
-        // 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
-        {
-            (
-                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.maxQuotaMultiplier = creditFacade.maxQuotaMultiplier();
-        // address treasury;
-        // result.treasury = creditFacade.treasury();
-        // bool expirable;
-        result.expirable = creditFacade.expirable();
-        // address degenNFT;
-        result.degenNFT = creditFacade.degenNFT();
-        // uint40 expirationDate;
-        result.expirationDate = creditFacade.expirationDate();
-        // uint8 maxDebtPerBlockMultiplier;
-        result.maxDebtPerBlockMultiplier = creditFacade.maxDebtPerBlockMultiplier();
-        // address botList;
-        result.botList = creditFacade.botList();
-        // uint256 minDebt;
-        // uint256 maxDebt;
-        (result.minDebt, result.maxDebt) = creditFacade.debtLimits();
-        // uint256 forbiddenTokenMask;
-        result.forbiddenTokenMask = creditFacade.forbiddenTokenMask();
-        // address lossLiquidator;
-        // result.lossLiquidator = creditFacade.lossLiquidator();
-        // bool isPaused;
-        result.isPaused = creditFacade.paused();
+    function getInterestRateModelState(address addr) public view returns (BaseState memory) {
+        return BaseLib.getBaseState(addr, "IRM_LINEAR", linearInterestRateModelSerializer);
     }
 
-    function getInterestRateModelState(address addr) public view returns (BaseState memory baseState) {
-        baseState = BaseLib.getBaseState(addr, "INTEREST_MODEL", linearInterestRateModelSerializer);
-    }
-
-    function getCreditManagerData(address creditManager) public view returns (CreditManagerData memory result) {
-        result.creditManager = getCreditManagerState(creditManager);
-        result.creditFacade = getCreditFacadeState(ICreditManagerV3(creditManager).creditFacade());
-        result.creditConfigurator = BaseLib.getBaseState(
-            ICreditManagerV3(creditManager).creditConfigurator(), "CREDIT_CONFIGURATOR", address(0)
-        );
-
-        PoolV3 _pool = PoolV3(result.creditManager.pool);
-        result.totalDebt = _pool.creditManagerBorrowed(creditManager);
-        result.totalDebtLimit = _pool.creditManagerDebtLimit(creditManager);
-        result.availableToBorrow = _pool.creditManagerBorrowable(creditManager);
-
-        result.adapters = adapterCompressor.getContractAdapters(creditManager);
+    function getLossPolicyState(address lossPolicy) public view returns (BaseState memory) {
+        return BaseLib.getBaseState(lossPolicy, "LP_ALIASED", address(0));
     }
 }

package/contracts/compressors/PriceFeedCompressor.sol

@@ -3,12 +3,12 @@
 // (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.17;
 
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
 import {AddressIsNotContractException} from "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
 import {IPriceOracleV3, PriceFeedParams} from "@gearbox-protocol/core-v3/contracts/interfaces/IPriceOracleV3.sol";
 import {IPriceFeed, IUpdatablePriceFeed} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IPriceFeed.sol";
 import {IPriceFeedCompressor} from "../interfaces/IPriceFeedCompressor.sol";
 import {PriceFeedType} from "@gearbox-protocol/sdk-gov/contracts/PriceFeedType.sol";
-import {IVersion} from "../interfaces/IVersion.sol";
 
 import {BaseLib} from "../libraries/BaseLib.sol";
 
@@ -197,10 +197,10 @@ contract PriceFeedCompressor is IPriceFeedCompressor {
     // --------- //
 
     /// @dev Sets `serializer` for `priceFeedType`
-    function _setSerializer(bytes32 contractType, address serializer) internal {
-        if (serializers[contractType] != serializer) {
-            serializers[contractType] = serializer;
-            emit SetSerializer(contractType, serializer);
+    function _setSerializer(bytes32 contractType_, address serializer) internal {
+        if (serializers[contractType_] != serializer) {
+            serializers[contractType_] = serializer;
+            emit SetSerializer(contractType_, serializer);
         }
     }
 
@@ -251,8 +251,8 @@ contract PriceFeedCompressor is IPriceFeedCompressor {
 
     /// @dev Returns price feed tree node, see `PriceFeedTreeNode` for detailed description of struct fields
     function _getPriceFeedTreeNode(address priceFeed) internal view returns (PriceFeedTreeNode memory data) {
-        try IVersion(priceFeed).contractType() returns (bytes32 contractType) {
-            data.baseParams.contractType = contractType;
+        try IVersion(priceFeed).contractType() returns (bytes32 contractType_) {
+            data.baseParams.contractType = contractType_;
         } catch {
             try ImplementsPriceFeedType(priceFeed).priceFeedType() returns (uint8 priceFeedType) {
                 data.baseParams.contractType = contractTypes[priceFeedType];

package/contracts/interfaces/IAdapterCompressor.sol

@@ -3,10 +3,10 @@
 // (c) Gearbox Holdings, 2024
 pragma solidity ^0.8.10;
 
-import {ContractAdapter} from "../types/MarketData.sol";
+import {AdapterState} from "../types/CreditSuiteData.sol";
 import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
 
 /// @title Adapter compressor 3.1
 interface IAdapterCompressor is IVersion {
-    function getContractAdapters(address creditManager) external view returns (ContractAdapter[] memory result);
+    function getAdapters(address creditManager) external view returns (AdapterState[] memory result);
 }

package/contracts/interfaces/ICreditAccountCompressor.sol

@@ -4,7 +4,8 @@
 pragma solidity ^0.8.17;
 
 import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
-import {CreditAccountData, CreditAccountFilter, MarketFilter, TokenInfo} from "../types/CreditAccountState.sol";
+import {CreditAccountData, TokenInfo} from "../types/CreditAccountState.sol";
+import {CreditAccountFilter, MarketFilter} from "../types/Filters.sol";
 
 /// @title  Credit account compressor
 /// @notice Allows to fetch data on all credit accounts matching certain criteria in an efficient manner

package/contracts/interfaces/IMarketCompressor.sol

@@ -3,18 +3,16 @@
 // (c) Gearbox Holdings, 2024
 pragma solidity ^0.8.10;
 
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
 import {BaseParams} from "../types/BaseState.sol";
+import {MarketFilter} from "../types/Filters.sol";
 import {MarketData} from "../types/MarketData.sol";
-import {PoolState} from "../types/PoolState.sol";
-import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
-import {MarketFilter} from "../types/CreditAccountState.sol";
 
-/// @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
 interface IMarketCompressor is IVersion {
     function getMarketData(address pool) external view returns (MarketData memory result);
 
+    function getMarketData(address pool, address configurator) external view returns (MarketData memory result);
+
     function getMarkets(MarketFilter memory filter) external view returns (MarketData[] memory result);
 
     function getUpdatablePriceFeeds(MarketFilter memory filter)

package/contracts/libraries/BaseLib.sol

@@ -3,8 +3,8 @@
 // (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.17;
 
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
 import {BaseParams, BaseState} from "../types/BaseState.sol";
-import {IVersion} from "../interfaces/IVersion.sol";
 import {IStateSerializer} from "../interfaces/IStateSerializer.sol";
 import {IStateSerializerLegacy} from "../interfaces/IStateSerializerLegacy.sol";
 

package/contracts/migration/MarketConfigurator.sol

@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: UNLICENSED
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
+import {ICreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
+import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
+import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
+
+import {IContractsRegisterLegacy} from
+    "@gearbox-protocol/governance/contracts/market/legacy/MarketConfiguratorLegacy.sol";
+import {ACL} from "@gearbox-protocol/governance/contracts/market/ACL.sol";
+import {ContractsRegister} from "@gearbox-protocol/governance/contracts/market/ContractsRegister.sol";
+
+/// @dev Extremely dumbed-down version of `MarketConfiguratorLegacy` that is just enough to let compressors work
+contract MarketConfigurator {
+    string public name;
+    address public immutable acl;
+    address public immutable treasury;
+    address public immutable contractsRegister;
+
+    constructor(string memory name_, address acl_, address contractsRegister_, address treasury_) {
+        name = name_;
+        acl = acl_;
+        contractsRegister = address(new ContractsRegister(address(new ACL())));
+        treasury = treasury_;
+
+        address[] memory pools = IContractsRegisterLegacy(contractsRegister_).getPools();
+        uint256 numPools = pools.length;
+        for (uint256 i; i < numPools; ++i) {
+            address pool = pools[i];
+            if (!_isV3Contract(pool)) continue;
+
+            address[] memory creditManagers = IPoolV3(pool).creditManagers();
+            uint256 numCreditManagers = creditManagers.length;
+            if (numCreditManagers == 0) continue;
+
+            address priceOracle = _priceOracle(creditManagers[0]);
+            // NOTE: v3.0.x contracts don't have loss policies set so we don't bother with them here
+            address lossPolicy = address(1);
+
+            ContractsRegister(contractsRegister).registerMarket(pool, priceOracle, lossPolicy);
+            for (uint256 j; j < numCreditManagers; ++j) {
+                ContractsRegister(contractsRegister).registerCreditSuite(creditManagers[j]);
+            }
+        }
+    }
+
+    function _isV3Contract(address contract_) internal view returns (bool) {
+        try IVersion(contract_).version() returns (uint256 version_) {
+            return version_ >= 300 && version_ < 400;
+        } catch {
+            return false;
+        }
+    }
+
+    function _priceOracle(address creditManager) internal view returns (address) {
+        return ICreditManagerV3(creditManager).priceOracle();
+    }
+
+    function _lossLiquidator(address creditManager) internal view returns (address) {
+        return ICreditFacadeV3(ICreditManagerV3(creditManager).creditFacade()).lossLiquidator();
+    }
+}

package/contracts/test/ForkTest.sol

@@ -15,13 +15,15 @@ import {
     NO_VERSION_CONTROL
 } from "@gearbox-protocol/governance/contracts/libraries/ContractLiterals.sol";
 
-import {IACLLegacy as IACL} from "@gearbox-protocol/governance/contracts/market/legacy/MarketConfiguratorLegacy.sol";
-import {IContractsRegisterExt} from "./interfaces/IContractsRegisterExt.sol";
+import {ACL} from "@gearbox-protocol/governance/contracts/market/ACL.sol";
+import {IACLLegacy} from "@gearbox-protocol/governance/contracts/market/legacy/MarketConfiguratorLegacy.sol";
+import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IContractsRegister.sol";
 
 abstract contract ForkTest is Test {
     IAddressProvider addressProvider;
-    IACL acl;
-    IContractsRegisterExt register;
+    ACL acl;
+    IACLLegacy aclLegacy;
+    IContractsRegister register;
     address configurator;
 
     modifier onlyFork() {
@@ -40,8 +42,25 @@ abstract contract ForkTest is Test {
         }
 
         addressProvider = IAddressProvider(vm.envAddress("FORK_ADDRESS_PROVIDER"));
-        acl = IACL(addressProvider.getAddressOrRevert(AP_ACL, NO_VERSION_CONTROL));
-        register = IContractsRegisterExt(addressProvider.getAddressOrRevert(AP_CONTRACTS_REGISTER, NO_VERSION_CONTROL));
-        configurator = Ownable(address(acl)).owner();
+
+        acl = new ACL();
+        aclLegacy = IACLLegacy(addressProvider.getAddressOrRevert(AP_ACL, NO_VERSION_CONTROL));
+        register = IContractsRegister(addressProvider.getAddressOrRevert(AP_CONTRACTS_REGISTER, NO_VERSION_CONTROL));
+        configurator = Ownable(address(aclLegacy)).owner();
+        acl.transferOwnership(configurator);
+        vm.prank(configurator);
+        acl.acceptOwnership();
+    }
+
+    function _grantRole(bytes32 role, address account) internal {
+        acl.grantRole(role, account);
+        if (role == "PAUSABLE_ADMIN") IACLLegacy(aclLegacy).addPausableAdmin(account);
+        else if (role == "UNPAUSABLE_ADMIN") IACLLegacy(aclLegacy).addUnpausableAdmin(account);
+    }
+
+    function _revokeRole(bytes32 role, address account) internal {
+        acl.revokeRole(role, account);
+        if (role == "PAUSABLE_ADMIN") IACLLegacy(aclLegacy).removePausableAdmin(account);
+        else if (role == "UNPAUSABLE_ADMIN") IACLLegacy(aclLegacy).removeUnpausableAdmin(account);
     }
 }

package/contracts/test/MultiPause.t.sol

@@ -22,8 +22,8 @@ contract MultiPauseTest is ForkTest {
         admin = makeAddr("ADMIN");
 
         vm.startPrank(configurator);
-        acl.addPausableAdmin(admin);
-        acl.addPausableAdmin(address(multiPause));
+        _grantRole("PAUSABLE_ADMIN", admin);
+        _grantRole("PAUSABLE_ADMIN", address(multiPause));
         vm.stopPrank();
     }
 

package/contracts/types/CreditAccountState.sol

@@ -9,6 +9,7 @@ pragma solidity ^0.8.17;
 /// @param  creditFacade Facade connected to account's credit manager
 /// @param  underlying Credit manager's underlying token
 /// @param  owner Credit account's owner
+/// @param  expirationDate Expiration timestamp, in case facade is expirable
 /// @param  enabledTokensMask Bitmask of tokens enabled on credit account as collateral
 /// @param  debt Credit account's debt principal in underlying
 /// @param  accruedInterest Base and quota interest accrued on the credit account
@@ -28,6 +29,7 @@ struct CreditAccountData {
     address creditFacade;
     address underlying;
     address owner;
+    uint40 expirationDate;
     uint256 enabledTokensMask;
     uint256 debt;
     uint256 accruedInterest;
@@ -41,30 +43,6 @@ struct CreditAccountData {
     TokenInfo[] tokens;
 }
 
-/// @notice Credit account filters
-/// @param  owner If set, match credit accounts owned by given address
-/// @param  includeZeroDebt If set, also match accounts with zero debt
-/// @param  minHealthFactor If set, only return accounts with health factor above this value
-/// @param  maxHealthFactor If set, only return accounts with health factor below this value
-/// @param  reverting If set, only match accounts with reverting collateral calculation
-struct CreditAccountFilter {
-    address owner;
-    bool includeZeroDebt;
-    uint16 minHealthFactor;
-    uint16 maxHealthFactor;
-    bool reverting;
-}
-
-/// @notice Credit manager filters
-/// @param  curators If set, match credit managers managed by given curators
-/// @param  pools If set, match credit managers connected to given pools
-/// @param  underlying If set, match credit managers with given underlying
-struct MarketFilter {
-    address[] curators;
-    address[] pools;
-    address underlying;
-}
-
 /// @notice Info on credit account's holdings of a token
 /// @param  token Token address
 /// @param  mask Token mask in the credit manager

package/contracts/types/CreditFacadeState.sol

@@ -7,17 +7,14 @@ import {BaseParams} from "./BaseState.sol";
 
 struct CreditFacadeState {
     BaseParams baseParams;
-    uint256 maxQuotaMultiplier;
     address creditManager;
-    address treasury;
-    bool expirable;
     address degenNFT;
+    address botList;
+    bool expirable;
     uint40 expirationDate;
     uint8 maxDebtPerBlockMultiplier;
-    address botList;
     uint256 minDebt;
     uint256 maxDebt;
     uint256 forbiddenTokenMask;
-    address lossLiquidator;
     bool isPaused;
 }

package/contracts/types/CreditManagerState.sol

@@ -5,6 +5,11 @@ pragma solidity ^0.8.17;
 
 import {BaseParams} from "./BaseState.sol";
 
+struct CollateralToken {
+    address token;
+    uint16 liquidationThreshold;
+}
+
 struct CreditManagerState {
     BaseParams baseParams;
     string name;
@@ -13,13 +18,11 @@ struct CreditManagerState {
     address pool;
     address creditFacade;
     address creditConfigurator;
-    address priceOracle;
     uint8 maxEnabledTokens;
-    address[] collateralTokens;
-    uint16[] liquidationThresholds;
-    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
+    CollateralToken[] collateralTokens;
+    uint16 feeInterest;
+    uint16 feeLiquidation;
+    uint16 liquidationDiscount;
+    uint16 feeLiquidationExpired;
+    uint16 liquidationDiscountExpired;
 }

package/contracts/types/CreditSuiteData.sol

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {CreditManagerState} from "./CreditManagerState.sol";
+import {CreditFacadeState} from "./CreditFacadeState.sol";
+import {BaseState, BaseParams} from "./BaseState.sol";
+
+struct AdapterState {
+    BaseParams baseParams;
+    address targetContract;
+}
+
+struct CreditSuiteData {
+    CreditFacadeState creditFacade;
+    CreditManagerState creditManager;
+    BaseState creditConfigurator;
+    AdapterState[] adapters;
+}

package/contracts/types/Filters.sol

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+// TODO: might need separate filters for markets and credit suites
+
+/// @notice Credit account filters
+/// @param  owner If set, match credit accounts owned by given address
+/// @param  includeZeroDebt If set, also match accounts with zero debt
+/// @param  minHealthFactor If set, only return accounts with health factor above this value
+/// @param  maxHealthFactor If set, only return accounts with health factor below this value
+/// @param  reverting If set, only match accounts with reverting collateral calculation
+struct CreditAccountFilter {
+    address owner;
+    bool includeZeroDebt;
+    uint16 minHealthFactor;
+    uint16 maxHealthFactor;
+    bool reverting;
+}
+
+/// @notice Credit manager filters
+/// @param  configurators If set, match credit managers by given market configurators
+/// @param  pools If set, match credit managers connected to given pools
+/// @param  underlying If set, match credit managers with given underlying
+struct MarketFilter {
+    address[] configurators;
+    address[] pools;
+    address underlying;
+}

package/contracts/types/MarketData.sol

@@ -3,57 +3,38 @@
 // (c) Gearbox Holdings, 2024
 pragma solidity ^0.8.17;
 
-import {ACLState} from "./ACLState.sol";
 import {PoolState} from "./PoolState.sol";
 import {PoolQuotaKeeperState} from "./PoolQuotaKeeperState.sol";
 import {RateKeeperState} from "./RateKeeperState.sol";
 import {PriceOracleState} from "./PriceOracleState.sol";
 import {CreditManagerState} from "./CreditManagerState.sol";
 import {CreditFacadeState} from "./CreditFacadeState.sol";
+import {CreditSuiteData} from "./CreditSuiteData.sol";
 import {BaseState, BaseParams} from "./BaseState.sol";
 import {TokenData} from "./TokenData.sol";
 
 struct MarketData {
-    // MarketConfigurator baseParams
-    BaseParams baseParams;
-    // Owner who manages market
-    address owner;
+    // TODO: add risk curator once structure is figured
     address acl;
-    // Syntax sugar ?
-    // address underlying;
-    // Risk curator name
-    string name;
+    address contractsRegister;
+    address treasury;
     PoolState pool;
     PoolQuotaKeeperState poolQuotaKeeper;
     BaseState interestRateModel;
     RateKeeperState rateKeeper;
     PriceOracleState priceOracleData;
-    TokenData[] tokens; // <- V3: collateral tokens, V3.1. from local price oracle
-    CreditManagerData[] creditManagers;
-    // ZappersInfo
-    ZapperInfo[] zappers;
-    // Roles
+    BaseState lossPolicy;
+    TokenData[] tokens;
+    CreditSuiteData[] creditManagers;
+    address configurator;
+    address[] pausableAdmins;
+    address[] unpausableAdmins;
     address[] emergencyLiquidators;
+    ZapperState[] zappers;
 }
-// LossLiquidatorPolicy
 
-struct ZapperInfo {
+struct ZapperState {
     BaseParams baseParams;
     TokenData tokenIn;
     TokenData tokenOut;
 }
-
-struct ContractAdapter {
-    BaseParams baseParams;
-    address targetContract;
-}
-
-struct CreditManagerData {
-    CreditFacadeState creditFacade;
-    CreditManagerState creditManager;
-    BaseState creditConfigurator;
-    ContractAdapter[] adapters;
-    uint256 totalDebt;
-    uint256 totalDebtLimit;
-    uint256 availableToBorrow;
-}

package/contracts/types/PoolState.sol

@@ -17,18 +17,16 @@ struct PoolState {
     // connected contracts
     address poolQuotaKeeper; // +
     address interestRateModel; // +
-    address treasury; // +
     address underlying; // +
     uint256 availableLiquidity; // +
     uint256 expectedLiquidity; // +
     uint256 baseInterestIndex; // +
     uint256 baseInterestRate; // +
     uint256 dieselRate;
-    uint256 totalBorrowed; // +
-    uint256 totalAssets; // +
     uint256 supplyRate; // +
     uint256 withdrawFee; // +
     // Limits
+    uint256 totalBorrowed; // +
     uint256 totalDebtLimit; // +
     CreditManagerDebtParams[] creditManagerDebtParams; // +
     //
@@ -47,4 +45,5 @@ struct CreditManagerDebtParams {
     address creditManager;
     uint256 borrowed;
     uint256 limit;
+    uint256 available;
 }

package/contracts/types/PriceOracleState.sol

@@ -31,6 +31,7 @@ struct PriceFeedMapEntry {
     uint32 stalenessPeriod;
 }
 
+// TODO: revise fields
 /// @notice Represents a node in the price feed "tree"
 /// @param  priceFeed Price feed address
 /// @param  decimals Price feed's decimals (might not be equal to 8 for lower-level)
@@ -49,7 +50,6 @@ struct PriceFeedTreeNode {
     uint8 decimals;
     bool skipCheck;
     bool updatable;
-    // TODO: better naming, underlying is confusing
     address[] underlyingFeeds;
     uint32[] underlyingStalenessPeriods;
     PriceFeedAnswer answer;

package/contracts/types/TokenData.sol

@@ -9,12 +9,3 @@ struct TokenData {
     string name;
     uint8 decimals;
 }
-
-/// 3 sources:
-/// "PriceOracleFather"
-/// Pools | on the fly in SDK
-/// Farming pools | on the fly in SDK
-/// subscribe on new token addition event
-///
-/// POV3 -> POV3.1
-///

package/package.json

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

package/contracts/interfaces/ITreasurySplitter.sol

@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Foundation, 2024.
-pragma solidity ^0.8.17;
-
-import {IVersion} from "./IVersion.sol";
-import {IStateSerializer} from "./IStateSerializer.sol";
-
-interface ITreasurySplitter is IVersion, IStateSerializer {}

package/contracts/interfaces/IVersion.sol

@@ -1,13 +0,0 @@
-    // SPDX-License-Identifier: MIT
-// Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Foundation, 2024.
-pragma solidity ^0.8.17;
-
-/// @title Version interface
-/// @notice Defines contract version
-interface IVersion {
-    /// @notice Contract version
-    function version() external view returns (uint256);
-
-    function contractType() external view returns (bytes32);
-}

package/contracts/market/MarketManager.sol

@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2024
-pragma solidity ^0.8.17;
-
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-
-contract MarketManager is Ownable {
-    address public riskCurator;
-    /// PriceOracleStore priceOracleStore;
-    address public pool;
-
-    // @dev Updates PriceOracles on all connected credit managers
-    function updatePriceOracle() external onlyOwner {}
-}

package/contracts/types/ACLState.sol

@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2024
-pragma solidity ^0.8.17;
-
-struct ACLState {
-    address addr;
-    uint256 version;
-    address owner;
-    address[] pausableAdmins;
-    address[] unpausableAdmins;
-    bytes serializedParams;
-}