diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-12-08 23:01:59 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-12-14 22:47:02 +0800 |
commit | abd55411d4b79b42f48a19c0c90194c8d9f5b5b5 (patch) | |
tree | b1cefaac3ee3eb28b23ba35bc8cbc4ece111731a /packages | |
parent | cb596c1413938ce23901135f8235bb813cc6e784 (diff) | |
download | dexon-0x-contracts-abd55411d4b79b42f48a19c0c90194c8d9f5b5b5.tar dexon-0x-contracts-abd55411d4b79b42f48a19c0c90194c8d9f5b5b5.tar.gz dexon-0x-contracts-abd55411d4b79b42f48a19c0c90194c8d9f5b5b5.tar.bz2 dexon-0x-contracts-abd55411d4b79b42f48a19c0c90194c8d9f5b5b5.tar.lz dexon-0x-contracts-abd55411d4b79b42f48a19c0c90194c8d9f5b5b5.tar.xz dexon-0x-contracts-abd55411d4b79b42f48a19c0c90194c8d9f5b5b5.tar.zst dexon-0x-contracts-abd55411d4b79b42f48a19c0c90194c8d9f5b5b5.zip |
Move shared types to types package
Diffstat (limited to 'packages')
-rw-r--r-- | packages/0x.js/src/contract_wrappers/generated/base_contract.ts | 3 | ||||
-rw-r--r-- | packages/0x.js/src/index.ts | 5 | ||||
-rw-r--r-- | packages/0x.js/src/types.ts | 28 |
3 files changed, 7 insertions, 29 deletions
diff --git a/packages/0x.js/src/contract_wrappers/generated/base_contract.ts b/packages/0x.js/src/contract_wrappers/generated/base_contract.ts index 396a4d593..28a7e2f52 100644 --- a/packages/0x.js/src/contract_wrappers/generated/base_contract.ts +++ b/packages/0x.js/src/contract_wrappers/generated/base_contract.ts @@ -1,8 +1,7 @@ +import {TxData, TxDataPayable} from '@0xproject/types'; import * as _ from 'lodash'; import * as Web3 from 'web3'; -import {TxData, TxDataPayable} from '../../types'; - export class BaseContract { protected web3ContractInstance: Web3.ContractInstance; protected defaults: Partial<TxData>; diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index d4193a3e9..2f5296a9f 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -27,7 +27,6 @@ export { ContractEventArg, Web3Provider, ZeroExConfig, - TransactionReceipt, TransactionReceiptWithDecodedLogs, LogWithDecodedArgs, MethodOpts, @@ -42,3 +41,7 @@ export { OrderStateInvalid, OrderState, } from './types'; + +export { + TransactionReceipt, +} from '@0xproject/types'; diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts index 3586919cb..4f4314def 100644 --- a/packages/0x.js/src/types.ts +++ b/packages/0x.js/src/types.ts @@ -1,3 +1,4 @@ +import {TransactionReceipt} from '@0xproject/types'; import BigNumber from 'bignumber.js'; import * as Web3 from 'web3'; @@ -384,29 +385,4 @@ export interface OrderStateInvalid { export type OrderState = OrderStateValid|OrderStateInvalid; -export type OnOrderStateChangeCallback = (orderState: OrderState) => void; - -export interface TxData { - from?: string; - gas?: number; - gasPrice?: BigNumber; - nonce?: number; -} - -export interface TxDataPayable extends TxData { - value?: BigNumber; -} - -export interface TransactionReceipt { - blockHash: string; - blockNumber: number; - transactionHash: string; - transactionIndex: number; - from: string; - to: string; - status: null|0|1; - cumulativeGasUsed: number; - gasUsed: number; - contractAddress: string|null; - logs: Web3.LogEntry[]; -} // tslint:disable:max-file-line-count +export type OnOrderStateChangeCallback = (orderState: OrderState) => void; // tslint:disable:max-file-line-count |