diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui index 24cd41ee53..aac7bbb252 100644 --- a/src/qt/forms/debugwindow.ui +++ b/src/qt/forms/debugwindow.ui @@ -1419,30 +1419,11 @@ - - - - 10 - 100 - 301 - 23 - - - - - 180 - 23 - - - - Salvage wallet - - 10 - 150 + 100 301 23 @@ -1461,7 +1442,7 @@ 10 - 200 + 150 301 23 @@ -1480,7 +1461,7 @@ 10 - 250 + 200 301 23 @@ -1499,7 +1480,7 @@ 10 - 300 + 250 301 23 @@ -1518,7 +1499,7 @@ 10 - 350 + 300 301 23 @@ -1549,27 +1530,11 @@ true - - - - 330 - 90 - 411 - 41 - - - - -salvagewallet: Attempt to recover private keys from a corrupt wallet.dat. - - - true - - 330 - 140 + 90 411 41 @@ -1585,7 +1550,7 @@ 330 - 190 + 140 411 41 @@ -1601,7 +1566,7 @@ 330 - 240 + 190 411 41 @@ -1617,7 +1582,7 @@ 330 - 290 + 240 411 41 @@ -1633,7 +1598,7 @@ 330 - 340 + 290 411 41 @@ -1665,7 +1630,7 @@ 10 - 400 + 350 301 23 @@ -1678,7 +1643,7 @@ 330 - 390 + 340 411 41 diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 54195c2ee1..2e05181b4f 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -54,7 +54,6 @@ const char fontSizeSettingsKey[] = "consoleFontSize"; const TrafficGraphData::GraphRange INITIAL_TRAFFIC_GRAPH_SETTING = TrafficGraphData::Range_30m; // Repair parameters -const QString SALVAGEWALLET("-salvagewallet"); const QString RESCAN1("-rescan=1"); const QString RESCAN2("-rescan=2"); const QString ZAPTXES1("-zapwallettxes=1 -persistmempool=0"); @@ -491,9 +490,6 @@ RPCConsole::RPCConsole(interfaces::Node& node, QWidget* parent, Qt::WindowFlags ui->WalletSelectorLabel->setVisible(false); // Wallet Repair Buttons - // connect(ui->btn_salvagewallet, &QPushButton::clicked, this, &RPCConsole::walletSalvage); - // Disable salvage option in GUI, it's way too powerful and can lead to funds loss - ui->btn_salvagewallet->setEnabled(false); // Disable wallet repair options that require a wallet (enable them later when a wallet is added) ui->btn_rescan1->setEnabled(false); ui->btn_rescan2->setEnabled(false); @@ -810,12 +806,6 @@ void RPCConsole::setFontSize(int newSize) ui->messagesWidget->verticalScrollBar()->setValue(oldPosFactor * ui->messagesWidget->verticalScrollBar()->maximum()); } -/** Restart wallet with "-salvagewallet" */ -void RPCConsole::walletSalvage() -{ - buildParameterlist(SALVAGEWALLET); -} - /** Restart wallet with "-rescan=1" */ void RPCConsole::walletRescan1() { @@ -860,7 +850,6 @@ void RPCConsole::buildParameterlist(QString arg) args.removeFirst(); // Remove existing repair-options - args.removeAll(SALVAGEWALLET); args.removeAll(RESCAN1); args.removeAll(RESCAN2); args.removeAll(ZAPTXES1); diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index ccc4e9128e..4fbfc328a2 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -104,7 +104,6 @@ public Q_SLOTS: void setFontSize(int newSize); /** Wallet repair options */ - void walletSalvage(); void walletRescan1(); void walletRescan2(); void walletZaptxes1();