Skip to content

Commit

Permalink
Merge #517: [0.17] backport "Validation: stop logging fake pow data"
Browse files Browse the repository at this point in the history
a657da0 Validation: stop logging fake pow data (Sjors Provoost)

Pull request description:

  Based on #515.

  Backport of Blockstream/liquid#8

Tree-SHA512: 0f81430ca9905c4aa9b9e50ee3cd5a856132cc641dbc3346f982c2d5a023ab83cf68b64a3008f1adbda52d277d4357ed2d89e8ed6335c6288294fe5275743ba0
  • Loading branch information
instagibbs committed Mar 21, 2019
2 parents add62e4 + a657da0 commit 928c756
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1324,13 +1324,13 @@ void static InvalidChainFound(CBlockIndex* pindexNew) EXCLUSIVE_LOCKS_REQUIRED(c
if (!pindexBestInvalid || pindexNew->nChainWork > pindexBestInvalid->nChainWork)
pindexBestInvalid = pindexNew;

LogPrintf("%s: invalid block=%s height=%d log2_work=%.8g date=%s\n", __func__,
LogPrintf("%s: invalid block=%s height=%d date=%s\n", __func__,
pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
log(pindexNew->nChainWork.getdouble())/log(2.0), FormatISO8601DateTime(pindexNew->GetBlockTime()));
FormatISO8601DateTime(pindexNew->GetBlockTime()));
CBlockIndex *tip = chainActive.Tip();
assert (tip);
LogPrintf("%s: current best=%s height=%d log2_work=%.8g date=%s\n", __func__,
tip->GetBlockHash().ToString(), chainActive.Height(), log(tip->nChainWork.getdouble())/log(2.0),
LogPrintf("%s: current best=%s height=%d date=%s\n", __func__,
tip->GetBlockHash().ToString(), chainActive.Height(),
FormatISO8601DateTime(tip->GetBlockTime()));
CheckForkWarningConditions();
}
Expand Down Expand Up @@ -2390,9 +2390,9 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar
DoWarning(strWarning);
}
}
LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)", __func__, /* Continued */
LogPrintf("%s: new best=%s height=%d version=0x%08x tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)", __func__, /* Continued */
pindexNew->GetBlockHash().ToString(), pindexNew->nHeight, pindexNew->nVersion,
log(pindexNew->nChainWork.getdouble())/log(2.0), (unsigned long)pindexNew->nChainTx,
(unsigned long)pindexNew->nChainTx,
FormatISO8601DateTime(pindexNew->GetBlockTime()),
GuessVerificationProgress(chainParams.TxData(), pindexNew), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
if (!warningMessages.empty())
Expand Down

0 comments on commit 928c756

Please sign in to comment.