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

allow only valid cases for livenet

Browse source
This commit is contained in:
Manuel Araoz 2014-05-23 17:22:24 -03:00
commit 60e4be4d6a
4 changed files with 173 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -426,7 +426,10 @@ Wallet.prototype.sign = function(ntxid, cb) {
setTimeout(function() {
var myId = self.getMyCopayerId();
var txp = self.txProposals.txps[ntxid];
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) return;
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) {
if (cb) cb(false);
return;
}
var pkr = self.publicKeyRing;
var keys = self.privateKey.getAll(pkr.addressIndex, pkr.changeAddressIndex);
@ -455,6 +458,10 @@ Wallet.prototype.sendTx = function(ntxid, cb) {
if (!tx.isComplete()) return;
this.log('[Wallet.js.231] BROADCASTING TX!!!'); //TODO
var scriptSig = tx.ins[0].getScript();
var size = scriptSig.serialize().length;
alert('\t scriptSig size: '+size);
var txHex = tx.serialize().toString('hex');
this.log('[Wallet.js.261:txHex:]', txHex); //TODO