diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-24 00:01:23 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-24 05:12:34 +0800 |
| commit | e01468b49265c1cad9a4d81873584a7e89169aa1 (patch) | |
| tree | e1592ae8ca9f293fb4c57f1af84e5b0f6f1cf8e4 /packages/0x.js/src | |
| parent | f97074dc84b5c45b9c487ee27ca7ed671bb6fd71 (diff) | |
| download | dexon-sol-tools-e01468b49265c1cad9a4d81873584a7e89169aa1.tar dexon-sol-tools-e01468b49265c1cad9a4d81873584a7e89169aa1.tar.gz dexon-sol-tools-e01468b49265c1cad9a4d81873584a7e89169aa1.tar.bz2 dexon-sol-tools-e01468b49265c1cad9a4d81873584a7e89169aa1.tar.lz dexon-sol-tools-e01468b49265c1cad9a4d81873584a7e89169aa1.tar.xz dexon-sol-tools-e01468b49265c1cad9a4d81873584a7e89169aa1.tar.zst dexon-sol-tools-e01468b49265c1cad9a4d81873584a7e89169aa1.zip | |
Make DecodedLogEvent contain web3 log under a log subkey
Diffstat (limited to 'packages/0x.js/src')
| -rw-r--r-- | packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 2 | ||||
| -rw-r--r-- | packages/0x.js/src/types.ts | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts index 7997b1647..70548293c 100644 --- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts @@ -100,7 +100,7 @@ export class ContractWrapper { if (filterUtils.matchesFilter(log, filter)) { const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs<ArgsType>; const logEvent = { - ...decodedLog, + log: decodedLog, removed, }; this._filterCallbacks[filterToken](null, logEvent); diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts index c3aabfd86..d94868d9f 100644 --- a/packages/0x.js/src/types.ts +++ b/packages/0x.js/src/types.ts @@ -40,7 +40,10 @@ export type OrderValues = [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]; export type LogEvent = Web3.LogEntryEvent; -export type DecodedLogEvent<ArgsType> = Web3.DecodedLogEntryEvent<ArgsType>; +export interface DecodedLogEvent<ArgsType> { + removed: boolean; + log: LogWithDecodedArgs<ArgsType>; +} export type EventCallback<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => void; export type EventWatcherCallback = (log: LogEvent) => void; |