diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-02 08:28:39 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-02 08:29:31 +0800 |
| commit | dc9ffb6bc4520b107653e6ff182a6f54de10073f (patch) | |
| tree | 35267a0d7679c2ceef759d85d6fd53f8c53ddbc3 | |
| parent | 7e75400bb568fe8a653246c4e76f6baab2455a61 (diff) | |
| parent | d2a09c83554cec864a27e704cf2a0d513691a567 (diff) | |
| download | bitcoin-dc9ffb6bc4520b107653e6ff182a6f54de10073f.tar.xz | |
Merge bitcoin/bitcoin#22837: doc: mention bech32m/BIP350 in doc/descriptors.md
d2a09c83554cec864a27e704cf2a0d513691a567 doc: mention bech32m/BIP350 in doc/descriptors.md (Pieter Wuille)
Pull request description:
As it says on the tin.
ACKs for top commit:
0xB10C:
ACK d2a09c83554cec864a27e704cf2a0d513691a567
fanquake:
ACK d2a09c83554cec864a27e704cf2a0d513691a567 - can be backported for coherent documentation. Bech32m support was backported into branches back to the 0.19.
Tree-SHA512: a75d8bbf1ab062ec19e14cbe38dd0405a08c58e5dd4e9d94881f2c5efd52cc22dc755eae8d21bbda066feb099d93312b65557900bc2e65a70ba0412614cf0135
| -rw-r--r-- | doc/descriptors.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/descriptors.md b/doc/descriptors.md index e27ff87546..3bbb626a42 100644 --- a/doc/descriptors.md +++ b/doc/descriptors.md @@ -99,7 +99,7 @@ Descriptors consist of several types of expressions. The top level expression is `ADDR` expressions are any type of supported address: - 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). - 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)). -- Segwit addresses (bech32, of the form `bc1...` for mainnet or `tb1...` for testnet, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki)). +- Segwit addresses (bech32 and bech32m, of the form `bc1...` for mainnet or `tb1...` for testnet, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki) and [BIP 350](https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki)). ## Explanation |