Merge branch 'v2-prototype' into eth-lightwallet-subprovider-final

1 files changed, 14 insertions, 1 deletions

diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index 931cb94b2..d0c1ddc7d 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -32,7 +32,20 @@ export class AbiDecoder {
         const decodedParams: DecodedLogArgs = {};
         let topicsIndex = 1;
 
-        const decodedData = ethersInterface.events[event.name].parse(log.data);
+        let decodedData: any[];
+        try {
+            decodedData = ethersInterface.events[event.name].parse(log.data);
+        } catch (error) {
+            if (error.code === ethers.errors.INVALID_ARGUMENT) {
+                // Because we index events by Method ID, and Method IDs are derived from the method
+                // name and the input parameters, it's possible that the return value of the event
+                // does not match our ABI. If that's the case, then ethers will throw an error
+                // when we try to parse the event. We handle that case here by returning the log rather
+                // than throwing an error.
+                return log;
+            }
+            throw error;
+        }
 
         let didFailToDecode = false;
         _.forEach(event.inputs, (param: EventParameter, i: number) => {