Merge branch 'master' into pubsub-docs

# Conflicts:
#	rpc/src/v1/tests/mocked/pubsub.rs

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.89",
+  "version": "1.7.90",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

js/src/api/contract/contract.js

@@ -177,19 +177,26 @@ export default class Contract {
           return null;
         }
 
-        const decoded = event.decodeLog(log.topics, log.data);
+        try {
+          const decoded = event.decodeLog(log.topics, log.data);
 
-        log.params = {};
-        log.event = event.name;
+          log.params = {};
+          log.event = event.name;
 
-        decoded.params.forEach((param, index) => {
-          const { type, value } = param.token;
-          const key = param.name || index;
+          decoded.params.forEach((param, index) => {
+            const { type, value } = param.token;
+            const key = param.name || index;
 
-          log.params[key] = { type, value };
-        });
+            log.params[key] = { type, value };
+          });
 
-        return log;
+          return log;
+        } catch (error) {
+          console.warn('Error decoding log', log);
+          console.warn(error);
+
+          return null;
+        }
       })
       .filter((log) => log);
   }