Skip to content

chore(qt): 19671 follow-up: drop zapwallettxes from gui #4841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2022
Merged

chore(qt): 19671 follow-up: drop zapwallettxes from gui #4841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 4 additions & 74 deletions src/qt/forms/debugwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,49 +1428,11 @@
<string>Rescan blockchain files 2</string>
</property>
</widget>
<widget class="QPushButton" name="btn_zapwallettxes1">
<property name="geometry">
<rect>
<x>10</x>
<y>200</y>
<width>301</width>
<height>23</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>180</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Recover transactions 1</string>
</property>
</widget>
<widget class="QPushButton" name="btn_zapwallettxes2">
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>301</width>
<height>23</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>180</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Recover transactions 2</string>
</property>
</widget>
<widget class="QPushButton" name="btn_upgradewallet">
<property name="geometry">
<rect>
<x>10</x>
<y>300</y>
<y>200</y>
<width>301</width>
<height>23</height>
</rect>
Expand Down Expand Up @@ -1533,43 +1495,11 @@
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_repair_zap1">
<property name="geometry">
<rect>
<x>330</x>
<y>190</y>
<width>411</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_repair_zap2">
<property name="geometry">
<rect>
<x>330</x>
<y>240</y>
<width>411</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_repair_upgrade">
<property name="geometry">
<rect>
<x>330</x>
<y>290</y>
<y>190</y>
<width>411</width>
<height>41</height>
</rect>
Expand Down Expand Up @@ -1601,7 +1531,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>350</y>
<y>250</y>
<width>301</width>
<height>23</height>
</rect>
Expand All @@ -1614,7 +1544,7 @@
<property name="geometry">
<rect>
<x>330</x>
<y>340</y>
<y>240</y>
<width>411</width>
<height>41</height>
</rect>
Expand Down
24 changes: 0 additions & 24 deletions src/qt/rpcconsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ const TrafficGraphData::GraphRange INITIAL_TRAFFIC_GRAPH_SETTING = TrafficGraphD
// Repair parameters
const QString RESCAN1("-rescan=1");
const QString RESCAN2("-rescan=2");
const QString ZAPTXES1("-zapwallettxes=1 -persistmempool=0");
const QString ZAPTXES2("-zapwallettxes=2 -persistmempool=0");
const QString UPGRADEWALLET("-upgradewallet");
const QString REINDEX("-reindex");

Expand Down Expand Up @@ -494,13 +492,9 @@ RPCConsole::RPCConsole(interfaces::Node& node, QWidget* parent, Qt::WindowFlags
// 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);
ui->btn_zapwallettxes1->setEnabled(false);
ui->btn_zapwallettxes2->setEnabled(false);
ui->btn_upgradewallet->setEnabled(false);
connect(ui->btn_rescan1, &QPushButton::clicked, this, &RPCConsole::walletRescan1);
connect(ui->btn_rescan2, &QPushButton::clicked, this, &RPCConsole::walletRescan2);
connect(ui->btn_zapwallettxes1, &QPushButton::clicked, this, &RPCConsole::walletZaptxes1);
connect(ui->btn_zapwallettxes2, &QPushButton::clicked, this, &RPCConsole::walletZaptxes2);
connect(ui->btn_upgradewallet, &QPushButton::clicked, this, &RPCConsole::walletUpgrade);
connect(ui->btn_reindex, &QPushButton::clicked, this, &RPCConsole::walletReindex);

Expand Down Expand Up @@ -736,8 +730,6 @@ void RPCConsole::addWallet(WalletModel * const walletModel)
}
ui->btn_rescan1->setEnabled(true);
ui->btn_rescan2->setEnabled(true);
ui->btn_zapwallettxes1->setEnabled(true);
ui->btn_zapwallettxes2->setEnabled(true);
ui->btn_upgradewallet->setEnabled(true);
}

Expand All @@ -751,8 +743,6 @@ void RPCConsole::removeWallet(WalletModel * const walletModel)
if (ui->WalletSelector->count() == 1) {
ui->btn_rescan1->setEnabled(false);
ui->btn_rescan2->setEnabled(false);
ui->btn_zapwallettxes1->setEnabled(false);
ui->btn_zapwallettxes2->setEnabled(false);
ui->btn_upgradewallet->setEnabled(false);
}
}
Expand Down Expand Up @@ -814,18 +804,6 @@ void RPCConsole::walletRescan2()
buildParameterlist(RESCAN2);
}

/** Restart wallet with "-zapwallettxes=1" */
void RPCConsole::walletZaptxes1()
{
buildParameterlist(ZAPTXES1);
}

/** Restart wallet with "-zapwallettxes=2" */
void RPCConsole::walletZaptxes2()
{
buildParameterlist(ZAPTXES2);
}

/** Restart wallet with "-upgradewallet" */
void RPCConsole::walletUpgrade()
{
Expand Down Expand Up @@ -857,8 +835,6 @@ void RPCConsole::buildParameterlist(QString arg)
// Remove existing repair-options
args.removeAll(RESCAN1);
args.removeAll(RESCAN2);
args.removeAll(ZAPTXES1);
args.removeAll(ZAPTXES2);
args.removeAll(UPGRADEWALLET);
args.removeAll(REINDEX);

Expand Down
2 changes: 0 additions & 2 deletions src/qt/rpcconsole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ public Q_SLOTS:
/** Wallet repair options */
void walletRescan1();
void walletRescan2();
void walletZaptxes1();
void walletZaptxes2();
void walletUpgrade();
void walletReindex();

Expand Down