When a switch fails, the failure modal now distinguishes a CORRUPT target wallet
from other failures and offers a one-click repair:
- The switch worker watermarks the node's captured console output before the
start and, if the node dies in init, scans this start's output for a corruption
signature ("Failed to rename … .bak" / "salvage failed" / "wallet.dat corrupt" /
"Error loading wallet") → sets switch_wallet_corrupt_.
- The Failed modal then shows an accurate "this wallet appears corrupt" message
(instead of the generic "Couldn't open that wallet") plus a "Try to repair
(salvage)" button that retries the switch with the target node started under
-salvagewallet (recovers readable keypairs; implies -rescan).
- EmbeddedDaemon::setSalvageOnNextStart (one-shot, precedence salvage > zap >
rescan) + controller forwarder; switchToWallet gains a salvage arg.
Salvage operates only on the corrupt target (never the good wallet, no fund
movement). Adversarially verified: output isolation, one-shot lifecycle, state
handling, re-entrancy, no success-path regression.
i18n (EN + 8 languages) + 2 new CJK glyphs baked into the subset font.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
154 lines
4.0 KiB
C++
154 lines
4.0 KiB
C++
#include "daemon_controller.h"
|
|
#include "../config/settings.h"
|
|
#include "../util/platform.h"
|
|
|
|
#include <algorithm>
|
|
#include <filesystem>
|
|
#include <system_error>
|
|
|
|
namespace dragonx {
|
|
namespace daemon {
|
|
|
|
DaemonController::DaemonController()
|
|
: daemon_(std::make_unique<EmbeddedDaemon>())
|
|
{
|
|
}
|
|
|
|
DaemonController::~DaemonController() = default;
|
|
|
|
void DaemonController::setStateCallback(StateCallback callback)
|
|
{
|
|
daemon_->setStateCallback(std::move(callback));
|
|
}
|
|
|
|
void DaemonController::syncSettings(const config::Settings* settings)
|
|
{
|
|
if (!settings) return;
|
|
daemon_->setDebugCategories(settings->getDebugCategories());
|
|
daemon_->setMaxConnections(settings->getMaxConnections());
|
|
|
|
std::string walletFile = settings->getActiveWalletFile();
|
|
// The Wallets dialog opens an out-of-datadir wallet by linking it into the datadir under a
|
|
// "wallet-ip-<hash>.dat" name. If that link went dangling (the external file was moved / a USB was
|
|
// unplugged between sessions), don't let the daemon create a fresh EMPTY wallet at that name — fall
|
|
// back to the default this launch. fs::exists follows the link, so it's false for a dangling one.
|
|
if (walletFile.rfind("wallet-ip-", 0) == 0) {
|
|
std::error_code ec;
|
|
if (!std::filesystem::exists(util::Platform::getDragonXDataDir() + "/" + walletFile, ec))
|
|
walletFile = "wallet.dat";
|
|
}
|
|
daemon_->setWalletFile(walletFile);
|
|
}
|
|
|
|
bool DaemonController::start(const config::Settings* settings)
|
|
{
|
|
syncSettings(settings);
|
|
return daemon_->start();
|
|
}
|
|
|
|
void DaemonController::stop(int waitMs)
|
|
{
|
|
daemon_->stop(waitMs);
|
|
}
|
|
|
|
bool DaemonController::isRunning() const
|
|
{
|
|
return daemon_->isRunning();
|
|
}
|
|
|
|
bool DaemonController::externalDaemonDetected() const
|
|
{
|
|
return daemon_->externalDaemonDetected();
|
|
}
|
|
|
|
void DaemonController::clearExternalDaemonDetected()
|
|
{
|
|
daemon_->clearExternalDaemonDetected();
|
|
}
|
|
|
|
DaemonController::State DaemonController::state() const
|
|
{
|
|
return daemon_->getState();
|
|
}
|
|
|
|
const std::string& DaemonController::lastError() const
|
|
{
|
|
return daemon_->getLastError();
|
|
}
|
|
|
|
int DaemonController::crashCount() const
|
|
{
|
|
return daemon_->getCrashCount();
|
|
}
|
|
|
|
int DaemonController::lastBlockHeight() const
|
|
{
|
|
return daemon_ ? daemon_->getLastBlockHeight() : 0;
|
|
}
|
|
|
|
double DaemonController::memoryUsageMB() const
|
|
{
|
|
return daemon_ ? daemon_->getMemoryUsageMB() : 0.0;
|
|
}
|
|
|
|
std::vector<std::string> DaemonController::recentLines(std::size_t count) const
|
|
{
|
|
return daemon_ ? daemon_->getRecentLines(count) : std::vector<std::string>{};
|
|
}
|
|
|
|
std::string DaemonController::outputSince(std::size_t& offset) const
|
|
{
|
|
return daemon_ ? daemon_->getOutputSince(offset) : std::string{};
|
|
}
|
|
|
|
void DaemonController::resetCrashCount()
|
|
{
|
|
daemon_->resetCrashCount();
|
|
}
|
|
|
|
void DaemonController::setRescanOnNextStart(bool enabled)
|
|
{
|
|
daemon_->setRescanOnNextStart(enabled);
|
|
}
|
|
|
|
bool DaemonController::rescanOnNextStart() const
|
|
{
|
|
return daemon_->rescanOnNextStart();
|
|
}
|
|
|
|
void DaemonController::setZapOnNextStart(bool enabled)
|
|
{
|
|
daemon_->setZapOnNextStart(enabled);
|
|
}
|
|
|
|
void DaemonController::setSalvageOnNextStart(bool enabled)
|
|
{
|
|
daemon_->setSalvageOnNextStart(enabled);
|
|
}
|
|
|
|
bool DaemonController::zapOnNextStart() const
|
|
{
|
|
return daemon_->zapOnNextStart();
|
|
}
|
|
|
|
void DaemonController::prepareLifecycleOperation(const LifecycleDecision& decision,
|
|
const config::Settings* settings)
|
|
{
|
|
if (settings) syncSettings(settings);
|
|
if (decision.resetCrashCount) resetCrashCount();
|
|
if (decision.setRescanOnNextStart) setRescanOnNextStart(true);
|
|
if (decision.setZapOnNextStart) setZapOnNextStart(true);
|
|
}
|
|
|
|
DaemonController::ShutdownDecision DaemonController::shutdownDecision(
|
|
bool keepDaemonRunning, bool stopExternalDaemon) const
|
|
{
|
|
return evaluateShutdownPolicy(static_cast<bool>(daemon_),
|
|
daemon_ && daemon_->externalDaemonDetected(),
|
|
keepDaemonRunning,
|
|
stopExternalDaemon);
|
|
}
|
|
|
|
} // namespace daemon
|
|
} // namespace dragonx
|