Merge branch 'v2-prototype' into feature/combinatorial-testing

* v2-prototype:
  Prettier fix
  Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility
  Fix missed merge conflicts
  Fix additional versions and update yarn.lock
  Add OrderWatcherConfig type to 0x.js docs page
  Export OrderWatcherConfig from 0x.js
  Update all package versions to match latest published to NPM
  Update CHANGELOG's with publishes performed on development branch
  Rebase with latest removing PROXY_ID from transfer
  Split transfer impl and AssetProxyMixin
  change @0xproject/types to ethereum-types
  remove mistaken comment
  workaround for TypeScript trailing comma bug
  Document contract_templates

3 files changed, 25 insertions, 74 deletions

diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json
index 7e934ad6e..464a5a13c 100644
--- a/packages/sol-cov/CHANGELOG.json
+++ b/packages/sol-cov/CHANGELOG.json
@@ -1,81 +1,24 @@
 [
     {
-        "version": "0.2.0",
+        "timestamp": 1529397769,
+        "version": "0.1.1",
         "changes": [
             {
-                "note": "Fixed a bug causing RegExp to crash if contract code is longer that 32767 characters",
-                "pr": 675
-            },
-            {
-                "note": "Fixed a bug caused by Geth debug trace depth being 1-indexed",
-                "pr": 675
-            },
-            {
-                "note": "Fixed a bug when the tool crashed on empty traces",
-                "pr": 675
-            },
-            {
-                "note": "Use `BlockchainLifecycle` to support reverts on Geth",
-                "pr": 675
-            },
-            {
-                "note": "Add `ProfilerSubprovider` as a hacky way to profile code using coverage tools",
-                "pr": 675
-            },
-            {
-                "note": "Collect traces from `estimate_gas` calls",
-                "pr": 675
-            },
-            {
-                "note": "Fix a race condition caused by not awaiting the transaction before getting a trace",
-                "pr": 675
-            },
-            {
-                "note": "Add `start`/`stop` functionality to `CoverageSubprovider` and `ProfilerSubprovider`",
-                "pr": 675
-            },
-            {
-                "note": "Skip interface artifacts with a warning instead of failing",
-                "pr": 675
-            },
-            {
-                "note": "Fix solcVersion regex in parameter validation",
-                "pr": 690
-            },
-            {
-                "note": "Fix a bug when in TruffleArtifactsAdapter causing it to throw if compiler.json is not there",
-                "pr": 690
-            },
-            {
-                "note": "HUGE perf improvements",
-                "pr": 690
+                "note": "Dependencies updated"
             }
         ]
     },
     {
-        "timestamp": 1527009134,
         "version": "0.1.0",
         "changes": [
             {
-                "note": "Add artifact adapter as a parameter for CoverageSubprovider. Export AbstractArtifactAdapter",
-                "pr": 589
-            },
-            {
-                "note": "Implement SolCompilerArtifactAdapter and TruffleArtifactAdapter",
-                "pr": 589
-            },
-            {
-                "note": "Properly parse multi-level traces",
-                "pr": 589
-            },
-            {
-                "note": "Add support for solidity libraries",
-                "pr": 589
+                "note": "Incorrect publish that was unpublished"
             }
-        ]
+        ],
+        "timestamp": 1527810075
     },
     {
-        "timestamp": 1527009133,
+        "timestamp": 1527009134,
         "version": "0.0.11",
         "changes": [
             {
diff --git a/packages/sol-cov/CHANGELOG.md b/packages/sol-cov/CHANGELOG.md
index f0312d297..d8f7c5310 100644
--- a/packages/sol-cov/CHANGELOG.md
+++ b/packages/sol-cov/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.1.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.1.0 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.0.11 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.0.10 - _May 4, 2018_
+## v0.0.10 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 1d9d7f94d..39618eacf 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-cov",
-    "version": "0.0.11",
+    "version": "0.1.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -50,12 +50,12 @@
     },
     "homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
     "dependencies": {
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/subproviders": "^0.10.2",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
-        "@0xproject/dev-utils": "^0.4.2",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/subproviders": "^0.10.4",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
+        "@0xproject/dev-utils": "^0.4.4",
         "ethereum-types": "^0.0.1",
         "ethereumjs-util": "^5.1.1",
         "glob": "^7.1.2",
@@ -68,8 +68,8 @@
         "solidity-parser-antlr": "^0.2.12"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/istanbul": "^0.4.30",
         "@types/loglevel": "^1.5.3",
         "@types/mkdirp": "^0.5.1",