feat: minor fixes

contracts/interfaces/mellow/IMellowChainlinkOracle.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+interface IMellowChainlinkOracle {
+    function baseTokens(address vault) external view returns (address);
+}

contracts/interfaces/mellow/IMellowVault.sol

@@ -3,6 +3,8 @@
 // (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.23;
 
+import {IMellowVaultConfigurator} from "./IMellowVaultConfigurator.sol";
+
 interface IMellowVault {
     struct ProcessWithdrawalsStack {
         address[] tokens;
@@ -17,4 +19,6 @@ interface IMellowVault {
     }
 
     function calculateStack() external view returns (ProcessWithdrawalsStack memory s);
+
+    function configurator() external view returns (IMellowVaultConfigurator);
 }

contracts/interfaces/mellow/IMellowVaultConfigurator.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {IMellowChainlinkOracle} from "./IMellowChainlinkOracle.sol";
+
+interface IMellowVaultConfigurator {
+    function priceOracle() external view returns (IMellowChainlinkOracle);
+}

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 contractType = "PF_BALANCER_STABLE_LP_ORACLE";
+    bytes32 public constant override contractType = "PF_BALANCER_STABLE_LP_ORACLE";
 
     uint8 public immutable numAssets;
 

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 contractType = "PF_BALANCER_WEIGHTED_LP_ORACLE";
+    bytes32 public constant override contractType = "PF_BALANCER_WEIGHTED_LP_ORACLE";
 
     /// @notice Balancer vault address
     address public immutable vault;

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 contractType = "PF_CURVE_CRYPTO_LP_ORACLE";
+    bytes32 public constant override contractType = "PF_CURVE_CRYPTO_LP_ORACLE";
 
     uint16 public immutable nCoins;
 

contracts/oracles/mellow/MellowLRTPriceFeed.sol

@@ -16,16 +16,10 @@ contract MellowLRTPriceFeed is SingleAssetLPPriceFeed {
     /// @dev Amount of base token comprising a single unit (accounting for decimals)
     uint256 immutable _baseTokenUnit;
 
-    constructor(
-        address _acl,
-        uint256 lowerBound,
-        address _vault,
-        address _priceFeed,
-        uint32 _stalenessPeriod,
-        address baseToken
-    )
+    constructor(address _acl, uint256 lowerBound, address _vault, address _priceFeed, uint32 _stalenessPeriod)
         SingleAssetLPPriceFeed(_acl, _vault, _vault, _priceFeed, _stalenessPeriod) // U:[MEL-1]
     {
+        address baseToken = IMellowVault(_vault).configurator().priceOracle().baseTokens(_vault);
         _baseTokenUnit = 10 ** ERC20(baseToken).decimals();
         _setLimiter(lowerBound); // U:[MEL-1]
     }

contracts/oracles/updatable/PythPriceFeed.sol

@@ -29,7 +29,7 @@ contract PythPriceFeed is IUpdatablePriceFeed {
     // --------------- //
 
     uint256 public constant override version = 3_10;
-    bytes32 public constant contractType = "PF_PYTH_ORACLE";
+    bytes32 public constant override contractType = "PF_PYTH_ORACLE";
 
     uint8 public constant override decimals = 8;
     bool public constant override skipPriceCheck = false;

contracts/oracles/updatable/RedstonePriceFeed.sol

@@ -82,12 +82,14 @@ contract RedstonePriceFeed is IUpdatablePriceFeed, RedstoneConsumerNumericBase {
     /// @notice Thrown when the provided set of signers contains duplicates
     error DuplicateSignersException();
 
-    /// @notice Thrown when attempting to push an update with the payload that is older than the last
-    ///         update payload, or too far from the current block timestamp
-    error RedstonePayloadTimestampIncorrect();
+    /// @notice Thrown when expected payload timestamp is too far ahead in the future
+    error PayloadTimestampTooFarAheadException();
+
+    /// @notice Thrown when expected payload timestamp is too far behind in the past
+    error PayloadTimestampTooFarBehindException();
 
     /// @notice Thrown when data package timestamp is not equal to expected payload timestamp
-    error DataPackageTimestampIncorrect();
+    error IncorrectDataPackageTimestampException();
 
     // ----------- //
     // CONSTRUCTOR //
@@ -223,20 +225,19 @@ contract RedstonePriceFeed is IUpdatablePriceFeed, RedstoneConsumerNumericBase {
         uint256 receivedTimestampSeconds = receivedTimestampMilliseconds / 1000;
 
         if (receivedTimestampSeconds != lastPayloadTimestamp) {
-            revert DataPackageTimestampIncorrect(); // U:[RPF-3]
+            revert IncorrectDataPackageTimestampException(); // U:[RPF-3]
         }
     }
 
-    /// @dev Validates that the expected payload timestamp is not older than the last payload's,
-    ///      and not too far from the current block's
+    /// @dev Validates that the expected payload timestamp is not too far ahead or behind of the current block timestamp
     /// @param expectedPayloadTimestamp Timestamp expected to be in all of the incoming payload's packages
     function _validateExpectedPayloadTimestamp(uint256 expectedPayloadTimestamp) internal view {
         if ((block.timestamp < expectedPayloadTimestamp)) {
             if ((expectedPayloadTimestamp - block.timestamp) > MAX_DATA_TIMESTAMP_AHEAD_SECONDS) {
-                revert RedstonePayloadTimestampIncorrect(); // U:[RPF-9]
+                revert PayloadTimestampTooFarAheadException(); // U:[RPF-9]
             }
         } else if ((block.timestamp - expectedPayloadTimestamp) > MAX_DATA_TIMESTAMP_DELAY_SECONDS) {
-            revert RedstonePayloadTimestampIncorrect(); // U:[RPF-9]
+            revert PayloadTimestampTooFarBehindException(); // U:[RPF-9]
         }
     }
 }

contracts/test/mocks/mellow/MellowChainlinkOracleMock.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: UNLICENSED
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {IMellowChainlinkOracle} from "../../../interfaces/mellow/IMellowChainlinkOracle.sol";
+
+contract MellowChainlinkOracleMock is IMellowChainlinkOracle {
+    mapping(address vault => address) public baseTokens;
+
+    function setBaseToken(address vault, address baseToken) external {
+        baseTokens[vault] = baseToken;
+    }
+}

contracts/test/mocks/mellow/MellowVaultConfiguratorMock.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: UNLICENSED
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {IMellowChainlinkOracle} from "../../../interfaces/mellow/IMellowChainlinkOracle.sol";
+import {IMellowVaultConfigurator} from "../../../interfaces/mellow/IMellowVaultConfigurator.sol";
+
+contract MellowVaultConfiguratorMock is IMellowVaultConfigurator {
+    IMellowChainlinkOracle public priceOracle;
+
+    constructor(IMellowChainlinkOracle priceOracle_) {
+        priceOracle = priceOracle_;
+    }
+}

contracts/test/mocks/mellow/MellowVaultMock.sol

@@ -4,11 +4,16 @@
 pragma solidity ^0.8.23;
 
 import {IMellowVault} from "../../../interfaces/mellow/IMellowVault.sol";
+import {IMellowVaultConfigurator} from "../../../interfaces/mellow/IMellowVaultConfigurator.sol";
 
 contract MellowVaultMock is IMellowVault {
     IMellowVault.ProcessWithdrawalsStack stack;
 
-    constructor() {}
+    IMellowVaultConfigurator public configurator;
+
+    constructor(IMellowVaultConfigurator configurator_) {
+        configurator = configurator_;
+    }
 
     function setStack(uint256 totalValue, uint256 totalSupply) external {
         stack.totalValue = totalValue;

contracts/test/suites/PriceFeedDeployer.sol

@@ -664,8 +664,7 @@ contract PriceFeedDeployer is Test, PriceFeedDataLive {
                         lowerBound,
                         token,
                         _getDeployedFeed(underlying, mellowLRTPriceFeeds[i].reserve),
-                        _getDeployedStalenessPeriod(underlying, mellowLRTPriceFeeds[i].reserve),
-                        underlying
+                        _getDeployedStalenessPeriod(underlying, mellowLRTPriceFeeds[i].reserve)
                     )
                 );
 

contracts/test/unit/mellow/MellowLRTPriceFeed.unit.t.sol

@@ -7,7 +7,9 @@ import {IMellowVault} from "../../../interfaces/mellow/IMellowVault.sol";
 
 import {PriceFeedUnitTestHelper} from "../PriceFeedUnitTestHelper.sol";
 
+import {MellowChainlinkOracleMock} from "../../mocks/mellow/MellowChainlinkOracleMock.sol";
 import {MellowVaultMock} from "../../mocks/mellow/MellowVaultMock.sol";
+import {MellowVaultConfiguratorMock} from "../../mocks/mellow/MellowVaultConfiguratorMock.sol";
 import {ERC20Mock} from "@gearbox-protocol/core-v3/contracts/test/mocks/token/ERC20Mock.sol";
 
 import {MellowLRTPriceFeed} from "../../../oracles/mellow/MellowLRTPriceFeed.sol";
@@ -23,10 +25,15 @@ contract MellowLRTPriceFeedUnitTest is PriceFeedUnitTestHelper {
         _setUp();
 
         asset = new ERC20Mock("Test Token", "TEST", 18);
-        vault = new MellowVaultMock();
+
+        MellowChainlinkOracleMock chainlinkOracle = new MellowChainlinkOracleMock();
+        MellowVaultConfiguratorMock vaultConfigurator = new MellowVaultConfiguratorMock(chainlinkOracle);
+        vault = new MellowVaultMock(vaultConfigurator);
         vault.setStack(1.2e18, 1e18);
+        chainlinkOracle.setBaseToken(address(vault), address(asset));
+
         priceFeed = new MellowLRTPriceFeed(
-            address(addressProvider), 1.2e18, address(vault), address(underlyingPriceFeed), 1 days, address(asset)
+            address(addressProvider), 1.2e18, address(vault), address(underlyingPriceFeed), 1 days
         );
     }
 

contracts/test/unit/updatable/RedstonePriceFeed.unit.t.sol

@@ -153,7 +153,7 @@ contract RedstonePriceFeedUnitTest is TestHelper, RedstoneConstants {
 
         bytes memory data = abi.encode(expectedPayloadTimestamp, payload);
 
-        vm.expectRevert(RedstonePriceFeed.DataPackageTimestampIncorrect.selector);
+        vm.expectRevert(RedstonePriceFeed.IncorrectDataPackageTimestampException.selector);
 
         pf.updatePrice(data);
     }
@@ -264,7 +264,7 @@ contract RedstonePriceFeedUnitTest is TestHelper, RedstoneConstants {
 
         bytes memory data = abi.encode(expectedPayloadTimestamp, payload);
 
-        vm.expectRevert(RedstonePriceFeed.RedstonePayloadTimestampIncorrect.selector);
+        vm.expectRevert(RedstonePriceFeed.PayloadTimestampTooFarBehindException.selector);
 
         pf.updatePrice(data);
 
@@ -276,7 +276,7 @@ contract RedstonePriceFeedUnitTest is TestHelper, RedstoneConstants {
 
         data = abi.encode(expectedPayloadTimestamp, payload);
 
-        vm.expectRevert(RedstonePriceFeed.RedstonePayloadTimestampIncorrect.selector);
+        vm.expectRevert(RedstonePriceFeed.PayloadTimestampTooFarAheadException.selector);
 
         pf.updatePrice(data);
     }