merge development

18 files changed, 29 insertions, 34 deletions

diff --git a/contracts/TESTING.md b/contracts/TESTING.md
index 750b3c62c..3e6888c04 100644
--- a/contracts/TESTING.md
+++ b/contracts/TESTING.md
@@ -20,7 +20,7 @@ TEST_PROVIDER=geth yarn test
 
 ## Code coverage
 
-In order to see the Solidity code coverage output generated by `@0x/sol-cov`, run:
+In order to see the Solidity code coverage output generated by `@0x/sol-coverage`, run:
 
 ```
 yarn test:coverage
diff --git a/contracts/examples/package.json b/contracts/examples/package.json
index b556d72d8..d04b5fc44 100644
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -37,7 +37,6 @@
         "@0x/contracts-test-utils": "^1.0.3",
         "@0x/dev-utils": "^1.0.22",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 05c066fc8..99b5b35a8 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -49,7 +49,6 @@
         "@0x/contracts-test-utils": "^1.0.3",
         "@0x/dev-utils": "^1.0.22",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",
diff --git a/contracts/interfaces/README.md b/contracts/interfaces/README.md
index b7d519abb..81dd4c3ac 100644
--- a/contracts/interfaces/README.md
+++ b/contracts/interfaces/README.md
@@ -6,8 +6,8 @@ Smart contract interfaces of the 0x protocol.
 
 Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [protocol](./contracts/protocol)
-    *   This directory contains the contract interfaces that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+-   [protocol](./contracts/protocol)
+    -   This directory contains the contract interfaces that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
 
 ## Bug bounty
 
diff --git a/contracts/libs/README.md b/contracts/libs/README.md
index 66eedf6be..cfa631679 100644
--- a/contracts/libs/README.md
+++ b/contracts/libs/README.md
@@ -6,10 +6,10 @@ Smart contracts libs used in the 0x protocol.
 
 Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [libs](./contracts/protocol)
-    *   This directory contains the libs.
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [libs](./contracts/protocol)
+    -   This directory contains the libs.
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Contributing
 
diff --git a/contracts/libs/package.json b/contracts/libs/package.json
index ed9d408ff..9d28cc038 100644
--- a/contracts/libs/package.json
+++ b/contracts/libs/package.json
@@ -48,7 +48,6 @@
         "@0x/contracts-test-utils": "^1.0.3",
         "@0x/dev-utils": "^1.0.22",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",
diff --git a/contracts/multisig/README.md b/contracts/multisig/README.md
index 93db63b5b..e29f46251 100644
--- a/contracts/multisig/README.md
+++ b/contracts/multisig/README.md
@@ -6,10 +6,10 @@ MultiSig smart contracts
 
 Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [multisig](./contracts/multisig)
-    *   This directory contains the [Gnosis MultiSigWallet](https://github.com/gnosis/MultiSigWallet) and a custom extension that adds a timelock to transactions within the MultiSigWallet.
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [multisig](./contracts/multisig)
+    -   This directory contains the [Gnosis MultiSigWallet](https://github.com/gnosis/MultiSigWallet) and a custom extension that adds a timelock to transactions within the MultiSigWallet.
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Contributing
 
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index 63b6de6f2..e0bbc001d 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -48,7 +48,6 @@
         "@0x/contracts-test-utils": "^1.0.3",
         "@0x/dev-utils": "^1.0.22",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",
diff --git a/contracts/protocol/README.md b/contracts/protocol/README.md
index 5fc9c0a89..dc1f32c98 100644
--- a/contracts/protocol/README.md
+++ b/contracts/protocol/README.md
@@ -6,10 +6,10 @@ Smart contracts that implement the 0x protocol. Addresses of the deployed contra
 
 Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [protocol](./contracts/protocol)
-    *   This directory contains the contracts that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [protocol](./contracts/protocol)
+    -   This directory contains the contracts that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Bug bounty
 
diff --git a/contracts/protocol/package.json b/contracts/protocol/package.json
index 02e1934d7..7d49dfbe8 100644
--- a/contracts/protocol/package.json
+++ b/contracts/protocol/package.json
@@ -47,7 +47,6 @@
         "@0x/abi-gen": "^1.0.20",
         "@0x/dev-utils": "^1.0.22",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",
diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json
index 852985636..2653fc0e4 100644
--- a/contracts/test-utils/package.json
+++ b/contracts/test-utils/package.json
@@ -40,11 +40,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
+        "@0x/sol-coverage": "^1.0.0",
+        "@0x/sol-profiler": "^1.0.0",
+        "@0x/sol-trace": "^1.0.0",
         "@0x/abi-gen": "^1.0.20",
         "@0x/dev-utils": "^1.0.22",
         "@0x/order-utils": "^3.1.0",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@0x/types": "^1.5.0",
diff --git a/contracts/test-utils/src/coverage.ts b/contracts/test-utils/src/coverage.ts
index 5becfa1b6..f82288eec 100644
--- a/contracts/test-utils/src/coverage.ts
+++ b/contracts/test-utils/src/coverage.ts
@@ -1,5 +1,5 @@
 import { devConstants } from '@0x/dev-utils';
-import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
+import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-coverage';
 import * as _ from 'lodash';
 
 let coverageSubprovider: CoverageSubprovider;
diff --git a/contracts/test-utils/src/profiler.ts b/contracts/test-utils/src/profiler.ts
index 2c7c1d66c..7f51c384f 100644
--- a/contracts/test-utils/src/profiler.ts
+++ b/contracts/test-utils/src/profiler.ts
@@ -1,5 +1,5 @@
 import { devConstants } from '@0x/dev-utils';
-import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
+import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-profiler';
 import * as _ from 'lodash';
 
 let profilerSubprovider: ProfilerSubprovider;
diff --git a/contracts/test-utils/src/revert_trace.ts b/contracts/test-utils/src/revert_trace.ts
index 3f74fd28b..3a5778859 100644
--- a/contracts/test-utils/src/revert_trace.ts
+++ b/contracts/test-utils/src/revert_trace.ts
@@ -1,5 +1,5 @@
 import { devConstants } from '@0x/dev-utils';
-import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
+import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-trace';
 import * as _ from 'lodash';
 
 let revertTraceSubprovider: RevertTraceSubprovider;
diff --git a/contracts/tokens/README.md b/contracts/tokens/README.md
index 9c4106d41..2d1db92f0 100644
--- a/contracts/tokens/README.md
+++ b/contracts/tokens/README.md
@@ -6,10 +6,10 @@ Token smart contracts that are used in the 0x protocol. Addresses of the deploye
 
 Token contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [tokens](./contracts/tokens)
-    *   This directory contains implementations of different tokens and token standards, including [wETH](https://weth.io/), ZRX, [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md), and [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md).
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [tokens](./contracts/tokens)
+    -   This directory contains implementations of different tokens and token standards, including [wETH](https://weth.io/), ZRX, [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md), and [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md).
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Bug bounty
 
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index 2fc5013a0..31bf8f7cc 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -48,7 +48,6 @@
         "@0x/contracts-test-utils": "^1.0.3",
         "@0x/dev-utils": "^1.0.22",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",
diff --git a/contracts/utils/README.md b/contracts/utils/README.md
index e7c7b49ff..2f872ddb5 100644
--- a/contracts/utils/README.md
+++ b/contracts/utils/README.md
@@ -6,10 +6,10 @@ Smart contracts utils used in the 0x protocol.
 
 Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [utils](./contracts/utils)
-    *   This directory contains libraries and utils.
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [utils](./contracts/utils)
+    -   This directory contains libraries and utils.
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Contributing
 
diff --git a/contracts/utils/package.json b/contracts/utils/package.json
index 58a7b3a71..732556f34 100644
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -48,7 +48,6 @@
         "@0x/contracts-test-utils": "^1.0.3",
         "@0x/dev-utils": "^1.0.22",
         "@0x/sol-compiler": "^2.0.0",
-        "@0x/sol-cov": "^2.1.17",
         "@0x/subproviders": "^2.1.9",
         "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",