diff options
author | Fabio Berger <me@fabioberger.com> | 2017-11-13 10:24:00 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-13 10:24:00 +0800 |
commit | a74ec0effa818a86233fe64cb0dad2c61bbb4bb6 (patch) | |
tree | 24438eda01318a80b5cbc7f1939d1640764a9859 /src/types.ts | |
parent | b0be323e899ea7be42b6c695b4fd6d526070b213 (diff) | |
parent | e33027c6244b99a1fb181404668bd2a259d923e2 (diff) | |
download | dexon-sol-tools-a74ec0effa818a86233fe64cb0dad2c61bbb4bb6.tar dexon-sol-tools-a74ec0effa818a86233fe64cb0dad2c61bbb4bb6.tar.gz dexon-sol-tools-a74ec0effa818a86233fe64cb0dad2c61bbb4bb6.tar.bz2 dexon-sol-tools-a74ec0effa818a86233fe64cb0dad2c61bbb4bb6.tar.lz dexon-sol-tools-a74ec0effa818a86233fe64cb0dad2c61bbb4bb6.tar.xz dexon-sol-tools-a74ec0effa818a86233fe64cb0dad2c61bbb4bb6.tar.zst dexon-sol-tools-a74ec0effa818a86233fe64cb0dad2c61bbb4bb6.zip |
Merge pull request #200 from 0xProject/feature/receipt-status
Normalize the way we return the transaction status
Diffstat (limited to 'src/types.ts')
-rw-r--r-- | src/types.ts | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/types.ts b/src/types.ts index 20f994ac7..11683378f 100644 --- a/src/types.ts +++ b/src/types.ts @@ -418,8 +418,6 @@ export interface ZeroExConfig { orderWatcherConfig?: OrderStateWatcherConfig; } -export type TransactionReceipt = Web3.TransactionReceipt; - export enum AbiType { Function = 'function', Constructor = 'constructor', @@ -433,7 +431,7 @@ export interface DecodedLogArgs { export interface LogWithDecodedArgs<ArgsType> extends Web3.DecodedLogEntry<ArgsType> {} -export interface TransactionReceiptWithDecodedLogs extends Web3.TransactionReceipt { +export interface TransactionReceiptWithDecodedLogs extends TransactionReceipt { logs: Array<LogWithDecodedArgs<DecodedLogArgs>|Web3.LogEntry>; } @@ -511,3 +509,17 @@ export type OrderState = OrderStateValid|OrderStateInvalid; export type OnOrderStateChangeCallbackSync = (orderState: OrderState) => void; export type OnOrderStateChangeCallbackAsync = (orderState: OrderState) => Promise<void>; export type OnOrderStateChangeCallback = OnOrderStateChangeCallbackAsync|OnOrderStateChangeCallbackSync; + +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[]; +} |