added miner text

ethereum · Dec 3, 2015 · 1b764b7 · 1b764b7
1 parent 64421b2
commit 1b764b7
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/interface/client/templates/elements/nodeInfo.html b/interface/client/templates/elements/nodeInfo.html
@@ -1,5 +1,11 @@
 <template name="elements_nodeInfo">
     <div class="node-info">
+        {{#if TemplateVar.get "mining"}}
+            <span data-tooltip="Mining" class="simptip-position-left simptip-movable">⛏ {{TemplateVar.get "mining"}} KH/s</span>
+            &nbsp;&nbsp;|&nbsp;&nbsp;
+        {{/if}}
+
+
         {{#if $eq (TemplateVar.get "network") "test"}}
             <span class="orange" style="font-weight: 400;">TEST-NET</span>
             &nbsp;&nbsp;|&nbsp;&nbsp;

diff --git a/interface/client/templates/elements/nodeInfo.js b/interface/client/templates/elements/nodeInfo.js
@@ -16,6 +16,25 @@ var getPeerCount = function(template) {
     });
 };
 
+/**
+Update the mining hashrate
+
+@method getMining
+*/
+var getMining = function(template) {
+    web3.eth.getMining(function(e, res) {
+        if(!e && res) {
+            web3.eth.getHashrate(function(e, res) {
+                if(!e) {
+                    TemplateVar.set(template, 'mining', numeral(res/1000).format('0,0.000'));
+                }
+            });
+        } else {
+            TemplateVar.set(template, 'mining', false);
+        }
+    });
+};
+
 /**
 The main template
 
@@ -79,6 +98,17 @@ Template['elements_nodeInfo'].onCreated(function(){
     this.peerCountIntervalId = setInterval(function() {
         getPeerCount(template);
     }, 1000);
+
+    // CHECK MINING and HASHRATE
+    this.miningIntervalId = null;
+
+    TemplateVar.set('mining', false);
+    getMining(template);
+
+    Meteor.clearInterval(this.miningIntervalId);
+    this.miningIntervalId = setInterval(function() {
+        getMining(template);
+    }, 1000);
 });
 
 

diff --git a/modules/menuItems.js b/modules/menuItems.js
@@ -240,17 +240,21 @@ var menuTempl = function(webviews) {
             label: (global.mining) ? i18n.t('mist.applicationMenu.develop.stopMining') : i18n.t('mist.applicationMenu.develop.startMining'),
             enabled: (global.network === 'test'),
             click: function(){
+                // TODO remove on new RPC
+                if(!global.nodeConnector.socket.writable)
+                    global.nodeConnector.connect();
+
                 if(!global.mining) {
                     global.nodeConnector.send('miner_start', [1], function(e, result){
-                        console.log('miner_start', result);
+                        console.log('miner_start', result, e);
                         if(result === true) {
                             global.mining = !global.mining;
                             createMenu(webviews);
                         }
                     });
                 } else {
                     global.nodeConnector.send('miner_stop', [], function(e, result){
-                        console.log('miner_stop', result);
+                        console.log('miner_stop', result, e);
                         if(result === true) {
                             global.mining = !global.mining;
                             createMenu(webviews);