Merge remote-tracking branch 'origin/feat/chainlink' into feat/chainlink-factorized

Author: QGarchery

src/ChainlinkOracle.sol

@@ -62,7 +62,7 @@ contract ChainlinkOracle is IOracle {
         // common quote currency.
         // Chainlink feeds return pB1*b1FeedPrecision, pB2*b2FeedPrecision, pQ1*q1FeedPrecision and pQ2*q2FeedPrecision.
         // `price()` should return 1e36 * (pB1/1e(b1Decimals) * pB2/1e(b2Decimals)) / (pQ1/1e(q1Decimals) *
-        // pQ2/1e(q2Decimals)).
+        // pQ2/1e(q2Decimals))
         // Yet `price()` returns (pB1*1e(b1FeedPrecision) * pB2*1e(b2FeedPrecision) * SCALE_FACTOR) /
         // (pQ1*1e(q1FeedPrecision) * pQ2*1e(q2FeedPrecision))
         // So 1e36 * (pB1/1e(b1Decimals) * pB2/1e(b2Decimals)) / (pQ1/1e(q1Decimals) * pQ2/1e(q2Decimals)) =
@@ -74,8 +74,8 @@ contract ChainlinkOracle is IOracle {
         // b2Decimals - b1FeedPrecision - b2FeedPrecision)
         SCALE_FACTOR = 10
             ** (
-                36 + quoteTokenDecimals + quoteFeed1.getDecimals() + quoteFeed2.getDecimals() - baseFeed1.getDecimals()
-                    - baseFeed2.getDecimals() - baseTokenDecimals - VAULT_DECIMALS
+                36 + quoteTokenDecimals + quoteFeed1.getDecimals() + quoteFeed2.getDecimals() - baseTokenDecimals
+                    - baseFeed1.getDecimals() - baseFeed2.getDecimals() - VAULT_DECIMALS
             );
     }
 

test/ChainlinkOracleTest.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 import "forge-std/Test.sol";
 import "src/ChainlinkOracle.sol";
 import "src/libraries/ErrorsLib.sol";
+import "./mocks/ChainlinkAggregatorMock.sol";
 
 AggregatorV3Interface constant feedZero = AggregatorV3Interface(address(0));
 // 8 decimals of precision
@@ -26,22 +27,6 @@ AggregatorV3Interface constant daiEthFeed = AggregatorV3Interface(0x773616E4d11A
 IERC4626 constant vaultZero = IERC4626(address(0));
 IERC4626 constant sDaiVault = IERC4626(0x83F20F44975D03b1b09e64809B757c47f942BEeA);
 
-contract FakeAggregator {
-    int256 public answer;
-
-    function setAnwser(int256 newAnswer) external {
-        answer = newAnswer;
-    }
-
-    function latestRoundData() external view returns (uint80, int256, uint256, uint256, uint80) {
-        return (0, answer, 0, 0, 0);
-    }
-
-    function decimals() external pure returns (uint256) {
-        return 8;
-    }
-}
-
 contract ChainlinkOracleTest is Test {
     function setUp() public {
         vm.createSelectFork(vm.envString("ETH_RPC_URL"));
@@ -112,7 +97,7 @@ contract ChainlinkOracleTest is Test {
 
     function testNegativeAnswer(int256 price) public {
         price = bound(price, type(int256).min, -1);
-        FakeAggregator aggregator = new FakeAggregator();
+        ChainlinkAggregatorMock aggregator = new ChainlinkAggregatorMock();
         ChainlinkOracle oracle =
         new ChainlinkOracle(vaultZero, AggregatorV3Interface(address(aggregator)), feedZero, feedZero, feedZero, 18, 0);
         aggregator.setAnwser(price);

test/mocks/ChainlinkAggregatorMock.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.0;
+
+contract ChainlinkAggregatorMock {
+    int256 public answer;
+
+    function setAnwser(int256 newAnswer) external {
+        answer = newAnswer;
+    }
+
+    function latestRoundData() external view returns (uint80, int256, uint256, uint256, uint80) {
+        return (0, answer, 0, 0, 0);
+    }
+
+    function decimals() external pure returns (uint256) {
+        return 8;
+    }
+}