@gearbox-protocol/periphery-v3 1.7.0-next.17 → 1.7.0-next.19

package/contracts/compressors/AdapterCompressor.sol

@@ -31,13 +31,13 @@ contract AdaptgerCompressorV3 {
 
                 /// add try{} catch for serialisation
 
-                adapters[i] = ContractAdapter({
-                    targetContract: ICreditManagerV3(creditManager).adapterToContract(allowedAdapter),
-                    adapter: allowedAdapter,
-                    adapterType: uint8(IAdapter(allowedAdapter)._gearboxAdapterType()),
-                    version: IAdapter(allowedAdapter)._gearboxAdapterVersion(),
-                    stateSerialised: stateSerialised
-                });
+                // adapters[i] = ContractAdapter({
+                //     targetContract: ICreditManagerV3(creditManager).adapterToContract(allowedAdapter),
+                //     adapter: allowedAdapter,
+                //     adapterType: uint8(IAdapter(allowedAdapter)._gearboxAdapterType()),
+                //     version: IAdapter(allowedAdapter)._gearboxAdapterVersion(),
+                //     stateSerialised: stateSerialised
+                // });
             }
         }
     }

package/contracts/compressors/CreditAccountCompressor.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.17;
 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/IContractsRegister.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,
@@ -17,19 +17,25 @@ import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces
 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} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3.sol";
 import {IMarketConfiguratorV3} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfiguratorV3.sol";
 
-import {CreditAccountData, CreditAccountFilter, CreditManagerFilter, TokenInfo} from "./Types.sol";
+import {CreditAccountData, CreditAccountFilter, CreditManagerFilter, TokenInfo} from "../types/CreditAccountState.sol";
+
+import {Contains} from "../libraries/Contains.sol";
 
 /// @title  Credit account compressor
 /// @notice Allows to fetch data on all credit accounts matching certain criteria in an efficient manner
 /// @dev    The contract is not gas optimized and is thus not recommended for on-chain use
 /// @dev    Querying functions try to process as many accounts as possible and stop when they get close to gas limit
-contract CreditAccountCompressor is IVersion, SanityCheckTrait {
+contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
+    using Contains for address[];
+
     /// @notice Contract version
     uint256 public constant override version = 3_10;
+    bytes32 public constant override contractType = "CREDIT_ACCOUNT_COMPRESSOR";
 
     /// @notice Address provider contract address
     address public immutable ADDRESS_PROVIDER;
@@ -372,7 +378,7 @@ contract CreditAccountCompressor is IVersion, SanityCheckTrait {
         uint256 num;
         for (uint256 i; i < configurators.length; ++i) {
             if (filter.curators.length != 0) {
-                if (!_contains(filter.curators, IMarketConfiguratorV3(configurators[i]).owner())) continue;
+                if (!filter.curators.contains(IMarketConfiguratorV3(configurators[i]).owner())) continue;
             }
 
             address cr = IMarketConfiguratorV3(configurators[i]).contractsRegister();
@@ -383,7 +389,7 @@ contract CreditAccountCompressor is IVersion, SanityCheckTrait {
                 if (ver < 3_00 || ver > 3_99) continue;
 
                 if (filter.pools.length != 0) {
-                    if (!_contains(filter.pools, ICreditManagerV3(managers[j]).pool())) continue;
+                    if (!filter.pools.contains(ICreditManagerV3(managers[j]).pool())) continue;
                 }
 
                 if (filter.underlying != address(0)) {
@@ -399,12 +405,4 @@ contract CreditAccountCompressor is IVersion, SanityCheckTrait {
             mstore(creditManagers, num)
         }
     }
-
-    /// @dev Checks whether `arr` contains `value`
-    function _contains(address[] memory arr, address value) internal pure returns (bool) {
-        for (uint256 i; i < arr.length; ++i) {
-            if (value == arr[i]) return true;
-        }
-        return false;
-    }
 }

package/contracts/compressors/MarketCompressor.sol

@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Holdings, 2024
+pragma solidity ^0.8.17;
+
+import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.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 {IMarketConfiguratorV3} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfiguratorV3.sol";
+
+import {PoolCompressorV3} from "./PoolCompressor.sol";
+import {PriceFeedCompressor} from "./PriceFeedCompressor.sol";
+
+// // EXCEPTIONS
+// import "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
+
+import {MarketData} from "../types/MarketData.sol";
+import {PoolState} from "../types/PoolState.sol";
+
+import {IMarketCompressor} from "../interfaces/IMarketCompressor.sol";
+
+import "forge-std/console.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
+contract MarketCompressor is IMarketCompressor {
+    using Contains for address[];
+    // Contract version
+
+    uint256 public constant version = 3_10;
+    bytes32 public constant contractType = "MARKET_COMPRESSOR";
+
+    /// @notice Address provider contract address
+    address public immutable ADDRESS_PROVIDER;
+
+    PriceFeedCompressor priceOracleCompressor;
+    PoolCompressorV3 poolCompressor;
+
+    error CreditManagerIsNotV3Exception();
+
+    constructor(address addressProvider, address priceOracleCompressorAddress) {
+        ADDRESS_PROVIDER = addressProvider;
+        addressProvider = addressProvider;
+        poolCompressor = new PoolCompressorV3();
+        priceOracleCompressor = PriceFeedCompressor(priceOracleCompressorAddress);
+    }
+
+    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);
+
+        address priceOracle = _getPriceOracle(result.pool);
+        address[] memory tokens = IPoolQuotaKeeperV3(result.pool.poolQuotaKeeper).quotedTokens();
+
+        result.tokens = new address[](tokens.length + 1);
+        result.tokens[0] = result.pool.underlying;
+
+        for (uint256 i = 0; i < tokens.length; i++) {
+            result.tokens[i + 1] = tokens[i];
+        }
+        // How to query if no credit mangers are deployed?
+        result.priceOracleData = priceOracleCompressor.getPriceOracleState(priceOracle, result.tokens);
+    }
+
+    function _getPriceOracle(PoolState memory ps) internal view returns (address) {
+        if (ps.creditManagerDebtParams.length == 0) {
+            return address(0);
+        }
+
+        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();
+
+        // rough estimate of maximum number of credit managers
+        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;
+            }
+        }
+
+        // allocate the array with maximum potentially needed size (total number of credit managers 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];
+                }
+            }
+        }
+    }
+}

package/contracts/compressors/PriceFeedCompressor.sol

@@ -41,6 +41,7 @@ contract PriceFeedCompressor is IPriceFeedCompressor {
 
     /// @notice Contract version
     uint256 public constant override version = 3_10;
+    bytes32 public constant override contractType = "PRICE_FEED_COMPRESSOR";
 
     /// @notice Map of state serializers for different price feed types
     /// @dev    Serializers only apply to feeds that don't implement `IStateSerializer` themselves

package/contracts/data/DataCompressorV3.sol

@@ -10,7 +10,7 @@ import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol";
 import {PERCENTAGE_FACTOR, RAY} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
 
 import {ContractsRegisterTrait} from "@gearbox-protocol/core-v3/contracts/traits/ContractsRegisterTrait.sol";
-import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/IContractsRegister.sol";
+import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IContractsRegister.sol";
 import {CreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditFacadeV3.sol";
 
 import {
@@ -64,6 +64,7 @@ import {IZapperRegister} from "../interfaces/IZapperRegister.sol";
 contract DataCompressorV3 is IDataCompressorV3, ContractsRegisterTrait {
     // Contract version
     uint256 public constant version = 3_00;
+    bytes32 public constant contractType = "DATA_COMPRESSOR";
 
     IZapperRegister public zapperRegister;
 

package/contracts/data/ZapperRegister.sol

@@ -6,10 +6,12 @@ pragma solidity ^0.8.10;
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {IZapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IZapper.sol";
 import {IZapperRegister} from "../interfaces/IZapperRegister.sol";
-import {ACLNonReentrantTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLNonReentrantTrait.sol";
+import {ACLTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLTrait.sol";
 import {ContractsRegisterTrait} from "@gearbox-protocol/core-v3/contracts/traits/ContractsRegisterTrait.sol";
+import {SanityCheckTrait} from "@gearbox-protocol/core-v3/contracts/traits/SanityCheckTrait.sol";
+import {ControlledTrait} from "@gearbox-protocol/core-v3/contracts/traits/ControlledTrait.sol";
 
-contract ZapperRegister is ACLNonReentrantTrait, ContractsRegisterTrait, IZapperRegister {
+contract ZapperRegister is ContractsRegisterTrait, SanityCheckTrait, ControlledTrait, IZapperRegister {
     using EnumerableSet for EnumerableSet.AddressSet;
 
     // Contract version
@@ -17,12 +19,12 @@ contract ZapperRegister is ACLNonReentrantTrait, ContractsRegisterTrait, IZapper
 
     mapping(address => EnumerableSet.AddressSet) internal _zappersMap;
 
-    constructor(address addressProvider)
-        ACLNonReentrantTrait(addressProvider)
-        ContractsRegisterTrait(addressProvider)
+    constructor(address acl, address contractsRegister)
+        ControlledTrait(acl)
+        ContractsRegisterTrait(contractsRegister)
     {}
 
-    function addZapper(address zapper) external nonZeroAddress(zapper) controllerOnly {
+    function addZapper(address zapper) external nonZeroAddress(zapper) controllerOrConfiguratorOnly {
         address pool = IZapper(zapper).pool();
         _ensureRegisteredPool(pool);
 
@@ -33,7 +35,7 @@ contract ZapperRegister is ACLNonReentrantTrait, ContractsRegisterTrait, IZapper
         }
     }
 
-    function removeZapper(address zapper) external nonZeroAddress(zapper) controllerOnly {
+    function removeZapper(address zapper) external nonZeroAddress(zapper) controllerOrConfiguratorOnly {
         EnumerableSet.AddressSet storage zapperSet = _zappersMap[IZapper(zapper).pool()];
         if (zapperSet.contains(zapper)) {
             zapperSet.remove(zapper);

package/contracts/emergency/MultiPause.sol

@@ -4,24 +4,32 @@
 pragma solidity ^0.8.17;
 
 import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
-import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/IContractsRegister.sol";
-import {ACLNonReentrantTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLNonReentrantTrait.sol";
+import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IContractsRegister.sol";
+import {ACLTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLTrait.sol";
 import {ContractsRegisterTrait} from "@gearbox-protocol/core-v3/contracts/traits/ContractsRegisterTrait.sol";
+import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol";
 
 enum PausableAction {
     Pause,
     Unpause
 }
 
+interface PausableContract {
+    /// @notice Pauses contract, can only be called by an account with pausable admin role
+    /// @dev Reverts if contract is already paused
+    function pause() external;
+
+    /// @notice Unpauses contract, can only be called by an account with unpausable admin role
+    /// @dev Reverts if contract is already unpaused
+    function unpause() external;
+}
+
 /// @title MultiPause
 /// @author Gearbox Foundation
 /// @notice Allows pausable admins to pause multiple contracts in a single transaction
 /// @dev This contract is expected to be one of pausable admins in the ACL contract
-contract MultiPause is ACLNonReentrantTrait, ContractsRegisterTrait {
-    constructor(address acl_, address contractsRegister_)
-        ACLNonReentrantTrait(acl_)
-        ContractsRegisterTrait(contractsRegister_)
-    {}
+contract MultiPause is ACLTrait, ContractsRegisterTrait {
+    constructor(address acl_, address contractsRegister_) ACLTrait(acl_) ContractsRegisterTrait(contractsRegister_) {}
 
     /// @notice Pauses contracts from the given list
     /// @dev Ignores contracts that are already paused
@@ -85,11 +93,11 @@ contract MultiPause is ACLNonReentrantTrait, ContractsRegisterTrait {
         unchecked {
             for (uint256 i; i < len; ++i) {
                 if (action == PausableAction.Pause) {
-                    if (ACLNonReentrantTrait(contracts[i]).paused()) continue;
-                    ACLNonReentrantTrait(contracts[i]).pause();
+                    if (Pausable(contracts[i]).paused()) continue;
+                    PausableContract(contracts[i]).pause();
                 } else {
-                    if (!ACLNonReentrantTrait(contracts[i]).paused()) continue;
-                    ACLNonReentrantTrait(contracts[i]).unpause();
+                    if (!Pausable(contracts[i]).paused()) continue;
+                    PausableContract(contracts[i]).unpause();
                 }
             }
         }

package/contracts/interfaces/ICreditAccountCompressor.sol

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+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";
+
+/// @title  Credit account compressor
+/// @notice Allows to fetch data on all credit accounts matching certain criteria in an efficient manner
+/// @dev    The contract is not gas optimized and is thus not recommended for on-chain use
+/// @dev    Querying functions try to process as many accounts as possible and stop when they get close to gas limit
+interface ICreditAccountCompressor is IVersion {
+    /// @notice Returns data for a particular `creditAccount`
+    function getCreditAccountData(address creditAccount) external view returns (CreditAccountData memory);
+
+    /// @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)
+        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,
+        CreditAccountFilter memory caFilter,
+        uint256 offset,
+        uint256 limit
+    ) external view returns (CreditAccountData[] memory data, uint256 nextOffset);
+
+    /// @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)
+        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(
+        address creditManager,
+        CreditAccountFilter memory caFilter,
+        uint256 offset,
+        uint256 limit
+    ) 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)
+        external
+        view
+        returns (uint256);
+
+    /// @notice Counts credit accounts that match `caFilter` in a given `creditManager`
+    function countCreditAccounts(address creditManager, CreditAccountFilter memory caFilter)
+        external
+        view
+        returns (uint256);
+}

package/contracts/interfaces/IMarketCompressor.sol

@@ -0,0 +1,11 @@
+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 "forge-std/console.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);
+}

package/contracts/libraries/Contains.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.17;
+
+library Contains {
+    function contains(address[] memory array, address element) internal pure returns (bool) {
+        for (uint256 i = 0; i < array.length; i++) {
+            if (array[i] == element) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

package/contracts/serializers/oracles/LPPriceFeedSerializer.sol

@@ -23,8 +23,8 @@ contract LPPriceFeedSerializer is IStateSerializerLegacy {
             pf.lpContract(),
             pf.lowerBound(),
             pf.upperBound(),
-            pf.updateBoundsAllowed(),
-            pf.lastBoundsUpdate(),
+            // pf.updateBoundsAllowed(),
+            // pf.lastBoundsUpdate(),
             _getPriceData(pf)
         );
     }

package/contracts/test/ForkTest.sol

@@ -12,12 +12,12 @@ import {
     NO_VERSION_CONTROL
 } from "@gearbox-protocol/core-v3/contracts/test/interfaces/IAddressProviderV3.sol";
 
-import {IACLExt} from "./interfaces/IACLExt.sol";
+import {ACL} from "@gearbox-protocol/governance/contracts/market/ACL.sol";
 import {IContractsRegisterExt} from "./interfaces/IContractsRegisterExt.sol";
 
 abstract contract ForkTest is Test {
     IAddressProviderV3 addressProvider;
-    IACLExt acl;
+    ACL acl;
     IContractsRegisterExt register;
     address configurator;
 
@@ -37,7 +37,7 @@ abstract contract ForkTest is Test {
         }
 
         addressProvider = IAddressProviderV3(vm.envAddress("FORK_ADDRESS_PROVIDER"));
-        acl = IACLExt(addressProvider.getAddressOrRevert(AP_ACL, NO_VERSION_CONTROL));
+        acl = ACL(addressProvider.getAddressOrRevert(AP_ACL, NO_VERSION_CONTROL));
         register = IContractsRegisterExt(addressProvider.getAddressOrRevert(AP_CONTRACTS_REGISTER, NO_VERSION_CONTROL));
         configurator = acl.owner();
     }

package/contracts/test/MultiPause.t.sol

@@ -5,9 +5,9 @@ pragma solidity ^0.8.17;
 
 import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
 import {CallerNotPausableAdminException} from "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
-import {ACLNonReentrantTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLNonReentrantTrait.sol";
-
-import {MultiPause} from "../emergency/MultiPause.sol";
+import {ACLTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLTrait.sol";
+import {MultiPause, PausableContract} from "../emergency/MultiPause.sol";
+import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol";
 
 import {ForkTest} from "./ForkTest.sol";
 
@@ -45,9 +45,9 @@ contract MultiPauseTest is ForkTest {
         address[] memory pools = register.getPools();
 
         // ensure that at least one contract is paused
-        if (!ACLNonReentrantTrait(pools[0]).paused()) {
+        if (!Pausable(pools[0]).paused()) {
             vm.prank(admin);
-            ACLNonReentrantTrait(pools[0]).pause();
+            PausableContract(pools[0]).pause();
         }
 
         vm.prank(admin);
@@ -75,38 +75,32 @@ contract MultiPauseTest is ForkTest {
         _assert_allManagersPaused();
     }
 
-    function _assert_contractsPaused(address[] memory contracts) internal {
+    function _assert_contractsPaused(address[] memory contracts) internal view {
         for (uint256 i; i < contracts.length; ++i) {
             assertTrue(
-                ACLNonReentrantTrait(contracts[i]).paused(),
-                string.concat("Contract ", vm.toString(contracts[i]), " is not paused")
+                Pausable(contracts[i]).paused(), string.concat("Contract ", vm.toString(contracts[i]), " is not paused")
             );
         }
     }
 
-    function _assert_allPoolsPaused() internal {
+    function _assert_allPoolsPaused() internal view {
         address[] memory pools = register.getPools();
         for (uint256 i; i < pools.length; ++i) {
-            assertTrue(
-                ACLNonReentrantTrait(pools[i]).paused(), string.concat("Pool ", vm.toString(pools[i]), " is not paused")
-            );
+            assertTrue(Pausable(pools[i]).paused(), string.concat("Pool ", vm.toString(pools[i]), " is not paused"));
         }
     }
 
-    function _assert_allManagersPaused() internal {
+    function _assert_allManagersPaused() internal view {
         address[] memory creditManagers = register.getCreditManagers();
         for (uint256 i; i < creditManagers.length; ++i) {
             if (ICreditManagerV3(creditManagers[i]).version() < 3_00) {
                 assertTrue(
-                    ACLNonReentrantTrait(creditManagers[i]).paused(),
+                    Pausable(creditManagers[i]).paused(),
                     string.concat("Manager ", vm.toString(creditManagers[i]), " is not paused")
                 );
             } else {
                 address facade = ICreditManagerV3(creditManagers[i]).creditFacade();
-                assertTrue(
-                    ACLNonReentrantTrait(facade).paused(),
-                    string.concat("Facade ", vm.toString(facade), " is not paused")
-                );
+                assertTrue(Pausable(facade).paused(), string.concat("Facade ", vm.toString(facade), " is not paused"));
             }
         }
     }

package/contracts/test/interfaces/IACLExt.sol

@@ -3,7 +3,7 @@
 // (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.17;
 
-import {IACL} from "@gearbox-protocol/core-v3/contracts/interfaces/IACL.sol";
+import {IACL} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IACL.sol";
 
 interface IACLExt is IACL {
     function addPausableAdmin(address addr) external;

package/contracts/test/interfaces/IContractsRegisterExt.sol

@@ -3,7 +3,7 @@
 // (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.17;
 
-import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/IContractsRegister.sol";
+import {IContractsRegister} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IContractsRegister.sol";
 
 interface IContractsRegisterExt is IContractsRegister {
     function addPool(address pool) external;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/periphery-v3",
-  "version": "1.7.0-next.17",
+  "version": "1.7.0-next.19",
   "main": "index.js",
   "repository": "git@github.com:Gearbox-protocol/periphery-v3.git",
   "author": "Mikael <26343374+0xmikko@users.noreply.github.com>",
@@ -18,13 +18,9 @@
     "@chainlink/contracts": "^0.4.0",
     "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "17.6.0",
-    "@gearbox-protocol/core-v3": "^1.50.0-next.15",
-    "@gearbox-protocol/governance": "^1.4.0-next.5",
-    "@gearbox-protocol/integrations-v3": "^1.23.1",
-    "@gearbox-protocol/oracles-v3": "^1.11.0-next.3",
-    "@gearbox-protocol/sdk-gov": "^2.17.0",
+    "@gearbox-protocol/sdk-gov": "^2.18.2",
     "@openzeppelin/contracts": "^4.9.3",
-    "@redstone-finance/evm-connector": "0.2.5",
+    "@redstone-finance/evm-connector": "^0.6.1",
     "ds-test": "dapphub/ds-test",
     "forge-std": "foundry-rs/forge-std"
   },

package/contracts/compressors/MarketCompressorV3.sol

@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2024
-pragma solidity ^0.8.17;
-
-import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
-import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
-
-import {PoolCompressorV3} from "./PoolCompressor.sol";
-import {PriceFeedCompressor} from "./PriceFeedCompressor.sol";
-
-// // EXCEPTIONS
-// import "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
-
-import {MarketData} from "../types/MarketData.sol";
-import {PoolState} from "../types/PoolState.sol";
-
-import "forge-std/console.sol";
-
-// struct PriceOnDemand {
-//     address priceFeed;
-//     bytes callData;
-// }
-
-/// @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
-contract MarketCompressorV3 {
-    // Contract version
-    uint256 public constant version = 3_10;
-
-    PriceFeedCompressor priceOracleCompressor;
-    PoolCompressorV3 poolCompressor;
-
-    error CreditManagerIsNotV3Exception();
-
-    constructor(address priceOracleCompressorAddress) {
-        poolCompressor = new PoolCompressorV3();
-        priceOracleCompressor = PriceFeedCompressor(priceOracleCompressorAddress);
-    }
-
-    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);
-
-        address priceOracle = _getPriceOracle(result.pool);
-        address[] memory tokens = IPoolQuotaKeeperV3(result.pool.poolQuotaKeeper).quotedTokens();
-
-        result.tokens = new address[](tokens.length + 1);
-        result.tokens[0] = result.pool.underlying;
-
-        for (uint256 i = 0; i < tokens.length; i++) {
-            result.tokens[i + 1] = tokens[i];
-        }
-        // How to query if no credit mangers are deployed?
-        result.priceOracleData = priceOracleCompressor.getPriceOracleState(priceOracle, result.tokens);
-    }
-
-    function _getPriceOracle(PoolState memory ps) internal view returns (address) {
-        if (ps.creditManagerDebtParams.length == 0) {
-            return address(0);
-        }
-
-        return ICreditManagerV3(ps.creditManagerDebtParams[0].creditManager).priceOracle();
-    }
-}