fix: Fix bugs from the v0.2.0-beta release

chore: Prepare for the v0.2.1-beta release

Author: andrejrakic

CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1-beta] - 26 June 2024
+
+### Dependencies
+
+| Package                   | Version |
+| ------------------------- | ------- |
+| @chainlink/contracts-ccip | 1.4.0   |
+| @chainlink/contracts      | 1.1.1   |
+
+### Services
+
+- [x] Chainlink CCIP
+- [x] Chainlink Data Feeds
+- [ ] Chainlink VRF 2
+- [ ] Chainlink VRF 2.5
+
+### Fixed
+
+- Bug in propose & confirm aggregator flow that could lead to aggregator being set to `address(0)`
+- The `maxAnswer` variable in the `MockOffchainAggregator.sol` contract was set to an incorrect value
+- Bug in the `MockOffchainAggregator.sol` contract where the `minAnswer` could've been set to the value greather than `maxAnswer`
+
 ## [0.2.0-beta] - 24 June 2024
 
 ### Dependencies
@@ -46,3 +68,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [0.1.0]: https://github.com/smartcontractkit/chainlink-local/releases/tag/v0.1.0
 [0.2.0-beta]: https://github.com/smartcontractkit/chainlink-local/releases/tag/v0.2.0-beta
+[0.2.1-beta]: https://github.com/smartcontractkit/chainlink-local/releases/tag/v0.2.1-beta

package.json

@@ -2,7 +2,7 @@
   "name": "@chainlink/local",
   "description": "Chainlink Local Simulator",
   "license": "MIT",
-  "version": "0.1.0",
+  "version": "0.2.1-beta",
   "files": [
     "src/**/*.sol",
     "!src/test/**/*",
@@ -33,4 +33,4 @@
     "@chainlink/contracts": "^1.1.1",
     "@chainlink/contracts-ccip": "^1.4.0"
   }
-}
+}

src/data-feeds/MockOffchainAggregator.sol

@@ -2,6 +2,9 @@
 pragma solidity ^0.8.0;
 
 contract MockOffchainAggregator {
+    int192 private constant MIN_ANSWER_POSSIBLE = 1;
+    int192 private constant MAX_ANSWER_POSSIBLE = 95780971304118053647396689196894323976171195136475135; // type(uint176).max
+
     uint8 public decimals;
     int256 public latestAnswer;
     uint256 public latestTimestamp;
@@ -23,8 +26,8 @@ contract MockOffchainAggregator {
         updateAnswer(_initialAnswer);
         // If the minAnswer has a value of 1 and the maxAnswer has a value of 95780971304118053647396689196894323976171195136475135 then that theoretically means there is no min or max for that feed
         // If the minAnswer and maxAnswer values are set to other than those mentioned above, then there are actually min and max for that feed - which you will need to normalize using the demicals value
-        minAnswer = 1;
-        maxAnswer = type(int192).max;
+        minAnswer = MIN_ANSWER_POSSIBLE;
+        maxAnswer = MAX_ANSWER_POSSIBLE;
     }
 
     function updateAnswer(int256 _answer) public {
@@ -68,6 +71,10 @@ contract MockOffchainAggregator {
     }
 
     function updateMinAndMaxAnswers(int192 _minAnswer, int192 _maxAnswer) external {
+        require(_minAnswer < _maxAnswer, "minAnswer must be less than maxAnswer");
+        require(_minAnswer >= MIN_ANSWER_POSSIBLE, "minAnswer is too low");
+        require(_maxAnswer <= MAX_ANSWER_POSSIBLE, "maxAnswer is too high");
+
         minAnswer = _minAnswer;
         maxAnswer = _maxAnswer;
     }

src/data-feeds/MockV3Aggregator.sol

@@ -66,10 +66,13 @@ contract MockV3Aggregator is AggregatorV2V3Interface {
     }
 
     function proposeAggregator(AggregatorV2V3Interface _aggregator) external {
+        require(address(_aggregator) != address(0), "Proposed aggregator cannot be zero address");
+        require(address(_aggregator) != aggregator, "Proposed aggregator cannot be current aggregator");
         proposedAggregator = address(_aggregator);
     }
 
-    function confirmAggregator() external {
+    function confirmAggregator(address _aggregator) external {
+        require(_aggregator == address(proposedAggregator), "Invalid proposed aggregator");
         aggregator = proposedAggregator;
         proposedAggregator = address(0);
     }

test/unit/data-feeds/DataFeedsUnit.t.sol

@@ -134,7 +134,7 @@ contract BasicDataConsumerV3Test is Test {
         currentProposedAggregator = mockAggregator.proposedAggregator();
         assertEq(currentProposedAggregator, address(newMockOffchainAggregator));
 
-        mockAggregator.confirmAggregator();
+        mockAggregator.confirmAggregator(address(newMockOffchainAggregator));
 
         currentAggregator = mockAggregator.aggregator();
         currentProposedAggregator = mockAggregator.proposedAggregator();
@@ -148,7 +148,7 @@ contract BasicDataConsumerV3Test is Test {
 
     function test_shouldReturnMinAndMaxAnswers() public {
         int192 minAnswer = 1;
-        int192 maxAnswer = type(int192).max;
+        int192 maxAnswer = 95780971304118053647396689196894323976171195136475135; // type(uint176).max
 
         int192 resultMinAnswer = mockOffchainAggregator.minAnswer();
         int192 resultMaxAnswer = mockOffchainAggregator.maxAnswer();
@@ -169,4 +169,60 @@ contract BasicDataConsumerV3Test is Test {
         assertEq(resultMinAnswer, newMinAnswer);
         assertEq(resultMaxAnswer, newMaxAnswer);
     }
+
+    function test_shouldRevertIfProposedAggregatorIsZero() public {
+        vm.expectRevert("Proposed aggregator cannot be zero address");
+        mockAggregator.proposeAggregator(AggregatorV2V3Interface(address(0)));
+    }
+
+    function test_shouldRevertIfProposedAggregatorIsCurrentAggregator() public {
+        vm.expectRevert("Proposed aggregator cannot be current aggregator");
+        mockAggregator.proposeAggregator(AggregatorV2V3Interface(address(mockOffchainAggregator)));
+    }
+
+    function test_shouldRevertIfProposedAggregatorIsNotSet() public {
+        vm.expectRevert("Invalid proposed aggregator");
+        mockAggregator.confirmAggregator(address(1));
+    }
+
+    function test_shouldRevertIfProposedAggregatorIsNotCorrect() public {
+        int256 newAnswer = 200000000000;
+        MockOffchainAggregator newMockOffchainAggregator = new MockOffchainAggregator(decimals, newAnswer);
+
+        mockAggregator.proposeAggregator(AggregatorV2V3Interface(address(newMockOffchainAggregator)));
+        vm.expectRevert("Invalid proposed aggregator");
+        mockAggregator.confirmAggregator(address(1));
+    }
+
+    function test_shouldRevertIfMinAnswerIsGreaterThanMaxAnswer() public {
+        int192 newMinAnswer = 1.5 ether;
+        int192 newMaxAnswer = 0.5 ether;
+
+        vm.expectRevert("minAnswer must be less than maxAnswer");
+        mockOffchainAggregator.updateMinAndMaxAnswers(newMinAnswer, newMaxAnswer);
+    }
+
+    function test_shouldRevertIfMinAnswerIsEqualToMaxAnswer() public {
+        int192 newMinAnswer = 1.5 ether;
+        int192 newMaxAnswer = 1.5 ether;
+
+        vm.expectRevert("minAnswer must be less than maxAnswer");
+        mockOffchainAggregator.updateMinAndMaxAnswers(newMinAnswer, newMaxAnswer);
+    }
+
+    function test_shouldRevertIfMinAnswerIsLessMinAnswerPossible() public {
+        int192 newMinAnswer = 0;
+        int192 newMaxAnswer = 1.5 ether;
+
+        vm.expectRevert("minAnswer is too low");
+        mockOffchainAggregator.updateMinAndMaxAnswers(newMinAnswer, newMaxAnswer);
+    }
+
+    function test_shouldRevertIfMaxAnswerIsGreaterThanMaxAnswerPossible() public {
+        int192 newMinAnswer = 0.5 ether;
+        int192 newMaxAnswer = type(int192).max;
+
+        vm.expectRevert("maxAnswer is too high");
+        mockOffchainAggregator.updateMinAndMaxAnswers(newMinAnswer, newMaxAnswer);
+    }
 }