anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

added from & to args to #getTransactions call

Browse source
This commit is contained in:
Ivan Socolsky 2014-11-26 12:27:38 -03:00
commit e77c7d90b1
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
js/models/Insight.js
View file

@ -44,9 +44,9 @@ var Insight = function(opts) {
}; };
if (opts.transports) { if (opts.transports) {
this.opts['transports'] = opts.transports; this.opts['transports'] = opts.transports;
} }
this.socket = this.getSocket(); this.socket = this.getSocket();
} }
@ -224,7 +224,7 @@ Insight.prototype.subscribe = function(addresses) {
s.emit('subscribe', address); s.emit('subscribe', address);
s.on(address, handler); s.on(address, handler);
} }
}); });
}; };
@ -267,16 +267,21 @@ Insight.prototype.getTransaction = function(txid, cb) {
}); });
}; };
Insight.prototype.getTransactions = function (addresses, from, to, cb) { Insight.prototype.getTransactions = function(addresses, from, to, cb) {
preconditions.shouldBeArray(addresses); preconditions.shouldBeArray(addresses);
preconditions.shouldBeFunction(cb); preconditions.shouldBeFunction(cb);
var qs = '?from=' + (from || 0); var qs = '';
if (to) qs += '&to=' + to; if (_.isNumber(from)) {
qs += '?from=' + from;
if (_.isNumber(to)) {
qs += '&to=' + to;
}
}
this.requestPost('/api/addrs/txs' + qs, { this.requestPost('/api/addrs/txs' + qs, {
addrs: addresses.join(',') addrs: addresses.join(',')
}, function (err, res, txs) { }, function(err, res, txs) {
if (err || res.statusCode != 200) return cb(err || res); if (err || res.statusCode != 200) return cb(err || res);
cb(null, txs); cb(null, txs);
}); });
@ -294,7 +299,7 @@ Insight.prototype.getUnspent = function(addresses, cb) {
// This filter out possible broken unspent, as reported on // This filter out possible broken unspent, as reported on
// https://github.com/bitpay/copay/issues/1585 // https://github.com/bitpay/copay/issues/1585
// and later gitter conversation. // and later gitter conversation.
var unspent = _.filter(unspentRaw, 'scriptPubKey'); var unspent = _.filter(unspentRaw, 'scriptPubKey');
cb(null, unspent); cb(null, unspent);
}); });
@ -303,7 +308,7 @@ Insight.prototype.getUnspent = function(addresses, cb) {
Insight.prototype.getActivity = function(addresses, cb) { Insight.prototype.getActivity = function(addresses, cb) {
preconditions.shouldBeArray(addresses); preconditions.shouldBeArray(addresses);
this.getTransactions(addresses, function then(err, txs) { this.getTransactions(addresses, null, null, function then(err, txs) {
if (err) return cb(err); if (err) return cb(err);
var flatArray = function(xss) { var flatArray = function(xss) {