diff options
author | Leonid <logvinov.leon@gmail.com> | 2018-02-09 16:27:08 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 16:27:08 +0800 |
commit | 936f6ac10fe55257d846204ce4e5bd39ca27c78d (patch) | |
tree | f76cca84a55f979103a027282b289693a1f78491 /packages/website/ts/types.ts | |
parent | 7e04c4f24b789a2ce8f4a5884212cfb1e508b508 (diff) | |
parent | 43cf8d30bdab025cdcda888897d35b25ad455031 (diff) | |
download | dexon-sol-tools-936f6ac10fe55257d846204ce4e5bd39ca27c78d.tar dexon-sol-tools-936f6ac10fe55257d846204ce4e5bd39ca27c78d.tar.gz dexon-sol-tools-936f6ac10fe55257d846204ce4e5bd39ca27c78d.tar.bz2 dexon-sol-tools-936f6ac10fe55257d846204ce4e5bd39ca27c78d.tar.lz dexon-sol-tools-936f6ac10fe55257d846204ce4e5bd39ca27c78d.tar.xz dexon-sol-tools-936f6ac10fe55257d846204ce4e5bd39ca27c78d.tar.zst dexon-sol-tools-936f6ac10fe55257d846204ce4e5bd39ca27c78d.zip |
Merge pull request #379 from 0xProject/portal_json
Make portal order JSON compatible with 0x.js
Diffstat (limited to 'packages/website/ts/types.ts')
-rw-r--r-- | packages/website/ts/types.ts | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index c48c88cae..19fc24852 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -1,3 +1,4 @@ +import { ECSignature } from '0x.js'; import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; @@ -34,13 +35,6 @@ export interface SideToAssetToken { [side: string]: AssetToken; } -export interface SignatureData { - hash: string; - r: string; - s: string; - v: number; -} - export interface HashData { depositAmount: BigNumber; depositTokenContractAddr: string; @@ -59,25 +53,32 @@ export interface OrderToken { name: string; symbol: string; decimals: number; - address: string; } -export interface OrderParty { - address: string; - token: OrderToken; - amount: string; - feeAmount: string; +export interface SignedOrder { + maker: string; + taker: string; + makerTokenAddress: string; + takerTokenAddress: string; + makerFee: string; + takerFee: string; + makerTokenAmount: string; + takerTokenAmount: string; + expirationUnixTimestampSec: string; + feeRecipient: string; + salt: string; + ecSignature: ECSignature; + exchangeContractAddress: string; +} + +export interface OrderMetadata { + makerToken: OrderToken; + takerToken: OrderToken; } export interface Order { - maker: OrderParty; - taker: OrderParty; - expiration: string; - feeRecipient: string; - salt: string; - signature: SignatureData; - exchangeContract: string; - networkId: number; + signedOrder: SignedOrder; + metadata: OrderMetadata; } export interface Fill { @@ -118,7 +119,7 @@ export enum ActionTypes { UpdateChosenAssetTokenAddress = 'UPDATE_CHOSEN_ASSET_TOKEN_ADDRESS', UpdateOrderTakerAddress = 'UPDATE_ORDER_TAKER_ADDRESS', UpdateOrderSalt = 'UPDATE_ORDER_SALT', - UpdateOrderSignatureData = 'UPDATE_ORDER_SIGNATURE_DATA', + UpdateOrderECSignature = 'UPDATE_ORDER_EC_SIGNATURE', UpdateTokenByAddress = 'UPDATE_TOKEN_BY_ADDRESS', RemoveTokenFromTokenByAddress = 'REMOVE_TOKEN_FROM_TOKEN_BY_ADDRESS', ForceTokenStateRefetch = 'FORCE_TOKEN_STATE_REFETCH', |