diff options
| author | merge-script <fanquake@gmail.com> | 2024-10-31 13:51:02 +0000 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-10-31 13:51:02 +0000 |
| commit | bf03c458e994abab9be85486ed8a6d8813313579 (patch) | |
| tree | 29191dc34842916752b190ec7819b7386824d1db /src | |
| parent | 882e0d730d6dfe57727a3bf4c326ed09f7102042 (diff) | |
| parent | dd1bf8bc4ef75ef43c33bbf755c3e0d2c6c3c5f7 (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
Diffstat (limited to 'src')
| -rw-r--r-- | src/txmempool.h | 3 |
1 files changed, 0 insertions, 3 deletions
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 |