Merge pull request #1359 from MetaMask/FixBlockPollingv3.6.1

Fix block polling

2 files changed, 4 insertions, 10 deletions

diff --git a/app/manifest.json b/app/manifest.json
index d5f66173c..3a9b0b29f 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b91b5efe8..2e4bf07e1 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -341,9 +341,7 @@ module.exports = class MetamaskController extends EventEmitter {
         console.error('Error in RPC response:\n', response.error)
       }
       if (request.isMetamaskInternal) return
-      if (global.METAMASK_DEBUG) {
-        console.log(`RPC (${originDomain}):`, request, '->', response)
-      }
+      log.info(`RPC (${originDomain}):`, request, '->', response)
     }
   }
 
@@ -591,9 +589,7 @@ module.exports = class MetamaskController extends EventEmitter {
 
   // Log blocks
   logBlock (block) {
-    if (global.METAMASK_DEBUG) {
-      console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
-    }
+    log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
     this.verifyNetwork()
   }
 
@@ -682,9 +678,7 @@ module.exports = class MetamaskController extends EventEmitter {
         this.setNetworkState('loading')
         return
       }
-      if (global.METAMASK_DEBUG) {
-        console.log('web3.getNetwork returned ' + network)
-      }
+      log.info('web3.getNetwork returned ' + network)
       this.setNetworkState(network)
     })
   }