aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/background.js4
-rw-r--r--package.json4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index fb2fad54b..472ef5aeb 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -61,8 +61,8 @@ function getState(){
function onRpcRequest(remotePort, payload){
// console.log('MetaMaskPlugin - incoming payload:', payload)
zeroClient.sendAsync(payload, function onPayloadHandled(err, response){
- if (err) throw err
- console.log('MetaMaskPlugin - RPC complete:', payload, '->', response)
+ // provider engine errors are included in response objects
+ if (!payload.isMetamaskInternal) console.log('MetaMaskPlugin - RPC complete:', payload, '->', response)
try {
remotePort.postMessage(response)
} catch (_) {
diff --git a/package.json b/package.json
index ad62c4c02..d323c577c 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,10 @@
"ethereumjs-util": "^1.3.5",
"faux-jax": "git+https://github.com/kumavis/faux-jax.git#c3648de04804f3895c5b4972750cae5b51ddb103",
"inject-css": "^0.1.1",
- "metamask-ui": "^1.3.0",
+ "metamask-ui": "^1.4.0",
"readable-stream": "^2.0.5",
"web3": "^0.15.1",
- "web3-provider-engine": "^6.0.3",
+ "web3-provider-engine": "^7.0.0",
"xtend": "^4.0.1"
},
"devDependencies": {