diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-07-08 05:21:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 05:21:43 +0800 |
| commit | d228f46254783885e9762a2f96ecb9c3077c5fb3 (patch) | |
| tree | b0e0fde9f209c3728f7a1e36d3c4417ea7a3852d /package.json | |
| parent | 51ff6d74e884b599f78b5454b33f2bc1a046f0b2 (diff) | |
| parent | 678cfd21755bab430d28a8f0d0fb44a81ecefade (diff) | |
| download | tangerine-wallet-browser-d228f46254783885e9762a2f96ecb9c3077c5fb3.tar tangerine-wallet-browser-d228f46254783885e9762a2f96ecb9c3077c5fb3.tar.gz tangerine-wallet-browser-d228f46254783885e9762a2f96ecb9c3077c5fb3.tar.bz2 tangerine-wallet-browser-d228f46254783885e9762a2f96ecb9c3077c5fb3.tar.lz tangerine-wallet-browser-d228f46254783885e9762a2f96ecb9c3077c5fb3.tar.xz tangerine-wallet-browser-d228f46254783885e9762a2f96ecb9c3077c5fb3.tar.zst tangerine-wallet-browser-d228f46254783885e9762a2f96ecb9c3077c5fb3.zip | |
Merge branch 'master' into nonce-tracker
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/package.json b/package.json index 82792351d..16149f7b7 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.1.1", "eth-simple-keyring": "^1.1.1", - "eth-token-tracker": "^1.0.9", + "eth-token-tracker": "^1.1.2", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", @@ -104,7 +104,7 @@ "qrcode-npm": "0.0.3", "react": "^15.0.2", "react-addons-css-transition-group": "^15.0.2", - "react-dom": "^15.0.2", + "react-dom": "^15.5.4", "react-hyperscript": "^2.2.2", "react-markdown": "^2.3.0", "react-redux": "^4.4.5", @@ -124,9 +124,9 @@ "through2": "^2.0.1", "valid-url": "^1.0.9", "vreme": "^3.0.2", - "web3": "0.18.2", - "web3-provider-engine": "^13.0.3", - "web3-stream-provider": "^2.0.6", + "web3": "0.19.1", + "web3-provider-engine": "^13.1.1", + "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, "devDependencies": { @@ -142,7 +142,6 @@ "brfs": "^1.4.3", "browserify": "^13.0.0", "chai": "^3.5.0", - "clone": "^1.0.2", "deep-freeze-strict": "^1.1.1", "del": "^2.2.0", "envify": "^4.0.0", @@ -174,7 +173,6 @@ "qs": "^6.2.0", "qunit": "^0.9.1", "react-addons-test-utils": "^15.5.1", - "react-dom": "^15.5.4", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", "sinon": "^1.17.3", |