Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30719: Pre-28.x branch off version bump and doc…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
achow101 committed Aug 27, 2024
2 parents 0022c84 + 1bf9b70 commit 1248d0d
Show file tree
Hide file tree
Showing 25 changed files with 3 additions and 165 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 27)
define(_CLIENT_VERSION_MAJOR, 28)
define(_CLIENT_VERSION_MINOR, 99)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
Expand Down
2 changes: 2 additions & 0 deletions doc/bips.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ BIPs that are implemented by Bitcoin Core:
[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 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)).
* [`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)).
* [`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)
Expand All @@ -70,4 +71,5 @@ BIPs that are implemented by Bitcoin Core:
[`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)).
* [`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)).
* [`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)).
6 changes: 0 additions & 6 deletions doc/release-28984.md

This file was deleted.

21 changes: 0 additions & 21 deletions doc/release-notes-22729.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-27101.md

This file was deleted.

2 changes: 0 additions & 2 deletions doc/release-notes-27114.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-27307.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-27375.md

This file was deleted.

2 changes: 0 additions & 2 deletions doc/release-notes-27679.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-28052.md

This file was deleted.

5 changes: 0 additions & 5 deletions doc/release-notes-29091-29165.md

This file was deleted.

11 changes: 0 additions & 11 deletions doc/release-notes-29496.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-29612.md

This file was deleted.

10 changes: 0 additions & 10 deletions doc/release-notes-29775.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-29845.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-29987.md

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes-30058.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-30192.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-30212.md

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes-30275.md

This file was deleted.

10 changes: 0 additions & 10 deletions doc/release-notes-30352.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-30482.md

This file was deleted.

4 changes: 0 additions & 4 deletions doc/release-notes-30493.md

This file was deleted.

4 changes: 0 additions & 4 deletions doc/release-notes-30647.md

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes/release-notes-27064.md

This file was deleted.

0 comments on commit 1248d0d

Please sign in to comment.