Merge pull request #458 from matiu/feature/builder03
Fix loosing signatures after from-toObj roundtrip
This commit is contained in:
commit
9937ec6312
|
@ -834,6 +834,17 @@ TransactionBuilder.prototype.toObj = function() {
|
|||
return ret;
|
||||
};
|
||||
|
||||
TransactionBuilder.prototype._setScriptSig = function(inScriptSig) {
|
||||
this.vanilla.scriptSig = inScriptSig;
|
||||
|
||||
for (var i in inScriptSig) {
|
||||
this.tx.ins[i].s = new Buffer(inScriptSig[i], 'hex');
|
||||
var scriptSig = new Script(this.tx.ins[i].s);
|
||||
if (scriptSig.finishedMultiSig() !== false)
|
||||
this.inputsSigned++;
|
||||
}
|
||||
};
|
||||
|
||||
// fromObj
|
||||
// -------
|
||||
// Returns a TransactionBuilder instance given
|
||||
|
@ -855,12 +866,8 @@ TransactionBuilder.fromObj = function(data) {
|
|||
if (data.outs) {
|
||||
b.setOutputs(data.outs);
|
||||
|
||||
for (var i in data.scriptSig) {
|
||||
b.tx.ins[i].s = new Buffer(data.scriptSig[i], 'hex');
|
||||
|
||||
var scriptSig = new Script(b.tx.ins[i].s);
|
||||
if (scriptSig.finishedMultiSig() !== false)
|
||||
b.inputsSigned++;
|
||||
if (data.scriptSig) {
|
||||
b._setScriptSig(data.scriptSig);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -919,6 +919,15 @@ describe('TransactionBuilder', function() {
|
|||
util.valueToBigInt(tx.outs[1].v).cmp(2990000).should.equal(0);
|
||||
});
|
||||
|
||||
it('#clone roundtrip, signed', function() {
|
||||
var b = getBuilder3();
|
||||
b.sign(testdata.dataUnspentSign.keyStrings);
|
||||
b.isFullySigned().should.equal(true);
|
||||
|
||||
var b2 = b.clone().clone().clone();
|
||||
b2.isFullySigned().should.equal(true);
|
||||
});
|
||||
|
||||
it('#toObj #fromObj roundtrip, step signatures p2sh/p2pubkeyhash', function() {
|
||||
var b = getP2shBuilder(1);
|
||||
|
||||
|
@ -1204,8 +1213,5 @@ describe('TransactionBuilder', function() {
|
|||
b2.merge(b)
|
||||
}).should.throw('incompatible');
|
||||
});
|
||||
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue