zcash-hackworks
/
bitcore-lib-zcash
mirror of https://github.com/zcash-hackworks/bitcore-lib-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Transaction.fromObject

This commit is contained in:
Kirill Fomichev 2015-11-27 17:46:16 +03:00
parent 8f53fc8bc1
commit 446760fec7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/transaction/transaction.js
View File

@ -381,7 +381,7 @@ Transaction.prototype.fromObject = function fromObject(arg) {
this._changeScript = new Script(transaction.changeScript);
}
if (transaction.fee) {
this.fee(transaction.fee);
this._fee = transaction.fee;
}
this.nLockTime = transaction.nLockTime;
this.version = transaction.version;

6
test/transaction/transaction.js
View File

@ -79,10 +79,11 @@ describe('Transaction', function() {
a.should.deep.equal(b);
});
it('serialize to Object with signatures roundtrip', function() {
it('toObject/fromObject with signatures and custom fee', function() {
var tx = new Transaction()
.from(simpleUtxoWith100000Satoshis)
.to([{address: toAddress, satoshis: 50000}])
.fee(15000)
.change(changeAddress)
.sign(privateKey);
@ -92,10 +93,11 @@ describe('Transaction', function() {
txData.should.equal(txData2);
});
it('serialize to Object with p2sh signatures roundtrip', function() {
it('toObject/fromObject with p2sh signatures and custom fee', function() {
var tx = new Transaction()
.from(p2shUtxoWith1BTC, [p2shPublicKey1, p2shPublicKey2, p2shPublicKey3], 2)
.to([{address: toAddress, satoshis: 50000}])
.fee(15000)
.change(changeAddress)
.sign(p2shPrivateKey1)
.sign(p2shPrivateKey2);