Make mining client less gas-conservative

Author: area

packages/reputation-miner/ReputationMinerClient.js

@@ -232,30 +232,47 @@ class ReputationMinerClient {
     this._adapter.log("🏁 Initialised");
   }
 
-  async updateGasEstimate(type) {
-    if (this.chainId === 100){
-      this._miner.gasPrice = ethers.utils.hexlify(1000000000);
-      return;
-    }
-    // Get latest from ethGasStation
+  async updateGasEstimate(_type) {
+    let type = _type;
     const options = {
-      uri: 'https://ethgasstation.info/json/ethgasAPI.json',
       headers: {
-          'User-Agent': 'Request-Promise'
+        'User-Agent': 'Request-Promise'
       },
       json: true // Automatically parses the JSON string in the response
     };
+    let defaultGasPrice;
+    let factor;
+
+    if (this.chainId === 100){
+      options.uri = "https://blockscout.com/xdai/mainnet/api/v1/gas-price-oracle";
+      defaultGasPrice = ethers.utils.hexlify(1000000000);
+      factor = 1;
+      // This oracle presents the information slightly differently from ethgasstation.
+      if (_type === "safeLow") {
+        type = "slow";
+      }
+    } else if (this.chainId === 1) {
+      options.uri = "https://ethgasstation.info/json/ethgasAPI.json";
+      defaultGasPrice = ethers.utils.hexlify(20000000000);
+      factor = 10;
+    } else {
+      this._adapter.error(`Error during gas estimation: unknown chainid ${this.chainId}`);
+      this._miner.gasPrice = ethers.utils.hexlify(20000000000);
+      return;
+    }
+
+    // Get latest from whichever oracle
     try {
       const gasEstimates = await request(options);
 
       if (gasEstimates[type]){
-        this._miner.gasPrice = ethers.utils.hexlify(gasEstimates[type] / 10 * 1e9);
+        this._miner.gasPrice = ethers.utils.hexlify(gasEstimates[type] / factor * 1e9);
       } else {
-        this._miner.gasPrice = ethers.utils.hexlify(20000000000);
+        this._miner.gasPrice = defaultGasPrice;
       }
     } catch (err) {
       this._adapter.error(`Error during gas estimation: ${err}`);
-      this._miner.gasPrice = ethers.utils.hexlify(20000000000);
+      this._miner.gasPrice = defaultGasPrice;
     }
   }
 
@@ -335,7 +352,7 @@ class ReputationMinerClient {
           if (canSubmit) {
             this._adapter.log("⏰ Looks like it's time to submit an entry to the current cycle");
             this.submissionIndex += 1;
-            await this.updateGasEstimate('safeLow');
+            await this.updateGasEstimate('average');
             await this.submitEntry(entryIndex);
           }
         }
@@ -380,7 +397,7 @@ class ReputationMinerClient {
               return;
             }
           }
-          await this.updateGasEstimate('safeLow');
+          await this.updateGasEstimate('average');
           await repCycle.invalidateHash(round, oppIndex, {"gasPrice": this._miner.gasPrice});
           this.endDoBlockChecks();
           return;
@@ -398,7 +415,7 @@ class ReputationMinerClient {
           );
           if (responsePossible) {
             // If so, invalidate them.
-            await this.updateGasEstimate('safeLow');
+            await this.updateGasEstimate('average');
             await repCycle.invalidateHash(round, oppIndex, {"gasPrice": this._miner.gasPrice});
             this.endDoBlockChecks();
             return;
@@ -466,7 +483,7 @@ class ReputationMinerClient {
         if (responsePossible){
           this.best12Submissions = []; // Clear the submissions
           this.submissionIndex = 0;
-          await this.updateGasEstimate('safeLow');
+          await this.updateGasEstimate('average');
           await this.confirmEntry();
         }
       }

packages/reputation-miner/bin/index.js

@@ -22,6 +22,7 @@ const {
   network,
   localPort,
   localProviderAddress,
+  providerAddress,
   syncFrom,
   auto,
   oracle,
@@ -36,6 +37,7 @@ if ((!minerAddress && !privateKey) || !colonyNetworkAddress || !syncFrom) {
   process.exit();
 }
 
+
 const loader = new TruffleLoader({
   contractDir: path.resolve(__dirname, "..", "..", "..", "build", "contracts")
 });
@@ -48,7 +50,13 @@ if (network) {
   }
   provider = new ethers.providers.InfuraProvider(network);
 } else {
-  provider = new ethers.providers.JsonRpcProvider(`http://${localProviderAddress || "localhost"}:${localPort || "8545"}`);
+  let rpcEndpoint = providerAddress;
+
+  if (!rpcEndpoint) {
+      rpcEndpoint = `http://${localProviderAddress || "localhost"}:${localPort || "8545"}`;
+  }
+
+  provider = new ethers.providers.JsonRpcProvider(rpcEndpoint);
 }
 
 let adapterObject;