Merge branch '3.0' into feat/3.0/testnet-migrations

2019-10-03 23:04:07 -07:00
parent 650efb95e2 ccf40fd65e
commit ac1063dd68
295 changed files with 68140 additions and 46805 deletions
--- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts
+++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts
@@ -18,7 +18,7 @@ import {
    SupportedProvider,
 } from 'ethereum-types';
 import { BigNumber, classUtils, logUtils, providerUtils } from '@0x/utils';
-import { SimpleContractArtifact } from '@0x/types';
+import { SimpleContractArtifact, EventCallback, IndexedFilterValues } from '@0x/types';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { assert } from '@0x/assert';
 import * as ethers from 'ethers';