mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-31 19:06:10 +02:00
Merge bitcoin/bitcoin#22364: wallet: Make a tr() descriptor by default
4868c9f1b3Extract Taproot internal keyid with GetKeyFromDestination (Andrew Chow)d8abbe119cMention bech32m in -addresstype and -changetype help (Andrew Chow)8fb57845eeCreate a tr() descriptor bech32m DescriptorScriptPubKeyMan by default (Andrew Chow)54b3699862Store pubkeys in TRDescriptor::MakeScripts (Andrew Chow) Pull request description: Make a `tr()` descriptor by default in descriptor wallets so that users will be able to make and use segwit v1 bech32m addresses. ACKs for top commit: MarcoFalke: Concept ACK4868c9f1b3Sjors: re-utACK4868c9f1b3gruve-p: ACK4868c9f1b3meshcollider: Concept + code review ACK4868c9f1b3Tree-SHA512: e5896e665b8d559f1d759b6582d1bb24f70d4698a57307684339d9fdcdac28ae9bc17bc946a7efec9cb35c130a95ffc36e3961a335124ec4535d77b8d00e9631
This commit is contained in:
@@ -3168,11 +3168,6 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
|
||||
|
||||
for (bool internal : {false, true}) {
|
||||
for (OutputType t : OUTPUT_TYPES) {
|
||||
if (t == OutputType::BECH32M) {
|
||||
// Skip taproot (bech32m) for now
|
||||
// TODO: Setup taproot (bech32m) descriptors by default
|
||||
continue;
|
||||
}
|
||||
auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this));
|
||||
if (IsCrypted()) {
|
||||
if (IsLocked()) {
|
||||
|
||||
Reference in New Issue
Block a user