From 89e39eed1630cddcc397a64beb5e6c98671e3d6d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 15 Apr 2015 13:23:30 -0300
Subject: [PATCH] fix config

---
 config.js                 | 17 +++++++----------
 lib/blockchainexplorer.js |  4 ++--
 lib/blockchainmonitor.js  |  2 +-
 lib/server.js             |  8 +++++---
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/config.js b/config.js
index d78528e..f58e934 100644
--- a/config.js
+++ b/config.js
@@ -1,16 +1,13 @@
 var config = {
   basePath: '/bws/api',
   disableLogs: false,
-/*  port: 3232, */
-
+  port: 3232, 
   storageOpts: {
     dbPath: './db',
-    /*  To use multilevel, uncomment this:
-    multiLevel: {
-      host: 'localhost',
-      port: 3230,
-    },
-    */
+    // multiLevel: {
+    //   host: 'localhost',
+    //   port: 3230,
+    // },
   },
   lockOpts: {
     //  To use locker-server, uncomment this:
@@ -21,11 +18,11 @@ var config = {
   },
   blockchainExplorerOpts: {
     livenet: {
-      name: 'insight',
+      provider: 'insight',
       url: 'https://insight.bitpay.com:443',
     },
     testnet: {
-      name: 'insight',
+      provider: 'insight',
       url: 'https://test-insight.bitpay.com:443',
     },
   },
diff --git a/lib/blockchainexplorer.js b/lib/blockchainexplorer.js
index 6005fc0..c34660f 100644
--- a/lib/blockchainexplorer.js
+++ b/lib/blockchainexplorer.js
@@ -54,9 +54,9 @@ function getTransactionsInsight(url, addresses, from, to, cb) {
 };
 
 function getAddressActivityInsight(url, addresses, cb) {
-  getTransactionsInsight(url, addresses, 0, 0, function(err, result) {
+  getTransactionsInsight(url, addresses, null, null, function(err, result) {
     if (err) return cb(err);
-    return cb(null, result.totalItems > 0);
+    return cb(null, result && result.length > 0);
   });
 };
 
diff --git a/lib/blockchainmonitor.js b/lib/blockchainmonitor.js
index 4135a05..0e7f730 100644
--- a/lib/blockchainmonitor.js
+++ b/lib/blockchainmonitor.js
@@ -25,7 +25,7 @@ function BlockchainMonitor(opts) {
   _.each(['livenet', 'testnet'], function(network) {
     opts[network] = opts[network] || {};
     self.subscriber[network] = self._getAddressSubscriber(
-      opts[network].name, network, opts[network].url);
+      opts[network].provider, network, opts[network].url);
   });
 };
 
diff --git a/lib/server.js b/lib/server.js
index 3f10295..b08bbcc 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1169,21 +1169,23 @@ WalletService.prototype.scan = function(opts, cb) {
     }, cb);
   };
 
-  function checkActivity(addresses, cb) {
-    var bc = self._getBlockchainExplorer();
+  function checkActivity(addresses, networkName, cb) {
+    var bc = self._getBlockchainExplorer('insight', networkName);
     bc.getAddressActivity(addresses, cb);
   };
 
   function scanBranch(derivator, cb) {
     var activity = true;
     var allAddresses = [];
+    var networkName;
     async.whilst(function() {
       return activity;
     }, function(next) {
       deriveAddresses(WalletService.scanConfig.SCAN_WINDOW, derivator, function(err, addresses) {
         if (err) return next(err);
+        networkName = networkName || Bitcore.Address(addresses[0].address).toObject().network;
         allAddresses.push(addresses);
-        checkActivity(_.pluck(addresses, 'address'), function(err, thereIsActivity) {
+        checkActivity(_.pluck(addresses, 'address'), networkName, function(err, thereIsActivity) {
           if (err) return next(new Error('Could not fetch TX activity:' + err));
           activity = thereIsActivity;
           next();