Merge branch 'development' into dev-tools-pages

11 files changed, 103 insertions, 5 deletions

diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json
index f25a487b8..24eacd192 100644
--- a/packages/json-schemas/CHANGELOG.json
+++ b/packages/json-schemas/CHANGELOG.json
@@ -1,14 +1,18 @@
 [
     {
-        "version": "2.0.1",
+        "version": "2.1.0",
         "changes": [
             {
                 "note":
                     "Improve schemas by enforcing that amounts that must be whole numbers (e.g Order asset amounts) no longer allow decimal amounts",
                 "pr": 1173
+            },
+            {
+                "note": "Add schemas from @0x/connect",
+                "pr": 1250
             }
         ],
-        "timestamp": 1541740904
+        "timestamp": 1542028948
     },
     {
         "version": "2.0.0",
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index a1c784640..4f77d3aee 100644
--- a/packages/json-schemas/CHANGELOG.md
+++ b/packages/json-schemas/CHANGELOG.md
@@ -5,9 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v2.0.1 - _November 9, 2018_
+## v2.1.0 - _November 12, 2018_
 
     * Improve schemas by enforcing that amounts that must be whole numbers (e.g Order asset amounts) no longer allow decimal amounts (#1173)
+    * Add schemas from @0x/connect (#1250)
 
 ## v2.0.0 - _October 18, 2018_
 
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index c87cbb65a..2f57f5097 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/json-schemas",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "engines": {
         "node": ">=6.12"
     },
diff --git a/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json b/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
new file mode 100644
index 000000000..174a8fdc3
--- /dev/null
+++ b/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
@@ -0,0 +1,8 @@
+{
+    "id": "/AssetPairsRequestOpts",
+    "type": "object",
+    "properties": {
+        "assetDataA": { "$ref": "/hexSchema" },
+        "assetDataB": { "$ref": "/hexSchema" }
+    }
+}
diff --git a/packages/json-schemas/schemas/order_config_request_schema.json b/packages/json-schemas/schemas/order_config_request_schema.json
new file mode 100644
index 000000000..ca9b2e30e
--- /dev/null
+++ b/packages/json-schemas/schemas/order_config_request_schema.json
@@ -0,0 +1,24 @@
+{
+    "id": "/OrderConfigRequest",
+    "type": "object",
+    "properties": {
+        "makerAddress": { "$ref": "/addressSchema" },
+        "takerAddress": { "$ref": "/addressSchema" },
+        "makerAssetAmount": { "$ref": "/wholeNumberSchema" },
+        "takerAssetAmount": { "$ref": "/wholeNumberSchema" },
+        "makerAssetData": { "$ref": "/hexSchema" },
+        "takerAssetData": { "$ref": "/hexSchema" },
+        "exchangeAddress": { "$ref": "/addressSchema" },
+        "expirationTimeSeconds": { "$ref": "/wholeNumberSchema" }
+    },
+    "required": [
+        "makerAddress",
+        "takerAddress",
+        "makerAssetAmount",
+        "takerAssetAmount",
+        "makerAssetData",
+        "takerAssetData",
+        "exchangeAddress",
+        "expirationTimeSeconds"
+    ]
+}
diff --git a/packages/json-schemas/schemas/orderbook_request_schema.json b/packages/json-schemas/schemas/orderbook_request_schema.json
new file mode 100644
index 000000000..27848bdcb
--- /dev/null
+++ b/packages/json-schemas/schemas/orderbook_request_schema.json
@@ -0,0 +1,9 @@
+{
+    "id": "/OrderBookRequest",
+    "type": "object",
+    "properties": {
+        "baseAssetData": { "$ref": "/hexSchema" },
+        "quoteAssetData": { "$ref": "/hexSchema" }
+    },
+    "required": ["baseAssetData", "quoteAssetData"]
+}
\ No newline at end of file
diff --git a/packages/json-schemas/schemas/orders_request_opts_schema.json b/packages/json-schemas/schemas/orders_request_opts_schema.json
new file mode 100644
index 000000000..10da51060
--- /dev/null
+++ b/packages/json-schemas/schemas/orders_request_opts_schema.json
@@ -0,0 +1,19 @@
+{
+    "id": "/OrdersRequestOpts",
+    "type": "object",
+    "properties": {
+        "makerAssetProxyId": { "$ref": "/hexSchema" },
+        "takerAssetProxyId": { "$ref": "/hexSchema" },
+        "makerAssetAddress": { "$ref": "/addressSchema" },
+        "takerAssetAddress": { "$ref": "/addressSchema" },
+        "exchangeAddress": { "$ref": "/addressSchema" },
+        "senderAddress": { "$ref": "/addressSchema" },
+        "makerAssetData": { "$ref": "/hexSchema" },
+        "takerAssetData": { "$ref": "/hexSchema" },
+        "traderAssetData": { "$ref": "/hexSchema" },
+        "makerAddress": { "$ref": "/addressSchema" },
+        "takerAddress": { "$ref": "/addressSchema" },
+        "traderAddress": { "$ref": "/addressSchema" },
+        "feeRecipientAddress": { "$ref": "/addressSchema" }
+    }
+}
diff --git a/packages/json-schemas/schemas/paged_request_opts_schema.json b/packages/json-schemas/schemas/paged_request_opts_schema.json
new file mode 100644
index 000000000..7cfc73947
--- /dev/null
+++ b/packages/json-schemas/schemas/paged_request_opts_schema.json
@@ -0,0 +1,8 @@
+{
+    "id": "/PagedRequestOpts",
+    "type": "object",
+    "properties": {
+        "page": { "type": "number" },
+        "perPage": { "type": "number" }
+    }
+}
diff --git a/packages/json-schemas/schemas/request_opts_schema.json b/packages/json-schemas/schemas/request_opts_schema.json
new file mode 100644
index 000000000..b50547d18
--- /dev/null
+++ b/packages/json-schemas/schemas/request_opts_schema.json
@@ -0,0 +1,7 @@
+{
+    "id": "/RequestOpts",
+    "type": "object",
+    "properties": {
+        "networkId": { "type": "number" }
+    }
+}
diff --git a/packages/json-schemas/src/schemas.ts b/packages/json-schemas/src/schemas.ts
index 8ece5de75..21a6f424c 100644
--- a/packages/json-schemas/src/schemas.ts
+++ b/packages/json-schemas/src/schemas.ts
@@ -1,4 +1,5 @@
 import * as addressSchema from '../schemas/address_schema.json';
+import * as assetPairsRequestOptsSchema from '../schemas/asset_pairs_request_opts_schema.json';
 import * as blockParamSchema from '../schemas/block_param_schema.json';
 import * as blockRangeSchema from '../schemas/block_range_schema.json';
 import * as callDataSchema from '../schemas/call_data_schema.json';
@@ -10,11 +11,15 @@ import * as indexFilterValuesSchema from '../schemas/index_filter_values_schema.
 import * as jsNumber from '../schemas/js_number.json';
 import * as numberSchema from '../schemas/number_schema.json';
 import * as orderCancellationRequestsSchema from '../schemas/order_cancel_schema.json';
+import * as orderConfigRequestSchema from '../schemas/order_config_request_schema.json';
 import * as orderFillOrKillRequestsSchema from '../schemas/order_fill_or_kill_requests_schema.json';
 import * as orderFillRequestsSchema from '../schemas/order_fill_requests_schema.json';
 import * as orderHashSchema from '../schemas/order_hash_schema.json';
 import * as orderSchema from '../schemas/order_schema.json';
+import * as orderBookRequestSchema from '../schemas/orderbook_request_schema.json';
+import * as ordersRequestOptsSchema from '../schemas/orders_request_opts_schema.json';
 import * as ordersSchema from '../schemas/orders_schema.json';
+import * as pagedRequestOptsSchema from '../schemas/paged_request_opts_schema.json';
 import * as paginatedCollectionSchema from '../schemas/paginated_collection_schema.json';
 import * as relayerApiAssetDataPairsResponseSchema from '../schemas/relayer_api_asset_data_pairs_response_schema.json';
 import * as relayerApiAssetDataPairsSchema from '../schemas/relayer_api_asset_data_pairs_schema.json';
@@ -30,6 +35,7 @@ import * as relayerApiOrdersChannelSubscribeSchema from '../schemas/relayer_api_
 import * as relayerApiOrdersChannelUpdateSchema from '../schemas/relayer_api_orders_channel_update_response_schema.json';
 import * as relayerApiOrdersResponseSchema from '../schemas/relayer_api_orders_response_schema.json';
 import * as relayerApiOrdersSchema from '../schemas/relayer_api_orders_schema.json';
+import * as requestOptsSchema from '../schemas/request_opts_schema.json';
 import * as signedOrderSchema from '../schemas/signed_order_schema.json';
 import * as signedOrdersSchema from '../schemas/signed_orders_schema.json';
 import * as tokenSchema from '../schemas/token_schema.json';
@@ -58,6 +64,12 @@ export const schemas = {
     blockRangeSchema,
     tokenSchema,
     jsNumber,
+    requestOptsSchema,
+    pagedRequestOptsSchema,
+    ordersRequestOptsSchema,
+    orderBookRequestSchema,
+    orderConfigRequestSchema,
+    assetPairsRequestOptsSchema,
     txDataSchema,
     paginatedCollectionSchema,
     relayerApiErrorResponseSchema,
diff --git a/packages/json-schemas/tsconfig.json b/packages/json-schemas/tsconfig.json
index 7b14166c0..a79d54385 100644
--- a/packages/json-schemas/tsconfig.json
+++ b/packages/json-schemas/tsconfig.json
@@ -44,6 +44,12 @@
         "./schemas/zero_ex_transaction_schema.json",
         "./schemas/tx_data_schema.json",
         "./schemas/index_filter_values_schema.json",
-        "./schemas/whole_number_schema.json"
+        "./schemas/whole_number_schema.json",
+        "./schemas/asset_pairs_request_opts_schema.json",
+        "./schemas/orderbook_request_schema.json",
+        "./schemas/orders_request_opts_schema.json",
+        "./schemas/paged_request_opts_schema.json",
+        "./schemas/request_opts_schema.json",
+        "./schemas/order_config_request_schema.json"
     ]
 }