backport: Merge bitcoin#22217, 23025, 22362 #6250
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vijaydasmp
changed the title
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_2024_09
branch
from
71056b4 to
d76cd26
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_2024_09
branch
from
d76cd26 to
1d973e4
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_2024_09
branch
from
1d973e4 to
b32add5
Compare
vijaydasmp
changed the title
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_2024_09
branch
from
9dc526f to
ee978c7
Compare
Author
vijaydasmp
changed the title
UdjinM6
requested changes
Sep 11, 2024
vijaydasmp
force-pushed
the
bp23_2024_09
branch
from
ee978c7 to
2fdfe6f
Compare
UdjinM6
previously approved these changes
Sep 12, 2024
Author
|
Hello @PastaPastaPasta requesting review |
2 similar comments
Author
|
Hello @PastaPastaPasta requesting review |
Author
|
Hello @PastaPastaPasta requesting review |
knst
reviewed
Sep 22, 2024
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
check comments for 23025
22217, 22362 is OK
knst
requested changes
Sep 22, 2024
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
check comments for 23025
22217, 22362 is OK
…s file 49ee2a0 Avoid wallet code writing node settings file (Russell Yanofsky) Pull request description: Change wallet loading code to access settings through the Chain interface instead of writing settings.json directly. This is for running wallet and node in separate processes, since multiprocess code wouldn't easily work with different processes updating the same file. --- This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10). The commit was first part of larger PR bitcoin#10102. ACKs for top commit: jamesob: ACK 49ee2a0 ([`jamesob/ackr/22217.1.ryanofsky.refactor_avoid_wallet_co`](https://github.com/jamesob/bitcoin/tree/ackr/22217.1.ryanofsky.refactor_avoid_wallet_co)) ryanofsky: > ACK [49ee2a0](bitcoin@49ee2a0) ([`jamesob/ackr/22217.1.ryanofsky.refactor_avoid_wallet_co`](https://github.com/jamesob/bitcoin/tree/ackr/22217.1.ryanofsky.refactor_avoid_wallet_co)) Zero-1729: crACK 49ee2a0 meshcollider: Code review ACK 49ee2a0 Tree-SHA512: a81c63b87816f739e02e3992808f314294d6c7213babaafdaaf3c4650ebc97ee4f98f9a4684ce4ff87372df59989b8ad5929159c5686293a7cce04e97e2fabba
e148a52 bench: fixed ubsan implicit conversion (Martin Ankerl) da4e2f1 bench: various args improvements (Jon Atack) d312fd9 bench: clean up includes (Jon Atack) 1f10f16 bench: add usage description and documentation (Martin Ankerl) d3c6f8b bench: introduce -min_time argument (Martin Ankerl) 9fef832 bench: make EvictionProtection.* work with any number of iterations (Martin Ankerl) 153e686 bench: change AddrManGood to AddrManAddThenGood (Martin Ankerl) 468b232 bench: remove unnecessary & incorrect multiplication in MuHashDiv (Martin Ankerl) eed99cf bench: update nanobench from 4.3.4 to 4.3.6 (Martin Ankerl) Pull request description: This PR updates the nanobench with the latest release from upstream, v4.3.6. It fixes the missing performance counters. Due to discussions on bitcoin#22999 I have done some work that should make the benchmark results more reliable. It introduces a new flag `-min_time` that allows to run a benchmark for much longer then the default. When results are unreliable, choosing a large timeframe here should usually get repeatable results even when frequency scaling cannot be disabled. The default is now 10ms. For this to work I have changed the `AddrManGood` and `EvictionProtection` benchmarks so they work with any number of iterations. Also, this adds more usage documentation to `bench_bitcoin -h` and I've cherry-picked two changes from bitcoin#22999 authored by Jon Atack ACKs for top commit: jonatack: re-ACK e148a52 laanwj: Code review ACK e148a52 Tree-SHA512: 2da6de19a5c85ac234b190025e195c727546166dbb75e3f9267e667a73677ba1e29b7765877418a42b1407b65df901e0130763936525e6f1450f18f08837c40c
faa6c3d net: Drop only invalid entries when reading banlist.json (MarcoFalke) Pull request description: All entries will be dropped when there is at least one invalid one in `banlist.json`. Fix this by only dropping invalid ones. Also suggested in bitcoin#20966 (comment) ACKs for top commit: laanwj: Re-ACK faa6c3d Tree-SHA512: 5a58e7f1dcabf78d0c65d8c6d5d997063af1efeaa50ca7730fc00056fda7e0061b6f7a38907ea045fe667c9f61d392e01e556b425a95e6b126e3c41cd33deb83
vijaydasmp
force-pushed
the
bp23_2024_09
branch
from
2fdfe6f to
bd67f80
Compare
knst
approved these changes
Sep 25, 2024
UdjinM6
approved these changes
Sep 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backport includes the following changes:
Refactor: Prevent the wallet code from writing to the node settings file. This change supports running the wallet and node in separate processes, as multiprocess code would struggle with different processes updating the same file.
Update banlist.json handling: Instead of dropping all entries when at least one invalid entry is found in banlist.json, the code now only removes the invalid entries.
Update nanobench: This update incorporates the latest release from upstream, version 4.3.6, which resolves the issue of missing performance counters.