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 /src/globals.d.ts | |
| 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 'src/globals.d.ts')
| -rw-r--r-- | src/globals.d.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/globals.d.ts b/src/globals.d.ts index 1ef70d679..9230ab02d 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -1,5 +1,6 @@ /// <reference types='chai-typescript-typings' /> /// <reference types='chai-as-promised-typescript-typings' /> +declare module 'web3_beta'; declare module 'chai-bignumber'; declare module 'dirty-chai'; declare module 'request-promise-native'; |