Skip to content

Commit 7c2400c

Browse files
committed
Merge #10775: nCheckDepth chain height fix
d9d1bd3 nCheckDepth chain height fix (romanornr) Pull request description: ```` if (nCheckDepth <= 0) nCheckDepth = 1000000000; // suffices until the year 19000 if (nCheckDepth > chainActive.Height()) nCheckDepth = chainActive.Height(); ```` These lines confuse me. Correct me if I am wrong, but we can't check any more blocks than we have right? If someone requests <= 0 it get set it into some huge number and then immediately limit it to the chain height in the following statement. ```` if (nCheckDepth > chainActive.Height()) nCheckDepth = chainActive.Height(); ```` when using ````--checkblocks=Z```` When Z is ````0```` or any other negative number, it will check all blocks. I think it should be changed to this maybe. ```` if (nCheckDepth <= 0 || nCheckDepth > chainActive.Height()) nCheckDepth = chainActive.Height(); ```` Which gets rid of that huge number which is confusing for any other altcoins that have a different block time. Tree-SHA512: 8ee0ae5f33b399fa74dc16926709694ccfe1fc8a043cba2f5d00884220ac1b9b13f2df4588041f4133be634e5c7b14f4eebe24294028dafe91581a97dbe627f3
2 parents 041dad9 + d9d1bd3 commit 7c2400c

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/validation.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3573,9 +3573,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
35733573
return true;
35743574

35753575
// Verify blocks in the best chain
3576-
if (nCheckDepth <= 0)
3577-
nCheckDepth = 1000000000; // suffices until the year 19000
3578-
if (nCheckDepth > chainActive.Height())
3576+
if (nCheckDepth <= 0 || nCheckDepth > chainActive.Height())
35793577
nCheckDepth = chainActive.Height();
35803578
nCheckLevel = std::max(0, std::min(4, nCheckLevel));
35813579
LogPrintf("Verifying last %i blocks at level %i\n", nCheckDepth, nCheckLevel);

0 commit comments

Comments
 (0)