LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Avoid duplicate CheckBlock checks

Browse source
This commit is contained in:
Pieter Wuille 2015-08-15 23:32:38 +02:00
parent 391dff16fe
commit 3b33ec85ed
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main.cpp
View file

@ -2587,6 +2587,9 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
{ {
// These are checks that are independent of context. // These are checks that are independent of context.
if (block.fChecked)
return true;
// Check that the header is valid (particularly PoW). This is mostly // Check that the header is valid (particularly PoW). This is mostly
// redundant with the call in AcceptBlockHeader. // redundant with the call in AcceptBlockHeader.
if (!CheckBlockHeader(block, state, fCheckPOW)) if (!CheckBlockHeader(block, state, fCheckPOW))
@ -2642,6 +2645,9 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
return state.DoS(100, error("CheckBlock(): out-of-bounds SigOpCount"), return state.DoS(100, error("CheckBlock(): out-of-bounds SigOpCount"),
REJECT_INVALID, "bad-blk-sigops", true); REJECT_INVALID, "bad-blk-sigops", true);
if (fCheckPOW && fCheckMerkleRoot)
block.fChecked = true;
return true; return true;
} }

4
src/primitives/block.h
View file

@ -77,6 +77,9 @@ public:
// network and disk // network and disk
std::vector<CTransaction> vtx; std::vector<CTransaction> vtx;
// memory only
mutable bool fChecked;
CBlock() CBlock()
{ {
SetNull(); SetNull();
@ -100,6 +103,7 @@ public:
{ {
CBlockHeader::SetNull(); CBlockHeader::SetNull();
vtx.clear(); vtx.clear();
fChecked = false;
} }
CBlockHeader GetBlockHeader() const CBlockHeader GetBlockHeader() const