diff options
| author | Frankie <frankie.diamond@gmail.com> | 2018-01-16 07:25:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 07:25:14 +0800 |
| commit | f18ed8bfd43874065d19bdbf5f5513f5facb9061 (patch) | |
| tree | 07285d554dc9c29033ff0d8c77c63e4168c13938 /package.json | |
| parent | 724197b95f30931e17edaf86c7391687b2922457 (diff) | |
| parent | a18524300a1d95f9e118660115f5284f14a89f61 (diff) | |
| download | tangerine-wallet-browser-f18ed8bfd43874065d19bdbf5f5513f5facb9061.tar tangerine-wallet-browser-f18ed8bfd43874065d19bdbf5f5513f5facb9061.tar.gz tangerine-wallet-browser-f18ed8bfd43874065d19bdbf5f5513f5facb9061.tar.bz2 tangerine-wallet-browser-f18ed8bfd43874065d19bdbf5f5513f5facb9061.tar.lz tangerine-wallet-browser-f18ed8bfd43874065d19bdbf5f5513f5facb9061.tar.xz tangerine-wallet-browser-f18ed8bfd43874065d19bdbf5f5513f5facb9061.tar.zst tangerine-wallet-browser-f18ed8bfd43874065d19bdbf5f5513f5facb9061.zip | |
Merge branch 'master' into open-popup
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/package.json b/package.json index 8b846803b..cd5288689 100644 --- a/package.json +++ b/package.json @@ -72,14 +72,12 @@ "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^2.2.0", "eth-contract-metadata": "^1.1.4", - "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.5", - "eth-json-rpc-infura": "^1.0.2", - "eth-keyring-controller": "^2.1.2", + "eth-json-rpc-infura": "^2.0.5", + "eth-keyring-controller": "^2.1.4", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", - "eth-sig-util": "^1.4.0", - "eth-simple-keyring": "^1.2.0", + "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -152,7 +150,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.4.0", + "web3-provider-engine": "^13.5.0", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, |