From 9c850d152cd024c8852200c237790e8bee82b3a9 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 23 May 2018 16:52:41 -0700
Subject: Updated Order, SignedOrder schemas, removed ECSignature schema types
 and added Hex basic type

---
 .../json-schemas/schemas/basic_type_schemas.ts     |  6 ++++
 .../json-schemas/schemas/ec_signature_schema.ts    | 20 ------------
 packages/json-schemas/schemas/order_schemas.ts     | 36 +++++++++++-----------
 3 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 packages/json-schemas/schemas/ec_signature_schema.ts

(limited to 'packages/json-schemas/schemas')

diff --git a/packages/json-schemas/schemas/basic_type_schemas.ts b/packages/json-schemas/schemas/basic_type_schemas.ts
index 9d81ff333..8430b6f4a 100644
--- a/packages/json-schemas/schemas/basic_type_schemas.ts
+++ b/packages/json-schemas/schemas/basic_type_schemas.ts
@@ -4,6 +4,12 @@ export const addressSchema = {
     pattern: '^0x[0-9a-f]{40}$',
 };
 
+export const hexSchema = {
+    id: '/Hex',
+    type: 'string',
+    pattern: '^0x[0-9a-f]',
+};
+
 export const numberSchema = {
     id: '/Number',
     type: 'string',
diff --git a/packages/json-schemas/schemas/ec_signature_schema.ts b/packages/json-schemas/schemas/ec_signature_schema.ts
deleted file mode 100644
index 71b840dd8..000000000
--- a/packages/json-schemas/schemas/ec_signature_schema.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export const ecSignatureParameterSchema = {
-    id: '/ECSignatureParameter',
-    type: 'string',
-    pattern: '^0[xX][0-9A-Fa-f]{64}$',
-};
-
-export const ecSignatureSchema = {
-    id: '/ECSignature',
-    properties: {
-        v: {
-            type: 'number',
-            minimum: 27,
-            maximum: 28,
-        },
-        r: { $ref: '/ECSignatureParameter' },
-        s: { $ref: '/ECSignatureParameter' },
-    },
-    required: ['v', 'r', 's'],
-    type: 'object',
-};
diff --git a/packages/json-schemas/schemas/order_schemas.ts b/packages/json-schemas/schemas/order_schemas.ts
index 6f17224ad..183118c23 100644
--- a/packages/json-schemas/schemas/order_schemas.ts
+++ b/packages/json-schemas/schemas/order_schemas.ts
@@ -1,30 +1,30 @@
 export const orderSchema = {
     id: '/Order',
     properties: {
-        maker: { $ref: '/Address' },
-        taker: { $ref: '/Address' },
+        makerAddress: { $ref: '/Address' },
+        takerAddress: { $ref: '/Address' },
         makerFee: { $ref: '/Number' },
         takerFee: { $ref: '/Number' },
-        makerTokenAmount: { $ref: '/Number' },
-        takerTokenAmount: { $ref: '/Number' },
-        makerTokenAddress: { $ref: '/Address' },
-        takerTokenAddress: { $ref: '/Address' },
+        makerAssetAmount: { $ref: '/Number' },
+        takerAssetAmount: { $ref: '/Number' },
+        makerAssetData: { $ref: '/Hex' },
+        takerAssetData: { $ref: '/Hex' },
         salt: { $ref: '/Number' },
-        feeRecipient: { $ref: '/Address' },
-        expirationUnixTimestampSec: { $ref: '/Number' },
-        exchangeContractAddress: { $ref: '/Address' },
+        feeRecipientAddress: { $ref: '/Address' },
+        expirationTimeSeconds: { $ref: '/Number' },
     },
     required: [
-        'maker',
-        'taker',
+        'makerAddress',
+        'takerAddress',
         'makerFee',
         'takerFee',
-        'makerTokenAmount',
-        'takerTokenAmount',
+        'makerAssetAmount',
+        'takerAssetAmount',
+        'makerAssetData',
+        'takerAssetData',
         'salt',
-        'feeRecipient',
-        'expirationUnixTimestampSec',
-        'exchangeContractAddress',
+        'feeRecipientAddress',
+        'expirationTimeSeconds',
     ],
     type: 'object',
 };
@@ -35,9 +35,9 @@ export const signedOrderSchema = {
         { $ref: '/Order' },
         {
             properties: {
-                ecSignature: { $ref: '/ECSignature' },
+                signature: { $ref: '/Hex' },
             },
-            required: ['ecSignature'],
+            required: ['signature'],
         },
     ],
 };
-- 
cgit v1.2.3