[28.x] Further backports and rc2 #30827
pull achow101 wants to merge 10 commits into bitcoin:28.x from achow101:rc2-backports changing 37 files +817 −129-
achow101 commented at 10:30 pm on September 5, 2024: member
-
DrahtBot commented at 10:30 pm on September 5, 2024: contributor
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Code Coverage
For detailed information about the code coverage, see the test coverage report.
Reviews
See the guideline for information on the review process.
Type Reviewers ACK stickies-v, hebasto Stale ACK furszy If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
-
DrahtBot added the label Backport on Sep 5, 2024
-
achow101 marked this as a draft on Sep 5, 2024
-
test: Work around boost compilation error
Github-Pull: bitcoin/bitcoin#30834 Rebased-From: fa9d7d5d205ada8915cbbc29599ab8e7bf1fffe0
-
in src/txmempool.h:31 in a4b8a716c6 outdated
22@@ -23,7 +23,17 @@ 23 #include <util/result.h> 24 #include <util/feefrac.h> 25 26+// This works around a bug in Boost <= 1.80.0 when using Clang >=18. 27+// See https://github.com/bitcoin/bitcoin/issues/30751. 28+#if defined(__clang__) 29+#pragma clang diagnostic push 30+#pragma clang diagnostic ignored "-Wenum-constexpr-conversion" 31+#endif
maflcko commented at 7:42 am on September 6, 2024:Not sure if this is the right fix. It may avoid an error when using specific versions of Clang in combination with specific versions of boost. However, it may also result in a new warning with specific versions of Clang: #30821 (comment)
achow101 commented at 3:32 pm on September 6, 2024:Backported fa9d7d5d205ada8915cbbc29599ab8e7bf1fffe0achow101 force-pushed on Sep 6, 2024hebasto approvedhebasto commented at 4:41 pm on September 6, 2024: memberACK 37a6739203ea3da394acef38b18a794e67543a90.DrahtBot added the label CI failed on Sep 7, 2024achow101 added this to the milestone 28.0 on Sep 10, 2024DrahtBot removed the label CI failed on Sep 11, 2024assumeUTXO: fix peers disconnection during sync
Because AssumeUTXO nodes prioritize tip synchronization, they relay their local address through the network before completing the background chain sync. This, combined with the advertising of full-node service (NODE_NETWORK), can result in an honest peer in IBD connecting to the AssumeUTXO node (while syncing) and requesting an historical block the node does not have. This behavior leads to an abrupt disconnection due to perceived unresponsiveness (lack of response) from the AssumeUTXO node. This lack of response occurs because nodes ignore getdata requests when they do not have the block data available (further discussion can be found in PR 30385). Fix this by refraining from signaling full-node service support while the background chain is being synced. During this period, the node will only signal 'NODE_NETWORK_LIMITED' support. Then, full-node ('NODE_NETWORK') support will be re-enabled once the background chain sync is completed. Github-Pull: bitcoin/bitcoin#30807 Rebased-From: 6d5812e5c852c233bd7ead2ceef051f8567619ed
test: add coverage for assumeUTXO honest peers disconnection
Exercising and verifying the following points: 1. An IBD node can sync headers from an AssumeUTXO node at any time. 2. IBD nodes do not request historical blocks from AssumeUTXO nodes while they are syncing the background-chain. 3. The assumeUTXO node dynamically adjusts the network services it offers according to its state. 4. IBD nodes can fully sync from AssumeUTXO nodes after they finish the background-chain sync. Github-Pull: bitcoin/bitcoin#30807 Rebased-From: 992f83bb6f4b29b44f4eaace1d1a2c0001d43cac
achow101 force-pushed on Sep 11, 2024achow101 marked this as ready for review on Sep 11, 2024furszy commented at 7:26 pm on September 11, 2024: memberutACK b97323c7aaa06bda8c76dfc754c90f9de44f4898DrahtBot requested review from hebasto on Sep 11, 2024DrahtBot added the label CI failed on Sep 12, 2024test: Wait for local services to update in feature_assumeutxo
Github-Pull: bitcoin/bitcoin#30880 Rebased-From: 19f4a7c95a99162122068d4badffeea240967a65
achow101 force-pushed on Sep 12, 2024hebasto commented at 10:30 am on September 13, 2024: memberCould you please add https://github.com/bitcoin-core/gui/pull/835 as well?
gui: fix crash when closing wallet
The crash occurs because 'WalletController::removeAndDeleteWallet' is called twice for the same wallet model: first in the GUI's button connected function 'WalletController::closeWallet', and then again when the backend emits the 'WalletModel::unload' signal. This causes the issue because 'removeAndDeleteWallet' inlines an erase(std::remove()). So, if 'std::remove' returns an iterator to the end (indicating the element wasn't found because it was already erased), the subsequent call to 'erase' leads to an undefined behavior. Github-Pull: bitcoin-core/gui#835 Rebased-From: a965f2bc07a3588f8c2b8d6a542961562e3f5d0e
achow101 force-pushed on Sep 13, 2024achow101 commented at 3:33 pm on September 13, 2024: memberCould you please add bitcoin-core/gui#835 as well?
Done
fanquake commented at 4:18 pm on September 13, 2024: memberFeel free to pick this translation update
There’s not so much of a rush here that this should bypass the normal PR & review process. This should first be PR’d and merged into master and then backported. Otherwise any broken string are still in master. There is at least one other change waiting for 28.x, so rc2 also needs to either wait for that, or we’ll be having an rc3 (which can include the ts update) in any case.
hebasto commented at 4:24 pm on September 13, 2024: memberThere’s not so much of a rush here that this should bypass the normal PR & review process.
Sure.
This should first be PR’d and merged into master and then backported.
After branching off, the Transifex.com has translations for the version branches only. Fetching 28x translations into the master branch does not look reasonable.
Otherwise any broken string are still in master.
Maybe this case is a special one.
DrahtBot removed the label CI failed on Sep 13, 2024fanquake referenced this in commit 37679b856c on Sep 16, 2024qt: Translations update
The recent translations from Transifex.com 28.x fetched with the bitcoin-maintainer-tools/update-translations.py tool. Github-Pull: bitcoin/bitcoin#30899 Rebased-From: ae0529576147a1a5bee992574e2cefc8a1fa37d0
achow101 force-pushed on Sep 16, 2024achow101 marked this as a draft on Sep 16, 2024streams: cache file position within AutoFile
Github-Pull: bitcoin/bitcoin#30884 Rebased-From: e624a9bef16b6335fd119c10698352b59bf2930a
streams: remove AutoFile::Get() entirely
Co-Authored-By: David Gumberg <davidzgumberg@gmail.com> Github-Pull: bitcoin/bitcoin#30884 Rebased-From: a240e150e837b5a95ed19765a2e8b7c5b6013f35
build: Bump to 28.0rc2 5315886bf5doc: Generate manpages 06a7df70dfachow101 force-pushed on Sep 17, 2024achow101 marked this as ready for review on Sep 17, 2024stickies-v approvedstickies-v commented at 11:26 am on September 17, 2024: contributorACK 06a7df70df30879e0b691d1a252636f703b8cdfb
I verified that all backports are clean, except:
- b329ed739b7311b3b47cae1ef8d576a90e0a36a1 backported from 992f83bb6f4b29b44f4eaace1d1a2c0001d43cac: merge conflict due to a difference in
sha256sum_file
import, trivially resolved
I didn’t review each commit in-depth since they’re clean, but the changes backported seem sensible.
DrahtBot requested review from furszy on Sep 17, 2024hebasto approvedfanquake merged this on Sep 17, 2024fanquake closed this on Sep 17, 2024
This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-21 15:12 UTC
More mirrored repositories can be found on mirror.b10c.me