Merge development

4 files changed, 48 insertions, 43 deletions

diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index afd523f88..ad79000e3 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "2.4.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "2.4.0",
         "changes": [
             {
@@ -13,8 +22,7 @@
         "version": "2.3.0",
         "changes": [
             {
-                "note":
-                    "Added a WebSocket interface to OrderWatcher so that it can be used by a client written in any language",
+                "note": "Added a WebSocket interface to OrderWatcher so that it can be used by a client written in any language",
                 "pr": 1427
             }
         ]
@@ -59,8 +67,7 @@
         "version": "2.2.4",
         "changes": [
             {
-                "note":
-                    "Fix the bug when order watcher was throwing an error on order removal when maker token was ZRX",
+                "note": "Fix the bug when order watcher was throwing an error on order removal when maker token was ZRX",
                 "pr": 1259
             }
         ],
@@ -74,8 +81,7 @@
                 "pr": 1227
             },
             {
-                "note":
-                    "Fix the bug when order watcher was trying to convert undefined to an object in case of CancelUpTo event"
+                "note": "Fix the bug when order watcher was trying to convert undefined to an object in case of CancelUpTo event"
             }
         ],
         "timestamp": 1542134075
@@ -106,8 +112,7 @@
                 "pr": 1118
             },
             {
-                "note":
-                    "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers. Constructor has a new optional `contractAddresses` parameter.",
+                "note": "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers. Constructor has a new optional `contractAddresses` parameter.",
                 "pr": 1105
             }
         ],
@@ -136,18 +141,15 @@
         "version": "2.0.0",
         "changes": [
             {
-                "note":
-                    "Fixes dropped events issue by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
+                "note": "Fixes dropped events issue by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
                 "pr": 1080
             },
             {
-                "note":
-                    "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
+                "note": "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
                 "pr": 1080
             },
             {
-                "note":
-                    "Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction.",
+                "note": "Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction.",
                 "pr": 1087
             }
         ],
@@ -211,8 +213,7 @@
         "version": "1.0.1-rc.4",
         "changes": [
             {
-                "note":
-                    "Export types: `ExchangeContractErrs`, `OrderRelevantState`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload`",
+                "note": "Export types: `ExchangeContractErrs`, `OrderRelevantState`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload`",
                 "pr": 924
             },
             {
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index 600b9fa6f..84d3f303a 100644
--- a/packages/order-watcher/CHANGELOG.md
+++ b/packages/order-watcher/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.4.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v2.4.0 - _January 9, 2019_
 
     * Add support for `MultiAssetProxy` (#1363)
diff --git a/packages/order-watcher/README.md b/packages/order-watcher/README.md
index 385fe4715..a841775b6 100644
--- a/packages/order-watcher/README.md
+++ b/packages/order-watcher/README.md
@@ -36,7 +36,7 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
 **Environmental Variables**
 Several environmental variables can be set to configure the server:
 
-*   `ORDER_WATCHER_HTTP_PORT` specifies the port that the http server will listen on
+-   `ORDER_WATCHER_HTTP_PORT` specifies the port that the http server will listen on
     and accept connections from. When this is not set, we default to 8080.
 
 **Requests**
@@ -58,10 +58,10 @@ wsClient = create_connection("ws://127.0.0.1:8080")
 
 With the connection established, you prepare the payload for your request. The payload is a json object with a format established by the [JSON RPC specification](https://www.jsonrpc.org/specification):
 
-*   `id`: All requests require you to specify a numerical `id`. When the server responds to the request, the response will have the same `id` as the one supplied with your request.
-*   `jsonrpc`: This is always the string `'2.0'`.
-*   `method`: This specifies the OrderWatcher method you want to call. I.e., `'ADD_ORDER'`, `'REMOVE_ORDER'` or `'GET_STATS'`.
-*   `params`: These contain the parameters needed by OrderWatcher to execute the method you called. For `ADD_ORDER`, provide `{ signedOrder: <your signedOrder> }`. For `REMOVE_ORDER`, provide `{ orderHash: <your orderHash> }`. For `GET_STATS`, no parameters are needed, so you may leave this empty.
+-   `id`: All requests require you to specify a numerical `id`. When the server responds to the request, the response will have the same `id` as the one supplied with your request.
+-   `jsonrpc`: This is always the string `'2.0'`.
+-   `method`: This specifies the OrderWatcher method you want to call. I.e., `'ADD_ORDER'`, `'REMOVE_ORDER'` or `'GET_STATS'`.
+-   `params`: These contain the parameters needed by OrderWatcher to execute the method you called. For `ADD_ORDER`, provide `{ signedOrder: <your signedOrder> }`. For `REMOVE_ORDER`, provide `{ orderHash: <your orderHash> }`. For `GET_STATS`, no parameters are needed, so you may leave this empty.
 
 Next, convert the payload to a string and send it through the connection.
 In Javascript:
@@ -92,11 +92,11 @@ wsClient.send(json.dumps(remove_order_payload));
 **Response**
 The server responds to all requests in a similar format. In the data field, you'll find another object containing the following fields:
 
-*   `id`: The id corresponding to the request that the server is responding to. `UPDATE` responses are not based on any requests so the `id` field is omitted`.
-*   `jsonrpc`: Always `'2.0'`.
-*   `method`: The method the server is responding to. Eg. `ADD_ORDER`. When order states change the server may also initiate a response. In this case, method will be listed as `UPDATE`.
-*   `result`: This field varies based on the method. `UPDATE` responses contain the new order state. `GET_STATS` responses contain the current order count. When there are errors, this field is omitted.
-*   `error`: When there is an error executing a request, the [JSON RPC](https://www.jsonrpc.org/specification) error object is listed here. When the server responds successfully, this field is omitted.
+-   `id`: The id corresponding to the request that the server is responding to. `UPDATE` responses are not based on any requests so the `id` field is omitted`.
+-   `jsonrpc`: Always `'2.0'`.
+-   `method`: The method the server is responding to. Eg. `ADD_ORDER`. When order states change the server may also initiate a response. In this case, method will be listed as `UPDATE`.
+-   `result`: This field varies based on the method. `UPDATE` responses contain the new order state. `GET_STATS` responses contain the current order count. When there are errors, this field is omitted.
+-   `error`: When there is an error executing a request, the [JSON RPC](https://www.jsonrpc.org/specification) error object is listed here. When the server responds successfully, this field is omitted.
 
 In Javascript, the responses can be parsed using the `onmessage` callback:
 
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 5919759dd..06bb30001 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/order-watcher",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "description": "An order watcher daemon that watches for order validity",
     "keywords": [
         "0x",
@@ -33,10 +33,10 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/migrations": "^2.3.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/migrations": "^2.3.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bintrees": "^1.0.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -58,21 +58,21 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/abi-gen-wrappers": "^2.1.0",
-        "@0x/assert": "^1.0.21",
-        "@0x/base-contract": "^3.0.11",
+        "@0x/abi-gen-wrappers": "^2.1.1",
+        "@0x/assert": "^1.0.22",
+        "@0x/base-contract": "^3.0.12",
         "@0x/contract-addresses": "^2.1.0",
         "@0x/contract-artifacts": "^1.2.0",
-        "@0x/contract-wrappers": "^4.2.0",
-        "@0x/fill-scenarios": "^1.1.0",
-        "@0x/json-schemas": "^2.1.5",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/contract-wrappers": "^4.2.1",
+        "@0x/fill-scenarios": "^1.1.1",
+        "@0x/json-schemas": "^2.1.6",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "bintrees": "^1.0.2",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-blockstream": "6.0.0",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5",