Merge bitcoin/bitcoin#31154: [27.x] rc2 or final

dd1bf8b doc: update manual pages for 27.2 (fanquake) f42fcf6 build: bump version to v27.2 final (fanquake) 6c09325 doc: finalise release notes for 27.2 (fanquake) c838ce5 doc: use proper doxygen formatting for CTxMemPool::cs (Vasil Dimov) Pull request description: This backports one other change (that doesn't warrant an rc), which fixes noisey output from newer versions of Clang (19+). Also makes the changes for 27.2 final. Bins for rc1 are available here: https://bitcoincore.org/bin/bitcoin-core-27.2/test.rc1/. ACKs for top commit: stickies-v: ACK dd1bf8b Tree-SHA512: 10599443bb8862dc5f238246e21ff817d572fc23174efc0fe27960e490a4e82501555bc859a1a84f465ea211b00c54a3e9125612ca2d98be6e1e8684d5c61a4b
vertcoin-project · Oct 31, 2024 · bf03c45 · bf03c45
2 parents 882e0d7 + dd1bf8b
commit bf03c45
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 27)
 define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 1)
+define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

diff --git 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 2024" "bitcoin-cli v27.2.0rc1" "User Commands"
+.TH BITCOIN-CLI "1" "October 2024" "bitcoin-cli v27.2.0" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v27.2.0rc1
+bitcoin-cli \- manual page for bitcoin-cli v27.2.0
 .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 v27.2.0rc1
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v27.2.0rc1
+Bitcoin Core RPC client version v27.2.0
 .SH OPTIONS
 .HP
 \-?

diff --git 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 2024" "bitcoin-qt v27.2.0rc1" "User Commands"
+.TH BITCOIN-QT "1" "October 2024" "bitcoin-qt v27.2.0" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v27.2.0rc1
+bitcoin-qt \- manual page for bitcoin-qt v27.2.0
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v27.2.0rc1
+Bitcoin Core version v27.2.0
 .PP
 Optional URI is a Bitcoin address in BIP21 URI format.
 .SH OPTIONS

diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-TX "1" "October 2024" "bitcoin-tx v27.2.0rc1" "User Commands"
+.TH BITCOIN-TX "1" "October 2024" "bitcoin-tx v27.2.0" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v27.2.0rc1
+bitcoin-tx \- manual page for bitcoin-tx v27.2.0
 .SH SYNOPSIS
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
 .br
 .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 v27.2.0rc1
+Bitcoin Core bitcoin\-tx utility version v27.2.0
 .SH OPTIONS
 .HP
 \-?

diff --git 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 2024" "bitcoin-util v27.2.0rc1" "User Commands"
+.TH BITCOIN-UTIL "1" "October 2024" "bitcoin-util v27.2.0" "User Commands"
 .SH NAME
-bitcoin-util \- manual page for bitcoin-util v27.2.0rc1
+bitcoin-util \- manual page for bitcoin-util v27.2.0
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v27.2.0rc1
+Bitcoin Core bitcoin\-util utility version v27.2.0
 .SH OPTIONS
 .HP
 \-?

diff --git 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 2024" "bitcoin-wallet v27.2.0rc1" "User Commands"
+.TH BITCOIN-WALLET "1" "October 2024" "bitcoin-wallet v27.2.0" "User Commands"
 .SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v27.2.0rc1
+bitcoin-wallet \- manual page for bitcoin-wallet v27.2.0
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v27.2.0rc1
+Bitcoin Core bitcoin\-wallet version v27.2.0
 .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
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIND "1" "October 2024" "bitcoind v27.2.0rc1" "User Commands"
+.TH BITCOIND "1" "October 2024" "bitcoind v27.2.0" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v27.2.0rc1
+bitcoind \- manual page for bitcoind v27.2.0
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]                     \fI\,Start Bitcoin Core\/\fR
 .SH DESCRIPTION
-Bitcoin Core version v27.2.0rc1
+Bitcoin Core version v27.2.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -1,9 +1,9 @@
-27.2rc1 Release Notes
+27.2 Release Notes
 =====================
 
-Bitcoin Core version 27.2rc1 is now available from:
+Bitcoin Core version 27.2 is now available from:
 
-  <https://bitcoincore.org/bin/bitcoin-core-27.2/test.rc1/>
+  <https://bitcoincore.org/bin/bitcoin-core-27.2/>
 
 This release includes various bug fixes and performance
 improvements, as well as updated translations.
@@ -60,6 +60,10 @@ Notable changes
 
 - #30552 test: fix constructor of msg_tx
 
+### Doc
+
+- #30504 doc: use proper doxygen formatting for CTxMemPool::cs
+
 ### Build
 
 - #30283 upnp: fix build with miniupnpc 2.2.8
@@ -81,6 +85,7 @@ Thanks to everyone who directly contributed to this release:
 - Matt Whitlock
 - Max Edwards
 - Sebastian Falbesoner
+- Vasil Dimov
 - willcl-ark
 
 As well as to everyone that helped with translations on

diff --git a/src/txmempool.h b/src/txmempool.h
@@ -363,17 +363,14 @@ class CTxMemPool
      * that are guarded by it.
      *
      * @par Consistency guarantees
-     *
      * By design, it is guaranteed that:
-     *
      * 1. Locking both `cs_main` and `mempool.cs` will give a view of mempool
      *    that is consistent with current chain tip (`ActiveChain()` and
      *    `CoinsTip()`) and is fully populated. Fully populated means that if the
      *    current active chain is missing transactions that were present in a
      *    previously active chain, all the missing transactions will have been
      *    re-added to the mempool and should be present if they meet size and
      *    consistency constraints.
-     *
      * 2. Locking `mempool.cs` without `cs_main` will give a view of a mempool
      *    consistent with some chain that was active since `cs_main` was last
      *    locked, and that is fully populated as described above. It is ok for