diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-03-15 06:02:58 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-03-15 07:33:10 +0800 |
commit | ffe7363776077e2363afc23a8e4c5e2ea420aefe (patch) | |
tree | 6eb19a3944d07c1ff5ce5903b8ed496b07546894 /packages/0x.js/src/types.ts | |
parent | 4a27a7dc581fc6c8a3d4e212ca3712c249a5b417 (diff) | |
download | dexon-sol-tools-ffe7363776077e2363afc23a8e4c5e2ea420aefe.tar dexon-sol-tools-ffe7363776077e2363afc23a8e4c5e2ea420aefe.tar.gz dexon-sol-tools-ffe7363776077e2363afc23a8e4c5e2ea420aefe.tar.bz2 dexon-sol-tools-ffe7363776077e2363afc23a8e4c5e2ea420aefe.tar.lz dexon-sol-tools-ffe7363776077e2363afc23a8e4c5e2ea420aefe.tar.xz dexon-sol-tools-ffe7363776077e2363afc23a8e4c5e2ea420aefe.tar.zst dexon-sol-tools-ffe7363776077e2363afc23a8e4c5e2ea420aefe.zip |
Add SignedOrder, Order, and ECSignature types to the types package
Diffstat (limited to 'packages/0x.js/src/types.ts')
-rw-r--r-- | packages/0x.js/src/types.ts | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts index 2f17e30c2..65342b694 100644 --- a/packages/0x.js/src/types.ts +++ b/packages/0x.js/src/types.ts @@ -1,6 +1,13 @@ import { BigNumber } from '@0xproject/utils'; -import { BlockParam, BlockParamLiteral, ContractEventArg, LogWithDecodedArgs } from '@0xproject/types'; +import { + BlockParam, + BlockParamLiteral, + ContractEventArg, + LogWithDecodedArgs, + Order, + SignedOrder, +} from '@0xproject/types'; import * as Web3 from 'web3'; @@ -37,15 +44,6 @@ export enum InternalZeroExError { WethNotInTokenRegistry = 'WETH_NOT_IN_TOKEN_REGISTRY', } -/** - * Elliptic Curve signature - */ -export interface ECSignature { - v: number; - r: string; - s: string; -} - export type OrderAddresses = [string, string, string, string, string]; export type OrderValues = [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]; @@ -107,25 +105,6 @@ export interface ContractEvent { export type ContractEventArgs = ExchangeContractEventArgs | TokenContractEventArgs | EtherTokenContractEventArgs; -export interface Order { - maker: string; - taker: string; - makerFee: BigNumber; - takerFee: BigNumber; - makerTokenAmount: BigNumber; - takerTokenAmount: BigNumber; - makerTokenAddress: string; - takerTokenAddress: string; - salt: BigNumber; - exchangeContractAddress: string; - feeRecipient: string; - expirationUnixTimestampSec: BigNumber; -} - -export interface SignedOrder extends Order { - ecSignature: ECSignature; -} - // [address, name, symbol, decimals, ipfsHash, swarmHash] export type TokenMetadata = [string, string, string, number, string, string]; |