aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 1dbd50f4e6..5981c675a1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -53,6 +53,9 @@ map<uint256, CDataStream*> mapOrphanTransactions;
multimap<uint256, CDataStream*> mapOrphanTransactionsByPrev;
+const string strMessageMagic = "Bitcoin Signed Message:\n";
+
+
double dHashesPerSec;
int64 nHPSTimerStart;
@@ -3070,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);
@@ -3088,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();