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

Merge pull request #1315 from isocolsky/fix/insight_down

Browse source 
Catching errors when trying to create new TXP
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-09 10:38:52 -03:00
commit ea91c603f9
6 changed files with 63 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -879,7 +879,6 @@ Wallet.prototype.sendAllTxProposals = function(recipients) {
*/
Wallet.prototype.sendTxProposal = function(ntxid, recipients) {
preconditions.checkArgument(ntxid);
log.debug('### SENDING txProposal ' + ntxid + ' TO:', recipients || 'All', this.txProposals);
this.send(recipients, {
type: 'txProposal',
@ -2030,24 +2029,6 @@ Wallet.prototype.removeTxWithSpentInputs = function(cb) {
Wallet.prototype.createTx = function(toAddress, amountSatStr, comment, opts, cb) {
var self = this;
if (_.isFunction(amountSatStr)) {
var cb = amountSatStr;
var merchant = toAddress;
return this.createPaymentTx({
uri: merchant
}, cb);
}
if (_.isFunction(comment)) {
var cb = comment;
var merchant = toAddress;
var comment = amountSatStr;
return this.createPaymentTx({
uri: merchant,
memo: comment
}, cb);
}
if (_.isFunction(opts)) {
cb = opts;
opts = {};
@ -2059,14 +2040,18 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, comment, opts, cb)
}
this.getUnspent(function(err, safeUnspent) {
if (err) return cb(new Error('Could not get list of UTXOs'));
var ntxid = self.createTxSync(toAddress, amountSatStr, comment, safeUnspent, opts);
if (ntxid) {
self.sendIndexes();
self.sendTxProposal(ntxid);
self.store();
self.emit('txProposalsUpdated');
if (!ntxid) {
return cb(new Error('Error creating TX'));
}
return cb(ntxid);
self.sendIndexes();
self.sendTxProposal(ntxid);
self.store();
self.emit('txProposalsUpdated');
return cb(null, ntxid);
});
};