-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
backport: merge bitcoin#6589, #7003, #7087, #7180, #7181, #7257, #7570, #7906, #8049, #8065, #8083, #8168, #8102, #7749, #8113, #8128, partial bitcoin#7136, #8038 (networking backports) #6823
Open
kwvg
wants to merge
22
commits into
zcash:master
Choose a base branch
from
kwvg:torv3_pr1
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
note: - such changes are already present in `maxuploadtarget.py` and `feature_zip239.py` and have been applied to the rest to avoid failures due to change in the function signature caused by backports
…and "switch" (giant if/else) includes: - b3caa9b notes: - it appears the remaining commits have already been backported at some point in the past
note: - does not contain `sendheaders` due to lack of headers-first logic
note: - does not contain `SENDHEADERS` due to lack of headers-first logic
…s so translations can be shared and reused Co-authored-by: zancas <zancas@zingolabs.org>
…ection Co-authored-by: str4d <jack@electriccoin.co>
…ctures Co-authored-by: zancas <zancas@zingolabs.org>
includes: - fadd048
…s enabled in getnetwork
kwvg
changed the title
backport: merge bitcoin#6589, #7003, #7087, #7129, #7180, #7181, #7257, #7570, #7906, #7868, #8049, #8065, #8083, #8168, #8102, #7749, #8113, #8128, partial bitcoin#7136, #8038 (networking backports)
backport: merge bitcoin#6589, #7003, #7087, #7180, #7181, #7257, #7570, #7906, #8049, #8065, #8083, #8168, #8102, #7749, #8113, #8128, partial bitcoin#7136, #8038 (networking backports)
Feb 2, 2024
daira
added
F-tor
Feature: Tor integration
A-networking
Area: Networking code
safe-to-build
Used to send PR to prod CI environment
labels
Feb 3, 2024
Updates:
CC: @daira |
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.
Background
In line with the deprecation of TorV2 in Sept 2020 and the removal of TorV2 capabilities from Tor Client in October 2021 (source), Bitcoin Core has implemented TorV3 support with changes culminating with bitcoin#19954, merged October 2020 and released as part of Bitcoin Core 0.21 in January 2021 (source).
Zcash Core's codebase seems to be primarily rooted in Bitcoin Core 0.13 (0.12?) with backports from future versions made to fit the needs of the project. The implementation of TorV3 in Bitcoin Core builds on top of years of development put into their networking and P2P logic, rendering any attempts at backporting those capabilities to Zcash, requiring a retrace of prior steps made upstream.
Description
This pull request is possible primarily thanks to a comment on zcash#5366. zcash#5366 shown the path needed to potentially backport the fewest possible pull requests from upstream in order to achieve TorV3 functionality and the comment summarized the pull requests from which the commits were cherry-picked.
This pull request backports the following pull requests from the list (and their dependencies):
Backport validation with upstream for reviewers is relatively frustrated due to the presence of partial and out-of-order backports present on
master
requiring code changes being borrowed from those PRs in the future being applied in the past in order for the backport to function as-is but hopefully that is something that can be worked with.Additional Notes
Co-authored-by
in the comment message.