Merge branch 'development' into feature/contracts-monorepo-2

2018-12-04 12:42:28 +01:00
parent 672a4b93ba a1e985a1ca
commit 240a8a50d3
69 changed files with 1752 additions and 84 deletions
--- a/contracts/test-utils/src/types.ts
+++ b/contracts/test-utils/src/types.ts
@@ -86,6 +86,7 @@ export enum ContractName {
    ZRXToken = 'ZRXToken',
    DummyERC20Token = 'DummyERC20Token',
    EtherToken = 'WETH9',
+    DutchAuction = 'DutchAuction',
    AssetProxyOwner = 'AssetProxyOwner',
    AccountLevels = 'AccountLevels',
    EtherDelta = 'EtherDelta',