BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #80 from jc23424/fix-merge 

fix pr merge conflicts
This commit is contained in:
BlueSilver22 2018-02-23 07:34:35 -06:00 committed by GitHub
parent 4031ff02ec 1eb9e2b839
commit ab0886aaa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/consensus/params.h
View File

@ -77,6 +77,8 @@ struct Params {
int64_t nPowMaxAdjustUp;
int64_t nPowTargetSpacing;
int nPowDifficultyBombHeight;
int64_t AveragingWindowTimespan(bool isFork = false) const { return nPowAveragingWindow * nPowTargetSpacing / (isFork ? 20 : 1); }
int64_t MinActualTimespan(bool isFork = false) const { return (AveragingWindowTimespan(isFork) * (100 - nPowMaxAdjustUp )) / 100; }
int64_t MaxActualTimespan(bool isFork = false) const { return (AveragingWindowTimespan(isFork) * (100 + nPowMaxAdjustDown)) / 100; }

3
src/miner.cpp
View File

@ -155,6 +155,7 @@ CBlockTemplate* CreateNewForkBlock(bool& bFileNotFound)
pblock->hashPrevBlock = pindexPrev->GetBlockHash();
UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus());
pblock->nVersion = ComputeBlockVersion(pindexPrev, Params().GetConsensus());
CValidationState state;
if (!TestBlockValidity(state, *pblock, pindexPrev, false, false))
@ -728,7 +729,7 @@ void static BitcoinMiner()
LOCK(cs_vNodes);
fvNodesEmpty = vNodes.empty();
}
if (!fvNodesEmpty && !IsInitialBlockDownload())
if (!fvNodesEmpty) // && !IsInitialBlockDownload())
break;
MilliSleep(1000);
} while (true);