backport: merge bitcoin#22226, #22831, #23084, #22872, #23477, #23492, #23713, #23780, #23826, #23373, #24201, #24665, #22910, partial bitcoin#23025 (addrman backports: part 3)#6243
Merged
PastaPastaPasta merged 15 commits intodashpay:developfrom Sep 4, 2024
Conversation
UdjinM6
previously approved these changes
Sep 3, 2024
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
utACK 1f66c09a66ce9d55279775f7a03d460e9e46f1a0
|
This pull request has conflicts, please rebase. |
…on restart with asmap We need to continue inheriting the existing set of arguments to prevent block invalidation due to missing arguments that allow for fast DIP3 activation (will manifest as `bad-qc-premature`)
…ly check for collisions
…ddrMan::Good()`
`NodeContext` member was moved from `TestingSetup` to `BasicTestingSetup` in bitcoin#18571 but `connman` (which was a remnant from when `NodeContext` was absent) wasn't removed. Let's resolve that.
…tests, make addrman consistency check ratio easier to change
UdjinM6
approved these changes
Sep 3, 2024
5 tasks
PastaPastaPasta
added a commit
that referenced
this pull request
Sep 12, 2024
, bitcoin#25619, bitcoin#27214, bitcoin#26261, bitcoin#27745, bitcoin#27529, bitcoin#28341, partial bitcoin#25331 (addrman backports: part 4) e544d3c fmt: apply `clang-format-diff.py` suggestions, satisfy linter (Kittywhiskers Van Gogh) 7da74ff merge bitcoin#28341: Use HashWriter over legacy CHashWriter (Kittywhiskers Van Gogh) c798b49 merge bitcoin#27529: fix `feature_addrman.py` on big-endian systems (Kittywhiskers Van Gogh) 7d149c9 merge bitcoin#27745: select addresses by network follow-up (Kittywhiskers Van Gogh) 1d82994 merge bitcoin#26261: cleanup `LookupIntern`, `Lookup` and `LookupHost` (Kittywhiskers Van Gogh) 231ff82 merge bitcoin#27214: Enable selecting addresses by network (Kittywhiskers Van Gogh) e825595 merge bitcoin#25619: avoid overriding non-virtual ToString() in CService and use better naming (Kittywhiskers Van Gogh) 2e9b48a merge bitcoin#26847: track AddrMan totals by network and table, improve precision of adding fixed seeds (Kittywhiskers Van Gogh) 79a550e merge bitcoin#26040: comment "add only reachable addresses to addrman" (Kittywhiskers Van Gogh) 1adb635 merge bitcoin#25678: skip querying dns seeds if -onlynet disables IPv4 and IPv6 (Kittywhiskers Van Gogh) 2d99be0 partial bitcoin#25331: Add HashWriter without ser-type and ser-version (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6243 * Dependent on #5167 ## Breaking Changes None observed. ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK e544d3c Tree-SHA512: 63f014142c39c47bda3ac85dc6afeee8f2bfec71f033631bca16d41bb0785f4b090b3c860ddc3b3cf6c4a23558d3d102144fc83b065130c3f9ab91d0de8e4457
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
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.
Additional Information
In bitcoin#22831, when restarting the node in
rpc_net.py'stest_addpeeraddress(), existing commands need to be appended toextra_argsto ensure they're retained when the node is restarted (default behavior is to overwrite the argument list withextra_args) to prevent the test from hanging and then failing due to missing fast DIP3 activation params from the arguments list.Missing arguments result in a block database sanity check failure on restart due to
bad-qc-prematurearising from the activation height being higher than the height of a block with a quorum commitment.NodeContextwas moved fromTestingSetuptoBasicTestingSetupin bitcoin#18571 (dash#4844) butconnmanas aBasicTestingSetupvariable still stuck around (despiteNodeContext's presence making this unnecessary).To prepare for bitcoin#22910, the remnant variable has been replaced with
m_node.connmanand adjustments have been made to that effect.Breaking Changes
None observed.
Checklist: