feat: new state structure

Author: 0xmikko

contracts/compressors/AdapterCompressor.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.17;
 
 import {IStateSerializer} from "../interfaces/IStateSerializer.sol";
-import {ContractAdapter} from "../types/CreditManagerState.sol";
+import {ContractAdapter} from "../types/MarketData.sol";
 import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
 import {ICreditConfiguratorV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditConfiguratorV3.sol";
 import {IAdapter} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IAdapter.sol";
@@ -15,9 +15,12 @@ contract AdaptgerCompressorV3 {
     // Contract version
     uint256 public constant version = 3_10;
 
-    function getContractAdapters(address creditManager) external view returns (ContractAdapter[] memory adapters) {
-        ICreditConfiguratorV3 creditConfigurator =
-            ICreditConfiguratorV3(ICreditManagerV3(creditManager).creditConfigurator());
+    function getContractAdapters(
+        address creditManager
+    ) external view returns (ContractAdapter[] memory adapters) {
+        ICreditConfiguratorV3 creditConfigurator = ICreditConfiguratorV3(
+            ICreditManagerV3(creditManager).creditConfigurator()
+        );
 
         address[] memory allowedAdapters = creditConfigurator.allowedAdapters();
         uint256 len = allowedAdapters.length;

contracts/compressors/CreditAccountCompressor.sol

@@ -21,7 +21,7 @@ import {PriceFeedCompressor} from "./PriceFeedCompressor.sol";
 // // EXCEPTIONS
 // import "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
 
-import {MarketData} from "../types/MarketData.sol";
+import {MarketData, TokenInfo} from "../types/MarketData.sol";
 import {PoolState} from "../types/PoolState.sol";
 
 import {IMarketCompressor} from "../interfaces/IMarketCompressor.sol";
@@ -50,10 +50,14 @@ contract MarketCompressor is IMarketCompressor {
         ADDRESS_PROVIDER = addressProvider;
         addressProvider = addressProvider;
         poolCompressor = new PoolCompressorV3();
-        priceOracleCompressor = PriceFeedCompressor(priceOracleCompressorAddress);
+        priceOracleCompressor = PriceFeedCompressor(
+            priceOracleCompressorAddress
+        );
     }
 
-    function getMarkets(MarketFilter memory filter) external view returns (MarketData[] memory result) {
+    function getMarkets(
+        MarketFilter memory filter
+    ) external view returns (MarketData[] memory result) {
         address[] memory pools = _getPools(filter);
         result = new MarketData[](pools.length);
 
@@ -62,36 +66,59 @@ contract MarketCompressor is IMarketCompressor {
         }
     }
 
-    function getMarketData(address pool) public view returns (MarketData memory result) {
+    function getMarketData(
+        address pool
+    ) public view returns (MarketData memory result) {
         result.pool = poolCompressor.getPoolState(pool);
-        result.poolQuotaKeeper = poolCompressor.getPoolQuotaKeeperState(result.pool.poolQuotaKeeper);
-        result.rateKeeper = poolCompressor.getRateKeeperState(result.poolQuotaKeeper.rateKeeper);
-        result.interestRateModel = poolCompressor.getInterestRateModelState(result.pool.interestRateModel);
+        result.poolQuotaKeeper = poolCompressor.getPoolQuotaKeeperState(
+            result.pool.poolQuotaKeeper
+        );
+        result.rateKeeper = poolCompressor.getRateKeeperState(
+            result.poolQuotaKeeper.rateKeeper
+        );
+        result.interestRateModel = poolCompressor.getInterestModelState(
+            result.pool.interestRateModel
+        );
 
         address priceOracle = _getPriceOracle(result.pool);
-        address[] memory tokens = IPoolQuotaKeeperV3(result.pool.poolQuotaKeeper).quotedTokens();
+        address[] memory tokens = IPoolQuotaKeeperV3(
+            result.pool.poolQuotaKeeper
+        ).quotedTokens();
 
-        result.tokens = new address[](tokens.length + 1);
-        result.tokens[0] = result.pool.underlying;
+        // TODO: add token data
+        result.tokens = new TokenInfo[](tokens.length + 1);
+        // result.tokens[0] = tokenCompressor.getTokenInfo(result.pool.underlying);
 
-        for (uint256 i = 0; i < tokens.length; i++) {
-            result.tokens[i + 1] = tokens[i];
-        }
+        // for (uint256 i = 0; i < tokens.length; i++) {
+        //     result.tokens[i + 1] = tokenCompressor.getTokenInfo(tokens[i]);
+        // }
         // How to query if no credit mangers are deployed?
-        result.priceOracleData = priceOracleCompressor.getPriceOracleState(priceOracle, result.tokens);
+        // //
+        // TODO: add local address[]
+        // result.priceOracleData = priceOracleCompressor.getPriceOracleState(
+        //     priceOracle,
+        //     result.tokens
+        // );
     }
 
-    function _getPriceOracle(PoolState memory ps) internal view returns (address) {
+    function _getPriceOracle(
+        PoolState memory ps
+    ) internal view returns (address) {
         if (ps.creditManagerDebtParams.length == 0) {
             return address(0);
         }
 
-        return ICreditManagerV3(ps.creditManagerDebtParams[0].creditManager).priceOracle();
+        return
+            ICreditManagerV3(ps.creditManagerDebtParams[0].creditManager)
+                .priceOracle();
     }
 
     /// @dev Pools discovery
-    function _getPools(MarketFilter memory filter) internal view returns (address[] memory pools) {
-        address[] memory configurators = IAddressProviderV3_1(ADDRESS_PROVIDER).marketConfigurators();
+    function _getPools(
+        MarketFilter memory filter
+    ) internal view returns (address[] memory pools) {
+        address[] memory configurators = IAddressProviderV3_1(ADDRESS_PROVIDER)
+            .marketConfigurators();
 
         // rough estimate of maximum number of credit pools
         uint256 max;
@@ -106,18 +133,24 @@ contract MarketCompressor is IMarketCompressor {
 
         for (uint256 i; i < configurators.length; ++i) {
             if (filter.curators.length != 0) {
-                if (!filter.curators.contains(IMarketConfiguratorV3(configurators[i]).owner())) continue;
+                if (
+                    !filter.curators.contains(
+                        IMarketConfiguratorV3(configurators[i]).owner()
+                    )
+                ) continue;
             }
 
-            address[] memory poolsMC = IMarketConfiguratorV3(configurators[i]).pools();
+            address[] memory poolsMC = IMarketConfiguratorV3(configurators[i])
+                .pools();
             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;
+                    if (IPoolV3(currentPool).asset() != filter.underlying)
+                        continue;
                 }
 
                 pools[num++] = currentPool;