Merge branch 'development' into fix/broken-validator-signatures

packages/0x.js/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1565296576,
+        "version": "6.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1564604963,
+        "version": "6.0.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "6.0.13",
         "changes": [

packages/0x.js/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v6.0.15 - _August 8, 2019_
+
+    * Dependencies updated
+
+## v6.0.14 - _July 31, 2019_
+
+    * Dependencies updated
+
 ## v6.0.13 - _July 24, 2019_
 
     * re-export new ethereum-types type, TupleDataItem (#1919)

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "6.0.13",
+    "version": "6.0.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -43,10 +43,10 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0x/abi-gen-wrappers": "^5.0.3",
-        "@0x/contract-addresses": "^3.0.2",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/migrations": "^4.1.10",
+        "@0x/abi-gen-wrappers": "^5.2.0",
+        "@0x/contract-addresses": "^3.0.3",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/migrations": "^4.2.0",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -73,16 +73,17 @@
         "webpack": "^4.20.2"
     },
     "dependencies": {
-        "@0x/assert": "^2.1.1",
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contract-wrappers": "^9.1.8",
-        "@0x/order-utils": "^8.2.3",
-        "@0x/order-watcher": "^4.0.15",
-        "@0x/subproviders": "^4.1.2",
+        "@0x/assert": "^2.1.3",
+        "@0x/asset-swapper": "^1.0.1",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contract-wrappers": "9.1.7",
+        "@0x/order-utils": "^8.2.5",
+        "@0x/order-watcher": "^4.0.17",
+        "@0x/subproviders": "^5.0.1",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "@types/web3-provider-engine": "^14.0.0",
         "ethereum-types": "^2.1.4",
         "ethers": "~4.0.4",

packages/0x.js/src/index.ts

@@ -40,6 +40,13 @@ export {
 } from '@0x/contract-wrappers';
 
 export {
+    DutchAuctionContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
+    ExchangeContract,
+    ForwarderContract,
+    OrderValidatorContract,
+    WETH9Contract,
     WETH9Events,
     WETH9WithdrawalEventArgs,
     WETH9ApprovalEventArgs,
@@ -102,16 +109,13 @@ export {
     ObjectMap,
     OrderRelevantState,
     Stats,
-    DutchAuctionDetails,
     ZeroExTransaction,
     SignedZeroExTransaction,
     ValidatorSignature,
 } from '@0x/types';
 
 export {
-    BlockParamLiteral,
     ContractAbi,
-    BlockParam,
     LogWithDecodedArgs,
     ContractEventArg,
     SupportedProvider,