diff options
author | MarcoFalke <falke.marco@gmail.com> | 2016-10-08 21:26:07 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2016-10-08 21:28:26 +0200 |
commit | 072116fceb2294b97d1c40f79305f2e3ff71812b (patch) | |
tree | fa12cc829888fbdb1d356ea457d6ddf130039b14 | |
parent | e66cc1d58e16bf1650dd6479fed64ecaca8c6098 (diff) | |
parent | ef28d8a899aeb4487ef7fbfbfca9c0f2b60bdaf6 (diff) | |
download | bitcoin-072116fceb2294b97d1c40f79305f2e3ff71812b.tar.xz |
Merge #8891: [Doc] Update bips.md for Segregated Witness
ef28d8a [Doc] Update bips.md for Segregated Witness (fanquake)
-rw-r--r-- | doc/bips.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/bips.md b/doc/bips.md index 039d5114fd..040439fbcb 100644 --- a/doc/bips.md +++ b/doc/bips.md @@ -26,4 +26,9 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**): * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)). * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)). * [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)). +* [`BIP 141`](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki): Segregated Witness (Consensus Layer) as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)). +* [`BIP 143`](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki): Transaction Signature Verification for Version 0 Witness Program as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)). +* [`BIP 144`](https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki): Segregated Witness as of **0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)). +* [`BIP 145`](https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki): getblocktemplate updates for Segregated Witness as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)). +* [`BIP 147`](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki): NULLDUMMY softfork as of **v0.13.1** ([PR 8636](https://github.com/bitcoin/bitcoin/pull/8636)). * [`BIP 152`](https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki): Compact block transfer and related optimizations are used as of **v0.13.0** ([PR 8068](https://github.com/bitcoin/bitcoin/pull/8068)). |