From: Scott Nadal <scott.nadal@gmail.com>
Date: Tue, 24 Jul 2012 14:30:11 +0000 (+0100)
Subject: PPCoin: Fix merge mistake on connecting coinstake since commit 0561bbd
X-Git-Tag: v0.4.0-unstable~126
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a9b672e77d90ac92e47dd67bb81aa6368259f439

PPCoin: Fix merge mistake on connecting coinstake since commit 0561bbd
---

diff --git a/src/main.cpp b/src/main.cpp
index e99e95f..7790c58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1380,7 +1380,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
         nTxPos += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);
 
         MapPrevTx mapInputs;
-        if (!(tx.IsCoinBase() || tx.IsCoinStake()))
+        if (!tx.IsCoinBase())
         {
             bool fInvalid;
             if (!tx.FetchInputs(txdb, mapQueuedChanges, true, false, mapInputs, fInvalid))
@@ -1396,7 +1396,8 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
                     return DoS(100, error("ConnectBlock() : too many sigops"));
             }
 
-            nFees += tx.GetValueIn(mapInputs)-tx.GetValueOut();
+            if (!tx.IsCoinStake())
+                nFees += tx.GetValueIn(mapInputs)-tx.GetValueOut();
 
             if (!tx.ConnectInputs(txdb, mapInputs, mapQueuedChanges, posThisTx, pindex, true, false, fStrictPayToScriptHash))
                 return false;