aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-05-13 09:15:12 +0200
committerMarcoFalke <falke.marco@gmail.com>2021-05-13 09:15:15 +0200
commitdb2990d01f3c0ade2c786b182dd49a9307d1cfbc (patch)
treef12d2694c0bd3321ba87f4b58aaf1eeab2d8b3ef
parent0ab6ff5e375900906fdf6a2834fedcc76d0e031c (diff)
parentfaf30f2ae0450c15b2b9b07bf71cc87d259b1056 (diff)
downloadbitcoin-db2990d01f3c0ade2c786b182dd49a9307d1cfbc.tar.xz
Merge bitcoin/bitcoin#21925: doc: Update bips.md for 0.21.1
faf30f2ae0450c15b2b9b07bf71cc87d259b1056 doc: Update bips.md for 0.21.1 (MarcoFalke) Pull request description: ACKs for top commit: kristapsk: ACK faf30f2ae0450c15b2b9b07bf71cc87d259b1056 jarolrod: ACK faf30f2ae0450c15b2b9b07bf71cc87d259b1056 prayank23: ACK https://github.com/bitcoin/bitcoin/pull/21925/commits/faf30f2ae0450c15b2b9b07bf71cc87d259b1056 Tree-SHA512: b09e8782306fe990d4eba871627cb7aa97a521a5aa08b7c7369fbfc24e49c3c9386cd06c590af076dff9b95ade207cc470911aa4b97cd5f366630974e71e1348
-rw-r--r--doc/bips.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/bips.md b/doc/bips.md
index f72dbead9d..45954bcfd8 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -49,5 +49,11 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v22.0**):
* [`BIP 176`](https://github.com/bitcoin/bips/blob/master/bip-0176.mediawiki): Bits Denomination [QT only] is supported as of **v0.16.0** ([PR 12035](https://github.com/bitcoin/bitcoin/pull/12035)).
* [`BIP 325`](https://github.com/bitcoin/bips/blob/master/bip-0325.mediawiki): Signet test network is supported as of **v0.21.0** ([PR 18267](https://github.com/bitcoin/bitcoin/pull/18267)).
* [`BIP 339`](https://github.com/bitcoin/bips/blob/master/bip-0339.mediawiki): Relay of transactions by wtxid is supported as of **v0.21.0** ([PR 18044](https://github.com/bitcoin/bitcoin/pull/18044)).
-* [`BIP 340`](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki) [`341`](https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki) [`342`](https://github.com/bitcoin/bips/blob/master/bip-0342.mediawiki): Validation rules for Taproot (including Schnorr signatures and Tapscript leaves) are implemented as of **v0.21.0** ([PR 19953](https://github.com/bitcoin/bitcoin/pull/19953)), without mainnet activation.
+* [`BIP 340`](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki)
+ [`341`](https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki)
+ [`342`](https://github.com/bitcoin/bips/blob/master/bip-0342.mediawiki):
+ Validation rules for Taproot (including Schnorr signatures and Tapscript
+ leaves) are implemented as of **v0.21.0** ([PR 19953](https://github.com/bitcoin/bitcoin/pull/19953)),
+ with mainnet activation as of **v0.21.1** ([PR 21377](https://github.com/bitcoin/bitcoin/pull/21377),
+ [PR 21686](https://github.com/bitcoin/bitcoin/pull/21686)).
* [`BIP 350`](https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki): Addresses for native v1+ segregated Witness outputs use Bech32m instead of Bech32 as of **v22.0** ([PR 20861](https://github.com/bitcoin/bitcoin/pull/20861)).