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

Merge pull request #1270 from isocolsky/fix/remove_spent

Browse source 
Removed proposals with spent inputs
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-04 18:25:11 -03:00
commit db3ca4ceef
6 changed files with 144 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/models/core/TxProposals.js
View file

@ -44,6 +44,11 @@ TxProposals.prototype.getNtxids = function() {
return Object.keys(this.txps);
};
TxProposals.prototype.deleteOne = function(ntxid) {
preconditions.checkState(this.txps[ntxid], 'Unknown TXP: ' + ntxid);
delete this.txps[ntxid];
};
TxProposals.prototype.deleteAll = function() {
this.txps = {};
};

46
js/models/core/Wallet.js
View file

@ -1534,6 +1534,52 @@ Wallet.prototype.getUnspent = function(cb) {
});
};
Wallet.prototype.removeTxWithSpentInputs = function(cb) {
var self = this;
cb = cb || function () {};
var txps = [];
var maxRejectCount = this.maxRejectCount();
for (var ntxid in this.txProposals.txps) {
var txp = this.txProposals.txps[ntxid];
txp.ntxid = ntxid;
if (txp.isPending(maxRejectCount)) {
txps.push(txp);
}
}
var inputs = [];
txps.forEach(function (txp) {
txp.builder.utxos.forEach(function (utxo) {
inputs.push({ ntxid: txp.ntxid, txid: utxo.txid, vout: utxo.vout });
});
});
if (inputs.length === 0)
return;
this.blockchain.getUnspent(this.getAddressesStr(), function(err, unspentList) {
if (err) return cb(err);
unspentList.forEach(function (unspent) {
inputs.forEach(function (input) {
input.unspent = input.unspent || (input.txid === unspent.txid && input.vout === unspent.vout);
});
});
inputs.forEach(function (input) {
if (!input.unspent) {
self.txProposals.deleteOne(input.ntxid);
}
});
self.emit('txProposalsUpdated');
self.store();
cb(null);
});
};
Wallet.prototype.createTx = function(toAddress, amountSatStr, comment, opts, cb) {
var self = this;