diff options
author | MarcoFalke <falke.marco@gmail.com> | 2022-03-24 08:12:00 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2022-03-24 08:12:11 +0100 |
commit | 7d03cf632d16659166ef7f0d2e3b37ac1f05c0b5 (patch) | |
tree | bff492831141ee3b3c6feae803a50138d7d47866 /src/qt/sendcoinsdialog.h | |
parent | 55a60b971802753f94dd0e9f9622b5c10760de1d (diff) | |
parent | 70f2c579b9de41f987e170f15c0ce767d9ad7931 (diff) |
Merge bitcoin/bitcoin#24596: [23.x] GUI backports
70f2c579b9de41f987e170f15c0ce767d9ad7931 options: flip listenonion to false if not listening (Vasil Dimov)
642f2726deaa1dad21912d4319fac0deb6dbb564 gui: restore Send for external signer (Sjors Provoost)
940694664de2a10b9d6d81ddff9be05495e6a3da refactor: helper function signWithExternalSigner() (Sjors Provoost)
fc421d4c8c8cdd94a5377a8004209506a089357b move-only: helper function to present PSBT (Sjors Provoost)
Pull request description:
Backports from the GUI repo:
- bitcoin-core/gui#555
- bitcoin-core/gui#568
ACKs for top commit:
Sjors:
utACK 70f2c579b9de41f987e170f15c0ce767d9ad7931
gruve-p:
ACK https://github.com/bitcoin/bitcoin/pull/24596/commits/70f2c579b9de41f987e170f15c0ce767d9ad7931
Tree-SHA512: 883c442f8b789a9d11c949179e4382843cbb979a89a625bef3f481c7070421681d9db2af0e5b2449abca362c8ba05cf61db5893aeb6a9237b02088c2fb71e93e
Diffstat (limited to 'src/qt/sendcoinsdialog.h')
-rw-r--r-- | src/qt/sendcoinsdialog.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index 4a16702756..400503d0c0 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -70,6 +70,8 @@ private: bool fFeeMinimized; const PlatformStyle *platformStyle; + // Copy PSBT to clipboard and offer to save it. + void presentPSBT(PartiallySignedTransaction& psbt); // Process WalletModel::SendCoinsReturn and generate a pair consisting // of a message and message flags for use in Q_EMIT message(). // Additional parameter msgArg can be used via .arg(msgArg). @@ -77,6 +79,15 @@ private: void minimizeFeeSection(bool fMinimize); // Format confirmation message bool PrepareSendText(QString& question_string, QString& informative_text, QString& detailed_text); + /* Sign PSBT using external signer. + * + * @param[in,out] psbtx the PSBT to sign + * @param[in,out] mtx needed to attempt to finalize + * @param[in,out] complete whether the PSBT is complete (a successfully signed multisig transaction may not be complete) + * + * @returns false if any failure occurred, which may include the user rejection of a transaction on the device. + */ + bool signWithExternalSigner(PartiallySignedTransaction& psbt, CMutableTransaction& mtx, bool& complete); void updateFeeMinimizedLabel(); void updateCoinControlState(); @@ -117,6 +128,8 @@ class SendConfirmationDialog : public QMessageBox public: SendConfirmationDialog(const QString& title, const QString& text, const QString& informative_text = "", const QString& detailed_text = "", int secDelay = SEND_CONFIRM_DELAY, bool enable_send = true, bool always_show_unsigned = true, QWidget* parent = nullptr); + /* Returns QMessageBox::Cancel, QMessageBox::Yes when "Send" is + clicked and QMessageBox::Save when "Create Unsigned" is clicked. */ int exec() override; private Q_SLOTS: |