diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-23 18:05:40 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-23 18:07:49 +0800 |
| commit | af591f2068d0363c92d9756ca39c43db85e5804c (patch) | |
| tree | 98a22dbea2a3973dd75ba211d5b63416907d9d34 | |
| parent | 97d3500601c1d28642347d014a6de1e38f53ae4e (diff) | |
| parent | 6c102a696e1f6e3316b2a90c33c5d7875298c875 (diff) | |
Merge bitcoin/bitcoin#22858: [0.21] Final changes for 0.21.2v0.21.2
6c102a696e1f6e3316b2a90c33c5d7875298c875 release: bump RC to 0 (-final) (fanquake)
f78570ef87d8dd4864ddfe67439315bd6f374edd doc: mention bech32m/BIP350 in doc/descriptors.md (Pieter Wuille)
Pull request description:
Backports:
* #22837 - doc: mention bech32m/BIP350 in doc/descriptors.md
ACKs for top commit:
laanwj:
ACK 6c102a696e1f6e3316b2a90c33c5d7875298c875
glozow:
ACK 6c102a696e1f6e3316b2a90c33c5d7875298c875 looks correct to me
jnewbery:
ACK 6c102a696e1f6e3316b2a90c33c5d7875298c875
Tree-SHA512: 8cdfee955e1abdbc6900df3d01982cb77ec57ef008b75487ac9a63d571cc21e4ae0f107849aa575d239a8662619553778955ffbebf57201de5afcd34298d57b4
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/descriptors.md | 2 | ||||
| -rw-r--r-- | doc/release-notes.md | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0b2de09062..6df4c1ce09 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 21) define(_CLIENT_VERSION_REVISION, 2) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 2) +define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2020) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/doc/descriptors.md b/doc/descriptors.md index 181ff77e50..26937fa59f 100644 --- a/doc/descriptors.md +++ b/doc/descriptors.md @@ -91,7 +91,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 diff --git a/doc/release-notes.md b/doc/release-notes.md index f99bc59ccf..3b33c48a26 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,9 +1,9 @@ -0.21.2rc2 Release Notes +0.21.2 Release Notes ==================== -Bitcoin Core version 0.21.2rc2 is now available from: +Bitcoin Core version 0.21.2 is now available from: - <https://bitcoincore.org/bin/bitcoin-core-0.21.2/test.rc2/> + <https://bitcoincore.org/bin/bitcoin-core-0.21.2/> This minor release includes various bug fixes and performance improvements, as well as updated translations. @@ -42,7 +42,7 @@ longer supported. Additionally, Bitcoin Core does not yet change appearance when macOS "dark mode" is activated. -0.21.2rc2 change log +0.21.2 change log ================= ### P2P protocol and network code |