diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-12-22 12:09:14 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-22 12:09:19 +0100 |
commit | 63b5dfac21613b984803347bfe81454da667016e (patch) | |
tree | 217d180d81c08709d2c7a890680a096016e219a6 /src/init | |
parent | 887796a5ffcbafcd281b920f8d55fcb6e8347584 (diff) | |
parent | c9a77e227eecf357c7dd550efb8c1827bb99a5de (diff) | |
download | bitcoin-63b5dfac21613b984803347bfe81454da667016e.tar.xz |
Merge bitcoin-core/gui#459: Address type dropdown, add Taproot (Receive tab)
c9a77e227eecf357c7dd550efb8c1827bb99a5de gui: address type dropdown, add bech32m (Sjors Provoost)
56113daef4830cad1af3c00f6b3c447c9e2a8e05 wallet: add taprootEnabled() to interface (Sjors Provoost)
Pull request description:
This PR replaces the Bech32 checkbox with an address type dropdown It "Use Taproot" checkbox to the receive screen for any wallet with a Taproot descriptor. The Bech32m option is hidden for wallets that don't have taproot descriptors.
Bech32 is kept as the default even for Taproot enabled wallets until it's more widely supported.
(an earlier attempt of this PR added a second checkbox)
<img width="469" alt="Schermafbeelding 2021-12-21 om 11 44 05" src="https://user-images.githubusercontent.com/10217/146872660-339fae1f-c0b8-4673-b8be-33c25f3933fd.png">
**Suggested testing**
* notice that the Bech32m entry only appears for wallet with a taproot descriptor
* verify that it generates a bc1p instead of bc1q address
1. Legacy wallet
2. Default descriptor wallet (current does not have taproot descriptor)
3. Wallet with taproot descriptor:
* just create a new descriptor wallet
Replaces https://github.com/bitcoin/bitcoin/pull/22260
ACKs for top commit:
Rspigler:
tACK c9a77e227eecf357c7dd550efb8c1827bb99a5de. I like the changes made now, thanks!
kristapsk:
re-ACK c9a77e227eecf357c7dd550efb8c1827bb99a5de
Tree-SHA512: bae66ac90ed55372e6c94878db0e37d32b7b5c24ed00c0f2ebb10fd127dddce3a061162df915d67e92d7b35b3da093137db17b73931a0ae1a470fff20be1f30b
Diffstat (limited to 'src/init')
0 files changed, 0 insertions, 0 deletions