diff options
author | Fabio Berger <me@fabioberger.com> | 2018-05-24 07:52:41 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-05-24 07:52:41 +0800 |
commit | 9c850d152cd024c8852200c237790e8bee82b3a9 (patch) | |
tree | 3a7005193851d5ef788a65496b2054b27aed791f /packages/json-schemas/schemas/order_schemas.ts | |
parent | 9d11028fce50748d69db5c3b867b1ea063bf2b52 (diff) | |
download | dexon-0x-contracts-9c850d152cd024c8852200c237790e8bee82b3a9.tar.gz dexon-0x-contracts-9c850d152cd024c8852200c237790e8bee82b3a9.tar.zst dexon-0x-contracts-9c850d152cd024c8852200c237790e8bee82b3a9.zip |
Updated Order, SignedOrder schemas, removed ECSignature schema types and added Hex basic type
Diffstat (limited to 'packages/json-schemas/schemas/order_schemas.ts')
-rw-r--r-- | packages/json-schemas/schemas/order_schemas.ts | 36 |
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'], }, ], }; |