Merge pull request #360 from maraoz/optimize/many-addresses

Optimize for many addresses

js/models/blockchain/Insight.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var imports     = require('soop').imports();
-var bitcore     = require('bitcore');
+var imports = require('soop').imports();
+var bitcore = require('bitcore');
 
 function Insight(opts) {
   opts = opts || {};
@@ -12,55 +12,58 @@ function Insight(opts) {
 
 function _asyncForEach(array, fn, callback) {
   array = array.slice(0);
+
   function processOne() {
     var item = array.pop();
     fn(item, function(result) {
-        if(array.length > 0) {
-          setTimeout(processOne, 0); // schedule immediately
-        } else {
-          callback(); // Done!
-        }
-      });
+      if (array.length > 0) {
+        setTimeout(processOne, 0); // schedule immediately
+      } else {
+        callback(); // Done!
+      }
+    });
   }
-  if(array.length > 0) {
+  if (array.length > 0) {
     setTimeout(processOne, 0); // schedule immediately
   } else {
     callback(); // Done!
   }
 };
 
-function removeRepeatedElements(ar){ 
-  var ya=false,v="",aux=[].concat(ar),r=Array(); 
-  for (var i in aux){ // 
-    v=aux[i]; 
-    ya=false; 
-    for (var a in aux){ 
-      if (v==aux[a]){ 
-        if (ya==false){ 
-          ya=true; 
-        } 
-        else{ 
-          aux[a]=""; 
-        } 
-      } 
-    } 
-  } 
-  for (var a in aux){ 
-    if (aux[a]!=""){ 
-      r.push(aux[a]); 
-    } 
-  } 
-  return r; 
+function removeRepeatedElements(ar) {
+  var ya = false,
+    v = "",
+    aux = [].concat(ar),
+    r = Array();
+  for (var i in aux) { // 
+    v = aux[i];
+    ya = false;
+    for (var a in aux) {
+      if (v == aux[a]) {
+        if (ya == false) {
+          ya = true;
+        } else {
+          aux[a] = "";
+        }
+      }
+    }
+  }
+  for (var a in aux) {
+    if (aux[a] != "") {
+      r.push(aux[a]);
+    }
+  }
+  return r;
 }
 
 Insight.prototype.getTransactions = function(addresses, cb) {
   var self = this;
-  
+
   if (!addresses || !addresses.length) return cb([]);
 
   var txids = [];
   var txs = [];
-  
+
   _asyncForEach(addresses, function(addr, callback) {
     var options = {
       host: self.host,
@@ -69,12 +72,14 @@ Insight.prototype.getTransactions = function(addresses, cb) {
       method: 'GET',
       path: '/api/addr/' + addr,
 
-      headers: { 'Access-Control-Request-Headers' : '' }
+      headers: {
+        'Access-Control-Request-Headers': ''
+      }
     };
-    
+
     self._request(options, function(err, res) {
       var txids_tmp = res.transactions;
-      for(var i=0; i<txids_tmp.length; i++) {
+      for (var i = 0; i < txids_tmp.length; i++) {
         txids.push(txids_tmp[i]);
       }
       callback();
@@ -88,7 +93,9 @@ Insight.prototype.getTransactions = function(addresses, cb) {
         scheme: self.scheme,
         method: 'GET',
         path: '/api/tx/' + txid,
-        headers: { 'Access-Control-Request-Headers' : '' }
+        headers: {
+          'Access-Control-Request-Headers': ''
+        }
       };
       self._request(options, function(err, res) {
         txs.push(res);
@@ -102,29 +109,27 @@ Insight.prototype.getTransactions = function(addresses, cb) {
 
 Insight.prototype.getUnspent = function(addresses, cb) {
   var self = this;
-  
+
   if (!addresses || !addresses.length) return cb([]);
 
   var all = [];
 
-  _asyncForEach(addresses, function(addr, callback) {
-    var options = {
-      host: self.host,
-      port: self.port,
-      scheme: self.scheme,
-      method: 'GET',
-      path: '/api/addr/' + addr + '/utxo',
+  var options = {
+    host: self.host,
+    port: self.port,
+    scheme: self.scheme,
+    method: 'GET',
+    path: '/api/addrs/' + addresses.join(',') + '/utxo',
 
-      headers: { 'Access-Control-Request-Headers' : '' }
-    };
-    
-    self._request(options, function(err, res) {
-      if (res && res.length > 0) { 
-        all = all.concat(res);
-      } 
-      callback();
-    });
-  }, function() {
+    headers: {
+      'Access-Control-Request-Headers': ''
+    }
+  };
+
+  self._request(options, function(err, res) {
+    if (res && res.length > 0) {
+      all = all.concat(res);
+    }
     return cb(all);
   });
 };
@@ -137,14 +142,16 @@ Insight.prototype.sendRawTransaction = function(rawtx, cb) {
     port: this.port,
     method: 'POST',
     path: '/api/tx/send',
-    data: 'rawtx='+rawtx,
-    headers: { 'content-type' : 'application/x-www-form-urlencoded' }
+    data: 'rawtx=' + rawtx,
+    headers: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
   };
-  this._request(options, function(err,res) {
-console.log('[Insight.js.73:err:]',err); //TODO
+  this._request(options, function(err, res) {
+    console.log('[Insight.js.73:err:]', err); //TODO
     if (err) return cb();
 
-console.log('[Insight.js.74]', res); //TODO
+    console.log('[Insight.js.74]', res); //TODO
     return cb(res.txid);
   });
 };
@@ -171,8 +178,7 @@ Insight.prototype._request = function(options, callback) {
       if (request.readyState === 4) {
         if (request.status === 200) {
           return callback(null, JSON.parse(request.responseText));
-        } 
-        else {
+        } else {
           return callback({
             message: 'Error code: ' + request.status + ' - Status: ' + request.statusText + ' - Description: ' + request.responseText
           });
@@ -195,17 +201,20 @@ Insight.prototype._request = function(options, callback) {
           try {
             ret = JSON.parse(chunk);
           } catch (e) {
-            callback({message: "Wrong response from insight"});
+            callback({
+              message: "Wrong response from insight"
+            });
             return;
           }
         });
-        response.on('end', function () {
-          callback(undefined, ret);   
+        response.on('end', function() {
+          callback(undefined, ret);
           return;
         });
-      }
-      else {
-        callback({message: 'Error ' + response.statusCode}); 
+      } else {
+        callback({
+          message: 'Error ' + response.statusCode
+        });
         return;
       }
     });
@@ -218,4 +227,3 @@ Insight.prototype._request = function(options, callback) {
 
 
 module.exports = require('soop')(Insight);
-

js/services/controllerUtils.js

@@ -101,7 +101,6 @@ angular.module('copay.controllerUtils')
     };
 
     root.updateBalance = function(cb) {
-      root.setSocketHandlers();
       $rootScope.balanceByAddr = {};
       var w = $rootScope.wallet;
       $rootScope.addrInfos = w.getAddressesInfo();
@@ -121,6 +120,7 @@ angular.module('copay.controllerUtils')
         $rootScope.$digest();
         if (cb) cb();
       });
+      root.setSocketHandlers();
     };
 
     root.updateTxs = function() {