Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/beta-render-et-al

9 files changed, 22 insertions, 17 deletions

diff --git a/packages/json-schemas/schemas/order_cancel_schema.json b/packages/json-schemas/schemas/order_cancel_schema.json
index 09d4068c6..8d0999941 100644
--- a/packages/json-schemas/schemas/order_cancel_schema.json
+++ b/packages/json-schemas/schemas/order_cancel_schema.json
@@ -4,7 +4,7 @@
     "items": {
         "properties": {
             "order": { "$ref": "/orderSchema" },
-            "takerTokenCancelAmount": { "$ref": "/numberSchema" }
+            "takerTokenCancelAmount": { "$ref": "/wholeNumberSchema" }
         },
         "required": ["order", "takerTokenCancelAmount"],
         "type": "object"
diff --git a/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.json b/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.json
index c9549c72e..73bbf20bb 100644
--- a/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.json
+++ b/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.json
@@ -4,7 +4,7 @@
     "items": {
         "properties": {
             "signedOrder": { "$ref": "/signedOrderSchema" },
-            "fillTakerAmount": { "$ref": "/numberSchema" }
+            "fillTakerAmount": { "$ref": "/wholeNumberSchema" }
         },
         "required": ["signedOrder", "fillTakerAmount"],
         "type": "object"
diff --git a/packages/json-schemas/schemas/order_fill_requests_schema.json b/packages/json-schemas/schemas/order_fill_requests_schema.json
index 98325653b..d06fb19a2 100644
--- a/packages/json-schemas/schemas/order_fill_requests_schema.json
+++ b/packages/json-schemas/schemas/order_fill_requests_schema.json
@@ -4,7 +4,7 @@
     "items": {
         "properties": {
             "signedOrder": { "$ref": "/signedOrderSchema" },
-            "takerTokenFillAmount": { "$ref": "/numberSchema" }
+            "takerTokenFillAmount": { "$ref": "/wholeNumberSchema" }
         },
         "required": ["signedOrder", "takerTokenFillAmount"],
         "type": "object"
diff --git a/packages/json-schemas/schemas/order_schema.json b/packages/json-schemas/schemas/order_schema.json
index de2c8c7c2..c70b9e2dd 100644
--- a/packages/json-schemas/schemas/order_schema.json
+++ b/packages/json-schemas/schemas/order_schema.json
@@ -3,17 +3,17 @@
     "properties": {
         "makerAddress": { "$ref": "/addressSchema" },
         "takerAddress": { "$ref": "/addressSchema" },
-        "makerFee": { "$ref": "/numberSchema" },
-        "takerFee": { "$ref": "/numberSchema" },
+        "makerFee": { "$ref": "/wholeNumberSchema" },
+        "takerFee": { "$ref": "/wholeNumberSchema" },
         "senderAddress": { "$ref": "/addressSchema" },
-        "makerAssetAmount": { "$ref": "/numberSchema" },
-        "takerAssetAmount": { "$ref": "/numberSchema" },
+        "makerAssetAmount": { "$ref": "/wholeNumberSchema" },
+        "takerAssetAmount": { "$ref": "/wholeNumberSchema" },
         "makerAssetData": { "$ref": "/hexSchema" },
         "takerAssetData": { "$ref": "/hexSchema" },
-        "salt": { "$ref": "/numberSchema" },
+        "salt": { "$ref": "/wholeNumberSchema" },
         "exchangeAddress": { "$ref": "/addressSchema" },
         "feeRecipientAddress": { "$ref": "/addressSchema" },
-        "expirationTimeSeconds": { "$ref": "/numberSchema" }
+        "expirationTimeSeconds": { "$ref": "/wholeNumberSchema" }
     },
     "required": [
         "makerAddress",
diff --git a/packages/json-schemas/schemas/relayer_api_asset_data_trade_info_schema.json b/packages/json-schemas/schemas/relayer_api_asset_data_trade_info_schema.json
index 0ab9b444f..e0f274c5d 100644
--- a/packages/json-schemas/schemas/relayer_api_asset_data_trade_info_schema.json
+++ b/packages/json-schemas/schemas/relayer_api_asset_data_trade_info_schema.json
@@ -3,8 +3,8 @@
     "type": "object",
     "properties": {
         "assetData": { "$ref": "/hexSchema" },
-        "minAmount": { "$ref": "/numberSchema" },
-        "maxAmount": { "$ref": "/numberSchema" },
+        "minAmount": { "$ref": "/wholeNumberSchema" },
+        "maxAmount": { "$ref": "/wholeNumberSchema" },
         "precision": { "type": "number" }
     },
     "required": ["assetData"]
diff --git a/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.json b/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.json
index bc95b61ef..f4583fc62 100644
--- a/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.json
+++ b/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.json
@@ -4,12 +4,12 @@
     "properties": {
         "makerAddress": { "$ref": "/addressSchema" },
         "takerAddress": { "$ref": "/addressSchema" },
-        "makerAssetAmount": { "$ref": "/numberSchema" },
-        "takerAssetAmount": { "$ref": "/numberSchema" },
+        "makerAssetAmount": { "$ref": "/wholeNumberSchema" },
+        "takerAssetAmount": { "$ref": "/wholeNumberSchema" },
         "makerAssetData": { "$ref": "/hexSchema" },
         "takerAssetData": { "$ref": "/hexSchema" },
         "exchangeAddress": { "$ref": "/addressSchema" },
-        "expirationTimeSeconds": { "$ref": "/numberSchema" }
+        "expirationTimeSeconds": { "$ref": "/wholeNumberSchema" }
     },
     "required": [
         "makerAddress",
diff --git a/packages/json-schemas/schemas/relayer_api_order_config_response_schema.json b/packages/json-schemas/schemas/relayer_api_order_config_response_schema.json
index 0742febdf..8193861e1 100644
--- a/packages/json-schemas/schemas/relayer_api_order_config_response_schema.json
+++ b/packages/json-schemas/schemas/relayer_api_order_config_response_schema.json
@@ -2,8 +2,8 @@
     "id": "/relayerApiOrderConfigResponseSchema",
     "type": "object",
     "properties": {
-        "makerFee": { "$ref": "/numberSchema" },
-        "takerFee": { "$ref": "/numberSchema" },
+        "makerFee": { "$ref": "/wholeNumberSchema" },
+        "takerFee": { "$ref": "/wholeNumberSchema" },
         "feeRecipientAddress": { "$ref": "/addressSchema" },
         "senderAddress": { "$ref": "/addressSchema" }
     },
diff --git a/packages/json-schemas/schemas/whole_number_schema.json b/packages/json-schemas/schemas/whole_number_schema.json
new file mode 100644
index 000000000..944ce820e
--- /dev/null
+++ b/packages/json-schemas/schemas/whole_number_schema.json
@@ -0,0 +1,5 @@
+{
+    "id": "/wholeNumberSchema",
+    "type": "string",
+    "pattern": "^\\d+$"
+}
diff --git a/packages/json-schemas/schemas/zero_ex_transaction_schema.json b/packages/json-schemas/schemas/zero_ex_transaction_schema.json
index ad3b11583..0c714f14d 100644
--- a/packages/json-schemas/schemas/zero_ex_transaction_schema.json
+++ b/packages/json-schemas/schemas/zero_ex_transaction_schema.json
@@ -3,7 +3,7 @@
     "properties": {
         "data": { "$ref": "/hexSchema" },
         "signerAddress": { "$ref": "/addressSchema" },
-        "salt": { "$ref": "/numberSchema" }
+        "salt": { "$ref": "/wholeNumberSchema" }
     },
     "required": ["data", "salt", "signerAddress"],
     "type": "object"