BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge utxo exclusion into sanitize fn

This commit is contained in:
Ivan Socolsky 2016-03-07 15:44:40 -03:00
parent cbde3233df
commit 08cb603a50
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/server.js
View File

@ -1279,22 +1279,17 @@ WalletService.prototype._selectTxInputs = function(txp, utxosToExclude, cb) {
var sizePerInput = txp.getEstimatedSizeForSingleInput();
var feePerInput = sizePerInput * txp.feePerKb / 1000.;
function excludeUtxos(utxos) {
function sanitizeUtxos(utxos) {
var excludeIndex = _.reduce(utxosToExclude, function(res, val) {
res[val] = val;
return res;
}, {});
return _.reject(utxos, function(utxo) {
return excludeIndex[utxo.txid + ":" + utxo.vout];
});
};
function sanitizeUtxos(utxos) {
return _.filter(utxos, function(utxo) {
if (utxo.locked) return false;
if (utxo.satoshis <= feePerInput) return false;
if (txp.excludeUnconfirmedUtxos && !utxo.confirmations) return false;
if (excludeIndex[utxo.txid + ":" + utxo.vout]) return false;
return true;
});
};
@ -1415,8 +1410,6 @@ WalletService.prototype._selectTxInputs = function(txp, utxosToExclude, cb) {
self._getUtxosForCurrentWallet(null, function(err, utxos) {
if (err) return cb(err);
utxos = excludeUtxos(utxos);
var totalAmount;
var availableAmount;