From 6da367c5879d23a44ae65cb788efdc1a9b5e3e64 Mon Sep 17 00:00:00 2001
From: Alexander Blair <alex@snipanet.com>
Date: Tue, 7 Mar 2017 17:16:04 -0800
Subject: [PATCH] Update with more debug states

---
 debug_scripts/socket_io.html |  7 +++++--
 lib/api.js                   |  3 ++-
 lib/worker.js                | 10 ++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debug_scripts/socket_io.html b/debug_scripts/socket_io.html
index 4d7bba9..28879e8 100644
--- a/debug_scripts/socket_io.html
+++ b/debug_scripts/socket_io.html
@@ -5,11 +5,14 @@
     var socket = io.connect('https://api.xmrpool.net/');
 
     // let's assume that the client page, once rendered, knows what room it wants to join
-    var room = "pool_stats";
 
     socket.on('connect', function() {
         // Connected, let's sign-up for to receive messages for this room
-        socket.emit('room', room);
+        socket.emit('room', "pool_stats");
+        socket.emit('room', "pool_stats_pplns");
+        socket.emit('room', "pool_stats_solo");
+        socket.emit('room', "network_block_info");
+        socket.emit('room', "address_stats_46XWBqE1iwsVxSDP1qDrxhE1XvsZV6eALG5LwnoMdjbT4GPdy2bZTb99kagzxp2MMjUamTYZ4WgvZdFadvMimTjvR6Gv8hL")
     });
 
     socket.on('message', function(data) {
diff --git a/lib/api.js b/lib/api.js
index 41fb2e9..3e2aec9 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -117,7 +117,7 @@ sock.on('message', function(topic, message) {
             });
             break;
         case 'network_block_info':
-            io.sockets.in('block_update').emit('message', JSON.stringify(global.database.getCache('networkBlockInfo')));
+            io.sockets.in('block_update').emit('message', message);
             break;
         case 'pool_stats':
             if (message === 'global'){
@@ -145,6 +145,7 @@ sock.on('message', function(topic, message) {
                     case 'default':
                         io.sockets.in('pool_stats_' + message).emit('message', JSON.stringify({'error': 'Invalid pool type'}));
                 }
+                localCache.poolType = pool_type;
                 delete(localCache.minerHistory);
                 delete(localCache.hashHistory);
                 io.sockets.in('pool_stats_' + message).emit('message', JSON.stringify({pool_statistics: localCache}));
diff --git a/lib/worker.js b/lib/worker.js
index b329937..71430f8 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -177,7 +177,7 @@ function updateShareStats() {
                     if (globalMinerList.indexOf(miner) === -1) {
                         globalMinerList.push(miner);
                     }
-                    if (miner.indexOf('-') === -1){
+                    if (miner.indexOf('_') === -1){
                         activeAddresses.push(miner);
                     }
                     let cachedData = global.database.getCache(miner);
@@ -440,7 +440,13 @@ function updateBlockHeader() {
                 value: body.result.block_header.reward,
                 ts: body.result.block_header.timestamp
             });
-            sock.send(['network_block_info', 'complete']);
+            sock.send(['network_block_info', JSON.stringify({
+                difficulty: body.result.block_header.difficulty,
+                hash: body.result.block_header.hash,
+                height: body.result.block_header.height,
+                value: body.result.block_header.reward,
+                ts: body.result.block_header.timestamp
+            })]);
         } else {
             console.error("GetLastBlockHeader Error during block header update");
         }