highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-29 18:20:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

replace ComputeMinWork with CheckMinWork

Browse Source
This commit is contained in:
jtimon
2014-06-20 20:55:42 +02:00
parent b343c1a1e3
commit 654871d436
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pow.cpp
View File

@ -94,29 +94,36 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits)
}
//
// minimum amount of work that could possibly be required nTime after
// minimum work required was nBase
// true if nBits is greater than the minimum amount of work that could
// possibly be required deltaTime after minimum work required was nBase
//
unsigned int ComputeMinWork(unsigned int nBase, int64_t nTime)
bool CheckMinWork(unsigned int nBits, unsigned int nBase, int64_t deltaTime)
{
bool fOverflow = false;
uint256 bnNewBlock;
bnNewBlock.SetCompact(nBits, NULL, &fOverflow);
if (fOverflow)
return false;
const uint256 &bnLimit = Params().ProofOfWorkLimit();
// Testnet has min-difficulty blocks
// after Params().TargetSpacing()*2 time between blocks:
if (Params().AllowMinDifficultyBlocks() && nTime > Params().TargetSpacing()*2)
return bnLimit.GetCompact();
if (Params().AllowMinDifficultyBlocks() && deltaTime > Params().TargetSpacing()*2)
return bnNewBlock <= bnLimit;
uint256 bnResult;
bnResult.SetCompact(nBase);
while (nTime > 0 && bnResult < bnLimit)
while (deltaTime > 0 && bnResult < bnLimit)
{
// Maximum 400% adjustment...
bnResult *= 4;
// ... in best-case exactly 4-times-normal target time
nTime -= Params().TargetTimespan()*4;
deltaTime -= Params().TargetTimespan()*4;
}
if (bnResult > bnLimit)
bnResult = bnLimit;
return bnResult.GetCompact();
return bnNewBlock <= bnResult;
}
void UpdateTime(CBlockHeader* pblock, const CBlockIndex* pindexPrev)