Merge commit '9d84609b3faf797f4a611587abdda3d6b3b07917' into develop

cmd/mist/assets/ext/ethereum.js/dist/ethereum.js

@@ -1043,33 +1043,16 @@ var ProviderManager = function() {
 
     var self = this;
     var poll = function () {
-        if (self.provider) {
-            var pollsBatch = self.polls.map(function (data) {
-                return data.data;
-            });
-
-            var payload = jsonrpc.toBatchPayload(pollsBatch);
-            var results = self.provider.send(payload);
-
-            self.polls.forEach(function (data, index) {
-                var result = results[index];
-                
-                if (!jsonrpc.isValidResponse(result)) {
-                    console.log(result);
-                    return;
-                }
-
-                result = result.result;
-                // dont call the callback if result is not an array, or empty one
-                if (!(result instanceof Array) || result.length === 0) {
-                    return;
-                }
+        self.polls.forEach(function (data) {
+            var result = self.send(data.data);
 
-                data.callback(result);
+            if (!(result instanceof Array) || result.length === 0) {
+                return;
+            }
 
-            });
+            data.callback(result);
+        });
 
-        }
         setTimeout(poll, 1000);
     };
     poll();

cmd/mist/assets/ext/ethereum.js/lib/providermanager.js

@@ -42,33 +42,16 @@ var ProviderManager = function() {
 
     var self = this;
     var poll = function () {
-        if (self.provider) {
-            var pollsBatch = self.polls.map(function (data) {
-                return data.data;
-            });
+        self.polls.forEach(function (data) {
+            var result = self.send(data.data);
 
-            var payload = jsonrpc.toBatchPayload(pollsBatch);
-            var results = self.provider.send(payload);
+            if (!(result instanceof Array) || result.length === 0) {
+                return;
+            }
 
-            self.polls.forEach(function (data, index) {
-                var result = results[index];
-                
-                if (!jsonrpc.isValidResponse(result)) {
-                    console.log(result);
-                    return;
-                }
+            data.callback(result);
+        });
 
-                result = result.result;
-                // dont call the callback if result is not an array, or empty one
-                if (!(result instanceof Array) || result.length === 0) {
-                    return;
-                }
-
-                data.callback(result);
-
-            });
-
-        }
         setTimeout(poll, 1000);
     };
     poll();