@gearbox-protocol/periphery-v3 1.7.0-next.16 → 1.7.0-next.18

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,
@@ -30,6 +30,7 @@ import {CreditAccountData, CreditAccountFilter, CreditManagerFilter, TokenInfo}
 contract CreditAccountCompressor is IVersion, SanityCheckTrait {
     /// @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;

package/contracts/compressors/MarketCompressorV3.sol

@@ -0,0 +1,68 @@
+// 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();
+    }
+}

package/contracts/compressors/PoolCompressor.sol

@@ -7,16 +7,25 @@ pragma experimental ABIEncoderV2;
 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 {ICreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
 
 import {PoolState, CreditManagerDebtParams} from "../types/PoolState.sol";
 import {PoolQuotaKeeperState, QuotaTokenParams} from "../types/PoolQuotaKeeperState.sol";
 import {RateKeeperState, Rate} from "../types/RateKeeperState.sol";
+import {InterestRateModelState} from "../types/InterestRateModelState.sol";
+import {CreditManagerState} from "../types/CreditManagerState.sol";
+
 import {PERCENTAGE_FACTOR, RAY} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
 import {IRateKeeper} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IRateKeeper.sol";
 
 import {RateKeeperType} from "../types/Enums.sol";
+
 // Serializers
 import {GaugeSerializer} from "../serializers/pool/GaugeSerializer.sol";
+import {LinearInterestModelSerializer} from "../serializers/pool/LinearInterestModelSerializer.sol";
 
 /// @title Pool compressor
 /// @notice Collects data from pool related contracts
@@ -26,9 +35,11 @@ contract PoolCompressorV3 {
     uint256 public constant version = 3_10;
 
     address public immutable gaugeSerializer;
+    address public immutable linearInterestModelSerializer;
 
     constructor() {
         gaugeSerializer = address(new GaugeSerializer());
+        linearInterestModelSerializer = address(new LinearInterestModelSerializer());
     }
 
     function getPoolState(address pool) public view returns (PoolState memory result) {
@@ -73,8 +84,8 @@ contract PoolCompressorV3 {
         result.baseInterestIndex = _pool.baseInterestIndex();
         // uint256 baseInterestRate;
         result.baseInterestRate = _pool.baseInterestRate();
-        // uint256 dieselRate_RAY;
-        result.dieselRate_RAY = _pool.convertToAssets(RAY);
+        // uint256 dieselRate;
+        result.dieselRate = _pool.convertToAssets(RAY);
         // uint256 totalBorrowed;
         result.totalBorrowed = _pool.totalBorrowed();
         // uint256 totalDebtLimit;
@@ -173,4 +184,67 @@ contract PoolCompressorV3 {
             result.rates[i].rate = rawRates[i];
         }
     }
+
+    function getInterestRateModelState(address irm) external view returns (InterestRateModelState memory result) {
+        InterestRateModelState memory irmState;
+        irmState.addr = irm;
+        irmState.version = IVersion(irm).version();
+
+        try IVersion(irm).contractType() returns (bytes32 contractType) {
+            irmState.contractType = contractType;
+        } catch {
+            irmState.contractType = "IRM_LINEAR";
+        }
+        // add serialiser
+        irmState.serializedParams = LinearInterestModelSerializer(linearInterestModelSerializer).serialize(irm);
+        return irmState;
+    }
+
+    /// @dev Returns CreditManagerData for a particular _cm
+    /// @param _cm CreditManager address
+    function getCreditManagerData(address _cm) public view returns (CreditManagerState memory result) {
+        ICreditManagerV3 creditManager = ICreditManagerV3(_cm);
+        ICreditConfiguratorV3 creditConfigurator = ICreditConfiguratorV3(creditManager.creditConfigurator());
+        ICreditFacadeV3 creditFacade = ICreditFacadeV3(creditManager.creditFacade());
+
+        result.addr = _cm;
+        result.name = ICreditManagerV3(_cm).name();
+        result.cfVersion = IVersion(address(creditFacade)).version();
+
+        result.creditFacade = address(creditFacade);
+        result.creditConfigurator = address(creditConfigurator);
+
+        result.underlying = creditManager.underlying();
+
+        (result.minDebt, result.maxDebt) = creditFacade.debtLimits();
+
+        {
+            uint256 collateralTokenCount = creditManager.collateralTokensCount();
+
+            result.collateralTokens = new address[](collateralTokenCount);
+            result.liquidationThresholds = new uint256[](collateralTokenCount);
+
+            unchecked {
+                for (uint256 i = 0; i < collateralTokenCount; ++i) {
+                    (result.collateralTokens[i], result.liquidationThresholds[i]) =
+                        creditManager.collateralTokenByMask(1 << i);
+                }
+            }
+        }
+
+        result.degenNFT = creditFacade.degenNFT();
+
+        // (, result.isIncreaseDebtForbidden,,) = creditFacade.params(); // V2 only: true if increasing debt is forbidden
+        result.forbiddenTokenMask = creditFacade.forbiddenTokenMask(); // V2 only: mask which forbids some particular tokens
+        result.maxEnabledTokensLength = creditManager.maxEnabledTokens(); // V2 only: a limit on enabled tokens imposed for security
+        {
+            (
+                result.feeInterest,
+                result.feeLiquidation,
+                result.liquidationDiscount,
+                result.feeLiquidationExpired,
+                result.liquidationDiscountExpired
+            ) = creditManager.fees();
+        }
+    }
 }

package/contracts/compressors/PriceFeedCompressor.sol

@@ -8,6 +8,7 @@ import {IPriceOracleV3, PriceFeedParams} from "@gearbox-protocol/core-v3/contrac
 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 {IStateSerializerLegacy} from "../interfaces/IStateSerializerLegacy.sol";
 import {IStateSerializer} from "../interfaces/IStateSerializer.sol";
@@ -17,7 +18,7 @@ import {BPTWeightedPriceFeedSerializer} from "../serializers/oracles/BPTWeighted
 import {LPPriceFeedSerializer} from "../serializers/oracles/LPPriceFeedSerializer.sol";
 import {PythPriceFeedSerializer} from "../serializers/oracles/PythPriceFeedSerializer.sol";
 import {RedstonePriceFeedSerializer} from "../serializers/oracles/RedstonePriceFeedSerializer.sol";
-import {PriceFeedAnswer, PriceFeedMapEntry, PriceFeedTreeNode} from "../types/PriceOracleState.sol";
+import {PriceFeedAnswer, PriceFeedMapEntry, PriceFeedTreeNode, PriceOracleState} from "../types/PriceOracleState.sol";
 
 interface ImplementsPriceFeedType {
     /// @dev Annotates `priceFeedType` as `uint8` instead of `PriceFeedType` enum to support future types
@@ -40,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
@@ -78,7 +80,7 @@ contract PriceFeedCompressor is IPriceFeedCompressor {
     ///         from `priceFeedMap` and their underlying feeds, in case former are nested, which can help to determine
     ///         what underlying feeds should be updated to query the nested one.
     function getPriceFeeds(address priceOracle)
-        external
+        public
         view
         override
         returns (PriceFeedMapEntry[] memory priceFeedMap, PriceFeedTreeNode[] memory priceFeedTree)
@@ -87,6 +89,18 @@ contract PriceFeedCompressor is IPriceFeedCompressor {
         return getPriceFeeds(priceOracle, tokens);
     }
 
+    function getPriceOracleState(address priceOracle, address[] memory tokens)
+        external
+        view
+        returns (PriceOracleState memory result)
+    {
+        result.addr = priceOracle;
+        result.version = IPriceOracleV3(priceOracle).version();
+        result.contractType = IVersion(priceOracle).contractType();
+
+        (result.priceFeedMapping, result.priceFeedStructure) = getPriceFeeds(priceOracle, tokens);
+    }
+
     /// @dev Same as the above but takes the list of tokens as argument as legacy oracle doesn't implement `getTokens`
     function getPriceFeeds(address priceOracle, address[] memory tokens)
         public

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/IVersion.sol

@@ -0,0 +1,13 @@
+    // 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/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);
@@ -78,8 +78,7 @@ contract MultiPauseTest is ForkTest {
     function _assert_contractsPaused(address[] memory contracts) internal {
         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")
             );
         }
     }
@@ -87,9 +86,7 @@ contract MultiPauseTest is ForkTest {
     function _assert_allPoolsPaused() internal {
         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"));
         }
     }
 
@@ -98,15 +95,12 @@ contract MultiPauseTest is ForkTest {
         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/contracts/types/CreditManagerState.sol

@@ -8,20 +8,21 @@ struct CreditManagerState {
     uint256 version;
     bytes32 contractType;
     string name;
-    address creditFacade; // V2 only: address of creditFacade
-    address creditConfigurator; // V2 only: address of creditConfigurator
+    address creditFacade;
+    uint256 cfVersion;
+    bytes32 cfContractType;
+    address creditConfigurator;
     address underlying;
     address pool;
     uint256 totalDebt;
     uint256 totalDebtLimit;
     uint256 minDebt;
     uint256 maxDebt;
+    address degenNFT;
     uint256 availableToBorrow;
     address[] collateralTokens;
     ContractAdapter[] adapters;
     uint256[] liquidationThresholds;
-    bool isDegenMode; // V2 only: true if contract is in Degen mode
-    address degenNFT; // V2 only: degenNFT, address(0) if not in degen mode
     uint256 forbiddenTokenMask; // V2 only: mask which forbids some particular tokens
     uint8 maxEnabledTokensLength; // V2 only: in V1 as many tokens as the CM can support (256)
     uint16 feeInterest; // Interest fee protocol charges: fee = interest accrues * feeInterest
@@ -29,8 +30,6 @@ struct CreditManagerState {
     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
-    // V3 Fileds
-    bool isPaused;
 }
 
 struct ContractAdapter {

package/contracts/types/PoolState.sol

@@ -25,7 +25,7 @@ struct PoolState {
     uint256 expectedLiquidity;
     uint256 baseInterestIndex;
     uint256 baseInterestRate;
-    uint256 dieselRate_RAY;
+    uint256 dieselRate;
     uint256 totalBorrowed;
     uint256 totalAssets;
     uint256 supplyRate;

package/contracts/types/PriceOracleState.sol

@@ -7,8 +7,8 @@ struct PriceOracleState {
     address addr;
     uint256 version;
     bytes32 contractType;
-    PriceFeedMapEntry priceFeedMapping;
-    PriceFeedTreeNode priceFeedStructure;
+    PriceFeedMapEntry[] priceFeedMapping;
+    PriceFeedTreeNode[] priceFeedStructure;
 }
 
 /// @notice Price feed answer packed in a struct

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/periphery-v3",
-  "version": "1.7.0-next.16",
+  "version": "1.7.0-next.18",
   "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.14.1",
+    "@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/market/MarketCompressor.sol

@@ -1,451 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2024
-pragma solidity ^0.8.17;
-
-// import {IAddressProviderV3} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProviderV3.sol";
-// import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-// import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-// 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 {CreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditFacadeV3.sol";
-
-// import {
-//     ICreditManagerV3,
-//     CollateralDebtData,
-//     CollateralCalcTask
-// } from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
-// import {ICreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
-// import {ICreditConfiguratorV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditConfiguratorV3.sol";
-// import {IPriceOracleV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPriceOracleV3.sol";
-// import {ICreditAccountV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditAccountV3.sol";
-// import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
-// import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
-// import {PoolV3} from "@gearbox-protocol/core-v3/contracts/pool/PoolV3.sol";
-
-// import {CreditManagerV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditManagerV3.sol";
-
-// import {CreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditFacadeV3.sol";
-// import {IBotListV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IBotListV3.sol";
-// import {IGaugeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IGaugeV3.sol";
-
-// import {IPriceFeed, IUpdatablePriceFeed} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IPriceFeed.sol";
-
-// import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
-
-// import {IZapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IZapper.sol";
-
-// import {
-//     CreditManagerData,
-//     PoolData,
-//     TokenBalance,
-//     ContractAdapter,
-//     QuotaInfo,
-//     GaugeInfo,
-//     GaugeQuotaParams,
-//     CreditManagerDebtParams,
-//     ZapperInfo,
-//     LinearModel
-// } from "./Types.sol";
-
-// // EXCEPTIONS
-// import "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
-
-// import {MarketData} from "./Types.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 is ContractsRegisterTrait {
-//     // Contract version
-//     uint256 public constant version = 3_10;
-
-//     error CreditManagerIsNotV3Exception();
-
-//     constructor(address _addressProvider) ContractsRegisterTrait(_addressProvider) {
-//         // zapperRegister =
-//         //     IZapperRegister(IAddressProviderV3(_addressProvider).getAddressOrRevert("ZAPPER_REGISTER", 3_00));
-//     }
-
-//     function getMarketDataByPool(address pool) external returns (MarketData memory marketData) {}
-
-//     function getMarketDataByRiskCurtator(address riskCurator) external returns (MarketData[] memory marketData) {}
-
-//     function getMarketDataAll() external returns (MarketData[] memory marketData) {}
-
-//     /// @dev Returns CreditManagerData for a particular _cm
-//     /// @param _cm CreditManager address
-//     function getCreditManagerData(address _cm) public view returns (CreditManagerData memory result) {
-//         ICreditManagerV3 creditManager = ICreditManagerV3(_cm);
-//         ICreditConfiguratorV3 creditConfigurator = ICreditConfiguratorV3(creditManager.creditConfigurator());
-//         ICreditFacadeV3 creditFacade = _getCreditFacade(address(creditManager));
-
-//         result.addr = _cm;
-//         result.name = _getName(_cm);
-//         result.cfVersion = _getVersion(address(creditFacade));
-
-//         result.creditFacade = address(creditFacade);
-//         result.creditConfigurator = address(creditConfigurator);
-
-//         result.underlying = _getUnderlying(creditManager);
-
-//         {
-//             result.pool = _getPool(_cm);
-//             IPoolV3 pool = IPoolV3(result.pool);
-//             result.totalDebt = pool.creditManagerBorrowed(_cm);
-//             result.totalDebtLimit = pool.creditManagerDebtLimit(_cm);
-
-//             result.baseBorrowRate = _getBaseInterestRate(address(pool));
-//             result.availableToBorrow = pool.creditManagerBorrowable(_cm);
-//             result.lirm = _getInterestRateModel(address(pool));
-//         }
-
-//         (result.minDebt, result.maxDebt) = creditFacade.debtLimits();
-
-//         {
-//             uint256 collateralTokenCount = _getCollateralTokensCount(address(creditManager));
-
-//             result.collateralTokens = new address[](collateralTokenCount);
-//             result.liquidationThresholds = new uint256[](collateralTokenCount);
-
-//             unchecked {
-//                 for (uint256 i = 0; i < collateralTokenCount; ++i) {
-//                     (result.collateralTokens[i], result.liquidationThresholds[i]) =
-//                         creditManager.collateralTokenByMask(1 << i);
-//                 }
-//             }
-//         }
-
-//         address[] memory allowedAdapters = creditConfigurator.allowedAdapters();
-//         uint256 len = allowedAdapters.length;
-//         result.adapters = new ContractAdapter[](len);
-
-//         // unchecked {
-//         //     for (uint256 i = 0; i < len; ++i) {
-//         //         address allowedAdapter = allowedAdapters[i];
-
-//         //         result.adapters[i] = ContractAdapter({
-//         //             targetContract: creditManager.adapterToContract(allowedAdapter),
-//         //             adapter: allowedAdapter
-//         //         });
-//         //     }
-//         // }
-
-//         result.degenNFT = creditFacade.degenNFT();
-//         result.isDegenMode = result.degenNFT != address(0);
-//         // (, result.isIncreaseDebtForbidden,,) = creditFacade.params(); // V2 only: true if increasing debt is forbidden
-//         result.forbiddenTokenMask = creditFacade.forbiddenTokenMask(); // V2 only: mask which forbids some particular tokens
-//         result.maxEnabledTokensLength = creditManager.maxEnabledTokens(); // V2 only: a limit on enabled tokens imposed for security
-//         {
-//             (
-//                 result.feeInterest,
-//                 result.feeLiquidation,
-//                 result.liquidationDiscount,
-//                 result.feeLiquidationExpired,
-//                 result.liquidationDiscountExpired
-//             ) = creditManager.fees();
-//         }
-
-//         result.quotas = _getQuotas(result.pool);
-
-//         result.isPaused = _getPaused(address(creditFacade));
-//     }
-
-//     /// @dev Returns PoolData for a particular pool
-//     /// @param _pool Pool address
-//     function getPoolData(address _pool) public view registeredPoolOnly(_pool) returns (PoolData memory result) {
-//         PoolV3 pool = PoolV3(_pool);
-
-//         result.addr = _pool;
-//         result.expectedLiquidity = pool.expectedLiquidity();
-//         result.availableLiquidity = pool.availableLiquidity();
-
-//         result.dieselRate_RAY = pool.convertToAssets(RAY);
-//         result.baseInterestIndex = pool.baseInterestIndex();
-//         result.baseInterestRate = _getBaseInterestRate(address(pool));
-//         result.underlying = pool.underlyingToken();
-//         result.dieselToken = address(pool);
-//         (result.symbol, result.name) = _getSymbolAndName(_pool);
-
-//         result.dieselRate_RAY = pool.convertToAssets(RAY);
-//         result.withdrawFee = pool.withdrawFee();
-//         result.baseInterestIndexLU = pool.baseInterestIndexLU();
-//         result.lastBaseInterestUpdate = pool.lastBaseInterestUpdate();
-//         // result.cumulativeIndex_RAY = pool.calcLinearCumulative_RAY();
-
-//         // Borrowing limits
-//         result.totalBorrowed = pool.totalBorrowed();
-//         result.totalDebtLimit = pool.totalDebtLimit();
-
-//         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),
-//                     availableToBorrow: pool.creditManagerBorrowable(creditManager)
-//                 });
-//             }
-//         }
-
-//         result.totalSupply = pool.totalSupply();
-//         result.totalAssets = pool.totalAssets();
-//         result.supplyRate = pool.supplyRate();
-
-//         result.version = _getVersion(address(pool));
-
-//         result.quotas = _getQuotas(_pool);
-//         result.lirm = _getInterestRateModel(_pool);
-//         result.isPaused = _getPaused(_pool);
-
-//         // Adding zappers
-//         // address[] memory zappers = zapperRegister.zappers(address(pool));
-//         // len = zappers.length;
-//         // result.zappers = new ZapperInfo[](len);
-
-//         // unchecked {
-//         //     for (uint256 i; i < len; ++i) {
-//         //         address tokenIn = IZapper(zappers[i]).tokenIn();
-//         //         address tokenOut = IZapper(zappers[i]).tokenOut();
-//         //         result.zappers[i] = ZapperInfo({tokenIn: tokenIn, tokenOut: tokenOut, zapper: zappers[i]});
-//         //     }
-//         // }
-
-//         result.poolQuotaKeeper = address(_getPoolQuotaKeeper(_pool));
-//         result.gauge = _getGauge(IPoolQuotaKeeperV3(result.poolQuotaKeeper));
-
-//         return result;
-//     }
-
-//     /// @dev Returns PoolData for all registered pools
-//     function getPoolsV3List() external view returns (PoolData[] memory result) {
-//         address[] memory poolsV3 = _listPoolsV3();
-//         uint256 len = poolsV3.length;
-//         result = new PoolData[](len);
-
-//         unchecked {
-//             for (uint256 i = 0; i < len; ++i) {
-//                 result[i] = getPoolData(poolsV3[i]);
-//             }
-//         }
-//     }
-
-//     function _listPoolsV3() internal view returns (address[] memory result) {
-//         uint256 len = IContractsRegister(contractsRegister).getPools().length;
-
-//         // uint256 index;
-//         // unchecked {
-//         //     for (uint256 op = COUNT; op <= QUERY; ++op) {
-//         //         if (op == QUERY && index == 0) {
-//         //             break;
-//         //         } else {
-//         //             result = new address[](index);
-//         //             index = 0;
-//         //         }
-
-//         //         for (uint256 i = 0; i < len; ++i) {
-//         //             address _pool = IContractsRegister(contractsRegister).pools(i);
-
-//         //             if (_isContractV3(_pool)) {
-//         //                 if (op == QUERY) result[index] = _pool;
-//         //                 ++index;
-//         //             }
-//         //         }
-//         //     }
-//         // }
-//     }
-
-//     function _updatePrices(address creditManager, PriceOnDemand[] memory priceUpdates) internal {
-//         uint256 len = priceUpdates.length;
-//         unchecked {
-//             for (uint256 i; i < len; ++i) {
-//                 address priceFeed = _getPriceOracle(creditManager).priceFeeds(priceUpdates[i].priceFeed);
-//                 if (priceFeed == address(0)) revert PriceFeedDoesNotExistException();
-
-//                 IUpdatablePriceFeed(priceFeed).updatePrice(priceUpdates[i].callData);
-//             }
-//         }
-//     }
-
-//     function _getPriceFeedFailedList(address _cm, TokenBalance[] memory balances)
-//         internal
-//         view
-//         returns (address[] memory priceFeedFailed)
-//     {
-//         uint256 len = balances.length;
-
-//         IPriceOracleV3 priceOracle = _getPriceOracle(_cm);
-
-//         uint256 index;
-
-//         /// It counts on the first iteration how many price feeds failed and then fill the array on the second iteration
-//         // for (uint256 op = COUNT; op <= QUERY; ++op) {
-//         //     if (op == QUERY && index == 0) {
-//         //         break;
-//         //     } else {
-//         //         priceFeedFailed = new address[](index);
-//         //         index = 0;
-//         //     }
-//         //     unchecked {
-//         //         for (uint256 i = 0; i < len; ++i) {
-//         //             TokenBalance memory balance = balances[i];
-
-//         //             if (balance.balance > 1 && balance.isEnabled) {
-//         //                 try priceOracle.getPrice(balance.token) returns (uint256) {}
-//         //                 catch {
-//         //                     if (op == QUERY) priceFeedFailed[index] = balance.token;
-//         //                     ++index;
-//         //                 }
-//         //             }
-//         //         }
-//         //     }
-//         // }
-//     }
-
-//     function _getPoolQuotaKeeper(address pool) internal view returns (IPoolQuotaKeeperV3) {
-//         return IPoolQuotaKeeperV3(IPoolV3(pool).poolQuotaKeeper());
-//     }
-
-//     function _getPriceOracle(address _cm) internal view returns (IPriceOracleV3) {
-//         return IPriceOracleV3(ICreditManagerV3(_cm).priceOracle());
-//     }
-
-//     function _getBaseInterestRate(address pool) internal view returns (uint256) {
-//         return IPoolV3(pool).baseInterestRate();
-//     }
-
-//     function _getBorrowerOrRevert(address cm, address creditAccount) internal view returns (address) {
-//         return ICreditManagerV3(cm).getBorrowerOrRevert(creditAccount);
-//     }
-
-//     function _getVersion(address versionedContract) internal view returns (uint256) {
-//         return IVersion(versionedContract).version();
-//     }
-
-//     function _getCreditFacade(address cm) internal view returns (ICreditFacadeV3) {
-//         return ICreditFacadeV3(ICreditManagerV3(cm).creditFacade());
-//     }
-
-//     function _getSymbolAndName(address token) internal view returns (string memory symbol, string memory name) {
-//         symbol = IERC20Metadata(token).symbol();
-//         name = _getName(token);
-//     }
-
-//     function _getInterestRateModel(address pool) internal view returns (LinearModel memory) {
-//         // return getLIRMData(IPoolV3(pool).interestRateModel());
-//     }
-
-//     function _getQuotedTokens(IPoolQuotaKeeperV3 pqk) internal view returns (address[] memory result) {
-//         result = pqk.quotedTokens();
-//     }
-
-//     function _getPool(address cnt) internal view returns (address) {
-//         return ICreditManagerV3(cnt).pool();
-//     }
-
-//     function _getName(address _cm) internal view returns (string memory) {
-//         return IERC20Metadata(_cm).name();
-//     }
-
-//     function _getCollateralTokensCount(address _cm) internal view returns (uint256) {
-//         return ICreditManagerV3(_cm).collateralTokensCount();
-//     }
-
-//     function _getGauge(IPoolQuotaKeeperV3 pqk) internal view returns (address) {
-//         return pqk.gauge();
-//     }
-
-//     function _getPaused(address pausableContract) internal view returns (bool) {
-//         return Pausable(pausableContract).paused();
-//     }
-
-//     function _getUnderlying(ICreditManagerV3 cm) internal view returns (address) {
-//         return cm.underlying();
-//     }
-
-//     function _getQuotas(address _pool) internal view returns (QuotaInfo[] memory quotas) {
-//         IPoolQuotaKeeperV3 pqk = _getPoolQuotaKeeper(_pool);
-
-//         address[] memory quotaTokens = _getQuotedTokens(pqk);
-//         uint256 len = quotaTokens.length;
-//         quotas = new QuotaInfo[](len);
-//         unchecked {
-//             for (uint256 i; i < len; ++i) {
-//                 quotas[i].token = quotaTokens[i];
-//                 (
-//                     quotas[i].rate,
-//                     ,
-//                     quotas[i].quotaIncreaseFee,
-//                     quotas[i].totalQuoted,
-//                     quotas[i].limit,
-//                     quotas[i].isActive
-//                 ) = pqk.getTokenQuotaParams(quotaTokens[i]);
-//             }
-//         }
-//     }
-
-//     function getGaugesV3Data(address staker) external view returns (GaugeInfo[] memory result) {
-//         address[] memory poolsV3 = _listPoolsV3();
-//         uint256 len = poolsV3.length;
-//         result = new GaugeInfo[](len);
-
-//         unchecked {
-//             for (uint256 i; i < len; ++i) {
-//                 GaugeInfo memory gaugeInfo = result[i];
-//                 IPoolQuotaKeeperV3 pqk = _getPoolQuotaKeeper(poolsV3[i]);
-//                 address gauge = _getGauge(pqk);
-//                 gaugeInfo.addr = gauge;
-//                 gaugeInfo.pool = _getPool(gauge);
-//                 (gaugeInfo.symbol, gaugeInfo.name) = _getSymbolAndName(gaugeInfo.pool);
-//                 gaugeInfo.underlying = IPoolV3(gaugeInfo.pool).asset();
-
-//                 address[] memory quotaTokens = _getQuotedTokens(pqk);
-//                 uint256 quotaTokensLen = quotaTokens.length;
-//                 gaugeInfo.quotaParams = new GaugeQuotaParams[](quotaTokensLen);
-
-//                 gaugeInfo.currentEpoch = IGaugeV3(gauge).epochLastUpdate();
-//                 gaugeInfo.epochFrozen = IGaugeV3(gauge).epochFrozen();
-
-//                 for (uint256 j; j < quotaTokensLen; ++j) {
-//                     GaugeQuotaParams memory quotaParams = gaugeInfo.quotaParams[j];
-//                     address token = quotaTokens[j];
-//                     quotaParams.token = token;
-
-//                     (
-//                         quotaParams.rate,
-//                         ,
-//                         quotaParams.quotaIncreaseFee,
-//                         quotaParams.totalQuoted,
-//                         quotaParams.limit,
-//                         quotaParams.isActive
-//                     ) = pqk.getTokenQuotaParams(token);
-
-//                     (
-//                         quotaParams.minRate,
-//                         quotaParams.maxRate,
-//                         quotaParams.totalVotesLpSide,
-//                         quotaParams.totalVotesCaSide
-//                     ) = IGaugeV3(gauge).quotaRateParams(token);
-
-//                     (quotaParams.stakerVotesLpSide, quotaParams.stakerVotesCaSide) =
-//                         IGaugeV3(gauge).userTokenVotes(staker, token);
-//                 }
-//             }
-//         }
-//     }
-// }