mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-03-13 06:01:45 +00:00
Make sure to clean up mapBlockSource if we've already seen the block
Credit TheBlueMatt
This commit is contained in:
parent
e222618a32
commit
3f8fa7f58b
@ -2134,9 +2134,12 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
|
|||||||
}
|
}
|
||||||
bool fNewBlock = false;
|
bool fNewBlock = false;
|
||||||
ProcessNewBlock(chainparams, pblock, true, &fNewBlock);
|
ProcessNewBlock(chainparams, pblock, true, &fNewBlock);
|
||||||
if (fNewBlock)
|
if (fNewBlock) {
|
||||||
pfrom->nLastBlockTime = GetTime();
|
pfrom->nLastBlockTime = GetTime();
|
||||||
|
} else {
|
||||||
|
LOCK(cs_main);
|
||||||
|
mapBlockSource.erase(pblock->GetHash());
|
||||||
|
}
|
||||||
LOCK(cs_main); // hold cs_main for CBlockIndex::IsValid()
|
LOCK(cs_main); // hold cs_main for CBlockIndex::IsValid()
|
||||||
if (pindex->IsValid(BLOCK_VALID_TRANSACTIONS)) {
|
if (pindex->IsValid(BLOCK_VALID_TRANSACTIONS)) {
|
||||||
// Clear download state for this block, which is in
|
// Clear download state for this block, which is in
|
||||||
@ -2211,8 +2214,12 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
|
|||||||
// Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
|
// Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
|
||||||
// even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
|
// even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
|
||||||
ProcessNewBlock(chainparams, pblock, true, &fNewBlock);
|
ProcessNewBlock(chainparams, pblock, true, &fNewBlock);
|
||||||
if (fNewBlock)
|
if (fNewBlock) {
|
||||||
pfrom->nLastBlockTime = GetTime();
|
pfrom->nLastBlockTime = GetTime();
|
||||||
|
} else {
|
||||||
|
LOCK(cs_main);
|
||||||
|
mapBlockSource.erase(pblock->GetHash());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2390,8 +2397,12 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
|
|||||||
}
|
}
|
||||||
bool fNewBlock = false;
|
bool fNewBlock = false;
|
||||||
ProcessNewBlock(chainparams, pblock, forceProcessing, &fNewBlock);
|
ProcessNewBlock(chainparams, pblock, forceProcessing, &fNewBlock);
|
||||||
if (fNewBlock)
|
if (fNewBlock) {
|
||||||
pfrom->nLastBlockTime = GetTime();
|
pfrom->nLastBlockTime = GetTime();
|
||||||
|
} else {
|
||||||
|
LOCK(cs_main);
|
||||||
|
mapBlockSource.erase(pblock->GetHash());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user