From f7fe9b096115312f25f90a27a8f9e13e374dcc2b Mon Sep 17 00:00:00 2001 From: Bryce Date: Fri, 22 Jun 2018 16:39:58 -0700 Subject: Update at abi_decoder --- packages/order-watcher/CHANGELOG.json | 4 +--- packages/order-watcher/package.json | 2 +- packages/order-watcher/src/order_watcher/order_watcher.ts | 11 +---------- 3 files changed, 3 insertions(+), 14 deletions(-) (limited to 'packages/order-watcher') diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 28b210b8e..00f6ad1b9 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,11 +1,9 @@ [ { - "timestamp": 1529701469, "version": "0.0.7", "changes": [ { - "note": "Fixes Uncaught Error in OrderWatcher", - "pr": 763 + "note": "Dependencies updated" } ] }, diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index efc44a89f..3335713a3 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -85,7 +85,7 @@ "@0xproject/order-utils": "^0.0.7", "@0xproject/types": "^0.8.1", "@0xproject/typescript-typings": "^0.4.1", - "@0xproject/utils": "^0.7.1", + "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.1", "ethereum-types": "^0.0.1", "bintrees": "^1.0.2", diff --git a/packages/order-watcher/src/order_watcher/order_watcher.ts b/packages/order-watcher/src/order_watcher/order_watcher.ts index bf31c9c4d..140aa341b 100644 --- a/packages/order-watcher/src/order_watcher/order_watcher.ts +++ b/packages/order-watcher/src/order_watcher/order_watcher.ts @@ -16,7 +16,6 @@ import { } from '@0xproject/types'; import { errorUtils, intervalUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; -import * as ethers from 'ethers'; import * as _ from 'lodash'; import { artifacts } from '../artifacts'; @@ -242,15 +241,7 @@ export class OrderWatcher { return; } const log = logIfExists as LogEntryEvent; // At this moment we are sure that no error occured and log is defined. - let maybeDecodedLog; - try { - maybeDecodedLog = this._web3Wrapper.abiDecoder.tryToDecodeLogOrNoop(log); - } catch (error) { - if (error.code === ethers.errors.INVALID_ARGUMENT) { - return; // noop - } - throw error; - } + const maybeDecodedLog = this._web3Wrapper.abiDecoder.tryToDecodeLogOrNoop(log); const isLogDecoded = !_.isUndefined(((maybeDecodedLog as any) as LogWithDecodedArgs).event); if (!isLogDecoded) { return; // noop -- cgit v1.2.3