Backports to the 24.x branch. Currently:
[24.x] Further backports #28535
pull fanquake wants to merge 12 commits into bitcoin:24.x from fanquake:further_24_x_backports changing 15 files +329 −33-
fanquake commented at 11:00 AM on September 26, 2023: member
- fanquake added this to the milestone 24.2 on Sep 26, 2023
-
DrahtBot commented at 11:00 AM on September 26, 2023: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
Code Coverage
For detailed information about the code coverage, see the test coverage report.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline for information on the review process.
Type Reviewers ACK stickies-v 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 26, 2023
- DrahtBot added the label CI failed on Sep 26, 2023
-
0db69a3d50
ci: Prune dangling images on RESTART_CI_DOCKER_BEFORE_RUN
Github-Pull: #27777 Rebased-From: fa9c65a74cf18e9c75cd3472112d5197532ac2f2
-
7f1357de51
ci: Use podman for persistent workers
Github-Pull: #27777 Rebased-From: fa123077bc3f39aa0969d883e2d799a054cd4543
- fanquake force-pushed on Sep 26, 2023
-
defdc15023
ci: Use podman stop over podman kill
This should avoid a race where the kill is not done when spinning up the new container. podman stop waits 10 seconds by default. Github-Pull: #27844 Rebased-From: faaa62754e84417baa917f20db379db78146687d
-
67b6d99aea
Do not use std::vector = {} to release memory
Github-Pull: #28452 Rebased-From: 3fcd7fc7ff563bdc0e2bba66b4cbe72d898c876e
-
77979e0172
tx fees, policy: periodically flush fee estimates to fee_estimates.dat
This reduces chances of having old estimates in fee_estimates.dat. Github-Pull: #27622 Rebased-From: 5b886f2b436eaa8c2b7de58dc4644dc6223040da
-
1c98029b39
tx fees, policy: do not read estimates of old fee_estimates.dat
Old fee estimates could cause transactions to become stuck in the mempool. This commit prevents the node from using stale estimates from an old file. Github-Pull: #27622 Rebased-From: 3eb241a141defa564c94cb95c5bbaf4c5bd9682e
-
01f8ee48ef
tx fees, policy: read stale fee estimates with a regtest-only option
If -acceptstalefeeestimates option is passed stale fee estimates can now be read when operating in regtest environments. Additionally, this commit updates all declarations of the CBlockPolicyEstimator class to include a the second constructor variable. Github-Pull: #27622 Rebased-From: cf219f29f3c5b41070eaab9a549a476f01990f3a
-
cb5512da23
test: ensure old fee_estimate.dat not read on restart and flushed
This commit adds tests to ensure that old fee_estimates.dat files are not read and that fee_estimates are periodically flushed to the fee_estimates.dat file. Additionaly it tests the -regtestonly option -acceptstalefeeestimates. Github-Pull: #27622 Rebased-From: d2b39e09bc6a5982fc5cf4b538b7fdb0e3cae576
- fanquake force-pushed on Sep 26, 2023
-
fanquake commented at 3:27 PM on September 26, 2023: member
Pushed some more commits to improve the CI.
-
805f98b79a
ci: Nuke Android APK task, Use credits for tsan
Github-Pull: #27834 Rebased-From: fa22538e481fa2c4f0b5d6f91166335e60b67fe9
-
43596499b2
ci: Switch to `amd64` container in "ARM" task
Tee `arm_container` does not support 32-bit mode anymore. See: https://github.com/bitcoin/bitcoin/issues/27879 Github-Pull: #27886 Rebased-From: 016fe6d8280768917081894dfca233c2f06e78d9
-
dccacf0bf7
build, macos: Fix `qt` package build with new Xcode 15 linker
Github-Pull: #28543 Rebased-From: 79ef528511f0cbbe0a7097ef031f2964aaccfe5c
-
9077f214f5
depends: fix unusable memory_resource in macos qt build
See https://codereview.qt-project.org/c/qt/qtbase/+/482392. Github-Pull: #28571 Rebased-From: 848eec09363d1ba8198376eb9654b1a69e3541aa
-
fanquake commented at 10:58 AM on October 4, 2023: member
I think this is currently all we are going to backport to 24.x, so this is ready for review.
- stickies-v approved
-
stickies-v commented at 9:16 PM on October 5, 2023: contributor
ACK 9077f214f5
A couple diffs from the original commits, but all changes look good to me:
- 67b6d99aead0d1b2030bc3e88256d279477894b5: removed the V1/V2 transport diff (introduced by #28196)
- 01f8ee48efc1f46563f2841c0a7125b20b0df159:
ChainType->CBaseChainParamsandchainparams.GetChainTypeString->chainparams.NetworkIDString(from #27491) - 43596499b2c2b8cc0a51c0b9db9153047c266627: use
arm_container.dockerfile(as per #27562)
- fanquake merged this on Oct 6, 2023
- fanquake closed this on Oct 6, 2023
- fanquake deleted the branch on Oct 6, 2023
- bitcoin locked this on Oct 5, 2024
Milestone
24.2