refactor: create minimal CL interface

Author: MerlinEgalite

src/ChainlinkOracle.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.21;
 import {IChainlinkOracle} from "./interfaces/IChainlinkOracle.sol";
 import {IOracle} from "../lib/morpho-blue/src/interfaces/IOracle.sol";
 
-import {AggregatorV3Interface, ChainlinkDataFeedLib} from "./libraries/ChainlinkDataFeedLib.sol";
+import {MinimalAggregatorV3Interface, ChainlinkDataFeedLib} from "./libraries/ChainlinkDataFeedLib.sol";
 import {IERC4626, VaultLib} from "./libraries/VaultLib.sol";
 import {ErrorsLib} from "./libraries/ErrorsLib.sol";
 import {Math} from "../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
@@ -16,7 +16,7 @@ import {Math} from "../lib/openzeppelin-contracts/contracts/utils/math/Math.sol"
 contract ChainlinkOracle is IChainlinkOracle {
     using Math for uint256;
     using VaultLib for IERC4626;
-    using ChainlinkDataFeedLib for AggregatorV3Interface;
+    using ChainlinkDataFeedLib for MinimalAggregatorV3Interface;
 
     /* IMMUTABLES */
 
@@ -27,16 +27,16 @@ contract ChainlinkOracle is IChainlinkOracle {
     uint256 public immutable VAULT_CONVERSION_SAMPLE;
 
     /// @inheritdoc IChainlinkOracle
-    AggregatorV3Interface public immutable BASE_FEED_1;
+    MinimalAggregatorV3Interface public immutable BASE_FEED_1;
 
     /// @inheritdoc IChainlinkOracle
-    AggregatorV3Interface public immutable BASE_FEED_2;
+    MinimalAggregatorV3Interface public immutable BASE_FEED_2;
 
     /// @inheritdoc IChainlinkOracle
-    AggregatorV3Interface public immutable QUOTE_FEED_1;
+    MinimalAggregatorV3Interface public immutable QUOTE_FEED_1;
 
     /// @inheritdoc IChainlinkOracle
-    AggregatorV3Interface public immutable QUOTE_FEED_2;
+    MinimalAggregatorV3Interface public immutable QUOTE_FEED_2;
 
     /// @inheritdoc IChainlinkOracle
     uint256 public immutable SCALE_FACTOR;
@@ -63,10 +63,10 @@ contract ChainlinkOracle is IChainlinkOracle {
     /// @param quoteTokenDecimals Quote token decimals.
     constructor(
         IERC4626 vault,
-        AggregatorV3Interface baseFeed1,
-        AggregatorV3Interface baseFeed2,
-        AggregatorV3Interface quoteFeed1,
-        AggregatorV3Interface quoteFeed2,
+        MinimalAggregatorV3Interface baseFeed1,
+        MinimalAggregatorV3Interface baseFeed2,
+        MinimalAggregatorV3Interface quoteFeed1,
+        MinimalAggregatorV3Interface quoteFeed2,
         uint256 vaultConversionSample,
         uint256 baseTokenDecimals,
         uint256 quoteTokenDecimals

src/adapters/WstEthEthExchangeRateChainlinkAdapter.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.21;
 
 import {IStEth} from "../interfaces/IStEth.sol";
-import {AggregatorV3Interface} from "../interfaces/AggregatorV3Interface.sol";
+import {MinimalAggregatorV3Interface} from "../interfaces/MinimalAggregatorV3Interface.sol";
 
 import {ErrorsLib} from "../libraries/ErrorsLib.sol";
 
@@ -11,9 +11,8 @@ import {ErrorsLib} from "../libraries/ErrorsLib.sol";
 /// @custom:contact [email protected]
 /// @notice wstETH/ETH exchange rate price feed.
 /// @dev This contract should only be used as price feed for `ChainlinkOracle`.
-contract WstEthEthExchangeRateChainlinkAdapter is AggregatorV3Interface {
+contract WstEthEthExchangeRateChainlinkAdapter is MinimalAggregatorV3Interface {
     uint8 public constant decimals = 18;
-    string public constant description = "wstETH/ETH exchange rate";
 
     IStEth public immutable ST_ETH;
 
@@ -22,16 +21,6 @@ contract WstEthEthExchangeRateChainlinkAdapter is AggregatorV3Interface {
         ST_ETH = IStEth(stEth);
     }
 
-    /// @notice Reverts as no Chainlink aggregator is used.
-    function version() external pure returns (uint256) {
-        revert();
-    }
-
-    /// @notice Reverts as it's not necessary for the ChainlinkOracle contract.
-    function getRoundData(uint80) external pure returns (uint80, int256, uint256, uint256, uint80) {
-        revert();
-    }
-
     function latestRoundData() external view returns (uint80, int256, uint256, uint256, uint80) {
         uint256 answer = ST_ETH.getPooledEthByShares(10 ** decimals);
         return (0, int256(answer), 0, 0, 0);

src/interfaces/IChainlinkOracle.sol

@@ -2,8 +2,8 @@
 pragma solidity >=0.5.0;
 
 import {IERC4626} from "./IERC4626.sol";
-import {AggregatorV3Interface} from "./AggregatorV3Interface.sol";
 import {IOracle} from "../../lib/morpho-blue/src/interfaces/IOracle.sol";
+import {MinimalAggregatorV3Interface} from "./MinimalAggregatorV3Interface.sol";
 
 /// @title IChainlinkOracle
 /// @author Morpho Labs
@@ -17,16 +17,16 @@ interface IChainlinkOracle is IOracle {
     function VAULT_CONVERSION_SAMPLE() external view returns (uint256);
 
     /// @notice Returns the address of the first Chainlink base feed.
-    function BASE_FEED_1() external view returns (AggregatorV3Interface);
+    function BASE_FEED_1() external view returns (MinimalAggregatorV3Interface);
 
     /// @notice Returns the address of the second Chainlink base feed.
-    function BASE_FEED_2() external view returns (AggregatorV3Interface);
+    function BASE_FEED_2() external view returns (MinimalAggregatorV3Interface);
 
     /// @notice Returns the address of the first Chainlink quote feed.
-    function QUOTE_FEED_1() external view returns (AggregatorV3Interface);
+    function QUOTE_FEED_1() external view returns (MinimalAggregatorV3Interface);
 
     /// @notice Returns the address of the second Chainlink quote feed.
-    function QUOTE_FEED_2() external view returns (AggregatorV3Interface);
+    function QUOTE_FEED_2() external view returns (MinimalAggregatorV3Interface);
 
     /// @notice Returns the price scale factor, calculated at contract creation.
     function SCALE_FACTOR() external view returns (uint256);

src/interfaces/AggregatorV3Interface.sol renamed to src/interfaces/MinimalAggregatorV3Interface.sol

@@ -1,20 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.5.0;
 
-/// @dev From
+/// @dev Inspired
 /// https://github.com/smartcontractkit/chainlink/blob/master/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol
-interface AggregatorV3Interface {
+interface MinimalAggregatorV3Interface {
     function decimals() external view returns (uint8);
 
-    function description() external view returns (string memory);
-
-    function version() external view returns (uint256);
-
-    function getRoundData(uint80 _roundId)
-        external
-        view
-        returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound);
-
     function latestRoundData()
         external
         view

src/libraries/ChainlinkDataFeedLib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {AggregatorV3Interface} from "../interfaces/AggregatorV3Interface.sol";
+import {MinimalAggregatorV3Interface} from "../interfaces/MinimalAggregatorV3Interface.sol";
 
 import {ErrorsLib} from "./ErrorsLib.sol";
 
@@ -17,7 +17,7 @@ library ChainlinkDataFeedLib {
     /// - Staleness is not checked because it's assumed that the Chainlink feed keeps its promises on this.
     /// - The price is not checked to be in the min/max bounds because it's assumed that the Chainlink feed keeps its
     /// promises on this.
-    function getPrice(AggregatorV3Interface feed) internal view returns (uint256) {
+    function getPrice(MinimalAggregatorV3Interface feed) internal view returns (uint256) {
         if (address(feed) == address(0)) return 1;
 
         (, int256 answer,,,) = feed.latestRoundData();
@@ -28,7 +28,7 @@ library ChainlinkDataFeedLib {
 
     /// @dev Returns the number of decimals of a `feed`.
     /// @dev When `feed` is the address zero, returns 0.
-    function getDecimals(AggregatorV3Interface feed) internal view returns (uint256) {
+    function getDecimals(MinimalAggregatorV3Interface feed) internal view returns (uint256) {
         if (address(feed) == address(0)) return 0;
 
         return feed.decimals();

test/ChainlinkOracleTest.sol

@@ -79,7 +79,7 @@ contract ChainlinkOracleTest is Test {
         price = bound(price, type(int256).min, -1);
         ChainlinkAggregatorMock aggregator = new ChainlinkAggregatorMock();
         ChainlinkOracle oracle = new ChainlinkOracle(
-            vaultZero, AggregatorV3Interface(address(aggregator)), feedZero, feedZero, feedZero, 1, 18, 0
+            vaultZero, MinimalAggregatorV3Interface(address(aggregator)), feedZero, feedZero, feedZero, 1, 18, 0
         );
         aggregator.setAnwser(price);
         vm.expectRevert(bytes(ErrorsLib.NEGATIVE_ANSWER));

test/WstEthEthExchangeRateChainlinkAdapterTest.sol

@@ -24,23 +24,11 @@ contract WstEthEthExchangeRateChainlinkAdapterTest is Test {
         assertEq(oracle.decimals(), uint8(18));
     }
 
-    function testDescription() public {
-        assertEq(oracle.description(), "wstETH/ETH exchange rate");
-    }
-
     function testDeployZeroAddress() public {
         vm.expectRevert(bytes(ErrorsLib.ZERO_ADDRESS));
         new WstEthEthExchangeRateChainlinkAdapter(address(0));
     }
 
-    function testReverts() public {
-        vm.expectRevert();
-        oracle.version();
-
-        vm.expectRevert();
-        oracle.getRoundData(0);
-    }
-
     function testLatestRoundData() public {
         (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound) =
             oracle.latestRoundData();

test/helpers/Constants.sol

@@ -1,25 +1,25 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {IERC4626, AggregatorV3Interface} from "../../src/ChainlinkOracle.sol";
+import {IERC4626, MinimalAggregatorV3Interface} from "../../src/ChainlinkOracle.sol";
 
-AggregatorV3Interface constant feedZero = AggregatorV3Interface(address(0));
+MinimalAggregatorV3Interface constant feedZero = MinimalAggregatorV3Interface(address(0));
 // 8 decimals of precision
-AggregatorV3Interface constant btcUsdFeed = AggregatorV3Interface(0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c);
+MinimalAggregatorV3Interface constant btcUsdFeed = MinimalAggregatorV3Interface(0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c);
 // 8 decimals of precision
-AggregatorV3Interface constant usdcUsdFeed = AggregatorV3Interface(0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6);
+MinimalAggregatorV3Interface constant usdcUsdFeed = MinimalAggregatorV3Interface(0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6);
 // 18 decimals of precision
-AggregatorV3Interface constant btcEthFeed = AggregatorV3Interface(0xdeb288F737066589598e9214E782fa5A8eD689e8);
+MinimalAggregatorV3Interface constant btcEthFeed = MinimalAggregatorV3Interface(0xdeb288F737066589598e9214E782fa5A8eD689e8);
 // 8 decimals of precision
-AggregatorV3Interface constant wBtcBtcFeed = AggregatorV3Interface(0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23);
+MinimalAggregatorV3Interface constant wBtcBtcFeed = MinimalAggregatorV3Interface(0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23);
 // 18 decimals of precision
-AggregatorV3Interface constant stEthEthFeed = AggregatorV3Interface(0x86392dC19c0b719886221c78AB11eb8Cf5c52812);
+MinimalAggregatorV3Interface constant stEthEthFeed = MinimalAggregatorV3Interface(0x86392dC19c0b719886221c78AB11eb8Cf5c52812);
 // 18 decimals of precision
-AggregatorV3Interface constant usdcEthFeed = AggregatorV3Interface(0x986b5E1e1755e3C2440e960477f25201B0a8bbD4);
+MinimalAggregatorV3Interface constant usdcEthFeed = MinimalAggregatorV3Interface(0x986b5E1e1755e3C2440e960477f25201B0a8bbD4);
 // 8 decimals of precision
-AggregatorV3Interface constant ethUsdFeed = AggregatorV3Interface(0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419);
+MinimalAggregatorV3Interface constant ethUsdFeed = MinimalAggregatorV3Interface(0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419);
 // 18 decimals of precision
-AggregatorV3Interface constant daiEthFeed = AggregatorV3Interface(0x773616E4d11A78F511299002da57A0a94577F1f4);
+MinimalAggregatorV3Interface constant daiEthFeed = MinimalAggregatorV3Interface(0x773616E4d11A78F511299002da57A0a94577F1f4);
 
 IERC4626 constant vaultZero = IERC4626(address(0));
 IERC4626 constant sDaiVault = IERC4626(0x83F20F44975D03b1b09e64809B757c47f942BEeA);