Skip to content

Disable quorum for grandfathered blocks to speed up sync #1568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2019
Merged

Disable quorum for grandfathered blocks to speed up sync #1568

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b975ba
Remove duplicate checkpoint validation in AcceptBlock()
cyrossignol Oct 14, 2019
34c6dc0
Remove transitional v9 checks for GridcoinServices()
cyrossignol Oct 15, 2019
aed9150
Disable quorum for grandfathered blocks
cyrossignol Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3413,11 +3413,7 @@ bool SetBestChain(CTxDB& txdb, CBlock &blockNew, CBlockIndex* pindexNew)
boost::thread t(runCommand, strCmd); // thread runs free
}

// Perform Gridcoin services now that w have a new head.
// Remove V9 checks after the V9 switch.
// TODO: ???
if(IsV9Enabled(nBestHeight))
GridcoinServices();
GridcoinServices();

return true;
}
Expand Down Expand Up @@ -3812,10 +3808,6 @@ bool CBlock::AcceptBlock(bool generated_by_me)
//Grandfather
if (nHeight > nGrandfather)
{
// Check that the block chain matches the known block chain up to a checkpoint
if (!Checkpoints::CheckHardened(nHeight, hash))
return DoS(100, error("AcceptBlock() : rejected by hardened checkpoint lock-in at %d", nHeight));

// Enforce rule that the coinbase starts with serialized block height
CScript expect = CScript() << nHeight;
if (vtx[0].vin[0].scriptSig.size() < expect.size() ||
Expand Down Expand Up @@ -3955,19 +3947,21 @@ bool NeedASuperblock()

void GridcoinServices()
{

//Dont do this on headless - SeP
if(fQtActive)
if (fQtActive && (nBestHeight % 125) == 0 && nBestHeight > 0)
{
if ((nBestHeight % 125) == 0)
{
GetGlobalStatus();
bForceUpdate=true;
uiInterface.NotifyBlocksChanged();
}
GetGlobalStatus();
bForceUpdate=true;
uiInterface.NotifyBlocksChanged();
}

// Services thread activity
// Research reward checks are disabled before nGrandfather. There is no
// reason to update quorum state for grandfathered blocks since nothing
// checks that data until after nGrandfather:
//
if (pindexBest->nHeight < nGrandfather) {
return;
}

if(IsV9Enabled_Tally(nBestHeight))
{
Expand Down Expand Up @@ -4017,8 +4011,9 @@ void GridcoinServices()
}

//Dont perform the following functions if out of sync
if (pindexBest->nHeight < nGrandfather || OutOfSyncByAge())
if (OutOfSyncByAge()) {
return;
}

//Backup the wallet once per 900 blocks or as specified in config:
int nWBI = GetArg("-walletbackupinterval", 900);
Expand Down Expand Up @@ -4308,10 +4303,6 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock, bool generated_by_me)

}

// Compatiblity while V8 is in use. Can be removed after the V9 switch.
if(IsV9Enabled(pindexBest->nHeight) == false)
GridcoinServices();

return true;
}

Expand Down