diff options
author | MacroFake <falke.marco@gmail.com> | 2022-08-29 12:11:22 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-08-29 11:58:29 +0200 |
commit | fa3358b668d8415adc1b5586caa382fe4140ad42 (patch) | |
tree | f230d80854178cfbd77276b3ea90f1aaedfbd52f | |
parent | 15692e2641592394bdd4da0a7c2d371de8e576dd (diff) | |
download | bitcoin-fa3358b668d8415adc1b5586caa382fe4140ad42.tar.xz |
Move validation option logging to LoadChainstate()
-rw-r--r-- | src/init.cpp | 8 | ||||
-rw-r--r-- | src/node/chainstate.cpp | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/init.cpp b/src/init.cpp index 137d98026e..2eb3de54f5 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -920,10 +920,6 @@ bool AppInitParameterInteraction(const ArgsManager& args, bool use_syscall_sandb fCheckpointsEnabled = args.GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED); hashAssumeValid = uint256S(args.GetArg("-assumevalid", chainparams.GetConsensus().defaultAssumeValid.GetHex())); - if (!hashAssumeValid.IsNull()) - LogPrintf("Assuming ancestors of block %s have valid signatures.\n", hashAssumeValid.GetHex()); - else - LogPrintf("Validating signatures for all blocks.\n"); if (args.IsArgSet("-minimumchainwork")) { const std::string minChainWorkStr = args.GetArg("-minimumchainwork", ""); @@ -934,10 +930,6 @@ bool AppInitParameterInteraction(const ArgsManager& args, bool use_syscall_sandb } else { nMinimumChainWork = UintToArith256(chainparams.GetConsensus().nMinimumChainWork); } - LogPrintf("Setting nMinimumChainWork=%s\n", nMinimumChainWork.GetHex()); - if (nMinimumChainWork < UintToArith256(chainparams.GetConsensus().nMinimumChainWork)) { - LogPrintf("Warning: nMinimumChainWork set below default value of %s\n", chainparams.GetConsensus().nMinimumChainWork.GetHex()); - } // block pruning; get the amount of disk space (in MiB) to allot for block & undo files int64_t nPruneArg = args.GetIntArg("-prune", 0); diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp index ad9293f172..8e2b5c45f7 100644 --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -32,6 +32,16 @@ ChainstateLoadResult LoadChainstate(ChainstateManager& chainman, const CacheSize return options.reindex || options.reindex_chainstate || chainstate->CoinsTip().GetBestBlock().IsNull(); }; + if (!hashAssumeValid.IsNull()) { + LogPrintf("Assuming ancestors of block %s have valid signatures.\n", hashAssumeValid.GetHex()); + } else { + LogPrintf("Validating signatures for all blocks.\n"); + } + LogPrintf("Setting nMinimumChainWork=%s\n", nMinimumChainWork.GetHex()); + if (nMinimumChainWork < UintToArith256(chainman.GetConsensus().nMinimumChainWork)) { + LogPrintf("Warning: nMinimumChainWork set below default value of %s\n", chainman.GetConsensus().nMinimumChainWork.GetHex()); + } + LOCK(cs_main); chainman.InitializeChainstate(options.mempool); chainman.m_total_coinstip_cache = cache_sizes.coins; |