merge with latest development branch & fix conflict

Author: cwsnt

contracts/PriceFeed.sol

@@ -26,7 +26,7 @@ contract PriceFeed is PriceFeedStorage, IPriceFeed {
 
     /// @notice Returns the latest price obtained from the Oracle. Called by Zero functions that require a current price.
     ///         It uses the main price feed and fallback to the backup one in case of an error. If both fail return the last
-    ///         good price seen.
+    ///         good price seen. Function will rever if got false success flag from the medianizer contract.
     /// @dev It's also callable by anyone externally
     /// @return The price
     function fetchPrice() external override returns (uint256) {
@@ -39,7 +39,8 @@ contract PriceFeed is PriceFeedStorage, IPriceFeed {
                 emit PriceFeedBroken(index, address(priceFeeds[index]));
             }
         }
-        return lastGoodPrice;
+        
+        revert("PriceFeed: Price feed price is stale");
     }
 
     /// @notice Allows users to setup the main and the backup price feeds
@@ -50,8 +51,7 @@ contract PriceFeed is PriceFeedStorage, IPriceFeed {
         require(_index < priceFeeds.length, "Out of bounds when setting the price feed");
         checkContract(_newPriceFeed);
         priceFeeds[_index] = IExternalPriceFeed(_newPriceFeed);
-        (uint256 price, bool success) = priceFeeds[_index].latestAnswer();
-        require(success, "PriceFeed: Price feed must be working");
+        (uint256 price, bool _) = priceFeeds[_index].latestAnswer();
         emit PriceFeedUpdated(_index, _newPriceFeed);
         return price;
     }
@@ -61,4 +61,8 @@ contract PriceFeed is PriceFeedStorage, IPriceFeed {
         lastGoodPrice = _currentPrice;
         emit LastGoodPriceUpdated(_currentPrice);
     }
+
+    function getPriceFeedAtIndex(uint8 _index) external view returns(address) {
+        return address(priceFeeds[_index]);
+    }
 }

deployment/deploy/7-PriceFeed.ts

@@ -0,0 +1,15 @@
+import { DeployFunction } from "hardhat-deploy/types";
+import { deployWithCustomProxy } from "../../scripts/helpers/helpers";
+import { getContractNameFromScriptFileName } from "../../scripts/helpers/utils";
+const path = require("path");
+
+const deploymentName = getContractNameFromScriptFileName(path.basename(__filename));
+
+const func: DeployFunction = async (hre) => {
+    const { getNamedAccounts } = hre;
+    const { deployer } = await getNamedAccounts();
+    await deployWithCustomProxy(hre, deployer, deploymentName, "UpgradableProxy");
+};
+
+func.tags = [deploymentName];
+export default func;