backport: merge bitcoin#22648, #22497, #25355, #26065, #26837, #25993, #26838, #27937, partial bitcoin#22589, #22229 (i2p support: part 2)#6035
Merged
PastaPastaPasta merged 10 commits intodashpay:developfrom May 29, 2024
Conversation
This was referenced May 27, 2024
|
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
knst
approved these changes
May 29, 2024
Collaborator
knst
left a comment
There was a problem hiding this comment.
utACK eea481085c1d30c76841d3aab3ee98f1c9ad5150
UdjinM6
approved these changes
May 29, 2024
src/net.cpp
Outdated
There was a problem hiding this comment.
25355: nit: this part was refactored to put one param at a line in the original PR
src/net.h
Outdated
PastaPastaPasta
approved these changes
May 29, 2024
Member
PastaPastaPasta
left a comment
There was a problem hiding this comment.
Generally utACK eea481085c1d30c76841d3aab3ee98f1c9ad5150
doc/i2p.md
Outdated
Member
There was a problem hiding this comment.
22589: I would consider this complete; we don't have a need for the other commit.
Arguably partial; however the commit it excludes is not relevant includes: - d2dffd5
…persistent addresses
…oftware version
PastaPastaPasta
approved these changes
May 29, 2024
Member
PastaPastaPasta
left a comment
There was a problem hiding this comment.
re-utACK 0a23820; only changed commit title / text
PastaPastaPasta
added a commit
that referenced
this pull request
Jun 10, 2024
, bitcoin#24555, bitcoin#24663, bitcoin#24205, bitcoin#24687, bitcoin#25173, bitcoin#24991, partial bitcoin#24468 (cjdns support) 32f8fda merge bitcoin#24991: allow startup with -onlynet=onion -listenonion=1 (Kittywhiskers Van Gogh) e67ed92 merge bitcoin#25173: add coverage for unknown network in -onlynet (Kittywhiskers Van Gogh) 77efd36 merge bitcoin#24687: Check an invalid -i2psam will raise an init error (Kittywhiskers Van Gogh) fb1416f merge bitcoin#24205: improve network reachability test coverage and safety (Kittywhiskers Van Gogh) 7cb7479 merge bitcoin#24663: add links to doc/cjdns.md (Kittywhiskers Van Gogh) c736ebf merge bitcoin#24555: create initial doc/cjdns.md for CJDNS how-to documentation (Kittywhiskers Van Gogh) 554bd24 partial bitcoin#24468: improve -onlynet help and related tor/i2p documentation (Kittywhiskers Van Gogh) 5436b6a merge bitcoin#24165: extend inbound eviction protection by network to CJDNS peers (Kittywhiskers Van Gogh) d52724d merge bitcoin#22834: respect -onlynet= when making outbound connections (Kittywhiskers Van Gogh) f9d1a9a merge bitcoin#23077: Full CJDNS support (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Depends on #6034 * Depends on #6035 * If `-proxy=` is given together with `-noonion` then 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 the `addnode` RPC. To mimic the old behavior use `-proxy=` together with `-onlynet=` listing all relevant networks except `onion`. * [bitcoin#24165](bitcoin#24165) has been backported _before_ [bitcoin#23758](bitcoin#23758) and to account for this, minor changes were made in `src/test/net_peer_eviction_tests.cpp` (using `nTimeConnected` instead of `m_connected`). When backporting [bitcoin#23758](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 `develop` be used for a new minor/patch release, `doc/cjdns.md` will have to be modified to reflect the correct version number. ## Breaking changes No expected protocol or consensus changes. ## 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 - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK 32f8fda Tree-SHA512: e23b22ca5edbe4c4abeab0bc07780303e68e7c4cc46b7697300b0837c5acd3a98649b6b03bd07a23c827bd85f64210173027b0b0eea31872c031fa4ed04eeb0c
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
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
Breaking Changes
-i2pacceptincoming=0.Checklist: