backport: merge bitcoin#23077, #22834, #24165, #24555, #24663, #24205, #24687, #25173, #24991, partial bitcoin#24468 (cjdns support)#6031
Merged
PastaPastaPasta merged 10 commits intodashpay:developfrom Jun 10, 2024
Conversation
knst
reviewed
May 21, 2024
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
LGTM but kvb in strings should be dashified IMO
kwvg
changed the title
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
Generally LGTM; partial CI failure not great in p2p_node_network_limited.py tsan. Build restarted
kwvg
changed the title
5 tasks
|
This pull request has conflicts, please rebase. |
PastaPastaPasta
added a commit
that referenced
this pull request
May 28, 2024
, bitcoin#22547, bitcoin#22544, bitcoin#22959, bitcoin#23324, partial bitcoin#20764 (cli backports: part 2) bde72a4 merge bitcoin#23324: print peer counts for all reachable networks in -netinfo (Kittywhiskers Van Gogh) 4b24544 merge bitcoin#22959: Display all proxies in -getinfo (Kittywhiskers Van Gogh) 30b0fcf merge bitcoin#22544: drop torv2; torv3 becomes onion per GetNetworkName() (Kittywhiskers Van Gogh) b6ca36e merge bitcoin#22547: Add progress bar for -getinfo (Kittywhiskers Van Gogh) 1f89bfd merge bitcoin#21832: Implement human readable -getinfo (Kittywhiskers Van Gogh) 2200b78 merge bitcoin#20877: user help and argument parsing improvements (Kittywhiskers Van Gogh) bd934c7 partial bitcoin#20764: cli -netinfo peer connections dashboard updates (Kittywhiskers Van Gogh) b2d8656 merge bitcoin#21261: update inbound eviction protection for multiple networks, add I2P peers (Kittywhiskers Van Gogh) 0b16b50 cli: fix loop counter comparison in `ProcessReply` (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependency for #6035 * Dependency for #6031 * In [dash#5904](#5904) ([bitcoin#21595](bitcoin#21595)), one of the loops in `ProcessReply` is supposed to iterate `rows.size()` times (which at the time was hardcoded to `3`), the backport erroneously set the value to `m_networks.size()` (which also evaluated to `3`) as part of increasing `m_networks.size()` usage. As this pull request includes [bitcoin#23324](bitcoin#23324), which changes it over to `rows.size()`, the above has been corrected in a separate commit for documentation purposes. * `-addrinfo` output  * `-getinfo` output (diamonds are due to rendering limitations of my terminal and are not indicative of the symbols used)  * `-netinfo` output  ## Breaking Changes * CLI `-addrinfo` now returns a single field for the number of `onion` addresses known to the node instead of separate `torv2` and `torv3` fields, as support for TorV2 addresses was removed from Dash Core in 18.0. * `-getinfo` has been updated to return data in a user-friendly format that also reduces vertical space. ## 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 ACKs for top commit: PastaPastaPasta: utACK bde72a4 Tree-SHA512: 921cb45b7e243a321a32c835eb23d5ba8df610ff234a548a9051436a2c21845ce70097fb9a9bb812b77b04373f9f0a9f90264168d97b08da1890be06bfd9f99c
|
This pull request has conflicts, please rebase. |
kwvg
force-pushed
the
cjdns
branch
2 times, most recently
from
6af25da to
32f8fda
Compare
…mentation includes: - a1db99a (excl. changes to doc/ p2p-bad-ports.md)
Collaborator
Author
|
CJDNS has been confirmed to work on Dash Core 32f8fda using CJDNS v22 (
Marking PR as ready for review. |
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
4 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
Depends on backport: merge bitcoin#21261, #20877, #21832, #22547, #22544, #22959, #23324, partial bitcoin#20764 (cli backports: part 2) #6034
Depends on backport: merge bitcoin#22648, #22497, #25355, #26065, #26837, #25993, #26838, #27937, partial bitcoin#22589, #22229 (i2p support: part 2) #6035
If
-proxy=is given together with-noonionthen the provided proxy will not be set as a proxy for reaching the Tor network. So it will not be possible to open manual connections to the Tor network for example with theaddnodeRPC. To mimic the old behavior use-proxy=together with-onlynet=listing all relevant networks exceptonion.bitcoin#24165 has been backported before bitcoin#23758 and to account for this, minor changes were made in
src/test/net_peer_eviction_tests.cpp(usingnTimeConnectedinstead ofm_connected). When backporting bitcoin#23758, these changes will have to be reversed as they won't be covered by the cherry-pick diff.CJDNS support has been labelled as being introduced in Dash Core 21.0, in line with the milestone designation of the PR. Should
developbe used for a new minor/patch release,doc/cjdns.mdwill have to be modified to reflect the correct version number.Breaking changes
No expected protocol or consensus changes.
Checklist: