-
Notifications
You must be signed in to change notification settings - Fork 259
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.
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
Dialog for allowing the user to choose the change output when bumping a tx #700
Open
achow101
wants to merge
3
commits into
bitcoin-core:master
Choose a base branch
from
achow101:bumpfee-choose-reduce-output
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+285
−6
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Copyright (c) 2022 The Bitcoin Core developers | ||
| // Distributed under the MIT software license, see the accompanying | ||
| // file COPYING or https://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| #if defined(HAVE_CONFIG_H) | ||
| #include <config/bitcoin-config.h> | ||
| #endif | ||
|
|
||
| #include <qt/bumpfeechoosechangedialog.h> | ||
| #include <qt/forms/ui_bumpfeechoosechangedialog.h> | ||
|
|
||
| #include <addresstype.h> | ||
| #include <key_io.h> | ||
| #include <qt/bitcoinunits.h> | ||
| #include <qt/guiutil.h> | ||
| #include <qt/optionsmodel.h> | ||
| #include <qt/walletmodel.h> | ||
|
|
||
| #include <QHBoxLayout> | ||
| #include <QLabel> | ||
| #include <QRadioButton> | ||
| #include <QVBoxLayout> | ||
|
|
||
| BumpfeeChooseChangeDialog::BumpfeeChooseChangeDialog(WalletModel *model, QWidget *parent, const uint256& txid) : | ||
| QDialog(parent, GUIUtil::dialog_flags), | ||
| ui(new Ui::BumpfeeChooseChangeDialog), | ||
| model(model) | ||
| { | ||
| ui->setupUi(this); | ||
|
|
||
| bool found_change = false; | ||
| CTransactionRef tx = model->wallet().getTx(txid); | ||
| for (size_t i = 0; i < tx->vout.size(); ++i) { | ||
| const CTxOut& txout = tx->vout.at(i); | ||
| QString address_info = tr("No address decoded"); | ||
| CTxDestination dest; | ||
| if (ExtractDestination(txout.scriptPubKey, dest)) { | ||
| std::string address = EncodeDestination(dest); | ||
| std::string label; | ||
| if (model->wallet().getAddress(dest, &label, nullptr, nullptr) && !label.empty()) { | ||
| address_info = QString::fromStdString(label) + QString(" (") + QString::fromStdString(address) + QString(")"); | ||
| } else { | ||
| address_info = QString::fromStdString(address); | ||
| } | ||
| } | ||
| QString output_info = QString::number(i) + QString(": ") + BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), txout.nValue) + tr(" to ") + address_info; | ||
|
|
||
| QRadioButton *radio_button = new QRadioButton(output_info, nullptr); | ||
| radio_button->setObjectName(QString::number(i) + QString("_radioButton")); | ||
| ui->verticalLayout->addWidget(radio_button); | ||
|
|
||
| if (!found_change && model->wallet().isChange(txout)) { | ||
| radio_button->setChecked(true); | ||
| ui->none_radioButton->setChecked(false); | ||
| found_change = true; | ||
| } | ||
| } | ||
| GUIUtil::handleCloseWindowShortcut(this); | ||
| } | ||
|
|
||
| std::optional<uint32_t> BumpfeeChooseChangeDialog::GetSelectedOutput() | ||
| { | ||
| for (int i = 0; i < ui->verticalLayout->count(); ++i) { | ||
| QRadioButton* child = dynamic_cast<QRadioButton*>(ui->verticalLayout->itemAt(i)->widget()); | ||
| if (child->isChecked()) { | ||
| if (i == 0) { | ||
| // "None" option selected | ||
| return std::nullopt; | ||
| } | ||
| // Return the output index, offset by one for the "None" option at index 0 | ||
| return static_cast<uint32_t>(i - 1); | ||
| } | ||
| } | ||
| return std::nullopt; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // Copyright (c) 2022 The Bitcoin Core developers | ||
| // Distributed under the MIT software license, see the accompanying | ||
| // file COPYING or https://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| #ifndef BITCOIN_QT_BUMPFEECHOOSECHANGEDIALOG_H | ||
| #define BITCOIN_QT_BUMPFEECHOOSECHANGEDIALOG_H | ||
|
|
||
| #include <QDialog> | ||
| #include <optional> | ||
|
|
||
| #include <uint256.h> | ||
|
|
||
| class WalletModel; | ||
| class uint256; | ||
|
|
||
| namespace Ui { | ||
| class BumpfeeChooseChangeDialog; | ||
| } | ||
|
|
||
| /** Dialog for choosing the change output when bumping fee | ||
| */ | ||
| class BumpfeeChooseChangeDialog : public QDialog | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
|
|
||
| explicit BumpfeeChooseChangeDialog(WalletModel *model, QWidget *parent, const uint256& txid); | ||
| std::optional<uint32_t> GetSelectedOutput(); | ||
|
|
||
| private: | ||
| Ui::BumpfeeChooseChangeDialog *ui; | ||
| WalletModel *model; | ||
| }; | ||
|
|
||
| #endif // BITCOIN_QT_BUMPFEECHOOSECHANGEDIALOG_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <ui version="4.0"> | ||
| <class>BumpfeeChooseChangeDialog</class> | ||
| <widget class="QDialog" name="BumpfeeChooseChangeDialog"> | ||
| <property name="geometry"> | ||
| <rect> | ||
| <x>0</x> | ||
| <y>0</y> | ||
| <width>737</width> | ||
| <height>422</height> | ||
| </rect> | ||
| </property> | ||
| <property name="windowTitle"> | ||
| <string>Choose Change Output</string> | ||
| </property> | ||
| <property name="sizeGripEnabled"> | ||
| <bool>true</bool> | ||
| </property> | ||
| <layout class="QVBoxLayout" name="verticalLayout_2"> | ||
| <item> | ||
| <widget class="QLabel" name="label"> | ||
| <property name="text"> | ||
| <string><html><head/><body><p>Choose which output is change.</p><p>The additional transaction fee will be deducted from this output. If it is insufficient, new inputs may be added and the resulting change sent to the address of the selected output.</p></body></html></string> | ||
| </property> | ||
| <property name="textFormat"> | ||
| <enum>Qt::RichText</enum> | ||
| </property> | ||
| <property name="wordWrap"> | ||
| <bool>true</bool> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| <item> | ||
| <widget class="QScrollArea" name="scrollArea"> | ||
| <property name="widgetResizable"> | ||
| <bool>true</bool> | ||
| </property> | ||
| <widget class="QWidget" name="scrollAreaWidgetContents"> | ||
| <property name="geometry"> | ||
| <rect> | ||
| <x>0</x> | ||
| <y>0</y> | ||
| <width>711</width> | ||
| <height>288</height> | ||
| </rect> | ||
| </property> | ||
| <layout class="QVBoxLayout" name="verticalLayout"> | ||
| <item> | ||
| <widget class="QRadioButton" name="none_radioButton"> | ||
| <property name="text"> | ||
| <string>None</string> | ||
| </property> | ||
| <property name="checked"> | ||
| <bool>true</bool> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| </layout> | ||
| </widget> | ||
| </widget> | ||
| </item> | ||
| <item> | ||
| <widget class="QDialogButtonBox" name="buttonBox"> | ||
| <property name="orientation"> | ||
| <enum>Qt::Horizontal</enum> | ||
| </property> | ||
| <property name="standardButtons"> | ||
| <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| </layout> | ||
| </widget> | ||
| <resources/> | ||
| <connections> | ||
| <connection> | ||
| <sender>buttonBox</sender> | ||
| <signal>accepted()</signal> | ||
| <receiver>BumpfeeChooseChangeDialog</receiver> | ||
| <slot>accept()</slot> | ||
| <hints> | ||
| <hint type="sourcelabel"> | ||
| <x>210</x> | ||
| <y>395</y> | ||
| </hint> | ||
| <hint type="destinationlabel"> | ||
| <x>200</x> | ||
| <y>210</y> | ||
| </hint> | ||
| </hints> | ||
| </connection> | ||
| <connection> | ||
| <sender>buttonBox</sender> | ||
| <signal>rejected()</signal> | ||
| <receiver>BumpfeeChooseChangeDialog</receiver> | ||
| <slot>reject()</slot> | ||
| <hints> | ||
| <hint type="sourcelabel"> | ||
| <x>210</x> | ||
| <y>395</y> | ||
| </hint> | ||
| <hint type="destinationlabel"> | ||
| <x>200</x> | ||
| <y>210</y> | ||
| </hint> | ||
| </hints> | ||
| </connection> | ||
| </connections> | ||
| </ui> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To make translators' life easier and to keep the context as large as possible, I suggest to use
QString::arg. Also it will fix thelint-qt-translation.pywarning.