@gearbox-protocol/periphery-v3 1.7.0-next.20 → 1.7.0-next.22

package/contracts/compressors/CreditAccountCompressor.sol

@@ -19,10 +19,10 @@ import {PERCENTAGE_FACTOR} from "@gearbox-protocol/core-v3/contracts/libraries/C
 import {SanityCheckTrait} from "@gearbox-protocol/core-v3/contracts/traits/SanityCheckTrait.sol";
 import {ICreditAccountCompressor} from "../interfaces/ICreditAccountCompressor.sol";
 
-import {IAddressProviderV3} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3.sol";
+import {IAddressProviderV3_1} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3_1.sol";
 import {IMarketConfiguratorV3} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfiguratorV3.sol";
 
-import {CreditAccountData, CreditAccountFilter, CreditManagerFilter, TokenInfo} from "../types/CreditAccountState.sol";
+import {CreditAccountData, CreditAccountFilter, MarketFilter, TokenInfo} from "../types/CreditAccountState.sol";
 
 import {Contains} from "../libraries/Contains.sol";
 
@@ -47,7 +47,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     /// @param  addressProvider Address provider contract address
     constructor(address addressProvider) nonZeroAddress(addressProvider) {
         if (addressProvider.code.length == 0) revert InvalidAddressProviderException();
-        try IAddressProviderV3(addressProvider).marketConfigurators() {}
+        try IAddressProviderV3_1(addressProvider).marketConfigurators() {}
         catch {
             revert InvalidAddressProviderException();
         }
@@ -64,26 +64,26 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         return _getCreditAccountData(creditAccount, creditManager);
     }
 
-    /// @notice Returns data for credit accounts that match `caFilter` in credit managers matching `cmFilter`
+    /// @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(CreditManagerFilter memory cmFilter, 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(cmFilter);
+        address[] memory creditManagers = _getCreditManagers(marketFilter);
         return _getCreditAccounts(creditManagers, caFilter, offset, type(uint256).max);
     }
 
     /// @dev Same as above but with `limit` parameter that specifies the number of accounts to process
     function getCreditAccounts(
-        CreditManagerFilter memory cmFilter,
+        MarketFilter memory marketFilter,
         CreditAccountFilter memory caFilter,
         uint256 offset,
         uint256 limit
     ) public view returns (CreditAccountData[] memory data, uint256 nextOffset) {
-        address[] memory creditManagers = _getCreditManagers(cmFilter);
+        address[] memory creditManagers = _getCreditManagers(marketFilter);
         return _getCreditAccounts(creditManagers, caFilter, offset, limit);
     }
 
@@ -116,13 +116,13 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     // COUNTING //
     // -------- //
 
-    /// @notice Counts credit accounts that match `caFilter` in credit managers matching `cmFilter`
-    function countCreditAccounts(CreditManagerFilter memory cmFilter, CreditAccountFilter memory caFilter)
+    /// @notice Counts credit accounts that match `caFilter` in credit managers matching `marketFilter`
+    function countCreditAccounts(MarketFilter memory marketFilter, CreditAccountFilter memory caFilter)
         external
         view
         returns (uint256)
     {
-        address[] memory creditManagers = _getCreditManagers(cmFilter);
+        address[] memory creditManagers = _getCreditManagers(marketFilter);
         return _countCreditAccounts(creditManagers, caFilter, 0, type(uint256).max);
     }
 
@@ -358,12 +358,8 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     }
 
     /// @dev Credit managers discovery
-    function _getCreditManagers(CreditManagerFilter memory filter)
-        internal
-        view
-        returns (address[] memory creditManagers)
-    {
-        address[] memory configurators = IAddressProviderV3(ADDRESS_PROVIDER).marketConfigurators();
+    function _getCreditManagers(MarketFilter memory filter) internal view returns (address[] memory creditManagers) {
+        address[] memory configurators = IAddressProviderV3_1(ADDRESS_PROVIDER).marketConfigurators();
 
         // rough estimate of maximum number of credit managers
         uint256 max;

package/contracts/compressors/MarketCompressor.sol

@@ -4,14 +4,16 @@
 pragma solidity ^0.8.17;
 
 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 {Contains} from "../libraries/Contains.sol";
 
-import {IAddressProviderV3} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3.sol";
+import {IAddressProviderV3_1} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3_1.sol";
 import {IMarketConfiguratorV3} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfiguratorV3.sol";
+import {MarketFilter} from "../types/CreditAccountState.sol";
 
 import {PoolCompressorV3} from "./PoolCompressor.sol";
 import {PriceFeedCompressor} from "./PriceFeedCompressor.sol";
@@ -51,6 +53,15 @@ contract MarketCompressor is IMarketCompressor {
         priceOracleCompressor = PriceFeedCompressor(priceOracleCompressorAddress);
     }
 
+    function getMarkets(MarketFilter memory filter) external view returns (MarketData[] memory result) {
+        address[] memory pools = _getPools(filter);
+        result = new MarketData[](pools.length);
+
+        for (uint256 i = 0; i < pools.length; i++) {
+            result[i] = getMarketData(pools[i]);
+        }
+    }
+
     function getMarketData(address pool) public view returns (MarketData memory result) {
         result.pool = poolCompressor.getPoolState(pool);
         result.poolQuotaKeeper = poolCompressor.getPoolQuotaKeeperState(result.pool.poolQuotaKeeper);
@@ -78,36 +89,44 @@ contract MarketCompressor is IMarketCompressor {
         return ICreditManagerV3(ps.creditManagerDebtParams[0].creditManager).priceOracle();
     }
 
-    /// @dev Credit managers discovery
-    function _getPools(address[] memory riskCurators) internal view returns (address[] memory pools) {
-        address[] memory configurators = IAddressProviderV3(ADDRESS_PROVIDER).marketConfigurators();
+    /// @dev Pools discovery
+    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 managers
+        // rough estimate of maximum number of credit pools
         uint256 max;
         for (uint256 i; i < configurators.length; ++i) {
-            if (riskCurators.contains(IMarketConfiguratorV3(configurators[i]).owner())) {
-                address cr = IMarketConfiguratorV3(configurators[i]).contractsRegister();
-                max += IContractsRegister(cr).getCreditManagers().length;
-            }
+            max += IMarketConfiguratorV3(configurators[i]).pools().length;
         }
 
-        // allocate the array with maximum potentially needed size (total number of credit managers can be assumed
+        // 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);
         uint256 num;
 
         for (uint256 i; i < configurators.length; ++i) {
-            if (riskCurators.contains(IMarketConfiguratorV3(configurators[i]).owner())) {
-                address cr = IMarketConfiguratorV3(configurators[i]).contractsRegister();
-                address[] memory managers = IContractsRegister(cr).getPools();
-                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;
-
-                    pools[num++] = managers[j];
+            if (filter.curators.length != 0) {
+                if (!filter.curators.contains(IMarketConfiguratorV3(configurators[i]).owner())) continue;
+            }
+
+            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;
                 }
+
+                pools[num++] = currentPool;
             }
         }
+
+        // trim the array to its actual size
+        assembly {
+            mstore(pools, num)
+        }
     }
 }

package/contracts/compressors/PriceFeedCompressor.sol

@@ -96,7 +96,11 @@ contract PriceFeedCompressor is IPriceFeedCompressor {
     {
         result.addr = priceOracle;
         result.version = IPriceOracleV3(priceOracle).version();
-        result.contractType = IVersion(priceOracle).contractType();
+        try IVersion(priceOracle).contractType() returns (bytes32 contractType) {
+            result.contractType = contractType;
+        } catch {
+            result.contractType = "PRICE_ORACLE";
+        }
 
         (result.priceFeedMapping, result.priceFeedStructure) = getPriceFeeds(priceOracle, tokens);
     }

package/contracts/interfaces/ICreditAccountCompressor.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.17;
 
 import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
-import {CreditAccountData, CreditAccountFilter, CreditManagerFilter, TokenInfo} from "../types/CreditAccountState.sol";
+import {CreditAccountData, CreditAccountFilter, MarketFilter, TokenInfo} from "../types/CreditAccountState.sol";
 
 /// @title  Credit account compressor
 /// @notice Allows to fetch data on all credit accounts matching certain criteria in an efficient manner
@@ -17,14 +17,14 @@ interface ICreditAccountCompressor is IVersion {
     /// @notice Returns data for credit accounts that match `caFilter` in credit managers matching `cmFilter`
     /// @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(CreditManagerFilter memory cmFilter, CreditAccountFilter memory caFilter, uint256 offset)
+    function getCreditAccounts(MarketFilter memory cmFilter, CreditAccountFilter memory caFilter, uint256 offset)
         external
         view
         returns (CreditAccountData[] memory data, uint256 nextOffset);
 
     /// @dev Same as above but with `limit` parameter that specifies the number of accounts to process
     function getCreditAccounts(
-        CreditManagerFilter memory cmFilter,
+        MarketFilter memory cmFilter,
         CreditAccountFilter memory caFilter,
         uint256 offset,
         uint256 limit
@@ -47,7 +47,7 @@ interface ICreditAccountCompressor is IVersion {
     ) external view returns (CreditAccountData[] memory data, uint256 nextOffset);
 
     /// @notice Counts credit accounts that match `caFilter` in credit managers matching `cmFilter`
-    function countCreditAccounts(CreditManagerFilter memory cmFilter, CreditAccountFilter memory caFilter)
+    function countCreditAccounts(MarketFilter memory cmFilter, CreditAccountFilter memory caFilter)
         external
         view
         returns (uint256);

package/contracts/interfaces/IMarketCompressor.sol

@@ -1,6 +1,8 @@
 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";
+
 import "forge-std/console.sol";
 
 /// @title Data compressor 3.0.
@@ -8,4 +10,6 @@ import "forge-std/console.sol";
 /// 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 getMarkets(MarketFilter memory filter) external view returns (MarketData[] memory result);
 }

package/contracts/test/ForkTest.sol

@@ -5,18 +5,19 @@ pragma solidity ^0.8.17;
 
 import {Test} from "forge-std/Test.sol";
 
+import {IAddressProviderV3_1} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3_1.sol";
+
 import {
     AP_ACL,
     AP_CONTRACTS_REGISTER,
-    IAddressProviderV3,
     NO_VERSION_CONTROL
-} from "@gearbox-protocol/core-v3/contracts/test/interfaces/IAddressProviderV3.sol";
+} from "@gearbox-protocol/governance/contracts/libraries/ContractLiterals.sol";
 
 import {ACL} from "@gearbox-protocol/governance/contracts/market/ACL.sol";
 import {IContractsRegisterExt} from "./interfaces/IContractsRegisterExt.sol";
 
 abstract contract ForkTest is Test {
-    IAddressProviderV3 addressProvider;
+    IAddressProviderV3_1 addressProvider;
     ACL acl;
     IContractsRegisterExt register;
     address configurator;
@@ -36,7 +37,7 @@ abstract contract ForkTest is Test {
             vm.createSelectFork(rpcUrl, blockNumber);
         }
 
-        addressProvider = IAddressProviderV3(vm.envAddress("FORK_ADDRESS_PROVIDER"));
+        addressProvider = IAddressProviderV3_1(vm.envAddress("FORK_ADDRESS_PROVIDER"));
         acl = ACL(addressProvider.getAddressOrRevert(AP_ACL, NO_VERSION_CONTROL));
         register = IContractsRegisterExt(addressProvider.getAddressOrRevert(AP_CONTRACTS_REGISTER, NO_VERSION_CONTROL));
         configurator = acl.owner();

package/contracts/types/CreditAccountState.sol

@@ -59,7 +59,7 @@ struct CreditAccountFilter {
 /// @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 CreditManagerFilter {
+struct MarketFilter {
     address[] curators;
     address[] pools;
     address underlying;

package/package.json

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