diff options
| author | merge-script <fanquake@gmail.com> | 2024-05-29 09:16:55 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-05-29 09:16:55 +0100 |
| commit | fccd32efe6e2950b2c74fdec2ade54040ca32a2c (patch) | |
| tree | 4d9a4fd4978da3436c837fbbb22a3becc51ccdfa /src/qt/walletmodel.cpp | |
| parent | c7885ecd778d7e42bc07a0ba73156525e86a8aae (diff) | |
| parent | 22701a43464ab27ea83c8b49e2732ee647909a10 (diff) | |
Merge bitcoin/bitcoin#30092: [27.x] Backports and rc1v27.1rc1
22701a43464ab27ea83c8b49e2732ee647909a10 doc: update manual pages for 27.1rc1 (fanquake)
9e919072bd76b0c2048ef9df6ba7171e8be0ccf4 build: bump version to 27.1rc1 (fanquake)
9b4640c4bea984ebd496a4d6eb014fab7b6827fc doc: update release-notes.md for 27.1 (fanquake)
80032d691702f1e5eccb27571066bfc9b2415742 qt: 27.1rc1 translations update (Hennadii Stepanov)
423bd6dc68df1b023a699cb29825b946387a7b37 windeploy: Renew certificate (Ava Chow)
77b2321ca03dcbd5f77060510dc8a19e7f4fdfa2 depends: Fetch miniupnpc sources from an alternative website (Hennadii Stepanov)
31adcfa171c834a63237b4885ae19674fdff16f9 test: add GetAddedNodeInfo() CJDNS regression unit test (Jon Atack)
9cdb9edfb8d1a4b0c1ba39cea0d5cee2e28e1d31 p2p, bugfix: detect addnode cjdns peers in GetAddedNodeInfo() (Jon Atack)
3c26058da223b873094b62c30f2463ab0e629b6a crypto: disable asan for sha256_sse4 with clang and -O0 (Cory Fields)
0ba11cf90869fb437f6dce0c9430be4f899c0ea1 rpc: move UniValue in blockToJSON (willcl-ark)
dedf319b08d5b76dc1752d8bc4e14d38dc54e100 gui: don't permit port in proxy IP option (willcl-ark)
d1289a13006f43afa812f7ee8956f3d59449cfd0 gui: fix create unsigned transaction fee bump (furszy)
Pull request description:
Backports:
* https://github.com/bitcoin-core/gui/pull/812
* https://github.com/bitcoin-core/gui/pull/813
* https://github.com/bitcoin/bitcoin/pull/30085
* https://github.com/bitcoin/bitcoin/pull/30094
* https://github.com/bitcoin/bitcoin/pull/30097
* https://github.com/bitcoin/bitcoin/pull/30149
* https://github.com/bitcoin/bitcoin/pull/30151
Bump to 27.1rc1.
ACKs for top commit:
stickies-v:
re-ACK 22701a43464ab27ea83c8b49e2732ee647909a10
willcl-ark:
reACK 22701a43464ab27ea83c8b49e2732ee647909a10
hebasto:
re-ACK 22701a43464ab27ea83c8b49e2732ee647909a10.
Tree-SHA512: 6eca44ba7e6664eb4677646597dfdaf56a241c8c3e95e0ab8929ee2fc3671303fc6c2634d359b4523dbd452ac5e54fd1f4c7c2bf7e9c5209395f8cb3b4753fb3
Diffstat (limited to 'src/qt/walletmodel.cpp')
| -rw-r--r-- | src/qt/walletmodel.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 1bdf94d3b5..a481092327 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -529,12 +529,6 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash) return false; } - WalletModel::UnlockContext ctx(requestUnlock()); - if(!ctx.isValid()) - { - return false; - } - // Short-circuit if we are returning a bumped transaction PSBT to clipboard if (retval == QMessageBox::Save) { // "Create Unsigned" clicked @@ -549,10 +543,15 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash) DataStream ssTx{}; ssTx << psbtx; GUIUtil::setClipboard(EncodeBase64(ssTx.str()).c_str()); - Q_EMIT message(tr("PSBT copied"), tr("Copied to clipboard", "Fee-bump PSBT saved"), CClientUIInterface::MSG_INFORMATION); + Q_EMIT message(tr("PSBT copied"), tr("Fee-bump PSBT copied to clipboard"), CClientUIInterface::MSG_INFORMATION | CClientUIInterface::MODAL); return true; } + WalletModel::UnlockContext ctx(requestUnlock()); + if (!ctx.isValid()) { + return false; + } + assert(!m_wallet->privateKeysDisabled() || wallet().hasExternalSigner()); // sign bumped transaction |