diff options
author | fanquake <fanquake@gmail.com> | 2024-02-26 11:34:10 +0000 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2024-02-26 11:54:29 +0000 |
commit | 1ce5accc325cd7d3382f67a314dec018cfdc0a3e (patch) | |
tree | ffc2f9987ce3c0cf73e5ba550e0b578fc21e422f /doc | |
parent | 8087626cbda97f6def4fb51cdac6f204486ee6fb (diff) | |
parent | 9f13dc1ed3020d55ba79b1a62ca0db6b510357ab (diff) |
Merge bitcoin/bitcoin#29464: [25.2] Final backports and changes for 25.2rc1v25.2rc1
9f13dc1ed3020d55ba79b1a62ca0db6b510357ab doc: Update release notes for 25.2rc1 (Ava Chow)
a27662b16a626ade5f26613e9f5323edcd6e9105 doc: update manpages for 25.2rc1 (Ava Chow)
65c617178420d5904fd43399eb3c87e00aff524e build: Bump to 25.2rc1 (Ava Chow)
cf0f43ee42f0bf8d345b109b0ba552faf7cb62e1 wallet: Fix use-after-free in WalletBatch::EraseRecords (MarcoFalke)
6acfc4324cc98a10e083e5f391435bbfde4d8f69 Use only Span{} constructor for byte-like types where possible (MarcoFalke)
b40d10787b2dc161e236e50eb296bdf02f93933f util: Allow std::byte and char Span serialization (MarcoFalke)
Pull request description:
Backport:
* #29176
* #27927
#29176 does not cleanly backport, and it also requires 27927 to work. Both are still fairly simple backports.
Also does the rest of the version bump tasks for 25.2rc1.
ACKs for top commit:
fanquake:
ACK 9f13dc1ed3020d55ba79b1a62ca0db6b510357ab
Tree-SHA512: 9d9dbf415f8559410eba9a431b61a8fc94216898d2d1fd8398e1f7a22a04790faade810e65324c7a797456b33396c3a58f991e81319aaaa63d3ab441e5e20dbc
Diffstat (limited to 'doc')
-rw-r--r-- | doc/man/bitcoin-cli.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-qt.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-tx.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-util.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-wallet.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoind.1 | 8 | ||||
-rw-r--r-- | doc/release-notes.md | 11 |
7 files changed, 28 insertions, 23 deletions
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 571b5f75de..2dbe83068e 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.3. -.TH BITCOIN-CLI "1" "October 2023" "bitcoin-cli v25.1.0" "User Commands" +.TH BITCOIN-CLI "1" "February 2024" "bitcoin-cli v25.2.0rc1" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v25.1.0 +bitcoin-cli \- manual page for bitcoin-cli v25.2.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 v25.1.0 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v25.1.0 +Bitcoin Core RPC client version v25.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index c2d3f73d57..4204d5ca73 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.3. -.TH BITCOIN-QT "1" "October 2023" "bitcoin-qt v25.1.0" "User Commands" +.TH BITCOIN-QT "1" "February 2024" "bitcoin-qt v25.2.0rc1" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v25.1.0 +bitcoin-qt \- manual page for bitcoin-qt v25.2.0rc1 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v25.1.0 +Bitcoin Core version v25.2.0rc1 .SH OPTIONS .HP \-? @@ -116,7 +116,7 @@ Do not keep transactions in the mempool longer than <n> hours (default: .HP \fB\-par=\fR<n> .IP -Set the number of script verification threads (\fB\-10\fR to 15, 0 = auto, <0 = +Set the number of script verification threads (\fB\-64\fR to 15, 0 = auto, <0 = leave that many cores free, default: 0) .HP \fB\-persistmempool\fR diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index 75fe2fb1a1..b97f1bd9aa 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.3. -.TH BITCOIN-TX "1" "October 2023" "bitcoin-tx v25.1.0" "User Commands" +.TH BITCOIN-TX "1" "February 2024" "bitcoin-tx v25.2.0rc1" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v25.1.0 +bitcoin-tx \- manual page for bitcoin-tx v25.2.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 v25.1.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 v25.1.0 +Bitcoin Core bitcoin\-tx utility version v25.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index 0e04024173..02593581c1 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.3. -.TH BITCOIN-UTIL "1" "October 2023" "bitcoin-util v25.1.0" "User Commands" +.TH BITCOIN-UTIL "1" "February 2024" "bitcoin-util v25.2.0rc1" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v25.1.0 +bitcoin-util \- manual page for bitcoin-util v25.2.0rc1 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v25.1.0 +Bitcoin Core bitcoin\-util utility version v25.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index ef063c90b0..dda630ff6a 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.3. -.TH BITCOIN-WALLET "1" "October 2023" "bitcoin-wallet v25.1.0" "User Commands" +.TH BITCOIN-WALLET "1" "February 2024" "bitcoin-wallet v25.2.0rc1" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v25.1.0 +bitcoin-wallet \- manual page for bitcoin-wallet v25.2.0rc1 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v25.1.0 +Bitcoin Core bitcoin\-wallet version v25.2.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 d833621ad9..30fe309972 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.3. -.TH BITCOIND "1" "October 2023" "bitcoind v25.1.0" "User Commands" +.TH BITCOIND "1" "February 2024" "bitcoind v25.2.0rc1" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v25.1.0 +bitcoind \- manual page for bitcoind v25.2.0rc1 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v25.1.0 +Bitcoin Core version v25.2.0rc1 .SH OPTIONS .HP \-? @@ -116,7 +116,7 @@ Do not keep transactions in the mempool longer than <n> hours (default: .HP \fB\-par=\fR<n> .IP -Set the number of script verification threads (\fB\-10\fR to 15, 0 = auto, <0 = +Set the number of script verification threads (\fB\-64\fR to 15, 0 = auto, <0 = leave that many cores free, default: 0) .HP \fB\-persistmempool\fR diff --git a/doc/release-notes.md b/doc/release-notes.md index fdca90f36f..eb85c31a6b 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,9 +1,9 @@ -25.x Release Notes +25.2rc1 Release Notes ================== -Bitcoin Core version 25.x is now available from: +Bitcoin Core version 25.2rc1 is now available from: - <https://bitcoincore.org/bin/bitcoin-core-25.x/> + <https://bitcoincore.org/bin/bitcoin-core-25.2/test.rc1> This release includes various bug fixes and performance improvements, as well as updated translations. @@ -48,6 +48,10 @@ Notable changes - #29003 rpc: fix getrawtransaction segfault +### Wallet + +- #29176 wallet: Fix use-after-free in WalletBatch::EraseRecords + Credits ======= @@ -55,6 +59,7 @@ Thanks to everyone who directly contributed to this release: - Martin Zumsande - Sebastian Falbesoner +- MarcoFalke As well as to everyone that helped with translations on [Transifex](https://www.transifex.com/bitcoin/bitcoin/). |