From 0fe4f587d8e7e13c3c8b5cbadfc6a8d642bd0160 Mon Sep 17 00:00:00 2001 From: Xianny <8582774+xianny@users.noreply.github.com> Date: Wed, 21 Aug 2019 18:39:07 -0700 Subject: [PATCH] update ethereumjs-blockstream 6.0.0 -> ^7.0.0 (#2089) --- packages/base-contract/CHANGELOG.json | 9 +++++ packages/base-contract/package.json | 2 +- .../base-contract/src/subscription_manager.ts | 36 ++++++++++------- yarn.lock | 40 ++++--------------- 4 files changed, 39 insertions(+), 48 deletions(-) diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index fd102edc88..5237e91b9d 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "5.3.2", + "changes": [ + { + "note": "Updated to ethereumjs-blockstream@^7.0.0", + "pr": 2089 + } + ] + }, { "timestamp": 1565296576, "version": "5.3.1", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 07af21d2fe..8e0b0d2376 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -48,7 +48,7 @@ "@0x/utils": "^4.5.0", "@0x/web3-wrapper": "^6.0.10", "ethereum-types": "^2.1.4", - "ethereumjs-blockstream": "6.0.0", + "ethereumjs-blockstream": "^7.0.0", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", "js-sha3": "^0.7.0", diff --git a/packages/base-contract/src/subscription_manager.ts b/packages/base-contract/src/subscription_manager.ts index ad7e6067a0..38e62ff245 100644 --- a/packages/base-contract/src/subscription_manager.ts +++ b/packages/base-contract/src/subscription_manager.ts @@ -101,17 +101,23 @@ export class SubscriptionManager(isRemoved: boolean, rawLog: RawLogEntry): void { - const log: LogEntry = marshaller.unmarshalLog(rawLog); - _.forEach(this._filters, (filter: FilterObject, filterToken: string) => { - if (filterUtils.matchesFilter(log, filter)) { - const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs; - const logEvent = { - log: decodedLog, - isRemoved, - }; - this._filterCallbacks[filterToken](null, logEvent); - } + private _onLogStateChanged( + isRemoved: boolean, + blockHash: string, + rawLogs: RawLogEntry[], + ): void { + const logs: LogEntry[] = rawLogs.map(rawLog => marshaller.unmarshalLog(rawLog)); + logs.forEach(log => { + _.forEach(this._filters, (filter: FilterObject, filterToken: string) => { + if (filterUtils.matchesFilter(log, filter)) { + const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs; + const logEvent = { + log: decodedLog, + isRemoved, + }; + this._filterCallbacks[filterToken](null, logEvent); + } + }); }); } private _startBlockAndLogStream(isVerbose: boolean, blockPollingIntervalMs?: number): void { @@ -133,11 +139,11 @@ export class SubscriptionManager