Fix Transaction.fromObject

bitpay · Dec 1, 2015 · 446760f · 446760f
1 parent 8f53fc8
commit 446760f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/transaction/transaction.js b/lib/transaction/transaction.js
@@ -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;

diff --git a/test/transaction/transaction.js b/test/transaction/transaction.js
@@ -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);