Skip to content

Commit 8afcc89

Browse files
committed
Merge bitcoin/bitcoin#24282: docs: Move explanation of hardened key syntax closer to KEY section
bac30e8 docs: Move explanation of hardened key syntax closer to KEY section (Bitcoin Hodler) Pull request description: The line about "(Anywhere a `'` suffix is permitted to denote hardened derivation, the suffix `h` can be used instead.)" belongs with the section on KEY expressions, not following the unrelated TREE section. ACKs for top commit: prusnak: ACK bac30e8 meshcollider: ACK bac30e8 Tree-SHA512: 56fe97b89c02e67e94cab33b01e56f17f9b501b97036c5b35939dc4000a9d5e9afe4333869ba97bbe81372c538b7b2021a7d2520aba731400d8d0e62714d52b4
2 parents 87b5b00 + bac30e8 commit 8afcc89

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

doc/descriptors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ Descriptors consist of several types of expressions. The top level expression is
9090
- Optionally followed by a single `/*` or `/*'` final step to denote all (direct) unhardened or hardened children.
9191
- The usage of hardened derivation steps requires providing the private key.
9292

93+
(Anywhere a `'` suffix is permitted to denote hardened derivation, the suffix `h` can be used instead.)
94+
9395
`TREE` expressions:
9496
- any `SCRIPT` expression
9597
- An open brace `{`, a `TREE` expression, a comma `,`, a `TREE` expression, and a closing brace `}`
9698

97-
(Anywhere a `'` suffix is permitted to denote hardened derivation, the suffix `h` can be used instead.)
98-
9999
`ADDR` expressions are any type of supported address:
100100
- P2PKH addresses (base58, of the form `1...` for mainnet or `[nm]...` for testnet). Note that P2PKH addresses in descriptors cannot be used for P2PK outputs (use the `pk` function instead).
101101
- P2SH addresses (base58, of the form `3...` for mainnet or `2...` for testnet, defined in [BIP 13](https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki)).

0 commit comments

Comments
 (0)