Merge pull request #6 from tellor-io/t360-goerli

Tellor 360 implementation

.env.sample

@@ -1,3 +1,3 @@
-MNEMONIC=
 INFURA_KEY=
-ETHERSCAN_API_KEY=
+ETHERSCAN_API_KEY=
+PK=

contracts/TellorModule.sol

@@ -166,11 +166,10 @@ contract TellorModule is Module, UsingTellor {
         );
         require(_txHashes[_txIndex] == _txHash, "Unexpected transaction hash");
         (
-            bool _ifRetrieve,
             bytes memory _valueRetrieved,
             uint256 _timestampReceived
         ) = getDataBefore(_queryId, block.timestamp);
-        require(_ifRetrieve, "Data not retrieved");
+        require(_timestampReceived > 0, "Data not retrieved");
         // The result is valid in the time after the cooldown and before the expiration time (if set).
         require(
             _timestampReceived + uint256(cooldown) < block.timestamp,
@@ -315,11 +314,10 @@ contract TellorModule is Module, UsingTellor {
             "No query id set for provided proposal"
         );
         (
-            bool _ifRetrieve,
             bytes memory _valueRetrieved,
             uint256 _timestampRetrieved
         ) = getDataBefore(_queryId, block.timestamp);
-        require(_ifRetrieve, "Data not retrieved");
+        require(_timestampRetrieved > 0, "Data not retrieved");
         bool _didPass = abi.decode(_valueRetrieved, (bool));
         require(_didPass, "Transaction was not approved");
         require(

hardhat.config.ts

@@ -47,16 +47,16 @@ export default {
     sources: "contracts",
   },
   solidity: {
-    compilers: [{ version: "0.8.0" }, { version: "0.6.12" }],
+    compilers: [{ version: "0.8.7" }, { version: "0.6.12" }],
   },
   networks: {
     mainnet: {
       ...sharedNetworkConfig,
       url: `https://mainnet.infura.io/v3/${INFURA_KEY}`,
     },
-    rinkeby: {
+    goerli: {
       ...sharedNetworkConfig,
-      url: `https://rinkeby.infura.io/v3/${INFURA_KEY}`,
+      url: `https://goerli.infura.io/v3/${INFURA_KEY}`,
       gas: 10000000,
       gasPrice: 40000000000,
     },