diff options
author | F. Eugene Aumson <feuGeneA@users.noreply.github.com> | 2018-09-12 07:00:11 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-12 07:00:11 +0800 |
commit | cbb5a425dfb45d1dfda3579548d6b3f70dfca166 (patch) | |
tree | 8751979ad70ed0eb61dfda5a954bb9e1bc3d5c3b /packages/website/ts/types.ts | |
parent | 800dd5fb4f0ab21388440a46aef21cd0cf0801c3 (diff) | |
parent | 45b68832aa3eb5c09db33140468ab737114be9e3 (diff) | |
download | dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.gz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.bz2 dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.lz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.xz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.zst dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.zip |
Merge branch 'development' into sol-doc
Diffstat (limited to 'packages/website/ts/types.ts')
-rw-r--r-- | packages/website/ts/types.ts | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 6ab17e261..5fe9eef99 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -1,4 +1,4 @@ -import { ECSignature } from '@0xproject/types'; +import { SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Provider } from 'ethereum-types'; import * as React from 'react'; @@ -56,28 +56,12 @@ export interface OrderToken { decimals: number; } -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 { +export interface PortalOrder { signedOrder: SignedOrder; metadata: OrderMetadata; } @@ -120,7 +104,7 @@ export enum ActionTypes { UpdateChosenAssetTokenAddress = 'UPDATE_CHOSEN_ASSET_TOKEN_ADDRESS', UpdateOrderTakerAddress = 'UPDATE_ORDER_TAKER_ADDRESS', UpdateOrderSalt = 'UPDATE_ORDER_SALT', - UpdateOrderECSignature = 'UPDATE_ORDER_EC_SIGNATURE', + UpdateOrderSignature = 'UPDATE_ORDER_SIGNATURE', UpdateTokenByAddress = 'UPDATE_TOKEN_BY_ADDRESS', RemoveTokenFromTokenByAddress = 'REMOVE_TOKEN_FROM_TOKEN_BY_ADDRESS', ForceTokenStateRefetch = 'FORCE_TOKEN_STATE_REFETCH', |