This brings doc/descriptors.md up to date:
musig() KEY expressions in the specification part.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33986.
See the guideline for information on the review process.
If your review is incorrectly listed, please copy-paste <!–meta-tag:bot-skip–> into the comment that the bot should ignore.
No conflicts as of last run.
Possible typos and grammar issues:
2026-02-28 15:45:56
78@@ -79,18 +79,18 @@ Descriptors consist of several types of expressions. The top level expression is
79 - Followed by the actual key, which is either:
80 - Hex encoded public keys (either 66 characters starting with `02` or `03` for a compressed pubkey, or 130 characters starting with `04` for an uncompressed pubkey).
81 - Inside `wpkh` and `wsh`, only compressed public keys are permitted.
82- - Inside `tr` and `rawtr`, x-only pubkeys are also permitted (64 hex characters).
83+ - Inside [`tr`](https://github.com/bitcoin/bips/blob/master/bip-0387.mediawiki) and `rawtr`, x-only pubkeys are also permitted (64 hex characters).
Concept ACK
I prefer to display the BIP numbers rather than “hide” them behind links.
e.g.
0Pay-to-witness-pubkey-hash scripts (P2WPKH, [BIP-141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki))
72+- `sh(SCRIPT)` (top level only): P2SH embed the argument, defined in [BIP 381](https://github.com/bitcoin/bips/blob/master/bip-0381.mediawiki).
73+- `wsh(SCRIPT)` (top level or inside `sh` only): P2WSH embed the argument, defined in [BIP 382](https://github.com/bitcoin/bips/blob/master/bip-0382.mediawiki).
74+- `pk(KEY)` (anywhere): P2PK output for the given public key, defined in [BIP 381](https://github.com/bitcoin/bips/blob/master/bip-0381.mediawiki).
75+- `pkh(KEY)` (not inside `tr`): P2PKH output for the given public key (use `addr` if you only know the pubkey hash), defined in [BIP 381](https://github.com/bitcoin/bips/blob/master/bip-0381.mediawiki).
76+- `wpkh(KEY)` (top level or inside `sh` only): P2WPKH output for the given compressed pubkey, defined in [BIP 382](https://github.com/bitcoin/bips/blob/master/bip-0382.mediawiki).
77+- `combo(KEY)` (top level only): an alias for the collection of `pk(KEY)` and `pkh(KEY)`, defined in [BIP 384][https://github.com/bitcoin/bips/blob/master/bip-0384.mediawiki). If the key is compressed, it also includes `wpkh(KEY)` and `sh(wpkh(KEY))`.
55 - Raw hex scripts through the `raw` function.
56-- Public keys (compressed and uncompressed) in hex notation, or BIP32 extended pubkeys with derivation paths.
57-- [Miniscript](https://bitcoin.sipa.be/miniscript/) expressions in `wsh` (P2WSH) and `tr` (P2TR) functions.
58+- Public keys (compressed and uncompressed) in hex notation, or [BIP 32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) extended pubkeys with derivation paths.
59+- MuSig2 key aggregation, see [BIP 327](https://github.com/bitcoin/bips/blob/master/bip-0327.mediawiki).
60+- Miniscript expressions in `wsh` (P2WSH) and `tr` (P2TR) functions, see [BIP 379](https://github.com/bitcoin/bips/blob/master/bip-0379.mediawiki).
216@@ -237,7 +217,7 @@ Instead, it should be written as `xpub.../1/*`, where xpub corresponds to
217 `m/44'/0'/0'`.
218
219 When interacting with a hardware device, it may be necessary to include
220-the entire path from the master down. [BIP174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki) standardizes this by
221+the entire path from the master down. [BIP 174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki) standardizes this by
222 providing the master key *fingerprint* (first 32 bit of the Hash160 of
LLM nit, while touching this:
first 32 bit -> first 32 bits [plural needed for "bit(s)"]
light crACK d86f3804c9e33a25192178cacde3123406a8871e
I have not clicked & checked all the hyperlinks.
107@@ -107,6 +108,7 @@ Descriptors consist of several types of expressions. The top level expression is
108 - No more than one of these derivation steps may be of the form `<NUM;NUM;...;NUM>` (including hardened indicators with either or both `NUM`). If such specifiers are included, the descriptor will be parsed as multiple descriptors where the first descriptor uses all of the first `NUM` in the pair, and the second descriptor uses the second `NUM` in the pair for all `KEY` expressions, and so on.
109 - Optionally followed by a single `/*` or `/*'` final step to denote all (direct) unhardened or hardened children.
110 - The usage of hardened derivation steps requires providing the private key.
111+ - `musig(KEY,KEY,...)` to represent the MuSig2 key aggregation of the relevant keys, only inside `tr()` expressions. It may be followed by unhardened `/NUM` derivation steps if all `KEY` subexpressions are xpubs or derived thereof, and none use `/*` or `/<NUM;NUM;...>`.
ACK 37d49f5de6221aab90f99671413836479e6a71d1
I checked all the references to BIPs.