aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/metamask-controller.js12
-rw-r--r--package.json2
4 files changed, 8 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd71a0339..517a1830b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,10 @@
## Current Master
+## 3.6.1 2017-4-25
+
- Fix bug where error was reported in debugger console when Chrome opened a new window.
+- Fix bug where block-tracker could stop polling for new blocks.
## 3.6.0 2017-4-25
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)
})
}
diff --git a/package.json b/package.json
index 2e7887e0c..6e83b3560 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "0.18.2",
- "web3-provider-engine": "^12.0.2",
+ "web3-provider-engine": "^12.0.3",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},