Merge 2cedb42a92 into merged_master (Bitcoin PR bitcoin/bitcoin#29252)

This commit is contained in:
ivanlele 2026-02-20 11:47:18 +00:00
commit c38a7c5575
No known key found for this signature in database
33 changed files with 79 additions and 72 deletions

View file

@ -32,6 +32,8 @@
#include <interfaces/chain.h>
#include <interfaces/init.h>
#include <interfaces/node.h>
#include <kernel/context.h>
#include <key.h>
#include <logging.h>
#include <mainchainrpc.h>
#include <mapport.h>
@ -76,6 +78,7 @@
#include <util/fs_helpers.h>
#include <util/moneystr.h>
#include <util/result.h>
#include <util/signalinterrupt.h>
#include <util/strencodings.h>
#include <util/string.h>
#include <util/syserror.h>
@ -381,6 +384,7 @@ void Shutdown(NodeContext& node)
node.validation_signals.reset();
node.scheduler.reset();
node.reverification_scheduler.reset();
node.ecc_context.reset();
node.kernel.reset();
RemovePidFile(*node.args);
@ -1165,6 +1169,10 @@ bool AppInitSanityChecks(const kernel::Context& kernel)
return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), PACKAGE_NAME));
}
if (!ECC_InitSanityCheck()) {
return InitError(strprintf(_("Elliptic curve cryptography sanity check failure. %s is shutting down."), PACKAGE_NAME));
}
// Probe the data directory lock to give an early error message, if possible
// We cannot hold the data directory lock here, as the forking for daemon() hasn't yet happened,
// and a fork will cause weird behavior to it.