diff options
| author | Leonid <logvinov.leon@gmail.com> | 2017-06-15 23:59:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 23:59:13 +0800 |
| commit | f2d08ce3d99eb6c399b8328615e3d24be63115b6 (patch) | |
| tree | 106a10732e18abbfc9139b31b8627dbef96b7283 /src/types.ts | |
| parent | 76d6e6a7481a69c1c0100a90f30d5d28ec471e84 (diff) | |
| parent | 5932ebb52a4421ab56c9b855f29bc26349e2ebd0 (diff) | |
| download | dexon-sol-tools-f2d08ce3d99eb6c399b8328615e3d24be63115b6.tar dexon-sol-tools-f2d08ce3d99eb6c399b8328615e3d24be63115b6.tar.gz dexon-sol-tools-f2d08ce3d99eb6c399b8328615e3d24be63115b6.tar.bz2 dexon-sol-tools-f2d08ce3d99eb6c399b8328615e3d24be63115b6.tar.lz dexon-sol-tools-f2d08ce3d99eb6c399b8328615e3d24be63115b6.tar.xz dexon-sol-tools-f2d08ce3d99eb6c399b8328615e3d24be63115b6.tar.zst dexon-sol-tools-f2d08ce3d99eb6c399b8328615e3d24be63115b6.zip | |
Merge branch 'master' into event-types
Diffstat (limited to 'src/types.ts')
| -rw-r--r-- | src/types.ts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/types.ts b/src/types.ts index 742ac71ff..f15e05d1a 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,5 @@ import * as _ from 'lodash'; +import * as Web3 from 'web3'; // Utility function to create a K:V from a list of strings // Adapted from: https://basarat.gitbooks.io/typescript/content/docs/types/literal-types.html @@ -309,3 +310,9 @@ export interface ContractEventEmitter { watch: (eventCallback: EventCallback) => void; stopWatchingAsync: () => Promise<void>; } +/** + * We re-export the `Web3.Provider` type specified in the Web3 Typescript typings + * since it is the type of the `provider` argument to the `ZeroEx` constructor. + * It is however a `Web3` library type, not a native `0x.js` type. + */ +export type Web3Provider = Web3.Provider; |