diff options
| author | Andrew Chow <github@achow101.com> | 2023-03-06 11:14:49 -0500 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-03-06 11:15:16 -0500 |
| commit | 5e1aab23347eb02fa316cde82531a57327098ca7 (patch) | |
| tree | 088df89253f8471042c8eafbd7d8b6ce00a11f03 /src | |
| parent | dddc936d838edbb30f877b54b1abd101eff76cad (diff) | |
| parent | e4ede64fe87b1619f65da5753088d93e6f481b05 (diff) | |
| download | bitcoin-5e1aab23347eb02fa316cde82531a57327098ca7.tar.xz | |
Merge bitcoin/bitcoin#27155: doc: Expand scantxoutset help text to cover tr() and miniscript
e4ede64fe87b1619f65da5753088d93e6f481b05 Expand scantxoutset help text to cover tr() and miniscript (Greg Sanders)
Pull request description:
ACKs for top commit:
achow101:
ACK e4ede64fe87b1619f65da5753088d93e6f481b05
darosior:
webACK e4ede64fe87b1619f65da5753088d93e6f481b05
Tree-SHA512: 6b5d9e7fccc8242f4534861c1b438ec40fb03fbf5968c5a4af5ddbced73df6d666812053c2e12a1e0a34057f6f4fe11987c8c59d8cdfa48ca7ab7d2720b51ef9
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/blockchain.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 28a619fe54..9459801c2c 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -2106,6 +2106,10 @@ static RPCHelpMan scantxoutset() " combo(<pubkey>) P2PK, P2PKH, P2WPKH, and P2SH-P2WPKH outputs for the given pubkey\n" " pkh(<pubkey>) P2PKH outputs for the given pubkey\n" " sh(multi(<n>,<pubkey>,<pubkey>,...)) P2SH-multisig outputs for the given threshold and pubkeys\n" + " tr(<pubkey>) P2TR\n" + " tr(<pubkey>,{pk(<pubkey>)}) P2TR with single fallback pubkey in tapscript\n" + " rawtr(<pubkey>) P2TR with the specified key as output key rather than inner\n" + " wsh(and_v(v:pk(<pubkey>),after(2))) P2WSH miniscript with mandatory pubkey and a timelock\n" "\nIn the above, <pubkey> either refers to a fixed public key in hexadecimal notation, or to an xpub/xprv optionally followed by one\n" "or more path elements separated by \"/\", and optionally ending in \"/*\" (unhardened), or \"/*'\" or \"/*h\" (hardened) to specify all\n" "unhardened or hardened child keys.\n" |