search and replace tellor for fetch and trb for fetch, both case sensitive

Author: dsm-ll

README.md

@@ -1,8 +1,8 @@
-[![Tests](https://github.com/tellor-io/autopay/actions/workflows/tests.yml/badge.svg)](https://github.com/tellor-io/autopay/actions/workflows/tests.ymli)
+[![Tests](https://github.com/fetch-io/autopay/actions/workflows/tests.yml/badge.svg)](https://github.com/fetch-io/autopay/actions/workflows/tests.ymli)
 
 ## Overview <a name="overview"> </a>  
 
-<b>Autopay</b> is a system for creating and funding data feeds for use with Tellor. 
+<b>Autopay</b> is a system for creating and funding data feeds for use with Fetch. 
 
 ## To Use
 
@@ -73,7 +73,7 @@ To receive fees from a recurring feed:
 ```solidity 
 
     /**
-     * @param _reporter address of Tellor reporter
+     * @param _reporter address of Fetch reporter
      * @param _feedId unique feed identifier
      * @param _queryId ID of reported data
      * @param _timestamps[] batch of timestamps array of reported data eligible for reward
@@ -119,13 +119,13 @@ npx hardhat test
 ```
 
 ## Maintainers <a name="maintainers"> </a>
-This repository is maintained by the [Tellor team](https://github.com/orgs/tellor-io/people)
+This repository is maintained by the [Fetch team](https://github.com/orgs/fetch-io/people)
 
 
 ## How to Contribute<a name="how2contribute"> </a>  
 
-Check out our issues log here on Github or feel free to reach out anytime [info@tellor.io](mailto:info@tellor.io)
+Check out our issues log here on Github or feel free to reach out anytime [info@fetch.io](mailto:info@fetch.io)
 
 ## Copyright
 
-Tellor Inc. 2022
+Fetch Inc. 2022

contracts/Autopay.sol

@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.3;
 
-import {UsingTellor} from "usingtellor/contracts/UsingTellor.sol";
+import {UsingFetch} from "usingfetch/contracts/UsingFetch.sol";
 import {IERC20} from "./interfaces/IERC20.sol";
 import "./interfaces/IQueryDataStorage.sol";
 
 /**
- @author Tellor Inc.
+ @author Fetch Inc.
  @title Autopay
- @dev This is a contract for automatically paying for Tellor oracle data at
+ @dev This is a contract for automatically paying for Fetch oracle data at
  * specific time intervals, as well as one time tips.
 */
-contract Autopay is UsingTellor {
+contract Autopay is UsingFetch {
     // Storage
-    IERC20 public token; // TRB token address
+    IERC20 public token; // FETCH token address
     IQueryDataStorage public queryDataStorage; // Query data storage contract
     uint256 public fee; // 1000 is 100%, 50 is 5%, etc.
 
@@ -95,16 +95,16 @@ contract Autopay is UsingTellor {
     // Functions
     /**
      * @dev Initializes system parameters
-     * @param _tellor address of Tellor contract
+     * @param _fetch address of Fetch contract
      * @param _queryDataStorage address of query data storage contract
      * @param _fee percentage, 1000 is 100%, 50 is 5%, etc.
      */
     constructor(
-        address payable _tellor,
+        address payable _fetch,
         address _queryDataStorage,
         uint256 _fee
-    ) UsingTellor(_tellor) {
-        token = IERC20(tellor.token());
+    ) UsingFetch(_fetch) {
+        token = IERC20(fetch.token());
         queryDataStorage = IQueryDataStorage(_queryDataStorage);
         fee = _fee;
     }
@@ -135,8 +135,8 @@ contract Autopay is UsingTellor {
                 _cumulativeReward - ((_cumulativeReward * fee) / 1000)
             )
         );
-        token.approve(address(tellor), (_cumulativeReward * fee) / 1000);
-        tellor.addStakingRewards((_cumulativeReward * fee) / 1000);
+        token.approve(address(fetch), (_cumulativeReward * fee) / 1000);
+        fetch.addStakingRewards((_cumulativeReward * fee) / 1000);
         if (getCurrentTip(_queryId) == 0) {
             if (queryIdsWithFundingIndex[_queryId] != 0) {
                 uint256 _idx = queryIdsWithFundingIndex[_queryId] - 1;
@@ -154,7 +154,7 @@ contract Autopay is UsingTellor {
     }
 
     /**
-     * @dev Allows Tellor reporters to claim their tips in batches
+     * @dev Allows Fetch reporters to claim their tips in batches
      * @param _feedId unique feed identifier
      * @param _queryId ID of reported data
      * @param _timestamps batch of timestamps array of reported data eligible for reward
@@ -216,8 +216,8 @@ contract Autopay is UsingTellor {
                 _cumulativeReward - ((_cumulativeReward * fee) / 1000)
             )
         );
-        token.approve(address(tellor), (_cumulativeReward * fee) / 1000);
-        tellor.addStakingRewards((_cumulativeReward * fee) / 1000);
+        token.approve(address(fetch), (_cumulativeReward * fee) / 1000);
+        fetch.addStakingRewards((_cumulativeReward * fee) / 1000);
         emit TipClaimed(_feedId, _queryId, _cumulativeReward, msg.sender);
     }
 

contracts/Keeper.sol

@@ -2,19 +2,19 @@
 pragma solidity 0.8.3;
 
 /**
- @author Tellor Inc.
+ @author Fetch Inc.
  @title Keeper
- @dev This is contract for automatically paying for Tellor oracle data at
+ @dev This is contract for automatically paying for Fetch oracle data at
  * specific time intervals. Any non-rebasing ERC20 token can be used for payment.
  * Only the first data submission within each time window gets a reward.
 */
 
-import "usingtellor/contracts/UsingTellor.sol";
+import "usingfetch/contracts/UsingFetch.sol";
 import "./interfaces/IERC20.sol";
 
-contract Keeper is UsingTellor {
+contract Keeper is UsingFetch {
     // Storage
-    IERC20 public token; // TRB token address
+    IERC20 public token; // FETCH token address
     address public owner;
     uint256 public fee; // 1000 is 100%, 50 is 5%, etc.
 
@@ -77,16 +77,16 @@ contract Keeper is UsingTellor {
     // Functions
     /**
      * @dev Initializes system parameters
-     * @param _tellor address of Tellor contract
+     * @param _fetch address of Fetch contract
      * @param _token address of token used for tips
      * @param _fee percentage, 1000 is 100%, 50 is 5%, etc.
      */
     constructor(
-        address payable _tellor,
+        address payable _fetch,
         address _token,
         address _owner,
         uint256 _fee
-    ) UsingTellor(_tellor) {
+    ) UsingFetch(_fetch) {
         token = IERC20(_token);
         owner = _owner;
         fee = _fee;
@@ -188,9 +188,10 @@ contract Keeper is UsingTellor {
         emit KeeperJobFunded(msg.sender, _amount, _jobId);
     }
 
-    function increaseMaxGasForExistingJob(bytes32 _queryId, uint256 _amount)
-        external
-    {
+    function increaseMaxGasForExistingJob(
+        bytes32 _queryId,
+        uint256 _amount
+    ) external {
         KeeperTip storage _keep = keeperTips[_queryId];
         require(_keep.maxGasRefund > 0, "Job not setup yet");
         require(msg.sender == _keep.creator, "Not job creator");
@@ -223,7 +224,7 @@ contract Keeper is UsingTellor {
         uint256 _interval,
         uint256 _payReward
     ) external {
-        string memory _type = "TellorKpr";
+        string memory _type = "FetchKpr";
         bytes memory _encodedArgs = abi.encode(
             _functionSig,
             _contractAddress,
@@ -312,10 +313,8 @@ contract Keeper is UsingTellor {
                 _keeperTips.amount - ((_keeperTips.amount * fee) / 1000)
             )
         );
-        token.approve(address(tellor), (_keeperTips.amount * fee) / 1000);
-        tellor.addStakingRewards(
-            (_keeperTips.amount * fee) / 1000
-        );
+        token.approve(address(fetch), (_keeperTips.amount * fee) / 1000);
+        fetch.addStakingRewards((_keeperTips.amount * fee) / 1000);
         _keeperTips.amount = 0;
         emit KeeperTipClaimed(_queryId, _keeperTips.amount, _keeperAddress);
     }
@@ -337,7 +336,7 @@ contract Keeper is UsingTellor {
         uint256 _maxGasRefund,
         uint256 _tip
     ) external {
-        string memory _type = "TellorKpr";
+        string memory _type = "FetchKpr";
         bytes memory _encodedArgs = abi.encode(
             _functionSig,
             _contractAddress,
@@ -382,7 +381,9 @@ contract Keeper is UsingTellor {
     }
 
     // Getters
-    function continuousJobById(bytes32 _jobId)
+    function continuousJobById(
+        bytes32 _jobId
+    )
         external
         view
         returns (
@@ -419,11 +420,9 @@ contract Keeper is UsingTellor {
         return userTipsTotal[_user];
     }
 
-    function singleJobById(bytes32 _queryId)
-        external
-        view
-        returns (KeeperTip memory)
-    {
+    function singleJobById(
+        bytes32 _queryId
+    ) external view returns (KeeperTip memory) {
         return keeperTips[_queryId];
     }
 
@@ -433,13 +432,12 @@ contract Keeper is UsingTellor {
      * @param _jobId JobID to generate queryId for
      * @param _timestamp Unique timestamp used to generate queryId
      */
-    function _generateQueryId(bytes32 _jobId, uint256 _timestamp)
-        internal
-        view
-        returns (bytes32)
-    {
+    function _generateQueryId(
+        bytes32 _jobId,
+        uint256 _timestamp
+    ) internal view returns (bytes32) {
         KeeperJobDetails storage _job = jobs[_jobId];
-        string memory _type = "TellorKpr";
+        string memory _type = "FetchKpr";
         bytes memory _encodedArgs = abi.encode(
             _job.functionSig,
             _job.contractAddress,

contracts/QueryDataStorage.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.3;
 
 /**
- @author Tellor Inc.
+ @author Fetch Inc.
  @title QueryDataStorage
  @dev This contract is used for storing query data
 */

contracts/testing/AutopayMock.sol

@@ -5,10 +5,10 @@ import "../Autopay.sol";
 
 contract AutopayMock is Autopay {
     constructor(
-        address payable _tellor,
+        address payable _fetch,
         address _queryDataStorage,
         uint256 _fee
-        ) Autopay(_tellor, _queryDataStorage, _fee) {}
+        ) Autopay(_fetch, _queryDataStorage, _fee) {}
 
     function bytesToUint(bytes memory _b) public pure returns(uint256) {
         return _bytesToUint(_b);