Skip to content

Commit bc67215

Browse files
committed
Merge bitcoin/bitcoin#26558: doc: add tr() descriptor example to deriveaddresses
92a4ed0 doc: add tr() descriptor example to deriveaddresses (FractalEncrypt) Pull request description: This simple PR adds a missing tr() descriptor example to the `help deriveaddresses` examples. - The functionality added in bitcoin/bitcoin#24043 is a significant departure from legacy multisig address creation, yet there is no corresponding tr() descriptor example in the help. - Having this example in combination with the examples in the descriptors documentation will be helpful to users. I needed this information to correctly create a tr multisig address but was unable. I had to leave the software and use a 3rd party site to ask two separate questions ([1](https://bitcoin.stackexchange.com/questions/115700/how-do-i-create-a-taproot-multisig-address-requiring-21-of-210-keys-to-spend), [2](https://bitcoin.stackexchange.com/questions/115742/signing-psbts-to-spend-from-taproot-multisig-address)) to create an address using the new functionality. Note: This specific example is not provided in the [descriptors.md ](https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md) documentation, though there is a similar example with `sortedmulti_a. ` ACKs for top commit: instagibbs: ACK 92a4ed0 kouloumos: ACK 92a4ed0 w0xlt: ACK bitcoin/bitcoin@92a4ed0 Tree-SHA512: 8fb052bd469718157cb64439b885f8b0ecfb5a798535a02bae0a5dc748cd554a3e5ffdd9fe4acaef16156eadb59e1b2bcde7356e811397225f2783a84c8b112f
2 parents 38d06e1 + 92a4ed0 commit bc67215

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/rpc/output_script.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,11 @@ static RPCHelpMan deriveaddresses()
222222
return RPCHelpMan{"deriveaddresses",
223223
{"\nDerives one or more addresses corresponding to an output descriptor.\n"
224224
"Examples of output descriptors are:\n"
225-
" pkh(<pubkey>) P2PKH outputs for the given pubkey\n"
226-
" wpkh(<pubkey>) Native segwit P2PKH outputs for the given pubkey\n"
227-
" sh(multi(<n>,<pubkey>,<pubkey>,...)) P2SH-multisig outputs for the given threshold and pubkeys\n"
228-
" raw(<hex script>) Outputs whose scriptPubKey equals the specified hex scripts\n"
225+
" pkh(<pubkey>) P2PKH outputs for the given pubkey\n"
226+
" wpkh(<pubkey>) Native segwit P2PKH outputs for the given pubkey\n"
227+
" sh(multi(<n>,<pubkey>,<pubkey>,...)) P2SH-multisig outputs for the given threshold and pubkeys\n"
228+
" raw(<hex script>) Outputs whose scriptPubKey equals the specified hex scripts\n"
229+
" tr(<pubkey>,multi_a(<n>,<pubkey>,<pubkey>,...)) P2TR-multisig outputs for the given threshold and pubkeys\n"
229230
"\nIn the above, <pubkey> either refers to a fixed public key in hexadecimal notation, or to an xpub/xprv optionally followed by one\n"
230231
"or more path elements separated by \"/\", where \"h\" represents a hardened child key.\n"
231232
"For more information on output descriptors, see the documentation in the doc/descriptors.md file.\n"},

0 commit comments

Comments
 (0)