Skip to content

Conversation

@fanquake fanquake added this to the 24.2 milestone Sep 26, 2023
@DrahtBot
Copy link
Contributor

DrahtBot commented Sep 26, 2023

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

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@fanquake fanquake force-pushed the further_24_x_backports branch from f009d26 to f882b40 Compare September 26, 2023 15:26
MarcoFalke and others added 6 commits September 26, 2023 16:26
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: bitcoin#27844
Rebased-From: faaa627
This reduces chances of having old estimates in fee_estimates.dat.

Github-Pull: bitcoin#27622
Rebased-From: 5b886f2
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: bitcoin#27622
Rebased-From: 3eb241a
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: bitcoin#27622
Rebased-From: cf219f2
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: bitcoin#27622
Rebased-From: d2b39e0
@fanquake fanquake force-pushed the further_24_x_backports branch from f882b40 to cb5512d Compare September 26, 2023 15:27
@fanquake
Copy link
Member Author

Pushed some more commits to improve the CI.

MarcoFalke and others added 3 commits October 2, 2023 13:05
@fanquake
Copy link
Member Author

fanquake commented Oct 4, 2023

I think this is currently all we are going to backport to 24.x, so this is ready for review.

Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 9077f21

A couple diffs from the original commits, but all changes look good to me:

  • 67b6d99: removed the V1/V2 transport diff (introduced by #28196)
  • 01f8ee4: ChainType->CBaseChainParams and chainparams.GetChainTypeString->chainparams.NetworkIDString (from #27491)
  • 4359649: use arm_container.dockerfile (as per #27562)

@fanquake fanquake merged commit 1416d09 into bitcoin:24.x Oct 6, 2023
@fanquake fanquake deleted the further_24_x_backports branch October 6, 2023 10:37
@bitcoin bitcoin locked and limited conversation to collaborators Oct 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants