diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-10-13 00:59:28 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-10-13 01:25:19 +0800 |
commit | d0d082d70c1e256aeb70f90fcdc864aeca00aed4 (patch) | |
tree | a487d9bb888eebeba9c68d570cc55a5541384451 /package.json | |
parent | 1cba6543a42561c6691736d58f45e97f4832912b (diff) | |
parent | 29ee33359e818525549b5241adb6f5903a054bba (diff) | |
download | tangerine-wallet-browser-d0d082d70c1e256aeb70f90fcdc864aeca00aed4.tar.gz tangerine-wallet-browser-d0d082d70c1e256aeb70f90fcdc864aeca00aed4.tar.zst tangerine-wallet-browser-d0d082d70c1e256aeb70f90fcdc864aeca00aed4.zip |
Merge branch 'master' into i1340-SynchronousInjection
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/package.json b/package.json index 03d095228..2b7b2056a 100644 --- a/package.json +++ b/package.json @@ -69,12 +69,14 @@ "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^2.2.0", "eth-contract-metadata": "^1.1.4", - "eth-hd-keyring": "^1.1.1", + "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.2", - "eth-keyring-controller": "^2.0.0", + "eth-json-rpc-middleware": "^1.4.3", + "eth-keyring-controller": "^2.1.0", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", - "eth-sig-util": "^1.2.2", + "eth-rpc-client": "^1.1.3", + "eth-sig-util": "^1.4.0", "eth-simple-keyring": "^1.1.1", "eth-token-tracker": "^1.1.4", "ethereumjs-tx": "^1.3.0", @@ -141,7 +143,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.3.1", + "web3-provider-engine": "^13.3.2", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, |