Merge remote-tracking branch 'upstream/development' into sol-doc

3 files changed, 23 insertions, 16 deletions

diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index 46dc4c0df..fc7037bfb 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -17,7 +17,8 @@
                     "Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction.",
                 "pr": 1087
             }
-        ]
+        ],
+        "timestamp": 1537907159
     },
     {
         "version": "1.0.5",
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index d179b2e1a..32837337a 100644
--- a/packages/order-watcher/CHANGELOG.md
+++ b/packages/order-watcher/CHANGELOG.md
@@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.0 - _September 25, 2018_
+
+    * 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. (#1080)
+    * Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it (#1080)
+    * Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction. (#1087)
+
 ## v1.0.5 - _September 25, 2018_
 
     * Dependencies updated
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index b00a76e55..61218b632 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-watcher",
-    "version": "1.0.5",
+    "version": "2.0.0",
     "description": "An order watcher daemon that watches for order validity",
     "keywords": [
         "0x",
@@ -42,9 +42,9 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
-        "@0xproject/dev-utils": "^1.0.9",
-        "@0xproject/migrations": "^1.0.11",
+        "@0xproject/abi-gen": "^1.0.11",
+        "@0xproject/dev-utils": "^1.0.10",
+        "@0xproject/migrations": "^1.0.12",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/bintrees": "^1.0.2",
         "@types/lodash": "4.14.104",
@@ -70,18 +70,18 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
-        "@0xproject/base-contract": "^2.0.4",
-        "@0xproject/contract-wrappers": "^1.0.5",
-        "@0xproject/fill-scenarios": "^1.0.4",
-        "@0xproject/json-schemas": "^1.0.3",
-        "@0xproject/order-utils": "^1.0.4",
-        "@0xproject/types": "^1.1.0",
-        "@0xproject/typescript-typings": "^2.0.1",
-        "@0xproject/utils": "^1.0.10",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/assert": "^1.0.11",
+        "@0xproject/base-contract": "^2.0.5",
+        "@0xproject/contract-wrappers": "^2.0.0",
+        "@0xproject/fill-scenarios": "^1.0.5",
+        "@0xproject/json-schemas": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
+        "@0xproject/types": "^1.1.1",
+        "@0xproject/typescript-typings": "^2.0.2",
+        "@0xproject/utils": "^1.0.11",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "bintrees": "^1.0.2",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-blockstream": "6.0.0",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"