DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove spurios opret in tx builder, don't wait forever for blocks before mining, add delay to getblocktemplate

Browse Source
This commit is contained in:
miketout
2018-10-11 21:35:09 -07:00
parent 271326fafd
commit af2e212d7a
5 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/miner.cpp
View File

@@ -923,8 +923,10 @@ int32_t waitForPeers(const CChainParams &chainparams)
LOCK(cs_vNodes);
fvNodesEmpty = vNodes.empty();
}
if (fvNodesEmpty || !IsInSync())
if (fvNodesEmpty || IsNotInSync())
{
int loops = 0, blockDiff = 0, newDiff = 0;
do {
if (fvNodesEmpty)
MilliSleep(1000 + rand() % 4000);
@@ -932,8 +934,25 @@ int32_t waitForPeers(const CChainParams &chainparams)
boost::this_thread::interruption_point();
LOCK(cs_vNodes);
fvNodesEmpty = vNodes.empty();
loops = 0;
blockDiff = 0;
}
} while (fvNodesEmpty || !IsInSync());
if ((newDiff = IsNotInSync()) > 1)
{
if (blockDiff != newDiff)
{
blockDiff = newDiff;
}
else
{
if (++loops <= 90)
{
MilliSleep(1000);
}
else break;
}
}
} while (fvNodesEmpty || IsNotInSync());
MilliSleep(100 + rand() % 400);
}
}