Merge #13310: Report progress in ReplayBlocks while rolling forward

laanwj · laanwj · commit b9ed2fd02692 · 2018-09-13T14:07:20.000+02:00
b16ab9a Report progress in ReplayBlocks while rolling forward (João Barbosa) Pull request description: Fixes #13303. Tree-SHA512: 9375bda03bd2527018b9d24a25c82fa01a841e41ae2cb5307be61af19e2b759d3a7db76852baba9a286fbcb52f70f427a5ab4375df08215ac439e47e73633e54
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4133,6 +4133,7 @@ bool CChainState::ReplayBlocks(const CChainParams& params, CCoinsView* view)
     for (int nHeight = nForkHeight + 1; nHeight <= pindexNew->nHeight; ++nHeight) {
         const CBlockIndex* pindex = pindexNew->GetAncestor(nHeight);
         LogPrintf("Rolling forward %s (%i)\n", pindex->GetBlockHash().ToString(), nHeight);
+        uiInterface.ShowProgress(_("Replaying blocks..."), (int) ((nHeight - nForkHeight) * 100.0 / (pindexNew->nHeight - nForkHeight)) , false);
         if (!RollforwardBlock(pindex, cache, params)) return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4133,6 +4133,7 @@ bool CChainState::ReplayBlocks(const CChainParams& params, CCoinsView* view)`
`4133`	`4133`	`for (int nHeight = nForkHeight + 1; nHeight <= pindexNew->nHeight; ++nHeight) {`
`4134`	`4134`	`const CBlockIndex* pindex = pindexNew->GetAncestor(nHeight);`
`4135`	`4135`	`LogPrintf("Rolling forward %s (%i)\n", pindex->GetBlockHash().ToString(), nHeight);`
	`4136`	`+ uiInterface.ShowProgress(_("Replaying blocks..."), (int) ((nHeight - nForkHeight) * 100.0 / (pindexNew->nHeight - nForkHeight)) , false);`
`4136`	`4137`	`if (!RollforwardBlock(pindex, cache, params)) return false;`
`4137`	`4138`	`}`
`4138`	`4139`