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

mv filter to Insight

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-11-02 19:17:55 -03:00
commit 0567714628
2 changed files with 19 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/models/Insight.js
View file

@ -5,6 +5,7 @@ var async = require('async');
var request = require('request'); var request = require('request');
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var io = require('socket.io-client'); var io = require('socket.io-client');
var _ = require('lodash');
var log = require('../log'); var log = require('../log');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
@ -310,9 +311,15 @@ Insight.prototype.getUnspent = function(addresses, cb) {
this.requestPost('/api/addrs/utxo', { this.requestPost('/api/addrs/utxo', {
addrs: addresses.join(',') addrs: addresses.join(',')
}, function(err, res, body) { }, function(err, res, unspentRaw) {
if (err || res.statusCode != 200) return cb(err || res); if (err || res.statusCode != 200) return cb(err || res);
cb(null, body);
// This filter out possible broken unspent, as reported on
// https://github.com/bitpay/copay/issues/1585
// and later gitter conversation.
var unspent = _.filter(unspentRaw, 'scriptPubKey');
cb(null, unspent);
}); });
}; };

36
js/models/Wallet.js
View file

@ -1879,15 +1879,9 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
merchantData.total = merchantData.total.toString(10); merchantData.total = merchantData.total.toString(10);
var b; var b = new Builder(opts)
try { .setUnspent(unspent)
b = new Builder(opts) .setOutputs(outs);
.setUnspent(unspent)
.setOutputs(outs);
} catch (e) {
log.debug(e.message);
return;
};
merchantData.pr.pd.outputs.forEach(function(output, i) { merchantData.pr.pd.outputs.forEach(function(output, i) {
var script = { var script = {
@ -2172,17 +2166,11 @@ Wallet.prototype.getBalance = function(cb) {
var balanceByAddr = {}; var balanceByAddr = {};
var COIN = coinUtil.COIN; var COIN = coinUtil.COIN;
this.getUnspent(function(err, safeUnspent, unspentRaw) { this.getUnspent(function(err, safeUnspent, unspent) {
if (err) { if (err) {
return cb(err); return cb(err);
} }
// This filter out possible broken unspent, as reported on
// https://github.com/bitpay/copay/issues/1585
// and later gitter conversation.
var unspent = _.filter(unspentRaw, 'scriptPubKey');
for (var i = 0; i < unspent.length; i++) { for (var i = 0; i < unspent.length; i++) {
var u = unspent[i]; var u = unspent[i];
var amt = u.amount * COIN; var amt = u.amount * COIN;
@ -2371,16 +2359,12 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, comment, utxos
opts[k] = Wallet.builderOpts[k]; opts[k] = Wallet.builderOpts[k];
} }
var b = new Builder(opts); var b = new Builder(opts)
.setUnspent(utxos)
b.setUnspent(utxos); .setOutputs([{
address: toAddress.data,
console.log('[Wallet.js.2370:utxos:]',utxos); //TODO amountSatStr: amountSatStr,
}]);
b.setOutputs([{
address: toAddress.data,
amountSatStr: amountSatStr,
}]);
var selectedUtxos = b.getSelectedUnspent(); var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) { var inputChainPaths = selectedUtxos.map(function(utxo) {