highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-11 21:20:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#36227: Pre 32.x branching updates

Browse Source 
9a48134aea docs: Update bips.md (sedited)
57d3d00130 build: Bump version to 32.99 (sedited)

Pull request description:

  Bump the major version and add a note to the bips document about BIP 370.

ACKs for top commit:
  fanquake:
    ACK 9a48134aea
  janb84:
    ACK 9a48134aea

Tree-SHA512: 1be9dacd2c14d169a8495864bd66c05966f3cffe086649c1ded0827439934e543975283e394ed67ae4ff3d433531168481e1b0b1507071175504285f476d7ea4
This commit is contained in:
merge-script
2026-09-11 17:11:36 +01:00
parent 4d463de804 9a48134aea
commit f3fec67c3e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -27,7 +27,7 @@ get_directory_property(precious_variables CACHE_VARIABLES)
# Project / Package metadata
#=============================
set(CLIENT_NAME "Bitcoin Core")
set(CLIENT_VERSION_MAJOR 31)
set(CLIENT_VERSION_MAJOR 32)
set(CLIENT_VERSION_MINOR 99)
set(CLIENT_VERSION_BUILD 0)
set(CLIENT_VERSION_RC 0)

1
doc/bips.md
View File

@@ -64,6 +64,7 @@ BIPs that are implemented by Bitcoin Core:
[PR 21686](https://github.com/bitcoin/bitcoin/pull/21686)),
always active as of **v24.0** ([PR 23536](https://github.com/bitcoin/bitcoin/pull/23536)).
* [`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 370`](https://github.com/bitcoin/bips/blob/master/bip-0370.mediawiki): PSBT version 2 is supported and created by default by the PSBT RPCs as of **v32.0** ([PR 21283](https://github.com/bitcoin/bitcoin/pull/21283)).
* [`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 373`](https://github.com/bitcoin/bips/blob/master/bip-0373.mediawiki): MuSig2 fields for PSBT as of **v30.0** ([PR 31247](https://github.com/bitcoin/bitcoin/pull/31247))
* [`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)).