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

fail early with invalid tx proposals

Browse source
This commit is contained in:
Manuel Araoz 2014-06-04 16:28:37 -03:00
commit cd23751ada
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -438,7 +438,9 @@ Wallet.prototype.getTxProposals = function() {
Wallet.prototype.reject = function(ntxid) { Wallet.prototype.reject = function(ntxid) {
var myId = this.getMyCopayerId(); var myId = this.getMyCopayerId();
var txp = this.txProposals.txps[ntxid]; var txp = this.txProposals.txps[ntxid];
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) return; if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) {
throw new Error('Invalid transaction to reject: '+ntxid);
}
txp.rejectedBy[myId] = Date.now(); txp.rejectedBy[myId] = Date.now();
this.sendTxProposals(null, ntxid); this.sendTxProposals(null, ntxid);
@ -454,7 +456,7 @@ Wallet.prototype.sign = function(ntxid, cb) {
var txp = self.txProposals.txps[ntxid]; var txp = self.txProposals.txps[ntxid];
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) { if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) {
if (cb) cb(false); if (cb) cb(false);
return; throw new Error('Invalid transaction to sign: '+ntxid);
} }
var pkr = self.publicKeyRing; var pkr = self.publicKeyRing;