report errors to the miner on pool connection problems

Author: turboboost55

index.js

@@ -1,6 +1,6 @@
 
 
-global.VERSION = '1.0.6';
+global.VERSION = '1.0.7';
 
 global.logger = logger = require('./lib/log');
 logger.init(process.cwd(), 'log.txt');
@@ -80,6 +80,9 @@ async function init() {
    }).on('workPackage', (params) => {
       // listen for work packages from the stratum pool and make them available to the rpc server
       rpcServer.setWork(params);
+
+   }).on('login', (error) => {
+      rpcServer.poolLoginNotify(error);
    });
 
 }

lib/rpc.js

@@ -24,19 +24,26 @@ module.exports = class RPCServer extends EventEmitter {
       this.lastRPCRequest = Date.now();
       this.activeMiner = true;
       this.poolConnection = false;
+      this.poolError = null;
 
       // create an rpc server
       var server = jayson.server({
 
          getPoolEthAddress: (args, callback) => {
             this.serviceRPCRequest('getPoolEthAddress', () => {
-               callback(null, this.mintingAccount);
+               if (this.poolError) {
+                  callback(this.poolError);
+               } else {
+                  callback(null, this.mintingAccount);
+               }
             });
          },
 
          getMinimumShareDifficulty: async (args, callback) => {
             this.serviceRPCRequest('getMinimumShareDifficulty', () => {
-               if (args[0].toLowerCase() != this.minerEthAddress) {
+               if (this.poolError) {
+                  callback(this.poolError);
+               } else if (args[0].toLowerCase() != this.minerEthAddress) {
                   callback({code: -1, message: 'Invalid minerEthAddresss ' + args[0] + '. Expecting ' + this.minerEthAddress}); 
                } else {
                   callback(null, this.minerVarDiff);
@@ -46,7 +53,9 @@ module.exports = class RPCServer extends EventEmitter {
 
          getMinimumShareTarget: async (args, callback) => {
             this.serviceRPCRequest('getMinimumShareTarget', () => {
-               if (args[0].toLowerCase() != this.minerEthAddress) {
+               if (this.poolError) {
+                  callback(this.poolError);
+               } else if (args[0].toLowerCase() != this.minerEthAddress) {
                   callback({code: -1, message: 'Invalid minerEthAddresss ' + args[0] + '. Expecting ' + this.minerEthAddress}); 
                } else {
                   callback(null, this.minimumShareTarget);
@@ -56,17 +65,25 @@ module.exports = class RPCServer extends EventEmitter {
 
          getChallengeNumber: async (args, callback) => {
             this.serviceRPCRequest('getChallengeNumber', () => {
-               callback(null, this.challengeNumber);
+               if (this.poolError) {
+                  callback(this.poolError);
+               } else {
+                  callback(null, this.challengeNumber);
+               }
             });
          },
 
          submitShare: async (args, callback) => {
             this.serviceRPCRequest('submitShare', () => {
-               // notify interested listeners of a share submit. provide a callback so we can be 
-               // notified if share was accepted (true/false).
-               this.emit('submitShare', args, (res) => {
-                  callback(null, res);
-               })
+               if (this.poolError) {
+                  callback(this.poolError);
+               } else {
+                  // notify interested listeners of a share submit. provide a callback so we can be 
+                  // notified if share was accepted (true/false).
+                  this.emit('submitShare', args, (res) => {
+                     callback(null, res);
+                  })
+               }
             });
          },
 
@@ -131,5 +148,14 @@ module.exports = class RPCServer extends EventEmitter {
       }
    }
 
+
+   poolLoginNotify(error) {
+      if (error) {
+         this.poolError = {code: error[0], message: error[1]};
+      } else {
+         this.poolError = null;
+      }
+   }
+
 }
 

lib/stratum.js

@@ -82,8 +82,9 @@ module.exports = class StratumClient extends EventEmitter {
                   // miner.subscribe response
                   this.subscribed = jsonData.result;
                   if (jsonData.error) {
-                     LogB('Pool login rejected. Reason given:', jsonData.error);
+                     LogB('Pool login rejected. Reason given: ', jsonData.error[1]);
                   }
+                  this.emit('login', jsonData.error);
                   break;
                case 4:
                   // miner.submit response