diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-08-31 01:47:14 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-08-31 01:47:14 +0800 |
| commit | 4620c1c818e6d54741b262e2100d2731dae16dda (patch) | |
| tree | 2bb1e842a02780ec009995e1481997895885ff7b /package.json | |
| parent | 4370e19880966cf00726a6fae41cfaa5f751e881 (diff) | |
| parent | 5f44b5f7111873a3958050503fff0ed098b65b04 (diff) | |
| download | dexon-sol-tools-4620c1c818e6d54741b262e2100d2731dae16dda.tar dexon-sol-tools-4620c1c818e6d54741b262e2100d2731dae16dda.tar.gz dexon-sol-tools-4620c1c818e6d54741b262e2100d2731dae16dda.tar.bz2 dexon-sol-tools-4620c1c818e6d54741b262e2100d2731dae16dda.tar.lz dexon-sol-tools-4620c1c818e6d54741b262e2100d2731dae16dda.tar.xz dexon-sol-tools-4620c1c818e6d54741b262e2100d2731dae16dda.tar.zst dexon-sol-tools-4620c1c818e6d54741b262e2100d2731dae16dda.zip | |
Merge branch 'development' of github.com:0xProject/0x.js into development
* 'development' of github.com:0xProject/0x.js:
Improve the comment
Add assert.isWeb3Provider
Use more concise dep pointing
Don't create whole web3 object in beta tests
Improve the comment
Add tests for web3@1.0
Use zeroEx.getAvailableAddressesAsync instead of web3.eth.getAccounts
Add web3@1.0 to web3Factory
Support web3@1.0 providers
Define web3@1.0 types ;)
Install web3@1.0.0 as web3_beta
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json index 0806b2e87..96ad236ca 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "^0.0.5", "typescript": "^2.4.1", + "web3_beta": "ethereum/web3.js#1.0", "web3-provider-engine": "^13.0.1", "web3-typescript-typings": "^0.3.2", "webpack": "^3.1.0" |