diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-01-16 08:15:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 08:15:50 +0800 |
| commit | 0121892141ac4e81b388a3df579399a2c6337039 (patch) | |
| tree | 77ecba210f25c6b49b9dd170e64765fdcbec791b /package.json | |
| parent | 23a928bc9d6ebc0a7baf4a9e0800453cce87f9cc (diff) | |
| parent | a18524300a1d95f9e118660115f5284f14a89f61 (diff) | |
| download | tangerine-wallet-browser-0121892141ac4e81b388a3df579399a2c6337039.tar tangerine-wallet-browser-0121892141ac4e81b388a3df579399a2c6337039.tar.gz tangerine-wallet-browser-0121892141ac4e81b388a3df579399a2c6337039.tar.bz2 tangerine-wallet-browser-0121892141ac4e81b388a3df579399a2c6337039.tar.lz tangerine-wallet-browser-0121892141ac4e81b388a3df579399a2c6337039.tar.xz tangerine-wallet-browser-0121892141ac4e81b388a3df579399a2c6337039.tar.zst tangerine-wallet-browser-0121892141ac4e81b388a3df579399a2c6337039.zip | |
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/package.json b/package.json index 1d054b2ec..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", @@ -93,8 +91,6 @@ "extensionizer": "^1.0.0", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", - "gulp": "github:gulpjs/gulp#4.0", - "gulp-eslint": "^4.0.0", "hat": "0.0.3", "human-standard-token-abi": "^1.0.2", "idb-global": "^2.1.0", @@ -154,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" }, @@ -190,6 +186,7 @@ "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", "gulp-zip": "^4.0.0", + "gulp-eslint": "^4.0.0", "isomorphic-fetch": "^2.2.1", "jsdom": "^11.1.0", "jsdom-global": "^3.0.2", |