diff options
| author | Csaba S <csaba.solya@gmail.com> | 2018-07-21 02:09:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:09:57 +0800 |
| commit | c11dea9afc9f4215529abda11a0d5a7e4fdd10d4 (patch) | |
| tree | 9a21c102490c3a9c751c606008d1e0c10b20cdc2 /package.json | |
| parent | 682d59cfe0114dc987fe5e953e9db4dca5e2b5d7 (diff) | |
| parent | cb045fd8feec88bd631329ab9b3285aeed0f2e97 (diff) | |
| download | tangerine-wallet-browser-c11dea9afc9f4215529abda11a0d5a7e4fdd10d4.tar.gz tangerine-wallet-browser-c11dea9afc9f4215529abda11a0d5a7e4fdd10d4.tar.zst tangerine-wallet-browser-c11dea9afc9f4215529abda11a0d5a7e4fdd10d4.zip | |
Merge branch 'develop' into transaction-notifications
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/package.json b/package.json index a31262174..b7b138d24 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", - "eth-hd-keyring": "^1.2.1", + "eth-hd-keyring": "^2.0.0", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", "eth-method-registry": "^1.0.0", @@ -102,6 +102,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", + "eth-trezor-keyring": "^0.1.0", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -233,11 +234,11 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "^3.1.4", + "eth-keyring-controller": "^4.0.0", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", - "ganache-core": "^2.1.3", + "ganache-core": "^2.1.5", "geckodriver": "^1.11.0", "gh-pages": "^1.2.0", "gifencoder": "^1.1.0", @@ -273,7 +274,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^2.0.0", "nock": "^9.0.14", - "node-sass": "^4.9.0", + "node-sass": "^4.9.1", "nsp": "^3.2.1", "nyc": "^13.0.0", "open": "0.0.5", |