Merge pull request #17 from fetchoracle/managed-feeds

Managed Feeds
fetchoracle · Mar 26, 2024 · 3bea6ab · 3bea6ab
2 parents 49f6f40 + 851fcd0
commit 3bea6ab
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 10 deletions.
diff --git a/contracts/Autopay.sol b/contracts/Autopay.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.3;
+pragma solidity 0.8.20;
 
 //TODO fix import paths
 import {UsingFetchUpgradeReady} from "usingfetch/contracts/UsingFetchUpgradeReady.sol";

diff --git a/contracts/QueryDataStorage.sol b/contracts/QueryDataStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.3;
+pragma solidity 0.8.20;
 
 /**
  @author Fetch Inc.

diff --git a/contracts/interfaces/IERC20.sol b/contracts/interfaces/IERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.3;
+pragma solidity 0.8.20;
 
 interface IERC20 {
   function transfer(address _to, uint256 _amount) external returns(bool);

diff --git a/contracts/interfaces/IQueryDataStorage.sol b/contracts/interfaces/IQueryDataStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity 0.8.20;
 
 interface IQueryDataStorage {
   function storeData(bytes memory _queryData) external; 

diff --git a/contracts/testing/AutopayMock.sol b/contracts/testing/AutopayMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.3;
+pragma solidity 0.8.20;
 
 import "../Autopay.sol";
 

diff --git a/contracts/testing/FetchPlayground.sol b/contracts/testing/FetchPlayground.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity 0.8.20;
 
 contract FetchPlayground {
     // Events

diff --git a/contracts/testing/TestToken.sol b/contracts/testing/TestToken.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.3;
+pragma solidity 0.8.20;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/testing/TipAndReport.sol b/contracts/testing/TipAndReport.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.3;
+pragma solidity 0.8.20;
 
 import "../Autopay.sol";
 import "./FetchPlayground.sol";

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -15,7 +15,7 @@ require("dotenv").config();
   solidity: {
     compilers: [
       {
-        version: "0.8.3",
+        version: "0.8.20",
         settings: {
           optimizer: {
             enabled: true,

diff --git a/test/functionTests-FetchAutopay.js b/test/functionTests-FetchAutopay.js
@@ -162,7 +162,15 @@ describe("Autopay - function tests", () => {
     assert.include(result.message, "must be sending an amount");
     // require(IERC20(_feed.fetch).transferFrom(msg.sender,address(this),_amount),"ERC20: transfer amount exceeds balance");
     result = await h.expectThrowMessage(autopay.fundFeed(bytesId, ETH_QUERY_ID, h.toWei("1000300")));
-    assert.include(result.message, "Arithmetic operation underflowed or overflowed outside of an unchecked block") // real message returned
+
+    const acceptableMessages = [
+      "Arithmetic operation underflowed or overflowed outside of an unchecked block",
+      "Arithmetic operation overflowed outside of an unchecked block",
+      "Arithmetic operation underflowed outside of an unchecked block"
+    ];
+
+    const isAcceptableMessage = acceptableMessages.some(message => result.message.includes(message));
+    assert.isTrue(isAcceptableMessage, 'Expected one of the acceptable messages');
     //VARIABLE UPDATES
     // _feed.balance += _amount;
     dataFeedDetails = await autopay.getDataFeed(bytesId);