From a9b672e77d90ac92e47dd67bb81aa6368259f439 Mon Sep 17 00:00:00 2001 From: Scott Nadal Date: Tue, 24 Jul 2012 15:30:11 +0100 Subject: [PATCH] PPCoin: Fix merge mistake on connecting coinstake since commit 0561bbd --- src/main.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) 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; -- 1.7.1