diff options
author | MacroFake <falke.marco@gmail.com> | 2022-11-05 09:33:58 +0100 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-11-05 09:34:06 +0100 |
commit | 578752a44d684feb46bd0ad94b81bbab3ec57b90 (patch) | |
tree | 48566fe61da37ac34a217421a808d3cebf3552f8 | |
parent | 65c2f787c59abe1d9fbdd65e44b7cb35f2a053a1 (diff) | |
parent | 888480bd8819c78663baa6ded92a0d46f68fe7ee (diff) |
Merge bitcoin/bitcoin#26453: [23.x] Bump version to 23.1rc1
888480bd8819c78663baa6ded92a0d46f68fe7ee doc: update version number in bips.md to v23.1 (fanquake)
f89a2ea3b71b008b52165f1d260dead949d4548c doc: Update manual pages for 23.1rc1 (fanquake)
a43e380a1f3b119fb22186502de89b494ff8c29b build: Bump version to 23.1rc1 (fanquake)
5a57b656d3fa6a0004ebc208bf70e2fe2eba1aa2 doc: mention BIP86 in doc/bips.md (Sebastian Falbesoner)
Pull request description:
Bump the version to 23.1rc1.
Generate the man pages.
Update the version number in bips.md.
Also backports https://github.com/bitcoin/bitcoin/pull/26443.
ACKs for top commit:
MarcoFalke:
Concept ACK 888480bd8819c78663baa6ded92a0d46f68fe7ee
Tree-SHA512: e2c937fe7b18423e1450889f61f2f8bd0b50fb525ab839978fe0a58707176416412c69983f973e5fc9b512356c5bc873d9458470b55c87067ff6789ba347beec
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | doc/bips.md | 3 | ||||
-rw-r--r-- | doc/man/bitcoin-cli.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-qt.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-tx.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-util.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-wallet.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoind.1 | 8 |
8 files changed, 28 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index eef4b41973..1d4f26e200 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 23) -define(_CLIENT_VERSION_MINOR, 0) +define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 0) +define(_CLIENT_VERSION_RC, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2022) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/doc/bips.md b/doc/bips.md index 0f3f61daf1..8a7ceaf7b3 100644 --- a/doc/bips.md +++ b/doc/bips.md @@ -1,4 +1,4 @@ -BIPs that are implemented by Bitcoin Core (up-to-date up to **v23.0**): +BIPs that are implemented by Bitcoin Core (up-to-date up to **v23.1**): * [`BIP 9`](https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki): The changes allowing multiple soft-forks to be deployed in parallel have been implemented since **v0.12.1** ([PR #7575](https://github.com/bitcoin/bitcoin/pull/7575)) * [`BIP 11`](https://github.com/bitcoin/bips/blob/master/bip-0011.mediawiki): Multisig outputs are standard since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)). @@ -28,6 +28,7 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v23.0**): and it is disabled by default at build time since **v0.19.0** ([PR #15584](https://github.com/bitcoin/bitcoin/pull/15584)). It has been removed as of **v0.20.0** ([PR 17165](https://github.com/bitcoin/bitcoin/pull/17165)). * [`BIP 84`](https://github.com/bitcoin/bips/blob/master/bip-0084.mediawiki): The experimental descriptor wallets introduced in **v0.21.0** by default use the Hierarchical Deterministic Wallet derivation proposed by BIP 84. ([PR #16528](https://github.com/bitcoin/bitcoin/pull/16528)) +* [`BIP 86`](https://github.com/bitcoin/bips/blob/master/bip-0086.mediawiki): Descriptor wallets by default use the Hierarchical Deterministic Wallet derivation proposed by BIP 86 since **v23.0** ([PR #22364](https://github.com/bitcoin/bitcoin/pull/22364)). * [`BIP 90`](https://github.com/bitcoin/bips/blob/master/bip-0090.mediawiki): Trigger mechanism for activation of BIPs 34, 65, and 66 has been simplified to block height checks since **v0.14.0** ([PR #8391](https://github.com/bitcoin/bitcoin/pull/8391)). * [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)). * [`BIP 112`](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki): The CHECKSEQUENCEVERIFY opcode has been implemented since **v0.12.1** ([PR #7524](https://github.com/bitcoin/bitcoin/pull/7524)), and has been *buried* since **v0.19.0** ([PR #16060](https://github.com/bitcoin/bitcoin/pull/16060)). diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 5dc94356a8..af952908ab 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/bitcoin-cli.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-CLI "1" "April 2022" "bitcoin-cli v23.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-CLI "1" "November 2022" "bitcoin-cli v23.1.0rc1" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v23.0.0 +bitcoin-cli \- manual page for bitcoin-cli v23.1.0rc1 .SH SYNOPSIS .B bitcoin-cli [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v23.0.0 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v23.0.0 +Bitcoin Core RPC client version v23.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index 72a0486121..0ef72009bb 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/bitcoin-qt.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-QT "1" "April 2022" "bitcoin-qt v23.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-QT "1" "November 2022" "bitcoin-qt v23.1.0rc1" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v23.0.0 +bitcoin-qt \- manual page for bitcoin-qt v23.1.0rc1 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v23.0.0 +Bitcoin Core version v23.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index fe96147da7..1da154313d 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/bitcoin-tx.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-TX "1" "April 2022" "bitcoin-tx v23.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-TX "1" "November 2022" "bitcoin-tx v23.1.0rc1" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v23.0.0 +bitcoin-tx \- manual page for bitcoin-tx v23.1.0rc1 .SH SYNOPSIS .B bitcoin-tx [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR @@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v23.0.0 .B bitcoin-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-tx utility version v23.0.0 +Bitcoin Core bitcoin\-tx utility version v23.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index e5ae0197e7..690b2a7bcc 100644 --- a/doc/man/bitcoin-util.1 +++ b/doc/man/bitcoin-util.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-UTIL "1" "April 2022" "bitcoin-util v23.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-UTIL "1" "November 2022" "bitcoin-util v23.1.0rc1" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v23.0.0 +bitcoin-util \- manual page for bitcoin-util v23.1.0rc1 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v23.0.0 +Bitcoin Core bitcoin\-util utility version v23.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index 6041afc9c6..4122596976 100644 --- a/doc/man/bitcoin-wallet.1 +++ b/doc/man/bitcoin-wallet.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-WALLET "1" "April 2022" "bitcoin-wallet v23.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-WALLET "1" "November 2022" "bitcoin-wallet v23.1.0rc1" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v23.0.0 +bitcoin-wallet \- manual page for bitcoin-wallet v23.1.0rc1 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v23.0.0 +Bitcoin Core bitcoin\-wallet version v23.1.0rc1 .PP bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files. By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir. diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index b15f43c509..14fbc603d3 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIND "1" "April 2022" "bitcoind v23.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIND "1" "November 2022" "bitcoind v23.1.0rc1" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v23.0.0 +bitcoind \- manual page for bitcoind v23.1.0rc1 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v23.0.0 +Bitcoin Core version v23.1.0rc1 .SH OPTIONS .HP \-? |