Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2

Refactor order schemas in json-schemas for v2

1 files changed, 18 insertions, 18 deletions

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'],
         },
     ],
 };