[23.x] GUI backports #24596

hebasto commented at 6:33 AM on March 17, 2022: member

Backports from the GUI repo:

bitcoin-core/gui#555
bitcoin-core/gui#568

move-only: helper function to present PSBT

This commit does not change behavior.

Review hint:
git show --color-moved --color-moved-ws=allow-indentation-change

Github-Pull: bitcoin-core/gui#555
Rebased-From: 026b5b4523317fdefc69cf5cec55f76f18ad0c0a

fc421d4c8c

refactor: helper function signWithExternalSigner()

Does not change behavior.

Review hint:
git show --color-moved --color-moved-ws=allow-indentation-change

Github-Pull: bitcoin-core/gui#555
Rebased-From: 4b5a6cd14967b8ec3cb525e4cb18628de6c15091

940694664d

gui: restore Send for external signer

Before this change the send confirmation dialog would keep the Send option disabled. The Create Unsigned choice would actually send. This is potentially confusing.

With this change the Create Unsigned button will not attempt to sign and always produce a PSBT. The Send button will attempt to sign, and only return a PSBT if more signatures are needed.

When using an external signer, the Create Unsigned option only appears when PSBT controls are enabled in the wallet settings.

This commit maintains the pre-existing behavior of filling the PSBT (without signing) even when not using an external signer.

Closes #551

Co-authored-by: Jon Atack <jon@atack.com>

Github-Pull: bitcoin-core/gui#555
Rebased-From: 2efdfb88aab6496dcf2b98e0de30635bc6bade85

642f2726de

hebasto added the label GUI on Mar 17, 2022

hebasto added the label Backport on Mar 17, 2022

hebasto added this to the milestone 23.0 on Mar 17, 2022

Sjors commented at 9:37 AM on March 17, 2022: member

ACK 642f2726deaa1dad21912d4319fac0deb6dbb564

gruve-p commented at 5:33 PM on March 17, 2022: contributor

ACK https://github.com/bitcoin/bitcoin/pull/24596/commits/642f2726deaa1dad21912d4319fac0deb6dbb564

luke-jr commented at 7:15 PM on March 17, 2022: member

Approach NACK. This should just be a merge of the exact same commits/PR; it doesn't need a separate cherry-pick.

hebasto commented at 7:19 PM on March 17, 2022: member

Approach NACK. This should just be a merge of the exact same commits/PR; it doesn't need a separate cherry-pick.

As usual, the backport.py script was used to prepare this PR.

Sjors commented at 7:23 PM on March 17, 2022: member

I guess a new merge commit, rather than cherry-picking, has the benefit of preserving my commit signatures.

I don't know how easy it is to implement that in the backport script. I could also make a cherry-pick PR myself :-)

luke-jr commented at 8:47 PM on March 17, 2022: member

As usual, the backport.py script was used to prepare this PR.

Point is, that's not needed (and therefore shouldn't be used) for this PR.

options: flip listenonion to false if not listening

If the user has unchecked "Allow incoming connections" in
`Settings->Options...->Network` then `fListen=false` is saved in
`~/.config/Bitcoin/Bitcoin-Qt.conf`. This flips `-listen` to `false`
during startup, but leaves `-listenonion` to `true`.

This flipping of `-listen` is done in `OptionsModel::Init()` after
`InitParameterInteraction()` has been executed which would have flipped
`-listenonion`, should it have seen `-listen` being `false`
(this is a difference between `bitcoind` and `bitcoin-qt`).

Fixes: https://github.com/bitcoin-core/gui/issues/567

Github-Pull: bitcoin-core/gui#568
Rebased-From: 7f90dc26c8938f348938929b6d8bf1ea6f149209

70f2c579b9

hebasto commented at 4:28 PM on March 23, 2022: member

Added backport of bitcoin-core/gui#568.

hebasto renamed this:
~~[23.x] GUI backport~~
[23.x] GUI backports
on Mar 23, 2022

fanquake commented at 8:04 PM on March 23, 2022: member

@Sjors @gruve-p @vasild @mzumsande want to (re)-review so we can get these couple of backports in.

Sjors commented at 8:35 PM on March 23, 2022: member

utACK 70f2c579b9de41f987e170f15c0ce767d9ad7931

gruve-p commented at 8:46 PM on March 23, 2022: contributor

ACK https://github.com/bitcoin/bitcoin/pull/24596/commits/70f2c579b9de41f987e170f15c0ce767d9ad7931

MarcoFalke merged this on Mar 24, 2022

MarcoFalke closed this on Mar 24, 2022

hebasto deleted the branch on Mar 24, 2022

MarcoFalke commented at 7:15 AM on March 24, 2022: member

I can see why it is minimally cleaner (from a git perspective) to not cherry-pick unless required, but I don't think this is reason enough to NACK this pull, since there won't be any difference for end-users (except for the git hash that is embedded in the binary).

vasild commented at 7:21 AM on March 24, 2022: member

ACK 70f2c579b9de41f987e170f15c0ce767d9ad7931 @luke-jr, how could this be a merge instead of cherry-picks? I do not think this is possible, but maybe I am missing something. What exact git commands would create such a merge? There are intermediate, undesired, commits in master, a merge would drag them into 23.x too.

MarcoFalke commented at 7:30 AM on March 24, 2022: member

I think this would only be possible for pull requests which happen to be (or are intentionally) based on any commit pre-branch-off.

DrahtBot locked this on Mar 24, 2023