diff options
Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController
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 8526455e7..c3d086194 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,8 @@ "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.2.2", - "eth-token-tracker": "^1.1.3", + "eth-simple-keyring": "^1.1.1", + "eth-token-tracker": "^1.1.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", @@ -193,7 +194,7 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", - "sinon": "^3.2.0", + "sinon": "^4.0.0", "tape": "^4.5.1", "testem": "^1.10.3", "uglifyify": "^4.0.2", |