aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerge-script <fanquake@gmail.com>2024-10-31 13:51:02 +0000
committermerge-script <fanquake@gmail.com>2024-10-31 13:51:02 +0000
commitbf03c458e994abab9be85486ed8a6d8813313579 (patch)
tree29191dc34842916752b190ec7819b7386824d1db
parent882e0d730d6dfe57727a3bf4c326ed09f7102042 (diff)
parentdd1bf8bc4ef75ef43c33bbf755c3e0d2c6c3c5f7 (diff)
Merge bitcoin/bitcoin#31154: [27.x] rc2 or finalv27.2
dd1bf8bc4ef75ef43c33bbf755c3e0d2c6c3c5f7 doc: update manual pages for 27.2 (fanquake) f42fcf6ad7a95b750a9cdc742b801e14a476f823 build: bump version to v27.2 final (fanquake) 6c09325757b65191f7c3a44a039b65016dac9079 doc: finalise release notes for 27.2 (fanquake) c838ce514fe5a264b68e25b988988382302c6dfc 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 dd1bf8bc4ef75ef43c33bbf755c3e0d2c6c3c5f7 Tree-SHA512: 10599443bb8862dc5f238246e21ff817d572fc23174efc0fe27960e490a4e82501555bc859a1a84f465ea211b00c54a3e9125612ca2d98be6e1e8684d5c61a4b
-rw-r--r--configure.ac2
-rw-r--r--doc/man/bitcoin-cli.16
-rw-r--r--doc/man/bitcoin-qt.16
-rw-r--r--doc/man/bitcoin-tx.16
-rw-r--r--doc/man/bitcoin-util.16
-rw-r--r--doc/man/bitcoin-wallet.16
-rw-r--r--doc/man/bitcoind.16
-rw-r--r--doc/release-notes.md11
-rw-r--r--src/txmempool.h3
9 files changed, 27 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac
index 0989fc9d23..f3f5fa3bf8 100644
--- 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
index 0ed16c2321..986416c2f1 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 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
index 60a51bae37..d4c4d6be04 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 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
index 470d65d831..47f54ff4ac 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 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
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v27.2.0rc1
.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
index c8dc19ab28..eea5382827 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 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
index a9ceeba47d..f3cd1a5d72 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 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
index 15c7876bcd..d63e5111cd 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 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
index 8897da5f7f..85bf57c500 100644
--- 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
index b98355c65f..804d4807a1 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -363,9 +363,7 @@ public:
* 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
@@ -373,7 +371,6 @@ public:
* 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