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

paypro: differentiate safeUnspent and unspent.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-08-13 20:21:27 -04:00 • committed by Manuel Araoz
commit 685c6e54dc
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ Wallet.prototype.unlock = function() {
Wallet.prototype.checkAndLock = function() { Wallet.prototype.checkAndLock = function() {
if (this.getLock()) { if (this.getLock()) {
return true; return true;
} }
this.setLock(); this.setLock();
return false; return false;
@ -927,16 +927,16 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
raw: pr.serialize().toString('hex') raw: pr.serialize().toString('hex')
}; };
return this.getUnspent(function(err, unspent) { return this.getUnspent(function(err, safeUnspent, unspent) {
if (options.fetch) { if (options.fetch) {
if (!unspent || !unspent.length) { if (!unspent || !unspent.length) {
return cb(new Error('No unspent outputs available.')); return cb(new Error('No unspent outputs available.'));
} }
self.createPaymentTxSync(options, merchantData, unspent); self.createPaymentTxSync(options, merchantData, safeUnspent);
return cb(null, merchantData, pr); return cb(null, merchantData, pr);
} }
var ntxid = self.createPaymentTxSync(options, merchantData, unspent); var ntxid = self.createPaymentTxSync(options, merchantData, safeUnspent);
if (ntxid) { if (ntxid) {
self.sendIndexes(); self.sendIndexes();
self.sendTxProposal(ntxid); self.sendTxProposal(ntxid);