diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-10-03 06:23:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 06:23:27 +0800 |
| commit | 4b0e6a0a778efa24e6bbca1e9b60171606d46d2f (patch) | |
| tree | b5d338f9a9458a4cc3ff50abc0790823aac4b901 /package.json | |
| parent | e998d528f0af71d1163bc89fe9e81195bb4f5dc3 (diff) | |
| parent | b7c195160238119291ce62b01db1c8f7e4f94568 (diff) | |
| download | tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.gz tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.bz2 tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.lz tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.xz tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.zst tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.zip | |
Merge branch 'master' into RemoveSlackLink
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/package.json b/package.json index 182ae9900..918531f15 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "ui": "npm run test:flat:build:states && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", - "mascara": "node ./mascara/example/server", + "mascara": "METAMASK_DEBUG=true node ./mascara/example/server", "dist": "npm run dist:clear && npm install && gulp dist", "dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect", "test": "npm run lint && npm run test:coverage && npm run test:integration", @@ -53,10 +53,8 @@ "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", - "bip39": "^2.2.0", "bluebird": "^3.5.0", "bn.js": "^4.11.7", - "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", "client-sw-ready-event": "^3.3.0", "clone": "^2.1.1", @@ -69,9 +67,11 @@ "end-of-stream": "^1.1.0", "ensnare": "^1.0.0", "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-json-rpc-filters": "^1.1.0", + "eth-json-rpc-filters": "^1.2.1", + "eth-keyring-controller": "^2.0.0", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.2.2", @@ -80,9 +80,10 @@ "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", + "ethjs-contract": "^0.1.9", "ethjs-ens": "^2.0.0", "ethjs-query": "^0.2.9", - "express": "^4.14.0", + "express": "^4.15.5", "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", "fast-json-patch": "^2.0.4", @@ -90,6 +91,7 @@ "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", "identicon.js": "^2.3.1", "iframe": "^1.0.0", @@ -99,6 +101,7 @@ "json-rpc-engine": "^3.2.0", "json-rpc-middleware-stream": "^1.0.1", "loglevel": "^1.4.1", + "metamascara": "^1.3.1", "metamask-logo": "^2.1.2", "mississippi": "^1.2.0", "mkdirp": "^0.5.1", @@ -138,7 +141,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.2.9", + "web3-provider-engine": "^13.3.1", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, |