diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-05-24 15:18:40 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-24 15:18:40 +0800 |
commit | 6be1aa82c00c85e5c839de4cfb781088d229160c (patch) | |
tree | 4ade3448b5130a5f58a19f7fcebff049eb33e065 /package.json | |
parent | e55329d28b61b2d1066cf794a2099a18a94be7a4 (diff) | |
parent | e8288ad4bfaa5b65b23f0a03d0c036457a24893f (diff) | |
download | tangerine-wallet-browser-6be1aa82c00c85e5c839de4cfb781088d229160c.tar tangerine-wallet-browser-6be1aa82c00c85e5c839de4cfb781088d229160c.tar.gz tangerine-wallet-browser-6be1aa82c00c85e5c839de4cfb781088d229160c.tar.bz2 tangerine-wallet-browser-6be1aa82c00c85e5c839de4cfb781088d229160c.tar.lz tangerine-wallet-browser-6be1aa82c00c85e5c839de4cfb781088d229160c.tar.xz tangerine-wallet-browser-6be1aa82c00c85e5c839de4cfb781088d229160c.tar.zst tangerine-wallet-browser-6be1aa82c00c85e5c839de4cfb781088d229160c.zip |
Merge branch 'master' into Version-3.7.1
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index 14ddd2886..6b6996d9d 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", - "ethjs-ens": "^1.0.2", + "ethjs-ens": "^2.0.0", "express": "^4.14.0", "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", @@ -87,6 +87,7 @@ "mississippi": "^1.2.0", "mkdirp": "^0.5.1", "multiplex": "^6.7.0", + "number-to-bn": "^1.7.0", "obs-store": "^2.3.1", "once": "^1.3.3", "ping-pong-stream": "^1.0.0", @@ -121,7 +122,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "0.18.2", - "web3-provider-engine": "^12.0.6", + "web3-provider-engine": "^12.1.0", "web3-stream-provider": "^2.0.6", "xtend": "^4.0.1" }, |