commit
64446c9501
17
config.js
17
config.js
|
@ -1,16 +1,13 @@
|
||||||
var config = {
|
var config = {
|
||||||
basePath: '/bws/api',
|
basePath: '/bws/api',
|
||||||
disableLogs: false,
|
disableLogs: false,
|
||||||
/* port: 3232, */
|
port: 3232,
|
||||||
|
|
||||||
storageOpts: {
|
storageOpts: {
|
||||||
dbPath: './db',
|
dbPath: './db',
|
||||||
/* To use multilevel, uncomment this:
|
// multiLevel: {
|
||||||
multiLevel: {
|
// host: 'localhost',
|
||||||
host: 'localhost',
|
// port: 3230,
|
||||||
port: 3230,
|
// },
|
||||||
},
|
|
||||||
*/
|
|
||||||
},
|
},
|
||||||
lockOpts: {
|
lockOpts: {
|
||||||
// To use locker-server, uncomment this:
|
// To use locker-server, uncomment this:
|
||||||
|
@ -21,11 +18,11 @@ var config = {
|
||||||
},
|
},
|
||||||
blockchainExplorerOpts: {
|
blockchainExplorerOpts: {
|
||||||
livenet: {
|
livenet: {
|
||||||
name: 'insight',
|
provider: 'insight',
|
||||||
url: 'https://insight.bitpay.com:443',
|
url: 'https://insight.bitpay.com:443',
|
||||||
},
|
},
|
||||||
testnet: {
|
testnet: {
|
||||||
name: 'insight',
|
provider: 'insight',
|
||||||
url: 'https://test-insight.bitpay.com:443',
|
url: 'https://test-insight.bitpay.com:443',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -54,9 +54,9 @@ function getTransactionsInsight(url, addresses, from, to, cb) {
|
||||||
};
|
};
|
||||||
|
|
||||||
function getAddressActivityInsight(url, addresses, 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);
|
if (err) return cb(err);
|
||||||
return cb(null, result.totalItems > 0);
|
return cb(null, result && result.length > 0);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ function BlockchainMonitor(opts) {
|
||||||
_.each(['livenet', 'testnet'], function(network) {
|
_.each(['livenet', 'testnet'], function(network) {
|
||||||
opts[network] = opts[network] || {};
|
opts[network] = opts[network] || {};
|
||||||
self.subscriber[network] = self._getAddressSubscriber(
|
self.subscriber[network] = self._getAddressSubscriber(
|
||||||
opts[network].name, network, opts[network].url);
|
opts[network].provider, network, opts[network].url);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1169,21 +1169,23 @@ WalletService.prototype.scan = function(opts, cb) {
|
||||||
}, cb);
|
}, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
function checkActivity(addresses, cb) {
|
function checkActivity(addresses, networkName, cb) {
|
||||||
var bc = self._getBlockchainExplorer();
|
var bc = self._getBlockchainExplorer('insight', networkName);
|
||||||
bc.getAddressActivity(addresses, cb);
|
bc.getAddressActivity(addresses, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
function scanBranch(derivator, cb) {
|
function scanBranch(derivator, cb) {
|
||||||
var activity = true;
|
var activity = true;
|
||||||
var allAddresses = [];
|
var allAddresses = [];
|
||||||
|
var networkName;
|
||||||
async.whilst(function() {
|
async.whilst(function() {
|
||||||
return activity;
|
return activity;
|
||||||
}, function(next) {
|
}, function(next) {
|
||||||
deriveAddresses(WalletService.scanConfig.SCAN_WINDOW, derivator, function(err, addresses) {
|
deriveAddresses(WalletService.scanConfig.SCAN_WINDOW, derivator, function(err, addresses) {
|
||||||
if (err) return next(err);
|
if (err) return next(err);
|
||||||
|
networkName = networkName || Bitcore.Address(addresses[0].address).toObject().network;
|
||||||
allAddresses.push(addresses);
|
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));
|
if (err) return next(new Error('Could not fetch TX activity:' + err));
|
||||||
activity = thereIsActivity;
|
activity = thereIsActivity;
|
||||||
next();
|
next();
|
||||||
|
|
Loading…
Reference in New Issue