diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-28 06:03:57 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-28 06:03:57 +0800 |
| commit | 32867c9a07fc7c833ff8491ec4feea8c783e7f4d (patch) | |
| tree | 69be48f0ca710eb70221a542f662d283e9a8215b /packages/0x.js/src/contract_wrappers/contract_wrapper.ts | |
| parent | cf0a8b2d0503f9d08ac789024d44b196613ecdc3 (diff) | |
| download | dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.gz dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.bz2 dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.lz dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.xz dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.zst dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.zip | |
Fix merge conflicts
Diffstat (limited to 'packages/0x.js/src/contract_wrappers/contract_wrapper.ts')
| -rw-r--r-- | packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts index 395d974b2..8c92931b4 100644 --- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts @@ -153,7 +153,7 @@ export class ContractWrapper { // We need to coerce to Block type cause Web3.Block includes types for mempool blocks if (!_.isUndefined(this._blockAndLogStreamer)) { // If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined - this._blockAndLogStreamer.reconcileNewBlock(latestBlock as any as Block); + await this._blockAndLogStreamer.reconcileNewBlock(latestBlock as any as Block); } } catch (err) { const filterTokens = _.keys(this._filterCallbacks); |