Skip to content

Commit 1248d0d

Browse files
committed
Merge bitcoin/bitcoin#30719: Pre-28.x branch off version bump and doc updates
1bf9b70 docs: Add 379 and 387 to bips.md (Ava Chow) 35ef34e docs: Remove release 28.0 release notes fragments (Ava Chow) f5cf43b build: Bump to 28.99 (Ava Chow) Pull request description: * Bump to 28.99 in preparation for the 28.x branching * Remove current release note fragments. They've been moved to [draft release notes]((https://github.com/bitcoin-core/bitcoin-devwiki/wiki/28.0-Release-Notes-Draft).) in the wiki. * Updated bips.md with missing BIPs that were implemented a while ago. ACKs for top commit: maflcko: lgtm ACK 1bf9b70 tdb3: re ACK 1bf9b70 Tree-SHA512: 9d5b05330268bb233369d78f06011dbdcdcb87770c499ae743ac4833735ba657b6611ff1e332c9d4added854b694c5a3a961d911247303f7ddaaaa72149d5574
2 parents 0022c84 + 1bf9b70 commit 1248d0d

25 files changed

+3
-165
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ([2.69])
2-
define(_CLIENT_VERSION_MAJOR, 27)
2+
define(_CLIENT_VERSION_MAJOR, 28)
33
define(_CLIENT_VERSION_MINOR, 99)
44
define(_CLIENT_VERSION_BUILD, 0)
55
define(_CLIENT_VERSION_RC, 0)

doc/bips.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ BIPs that are implemented by Bitcoin Core:
6262
[PR 21686](https://github.com/bitcoin/bitcoin/pull/21686)).
6363
* [`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)).
6464
* [`BIP 371`](https://github.com/bitcoin/bips/blob/master/bip-0371.mediawiki): Taproot fields for PSBT as of **v24.0** ([PR 22558](https://github.com/bitcoin/bitcoin/pull/22558)).
65+
* [`BIP 379`](https://github.com/bitcoin/bips/blob/master/bip-0379.md): Miniscript was partially implemented in **v24.0** ([PR 24148](https://github.com/bitcoin/bitcoin/pull/24148)), and fully implemented as of **v26.0** ([PR 27255](https://github.com/bitcoin/bitcoin/pull/27255)).
6566
* [`BIP 380`](https://github.com/bitcoin/bips/blob/master/bip-0380.mediawiki)
6667
[`381`](https://github.com/bitcoin/bips/blob/master/bip-0381.mediawiki)
6768
[`382`](https://github.com/bitcoin/bips/blob/master/bip-0382.mediawiki)
@@ -70,4 +71,5 @@ BIPs that are implemented by Bitcoin Core:
7071
[`385`](https://github.com/bitcoin/bips/blob/master/bip-0385.mediawiki):
7172
Output Script Descriptors, and most of Script Expressions are implemented as of **v0.17.0** ([PR 13697](https://github.com/bitcoin/bitcoin/pull/13697)).
7273
* [`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)).
74+
* [`BIP 387`](https://github.com/bitcoin/bips/blob/master/bip-0387.mediawiki): Tapscript Multisig Output Script Descriptors are implemented as of **v24.0** ([PR 24043](https://github.com/bitcoin/bitcoin/pull/24043)).
7375
* [`BIP 431`](https://github.com/bitcoin/bips/blob/master/bip-0431.mediawiki): transactions with nVersion=3 are standard and treated as Topologically Restricted Until Confirmation as of **v28.0** ([PR 29496](https://github.com/bitcoin/bitcoin/pull/29496)).

doc/release-28984.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

doc/release-notes-22729.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

doc/release-notes-27101.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

doc/release-notes-27114.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

doc/release-notes-27307.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

doc/release-notes-27375.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

doc/release-notes-27679.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

doc/release-notes-28052.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)