Move shared types to types package
This commit is contained in:
parent
cb596c1413
commit
abd55411d4
@ -1,8 +1,7 @@
|
|||||||
|
import {TxData, TxDataPayable} from '@0xproject/types';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
import * as Web3 from 'web3';
|
import * as Web3 from 'web3';
|
||||||
|
|
||||||
import {TxData, TxDataPayable} from '../../types';
|
|
||||||
|
|
||||||
export class BaseContract {
|
export class BaseContract {
|
||||||
protected web3ContractInstance: Web3.ContractInstance;
|
protected web3ContractInstance: Web3.ContractInstance;
|
||||||
protected defaults: Partial<TxData>;
|
protected defaults: Partial<TxData>;
|
||||||
|
@ -27,7 +27,6 @@ export {
|
|||||||
ContractEventArg,
|
ContractEventArg,
|
||||||
Web3Provider,
|
Web3Provider,
|
||||||
ZeroExConfig,
|
ZeroExConfig,
|
||||||
TransactionReceipt,
|
|
||||||
TransactionReceiptWithDecodedLogs,
|
TransactionReceiptWithDecodedLogs,
|
||||||
LogWithDecodedArgs,
|
LogWithDecodedArgs,
|
||||||
MethodOpts,
|
MethodOpts,
|
||||||
@ -42,3 +41,7 @@ export {
|
|||||||
OrderStateInvalid,
|
OrderStateInvalid,
|
||||||
OrderState,
|
OrderState,
|
||||||
} from './types';
|
} from './types';
|
||||||
|
|
||||||
|
export {
|
||||||
|
TransactionReceipt,
|
||||||
|
} from '@0xproject/types';
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import {TransactionReceipt} from '@0xproject/types';
|
||||||
import BigNumber from 'bignumber.js';
|
import BigNumber from 'bignumber.js';
|
||||||
import * as Web3 from 'web3';
|
import * as Web3 from 'web3';
|
||||||
|
|
||||||
@ -384,29 +385,4 @@ export interface OrderStateInvalid {
|
|||||||
|
|
||||||
export type OrderState = OrderStateValid|OrderStateInvalid;
|
export type OrderState = OrderStateValid|OrderStateInvalid;
|
||||||
|
|
||||||
export type OnOrderStateChangeCallback = (orderState: OrderState) => void;
|
export type OnOrderStateChangeCallback = (orderState: OrderState) => void; // tslint:disable:max-file-line-count
|
||||||
|
|
||||||
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
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user