GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge e4bbfb2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#27632)

Browse source
This commit is contained in:
Byron Hambly 2025-06-27 15:10:29 +02:00
commit 38c95b75e9
9 changed files with 67 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/init.cpp
View file

@ -78,6 +78,7 @@
#include <util/fs.h>
#include <util/fs_helpers.h>
#include <util/moneystr.h>
#include <util/result.h>
#include <util/strencodings.h>
#include <util/string.h>
#include <util/syscall_sandbox.h>
@ -997,8 +998,10 @@ bool AppInitParameterInteraction(const ArgsManager& args, bool use_syscall_sandb
InitWarning(strprintf(_("Reducing -maxconnections from %d to %d, because of system limitations."), nUserMaxConnections, nMaxConnections));
// ********************************************************* Step 3: parameter-to-internal-flags
init::SetLoggingCategories(args);
init::SetLoggingLevel(args);
auto result = init::SetLoggingCategories(args);
if (!result) return InitError(util::ErrorString(result));
result = init::SetLoggingLevel(args);
if (!result) return InitError(util::ErrorString(result));
// ELEMENTS: epoch length and trim headers
uint32_t epoch_length = chainparams.GetConsensus().dynamic_epoch_length;