aboutsummaryrefslogtreecommitdiffstats
path: root/packages/order-watcher
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-09-25 19:05:44 +0800
committerFabio Berger <me@fabioberger.com>2018-09-25 19:05:44 +0800
commit55ca971186fd9318c1be9cc9e8c125f55c653cd9 (patch)
treec93f0c78970abe73dd5651369e1abf0dc7b6f40f /packages/order-watcher
parent284930eb58c95c03f1a73b7c1f127701068e41e9 (diff)
downloaddexon-sol-tools-55ca971186fd9318c1be9cc9e8c125f55c653cd9.tar
dexon-sol-tools-55ca971186fd9318c1be9cc9e8c125f55c653cd9.tar.gz
dexon-sol-tools-55ca971186fd9318c1be9cc9e8c125f55c653cd9.tar.bz2
dexon-sol-tools-55ca971186fd9318c1be9cc9e8c125f55c653cd9.tar.lz
dexon-sol-tools-55ca971186fd9318c1be9cc9e8c125f55c653cd9.tar.xz
dexon-sol-tools-55ca971186fd9318c1be9cc9e8c125f55c653cd9.tar.zst
dexon-sol-tools-55ca971186fd9318c1be9cc9e8c125f55c653cd9.zip
Decode logs received from blockstream
Diffstat (limited to 'packages/order-watcher')
-rw-r--r--packages/order-watcher/src/order_watcher/event_watcher.ts9
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/order-watcher/src/order_watcher/event_watcher.ts b/packages/order-watcher/src/order_watcher/event_watcher.ts
index d23052613..e73e1f9f9 100644
--- a/packages/order-watcher/src/order_watcher/event_watcher.ts
+++ b/packages/order-watcher/src/order_watcher/event_watcher.ts
@@ -1,6 +1,6 @@
import { intervalUtils, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { BlockParamLiteral, FilterObject, LogEntry, Provider } from 'ethereum-types';
+import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BlockParamLiteral, FilterObject, LogEntry, Provider, RawLogEntry } from 'ethereum-types';
import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream';
import * as _ from 'lodash';
@@ -96,7 +96,7 @@ export class EventWatcher {
const shouldIncludeTransactionData = false;
const blockOrNull = await this._web3Wrapper.sendRawPayloadAsync({
method: 'eth_getBlockByNumber',
- params: ['latest', shouldIncludeTransactionData],
+ params: [BlockParamLiteral.Latest, shouldIncludeTransactionData],
});
return blockOrNull as Block;
}
@@ -121,8 +121,9 @@ export class EventWatcher {
private async _onLogStateChangedAsync(
callback: EventWatcherCallback,
isRemoved: boolean,
- log: LogEntry,
+ rawLog: RawLogEntry,
): Promise<void> {
+ const log: LogEntry = marshaller.unmarshalLog(rawLog);
await this._emitDifferencesAsync(log, isRemoved ? LogEventState.Removed : LogEventState.Added, callback);
}
private async _reconcileBlockAsync(): Promise<void> {