feat: replace ACLTrait with Ownable in LPPriceFeed and update contract types

Author: lekhovitsky

contracts/oracles/BoundedPriceFeed.sol

@@ -17,7 +17,7 @@ contract BoundedPriceFeed is IPriceFeed, SanityCheckTrait, PriceFeedValidationTr
     using LibString for bytes32;
 
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_BOUNDED_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::BOUNDED";
 
     uint8 public constant override decimals = 8; // U:[BPF-2]
     bool public constant override skipPriceCheck = true; // U:[BPF-2]

contracts/oracles/CompositePriceFeed.sol

@@ -16,7 +16,7 @@ contract CompositePriceFeed is IPriceFeed, PriceFeedValidationTrait, SanityCheck
     using LibString for bytes32;
 
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_COMPOSITE_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::COMPOSITE";
 
     uint8 public constant override decimals = 8; // U:[CPF-2]
     bool public constant override skipPriceCheck = true; // U:[CPF-2]

contracts/oracles/LPPriceFeed.sol

@@ -3,13 +3,15 @@
 // (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.23;
 
-import {ILPPriceFeed} from "../interfaces/ILPPriceFeed.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import {SanityCheckTrait} from "@gearbox-protocol/core-v3/contracts/traits/SanityCheckTrait.sol";
+
+import {IUpdatablePriceFeed} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IPriceFeed.sol";
 import {PERCENTAGE_FACTOR} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
-import {ACLTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLTrait.sol";
 import {PriceFeedValidationTrait} from "@gearbox-protocol/core-v3/contracts/traits/PriceFeedValidationTrait.sol";
-import {IUpdatablePriceFeed} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IPriceFeed.sol";
+import {SanityCheckTrait} from "@gearbox-protocol/core-v3/contracts/traits/SanityCheckTrait.sol";
+
+import {ILPPriceFeed} from "../interfaces/ILPPriceFeed.sol";
 
 /// @dev Window size in bps, used to compute upper bound given lower bound
 uint256 constant WINDOW_SIZE = 200;
@@ -25,7 +27,7 @@ uint256 constant UPDATE_BOUNDS_COOLDOWN = 1 days;
 ///         It is assumed that the price of an LP token is the product of its exchange rate and some aggregate function
 ///         of underlying tokens prices. This contract simplifies creation of such price feeds and provides standard
 ///         validation of the LP token exchange rate that protects against price manipulation.
-abstract contract LPPriceFeed is ILPPriceFeed, ACLTrait, SanityCheckTrait, PriceFeedValidationTrait {
+abstract contract LPPriceFeed is ILPPriceFeed, Ownable, SanityCheckTrait, PriceFeedValidationTrait {
     /// @notice Answer precision (always 8 decimals for USD price feeds)
     uint8 public constant override decimals = 8; // U:[LPPF-2]
 
@@ -42,16 +44,16 @@ abstract contract LPPriceFeed is ILPPriceFeed, ACLTrait, SanityCheckTrait, Price
     uint256 public override lowerBound;
 
     /// @notice Constructor
-    /// @param _acl Address of the ACL contract
+    /// @param _owner Owner of the price feed that can update exchange rate bounds
     /// @param _lpToken  LP token for which the prices are computed
     /// @param _lpContract LP contract (can be different from LP token)
     /// @dev Derived price feeds must call `_setLimiter` in their constructor after
     ///      initializing all state variables needed for exchange rate calculation
-    constructor(address _acl, address _lpToken, address _lpContract)
-        ACLTrait(_acl) // U:[LPPF-1]
+    constructor(address _owner, address _lpToken, address _lpContract)
         nonZeroAddress(_lpToken) // U:[LPPF-1]
         nonZeroAddress(_lpContract) // U:[LPPF-1]
     {
+        transferOwnership(_owner); // U:[LPPF-1]
         lpToken = _lpToken; // U:[LPPF-1]
         lpContract = _lpContract; // U:[LPPF-1]
     }
@@ -106,7 +108,7 @@ abstract contract LPPriceFeed is ILPPriceFeed, ACLTrait, SanityCheckTrait, Price
     function setLimiter(uint256 newLowerBound)
         external
         override
-        configuratorOnly // U:[LPPF-6]
+        onlyOwner // U:[LPPF-6]
     {
         _setLimiter(newLowerBound); // U:[LPPF-6]
     }

contracts/oracles/SingleAssetLPPriceFeed.sol

@@ -14,8 +14,8 @@ abstract contract SingleAssetLPPriceFeed is LPPriceFeed {
     uint32 public immutable stalenessPeriod;
     bool public immutable skipCheck;
 
-    constructor(address _acl, address _lpToken, address _lpContract, address _priceFeed, uint32 _stalenessPeriod)
-        LPPriceFeed(_acl, _lpToken, _lpContract) // U:[SAPF-1]
+    constructor(address _owner, address _lpToken, address _lpContract, address _priceFeed, uint32 _stalenessPeriod)
+        LPPriceFeed(_owner, _lpToken, _lpContract) // U:[SAPF-1]
         nonZeroAddress(_priceFeed) // U:[SAPF-1]
     {
         priceFeed = _priceFeed; // U:[SAPF-1]

contracts/oracles/ZeroPriceFeed.sol

@@ -9,7 +9,7 @@ import {IPriceFeed} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IP
 /// @notice Always returns zero price as answer
 contract ZeroPriceFeed is IPriceFeed {
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_ZERO_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::ZERO";
 
     uint8 public constant override decimals = 8; // U:[ZPF-1]
     string public constant override description = "Zero price feed"; // U:[ZPF-1]

contracts/oracles/balancer/BPTStablePriceFeed.sol

@@ -12,7 +12,7 @@ import {IBalancerStablePool} from "../../interfaces/balancer/IBalancerStablePool
 /// @dev Similarly to Curve stableswap, aggregate function is minimum of underlying tokens prices
 contract BPTStablePriceFeed is LPPriceFeed {
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_BALANCER_STABLE_LP_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::BALANCER_STABLE";
 
     uint8 public immutable numAssets;
 
@@ -36,8 +36,8 @@ contract BPTStablePriceFeed is LPPriceFeed {
     uint32 public immutable stalenessPeriod4;
     bool public immutable skipCheck4;
 
-    constructor(address _acl, uint256 lowerBound, address _balancerPool, PriceFeedParams[5] memory priceFeeds)
-        LPPriceFeed(_acl, _balancerPool, _balancerPool) // U:[BAL-S-1]
+    constructor(address _owner, uint256 lowerBound, address _balancerPool, PriceFeedParams[5] memory priceFeeds)
+        LPPriceFeed(_owner, _balancerPool, _balancerPool) // U:[BAL-S-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[BAL-S-2]
         nonZeroAddress(priceFeeds[1].priceFeed) // U:[BAL-S-2]
     {

contracts/oracles/balancer/BPTWeightedPriceFeed.sol

@@ -32,7 +32,7 @@ contract BPTWeightedPriceFeed is LPPriceFeed {
     using FixedPoint for uint256;
 
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_BALANCER_WEIGHTED_LP_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::BALANCER_WEIGHTED";
 
     /// @notice Balancer vault address
     address public immutable vault;
@@ -96,8 +96,8 @@ contract BPTWeightedPriceFeed is LPPriceFeed {
     uint256 immutable scale6;
     uint256 immutable scale7;
 
-    constructor(address _acl, uint256 lowerBound, address _vault, address _pool, PriceFeedParams[] memory priceFeeds)
-        LPPriceFeed(_acl, _pool, _pool) // U:[BAL-W-1]
+    constructor(address _owner, uint256 lowerBound, address _vault, address _pool, PriceFeedParams[] memory priceFeeds)
+        LPPriceFeed(_owner, _pool, _pool) // U:[BAL-W-1]
         nonZeroAddress(_vault) // U:[BAL-W-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[BAL-W-2]
         nonZeroAddress(priceFeeds[1].priceFeed) // U:[BAL-W-2]

contracts/oracles/curve/CurveCryptoLPPriceFeed.sol

@@ -18,7 +18,7 @@ contract CurveCryptoLPPriceFeed is LPPriceFeed {
     using FixedPoint for uint256;
 
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_CURVE_CRYPTO_LP_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::CURVE_CRYPTO";
 
     uint16 public immutable nCoins;
 
@@ -34,8 +34,8 @@ contract CurveCryptoLPPriceFeed is LPPriceFeed {
     uint32 public immutable stalenessPeriod2;
     bool public immutable skipCheck2;
 
-    constructor(address _acl, uint256 lowerBound, address _token, address _pool, PriceFeedParams[3] memory priceFeeds)
-        LPPriceFeed(_acl, _token, _pool) // U:[CRV-C-1]
+    constructor(address _owner, uint256 lowerBound, address _token, address _pool, PriceFeedParams[3] memory priceFeeds)
+        LPPriceFeed(_owner, _token, _pool) // U:[CRV-C-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[CRV-C-2]
         nonZeroAddress(priceFeeds[1].priceFeed) // U:[CRV-C-2]
     {

contracts/oracles/curve/CurveStableLPPriceFeed.sol

@@ -13,7 +13,7 @@ import {WAD} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
 /// @dev Older pools may be decoupled from their LP token, so constructor accepts both token and pool
 contract CurveStableLPPriceFeed is LPPriceFeed {
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_CURVE_STABLE_LP_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::CURVE_STABLE";
 
     uint16 public immutable nCoins;
 
@@ -33,8 +33,8 @@ contract CurveStableLPPriceFeed is LPPriceFeed {
     uint32 public immutable stalenessPeriod3;
     bool public immutable skipCheck3;
 
-    constructor(address _acl, uint256 lowerBound, address _token, address _pool, PriceFeedParams[4] memory priceFeeds)
-        LPPriceFeed(_acl, _token, _pool) // U:[CRV-S-1]
+    constructor(address _owner, uint256 lowerBound, address _token, address _pool, PriceFeedParams[4] memory priceFeeds)
+        LPPriceFeed(_owner, _token, _pool) // U:[CRV-S-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[CRV-S-2]
         nonZeroAddress(priceFeeds[1].priceFeed) // U:[CRV-S-2]
     {

contracts/oracles/curve/CurveUSDPriceFeed.sol

@@ -13,17 +13,17 @@ import {WAD} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
 ///         is reused. Particularly, the same bounding mechanism is applied to the pool exchange rate.
 contract CurveUSDPriceFeed is SingleAssetLPPriceFeed {
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "PF_CURVE_USD_ORACLE";
+    bytes32 public constant override contractType = "PRICE_FEED::CURVE_USD";
 
     constructor(
-        address _acl,
+        address _owner,
         uint256 lowerBound,
         address _crvUSD,
         address _pool,
         address _priceFeed,
         uint32 _stalenessPeriod
     )
-        SingleAssetLPPriceFeed(_acl, _crvUSD, _pool, _priceFeed, _stalenessPeriod) // U:[CRV-D-1]
+        SingleAssetLPPriceFeed(_owner, _crvUSD, _pool, _priceFeed, _stalenessPeriod) // U:[CRV-D-1]
     {
         _setLimiter(lowerBound); // U:[CRV-D-1]
     }