merge development

4 files changed, 31 insertions, 16 deletions

diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index fc7037bfb..3a5462727 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,5 +1,15 @@
 [
     {
+        "version": "2.1.0",
+        "changes": [
+            {
+                "note": "Export ExpirationWatcher",
+                "pr": 1097
+            }
+        ],
+        "timestamp": 1538157789
+    },
+    {
         "version": "2.0.0",
         "changes": [
             {
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index 32837337a..ef4398cab 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.1.0 - _September 28, 2018_
+
+    * Export ExpirationWatcher (#1097)
+
 ## 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)
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 61218b632..f2469f172 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-watcher",
-    "version": "2.0.0",
+    "version": "2.1.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.11",
-        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/migrations": "^1.0.12",
+        "@0xproject/abi-gen": "^1.0.12",
+        "@0xproject/dev-utils": "^1.0.11",
+        "@0xproject/migrations": "^1.0.13",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/bintrees": "^1.0.2",
         "@types/lodash": "4.14.104",
@@ -70,20 +70,20 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@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",
+        "@0xproject/assert": "^1.0.12",
+        "@0xproject/base-contract": "^3.0.0",
+        "@0xproject/contract-wrappers": "^2.0.1",
+        "@0xproject/fill-scenarios": "^1.0.6",
+        "@0xproject/json-schemas": "^1.0.5",
+        "@0xproject/order-utils": "^1.0.6",
+        "@0xproject/types": "^1.1.2",
+        "@0xproject/typescript-typings": "^3.0.0",
+        "@0xproject/utils": "^2.0.0",
+        "@0xproject/web3-wrapper": "^3.0.2",
         "bintrees": "^1.0.2",
-        "ethereum-types": "^1.0.8",
+        "ethereum-types": "^1.0.9",
         "ethereumjs-blockstream": "6.0.0",
-        "ethers": "3.0.22",
+        "ethers": "4.0.0-beta.14",
         "lodash": "^4.17.5"
     },
     "publishConfig": {
diff --git a/packages/order-watcher/src/index.ts b/packages/order-watcher/src/index.ts
index 8efca6217..d7ad4fba7 100644
--- a/packages/order-watcher/src/index.ts
+++ b/packages/order-watcher/src/index.ts
@@ -1,4 +1,5 @@
 export { OrderWatcher } from './order_watcher/order_watcher';
+export { ExpirationWatcher } from './order_watcher/expiration_watcher';
 
 export {
     OrderStateValid,