Skip to content

Commit 5e1aab2

Browse files
committed
Merge bitcoin/bitcoin#27155: doc: Expand scantxoutset help text to cover tr() and miniscript
e4ede64 Expand scantxoutset help text to cover tr() and miniscript (Greg Sanders) Pull request description: ACKs for top commit: achow101: ACK e4ede64 darosior: webACK e4ede64 Tree-SHA512: 6b5d9e7fccc8242f4534861c1b438ec40fb03fbf5968c5a4af5ddbced73df6d666812053c2e12a1e0a34057f6f4fe11987c8c59d8cdfa48ca7ab7d2720b51ef9
2 parents dddc936 + e4ede64 commit 5e1aab2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/rpc/blockchain.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,6 +2106,10 @@ static RPCHelpMan scantxoutset()
21062106
" combo(<pubkey>) P2PK, P2PKH, P2WPKH, and P2SH-P2WPKH outputs for the given pubkey\n"
21072107
" pkh(<pubkey>) P2PKH outputs for the given pubkey\n"
21082108
" sh(multi(<n>,<pubkey>,<pubkey>,...)) P2SH-multisig outputs for the given threshold and pubkeys\n"
2109+
" tr(<pubkey>) P2TR\n"
2110+
" tr(<pubkey>,{pk(<pubkey>)}) P2TR with single fallback pubkey in tapscript\n"
2111+
" rawtr(<pubkey>) P2TR with the specified key as output key rather than inner\n"
2112+
" wsh(and_v(v:pk(<pubkey>),after(2))) P2WSH miniscript with mandatory pubkey and a timelock\n"
21092113
"\nIn the above, <pubkey> either refers to a fixed public key in hexadecimal notation, or to an xpub/xprv optionally followed by one\n"
21102114
"or more path elements separated by \"/\", and optionally ending in \"/*\" (unhardened), or \"/*'\" or \"/*h\" (hardened) to specify all\n"
21112115
"unhardened or hardened child keys.\n"

0 commit comments

Comments
 (0)