aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-09-20 05:37:43 +0800
committerGitHub <noreply@github.com>2017-09-20 05:37:43 +0800
commit9bd55f4897938bfdc363987252be6f5f390ab7a5 (patch)
treeeec464a90b4b7fddc19311a0b2ee76d912996218
parent166bd55a43125796521f7caf97c2e2baf3519b36 (diff)
parent3a3e1511e5cbeab1b94bb4052050c67eb3635ecc (diff)
downloadtangerine-wallet-browser-9bd55f4897938bfdc363987252be6f5f390ab7a5.tar
tangerine-wallet-browser-9bd55f4897938bfdc363987252be6f5f390ab7a5.tar.gz
tangerine-wallet-browser-9bd55f4897938bfdc363987252be6f5f390ab7a5.tar.bz2
tangerine-wallet-browser-9bd55f4897938bfdc363987252be6f5f390ab7a5.tar.lz
tangerine-wallet-browser-9bd55f4897938bfdc363987252be6f5f390ab7a5.tar.xz
tangerine-wallet-browser-9bd55f4897938bfdc363987252be6f5f390ab7a5.tar.zst
tangerine-wallet-browser-9bd55f4897938bfdc363987252be6f5f390ab7a5.zip
Merge pull request #2129 from MetaMask/json-rpc-engine-bumpv3.10.3
Json rpc engine bump
-rw-r--r--CHANGELOG.md1
-rw-r--r--package.json5
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4366db45..3ff062cf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## Current Master
+- Fix bug where metamask-dapp connections are lost on rpc error
- Fix bug that would sometimes display transactions as failed that could be successfully mined.
## 3.10.2 2017-9-18
diff --git a/package.json b/package.json
index d105aa0ad..0d02f1df5 100644
--- a/package.json
+++ b/package.json
@@ -96,8 +96,8 @@
"iframe-stream": "^3.0.0",
"inject-css": "^0.1.1",
"jazzicon": "^1.2.0",
- "json-rpc-engine": "^3.1.0",
- "json-rpc-middleware-stream": "^1.0.0",
+ "json-rpc-engine": "^3.2.0",
+ "json-rpc-middleware-stream": "^1.0.1",
"loglevel": "^1.4.1",
"metamask-logo": "^2.1.2",
"mississippi": "^1.2.0",
@@ -177,7 +177,6 @@
"jsdom": "^11.1.0",
"jsdom-global": "^3.0.2",
"jshint-stylish": "~2.2.1",
- "json-rpc-engine": "^3.0.1",
"karma": "^1.7.1",
"karma-chrome-launcher": "^2.2.0",
"karma-cli": "^1.0.1",