Merge development

4 files changed, 35 insertions, 22 deletions

diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index 08c1f7f58..6a365f314 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "version": "1.0.1-rc.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1534210131
+    },
+    {
         "version": "1.0.1-rc.2",
         "changes": [
             {
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index e5a2f15c5..bb92f2850 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
 
+## v1.0.1-rc.3 - _August 13, 2018_
+
+    * Dependencies updated
+
 ## v1.0.1-rc.2 - _July 26, 2018_
 
     * Fixed bug caused by importing non-existent dep
@@ -17,7 +21,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
 
     * Add support for ERC721 event watching and Exchange V2 events (#887)
 
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 917998739..ad3570533 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-watcher",
-    "version": "1.0.1-rc.2",
+    "version": "1.0.1-rc.3",
     "description": "An order watcher daemon that watches for order validity",
     "keywords": [
         "0x",
@@ -44,11 +44,11 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.4",
-        "@0xproject/dev-utils": "^1.0.3",
-        "@0xproject/migrations": "^1.0.3",
-        "@0xproject/sol-compiler": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/abi-gen": "^1.0.5",
+        "@0xproject/dev-utils": "^1.0.4",
+        "@0xproject/migrations": "^1.0.4",
+        "@0xproject/sol-compiler": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.5",
         "@types/bintrees": "^1.0.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -62,7 +62,7 @@
         "dirty-chai": "^2.0.1",
         "json-loader": "^0.5.4",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.0.1",
+        "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "nyc": "^11.0.1",
         "opn-cli": "^3.1.0",
@@ -70,24 +70,24 @@
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
         "tslint": "5.11.0",
-        "typescript": "2.7.1"
+        "typescript": "2.9.2"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.4",
-        "@0xproject/base-contract": "^1.0.4",
-        "@0xproject/contract-wrappers": "^1.0.1-rc.2",
-        "@0xproject/fill-scenarios": "^1.0.1-rc.2",
-        "@0xproject/json-schemas": "^1.0.1-rc.3",
-        "@0xproject/order-utils": "^1.0.1-rc.2",
-        "@0xproject/types": "^1.0.1-rc.3",
-        "@0xproject/typescript-typings": "^1.0.3",
-        "@0xproject/utils": "^1.0.4",
-        "@0xproject/web3-wrapper": "^1.1.2",
+        "@0xproject/assert": "^1.0.5",
+        "@0xproject/base-contract": "^2.0.0-rc.1",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.3",
+        "@0xproject/fill-scenarios": "^1.0.1-rc.3",
+        "@0xproject/json-schemas": "^1.0.1-rc.4",
+        "@0xproject/order-utils": "^1.0.1-rc.3",
+        "@0xproject/types": "^1.0.1-rc.4",
+        "@0xproject/typescript-typings": "^1.0.4",
+        "@0xproject/utils": "^1.0.5",
+        "@0xproject/web3-wrapper": "^1.2.0",
         "bintrees": "^1.0.2",
-        "ethereum-types": "^1.0.3",
+        "ethereum-types": "^1.0.4",
         "ethereumjs-blockstream": "5.0.0",
         "ethers": "3.0.22",
-        "lodash": "^4.17.4"
+        "lodash": "^4.17.5"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/order-watcher/src/schemas/order_watcher_partial_config_schema.ts b/packages/order-watcher/src/schemas/order_watcher_partial_config_schema.ts
index bc7d40524..8bfced063 100644
--- a/packages/order-watcher/src/schemas/order_watcher_partial_config_schema.ts
+++ b/packages/order-watcher/src/schemas/order_watcher_partial_config_schema.ts
@@ -1,7 +1,7 @@
 export const orderWatcherPartialConfigSchema = {
     id: '/OrderWatcherPartialConfigSchema',
     properties: {
-        stateLayer: { $ref: '/BlockParam' },
+        stateLayer: { $ref: '/blockParamSchema' },
         orderExpirationCheckingIntervalMs: { type: 'number' },
         eventPollingIntervalMs: { type: 'number' },
         expirationMarginMs: { type: 'number' },