From 68649bef9395947f3a71e40daae053ca5c0aabca Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Sat, 28 Jan 2012 10:16:21 -0500
Subject: CreateNewBlock was not adding in transaction fees.

---
 src/main.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 9e13f7a36e..5981c675a1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3073,8 +3073,8 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
             if (!tx.FetchInputs(txdb, mapTestPoolTmp, false, true, mapInputs, fInvalid))
                 continue;
 
-            int64 nFees = tx.GetValueIn(mapInputs)-tx.GetValueOut();
-            if (nFees < nMinFee)
+            int64 nTxFees = tx.GetValueIn(mapInputs)-tx.GetValueOut();
+            if (nTxFees < nMinFee)
                 continue;
 
             nTxSigOps += tx.GetP2SHSigOpCount(mapInputs);
@@ -3091,6 +3091,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
             nBlockSize += nTxSize;
             ++nBlockTx;
             nBlockSigOps += nTxSigOps;
+            nFees += nTxFees;
 
             // Add transactions that depend on this one to the priority queue
             uint256 hash = tx.GetHash();
-- 
cgit v1.2.3