From 4de5c5dd0071c5c91ae479dc8dcefc40e8413154 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 9 Jan 2014 18:35:14 -0300 Subject: [PATCH] omit feeds + valueIn in coinbase TXs --- app/models/Transaction.js | 7 +++++-- test/model/transaction.js | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/Transaction.js b/app/models/Transaction.js index 58a0707..e48bd1b 100644 --- a/app/models/Transaction.js +++ b/app/models/Transaction.js @@ -187,9 +187,12 @@ TransactionSchema.methods.queryInfo = function (next) { valueOut = valueOut.add(n); }); - that.info.valueIn = valueIn / util.COIN; that.info.valueOut = valueOut / util.COIN; - that.info.feeds = (valueIn - valueOut) / util.COIN; + + if ( !tx.isCoinBase() ) { + that.info.valueIn = valueIn / util.COIN; + that.info.feeds = (valueIn - valueOut) / util.COIN; + } that.info.size = b.length; diff --git a/test/model/transaction.js b/test/model/transaction.js index ee9f16c..7c51ec7 100644 --- a/test/model/transaction.js +++ b/test/model/transaction.js @@ -30,6 +30,7 @@ describe('Transaction fromIdWithInfo', function(){ Transaction.fromIdWithInfo(test_txid, function(err, tx) { if (err) done(err); assert.equal(tx.txid, test_txid); + assert(!tx.info.isCoinBase); done(); }); }); @@ -43,6 +44,7 @@ describe('Transaction fromIdWithInfo', function(){ assert.equal(tx.info.valueOut, 1.66174); assert.equal(tx.info.feeds, 0.0005 ); assert.equal(tx.info.size, 226 ); + assert(!tx.info.isCoinBase); done(); }); }); @@ -53,6 +55,7 @@ describe('Transaction fromIdWithInfo', function(){ if (err) done(err); assert(tx.info.isCoinBase); assert.equal(tx.info.txid, test_txid2); + assert(!tx.info.feeds); done(); }); });