zcash_protocol: Set the ZFuture consensus branch ID to agree with zcashd
#1480
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1480 +/- ##
=======================================
Coverage 60.82% 60.82%
=======================================
Files 140 140
Lines 16472 16472
=======================================
Hits 10019 10019
Misses 6453 6453 ☔ View full report in Codecov by Sentry. |
str4d
reviewed
Aug 1, 2024
| @@ -593,7 +593,7 @@ impl From<BranchId> for u32 { | |||
| #[cfg(zcash_unstable = "nu6")] | |||
| BranchId::Nu6 => 0xc8e7_1055, | |||
| #[cfg(zcash_unstable = "zfuture")] | |||
| BranchId::ZFuture => 0xffff_ffff, | |||
| BranchId::ZFuture => 0x7fff_ffff, | |||
There was a problem hiding this comment.
Looking at the git record:
0xffff_ffffwas used for ZFuture in the Rust code in Implementation for ZIP-222 Transparent Zcash Extensions #286, opened September 2020 and merged October 2020.0x7fff_ffffwas used for ZFuture inzcashdin Add feature flagging infrastructure to consensus parameters. zcash#4988, opened February 2021 and merged April 2021. However, it was factored out from ZIP-222 TZE host logic implementation zcash#4480, opened April 2020 and not yet merged.
So for some reason, both consensus branch IDs came out of the same TZE work but ended up differing by a single bit.
daira
approved these changes
Aug 5, 2024
|
This is completely wrong; there was a confusion between |
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.
No description provided.