diff options
| author | Antoine Poinsot <darosior@protonmail.com> | 2020-09-06 19:37:13 +0200 |
|---|---|---|
| committer | Antoine Poinsot <darosior@protonmail.com> | 2020-12-03 12:56:37 +0100 |
| commit | e8ea6ad9c16997bdc7e22a20eca16e234290b7ff (patch) | |
| tree | 1f67020b213cec9f7888475d878d7dff9a457425 /src/init.cpp | |
| parent | 86ff2cf202bfb9d9b50800b8ffe3fead3f77f5fa (diff) | |
| download | bitcoin-e8ea6ad9c16997bdc7e22a20eca16e234290b7ff.tar.xz | |
init: don't create a CBlockPolicyEstimator if we don't relay transactions
Signed-off-by: Antoine Poinsot <darosior@protonmail.com>
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp index 5c06b0459d..de8f32cf6a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1384,13 +1384,20 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA // is not yet setup and may end up being set up twice if we // need to reindex later. + // see Step 2: parameter interactions for more information about these + fListen = args.GetBoolArg("-listen", DEFAULT_LISTEN); + fDiscover = args.GetBoolArg("-discover", true); + g_relay_txes = !args.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY); + assert(!node.banman); node.banman = MakeUnique<BanMan>(GetDataDir() / "banlist.dat", &uiInterface, args.GetArg("-bantime", DEFAULT_MISBEHAVING_BANTIME)); assert(!node.connman); node.connman = MakeUnique<CConnman>(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max()), args.GetBoolArg("-networkactive", true)); assert(!node.fee_estimator); - node.fee_estimator = std::make_unique<CBlockPolicyEstimator>(); + // Don't initialize fee estimation with old data if we don't relay transactions, + // as they would never get updated. + if (g_relay_txes) node.fee_estimator = std::make_unique<CBlockPolicyEstimator>(); assert(!node.mempool); int check_ratio = std::min<int>(std::max<int>(args.GetArg("-checkmempool", chainparams.DefaultConsistencyChecks() ? 1 : 0), 0), 1000000); @@ -1476,11 +1483,6 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA } } - // see Step 2: parameter interactions for more information about these - fListen = args.GetBoolArg("-listen", DEFAULT_LISTEN); - fDiscover = args.GetBoolArg("-discover", true); - g_relay_txes = !args.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY); - for (const std::string& strAddr : args.GetArgs("-externalip")) { CService addrLocal; if (Lookup(strAddr, addrLocal, GetListenPort(), fNameLookup) && addrLocal.IsValid()) |