Merge branch 'v2-prototype' into update-lerna

* v2-prototype: (48 commits)
  Update CHANGELOG
  Rename call data schema id to CallData. Check for TypedArray when hashing data in order-utils crypto
  Fix broken links in sol-cov documentation
  Fix 0x.js ts warnings
  Update yarn.lock
  Fix 0x.js ts warnings
  Fix 0x.js tests on CI
  Fix a bad merge
  Update package versions
  Merge
  Update changelogs
  Add a test for ERC721 Allowance
  Use allowance instead of approval for all in fill-scenarios
  Upgrade sha3 to 1.2.2 to work with node v10
  Check if the token doesn't exist before minting in fill scenarios
  Make downlevelIteration a global config
  Fix tests descriptions
  DRY up the code in order-watcher collision-resistant abi decoder
  Await transactions in fillScenarios
  Rename decodeAssetData to decodeAssetDataOrThrow
  ...

4 files changed, 29 insertions, 13 deletions

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 4bbefbda4..27dafe4ca 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -44,6 +44,15 @@
         ]
     },
     {
+        "timestamp": 1531919263,
+        "version": "0.38.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1531149657,
         "version": "0.38.5",
         "changes": [
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 00048f610..f38529715 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.38.6 - _July 18, 2018_
+
+    * Dependencies updated
+
 ## v0.38.5 - _July 9, 2018_
 
     * Dependencies updated
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 502a346e4..538eafd59 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "0.38.5",
+    "version": "0.38.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -70,9 +70,9 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.3",
-        "@0xproject/dev-utils": "^0.4.5",
-        "@0xproject/migrations": "^0.0.9",
+        "@0xproject/abi-gen": "^0.3.4",
+        "@0xproject/dev-utils": "^0.4.6",
+        "@0xproject/migrations": "^0.0.10",
         "@0xproject/monorepo-scripts": "^0.2.2",
         "@0xproject/tslint-config": "^0.4.21",
         "@types/lodash": "4.14.104",
@@ -100,16 +100,16 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.13",
-        "@0xproject/base-contract": "^0.3.5",
-        "@0xproject/contract-wrappers": "^0.1.0",
+        "@0xproject/assert": "^0.2.14",
+        "@0xproject/base-contract": "^0.3.6",
+        "@0xproject/contract-wrappers": "^0.1.1",
         "@0xproject/order-utils": "^1.0.0",
-        "@0xproject/sol-compiler": "^0.5.3",
-        "@0xproject/subproviders": "^0.10.5",
+        "@0xproject/sol-compiler": "^0.5.4",
+        "@0xproject/subproviders": "^0.10.6",
         "@0xproject/types": "^1.0.0",
-        "@0xproject/typescript-typings": "^0.4.2",
-        "@0xproject/utils": "^0.7.2",
-        "@0xproject/web3-wrapper": "^0.7.2",
+        "@0xproject/typescript-typings": "^0.4.3",
+        "@0xproject/utils": "^0.7.3",
+        "@0xproject/web3-wrapper": "^0.7.3",
         "ethereum-types": "^0.0.2",
         "ethers": "3.0.22",
         "lodash": "^4.17.4"
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 385ba76b5..7c06a53af 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -17,7 +17,10 @@ import {
     MessagePrefixOpts,
     orderHashUtils,
 } from '@0xproject/order-utils';
-import { ECSignature, Order, SignedOrder } from '@0xproject/types';
+// HACK: Since we export assetDataUtils from ZeroEx and it has AssetProxyId, ERC20AssetData and ERC721AssetData
+// in it's public interface, we need to import these types here.
+// tslint:disable-next-line:no-unused-variable
+import { AssetProxyId, ECSignature, ERC20AssetData, ERC721AssetData, Order, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';