diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-11-02 09:41:43 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-11-02 09:41:46 +0100 |
| commit | 76886ce11e85509cd9323fcff541c79e2c26034b (patch) | |
| tree | dfcb7e6d5b4d1f4c1db1eb3102366d434c939909 | |
| parent | 5adc5c02800f00d1e6e8812a2b0559b1800e82e9 (diff) | |
| parent | c02a674e97b61f675c94341fca1bf232070e6991 (diff) | |
| download | bitcoin-76886ce11e85509cd9323fcff541c79e2c26034b.tar.xz | |
Merge bitcoin/bitcoin#23410: doc: Add output script descriptors BIPs 380..386
c02a674e97b61f675c94341fca1bf232070e6991 doc: Add output script descriptors BIPs 380..386 (Hennadii Stepanov)
Pull request description:
BIPs 380..385 are implemented as of v0.17.0.
BIP 386 is implemented as of v22.0.
ACKs for top commit:
sipa:
ACK c02a674e97b61f675c94341fca1bf232070e6991
jarolrod:
ACK c02a674e97b61f675c94341fca1bf232070e6991
shaavan:
ACK c02a674e97b61f675c94341fca1bf232070e6991
Tree-SHA512: 40f0252d3aad08c61a8e1476d26a590dbcf3f9d66c1f8315d15d13feb17288cc25b9c75df5b938f77695eafaba847dacc0020a880ba6034a511e7c9b7f40fd8f
| -rw-r--r-- | doc/bips.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bips.md b/doc/bips.md index 45954bcfd8..b5fa9315d3 100644 --- a/doc/bips.md +++ b/doc/bips.md @@ -57,3 +57,11 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v22.0**): 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)). +* [`BIP 380`](https://github.com/bitcoin/bips/blob/master/bip-0380.mediawiki) + [`381`](https://github.com/bitcoin/bips/blob/master/bip-0381.mediawiki) + [`382`](https://github.com/bitcoin/bips/blob/master/bip-0382.mediawiki) + [`383`](https://github.com/bitcoin/bips/blob/master/bip-0383.mediawiki) + [`384`](https://github.com/bitcoin/bips/blob/master/bip-0384.mediawiki) + [`385`](https://github.com/bitcoin/bips/blob/master/bip-0385.mediawiki): + Output Script Descriptors, and most of Script Expressions are implemented as of **v0.17.0** ([PR 13697](https://github.com/bitcoin/bitcoin/pull/13697)). +* [`BIP 386`](https://github.com/bitcoin/bips/blob/master/bip-0386.mediawiki): tr() Output Script Descriptors are implemented as of **v22.0** ([PR 22051](https://github.com/bitcoin/bitcoin/pull/22051)). |