Merge commit '88955a7049bc2179ef875856578831f3325614ee' into jsonrpc

libjsqrc/ethereumjs/dist/ethereum.js

@@ -715,6 +715,7 @@ var outputParser = function (event) {
             args: {}
         };
 
+        output.topics = output.topic; // fallback for go-ethereum
         if (!output.topic) {
             return result;
         }
@@ -829,7 +830,7 @@ var filter = function(options, implementation, formatter) {
     var filterId = implementation.newFilter(options);
     var onMessages = function (messages) {
         messages.forEach(function (message) {
-            messages = formatter ? formatter(message) : message;
+            message = formatter ? formatter(message) : message;
             callbacks.forEach(function (callback) {
                 callback(message);
             });

libjsqrc/ethereumjs/lib/event.js

@@ -99,6 +99,7 @@ var outputParser = function (event) {
             args: {}
         };
 
+        output.topics = output.topic; // fallback for go-ethereum
         if (!output.topic) {
             return result;
         }

libjsqrc/ethereumjs/lib/filter.js

@@ -76,7 +76,7 @@ var filter = function(options, implementation, formatter) {
     var filterId = implementation.newFilter(options);
     var onMessages = function (messages) {
         messages.forEach(function (message) {
-            messages = formatter ? formatter(message) : message;
+            message = formatter ? formatter(message) : message;
             callbacks.forEach(function (callback) {
                 callback(message);
             });