From 93b707620f8cb36ef4cfb17f470706f7a4af5f0a Mon Sep 17 00:00:00 2001 From: Sunny King Date: Mon, 7 May 2012 15:08:11 +0100 Subject: [PATCH] PPCoin: Fix proof-of-stake block generation since c03bef8c Remove obsolete check in CheckBlock() --- src/main.cpp | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index a857edc..3bc0983 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1528,14 +1528,7 @@ bool CBlock::CheckBlock() const if (hashMerkleRoot != BuildMerkleTree()) return DoS(100, error("CheckBlock() : hashMerkleRoot mismatch")); - // Coin base vout[0] scriptPubKey must be the same as coin stake vout[1] - // scriptPubKey - if (vtx.size() > 1 && vtx[1].IsCoinStake() && - vtx[0].vout[0].scriptPubKey != vtx[1].vout[1].scriptPubKey) - return DoS(100, error("CheckBlock() : block key mismatch")); - - - // Check block signature + // ppcoin: check block signature if (!CheckBlockSignature()) return DoS(100, error("CheckBlock() : bad block signature")); @@ -3163,7 +3156,8 @@ CBlock* CreateNewBlock(CWallet* pwallet) } } } - pblock->vtx[0].vout[0].nValue = GetProofOfWorkReward(pblock->nBits); + if (pblock->IsProofOfWork()) + pblock->vtx[0].vout[0].nValue = GetProofOfWorkReward(pblock->nBits); // Fill in header pblock->hashPrevBlock = pindexPrev->GetBlockHash(); -- 1.7.1