Merge non-consensus changes #518
Merged
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
This removes unreleased incrementalmerkletree::BridgeTree serialization that was zcashd-specific.
Update the versions of incrementalmerkletree & orchard.
Update `orchard` crate
…non-consensus-changes-3
str4d
commented
Feb 28, 2022
| orchard = { git = "https://github.com/zcash/orchard.git", rev = "f1795f8068c8c83af89af8a061131759f973d656" } | ||
| hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "576683b9f2865f1118c309017ff36e01f84420c9" } | ||
| incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "dd57b430dee7c0b163f4035fef2280cd1935036c" } | ||
| orchard = { git = "https://github.com/zcash/orchard.git", rev = "3ddf6c49f7484ed1295bd5351317bbfe49e14472" } |
There was a problem hiding this comment.
This orchard revision is precisely the merge of the previous revisions used in the consensus and non-consensus branches.
There was a problem hiding this comment.
I have verified that this commit is the current HEAD of orchard/main.
Codecov Report
@@ Coverage Diff @@
## master #518 +/- ##
==========================================
+ Coverage 49.64% 50.73% +1.08%
==========================================
Files 90 90
Lines 8438 8346 -92
==========================================
+ Hits 4189 4234 +45
+ Misses 4249 4112 -137
Continue to review full report at Codecov.
|
nuttycom
approved these changes
Feb 28, 2022
| orchard = { git = "https://github.com/zcash/orchard.git", rev = "f1795f8068c8c83af89af8a061131759f973d656" } | ||
| hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "576683b9f2865f1118c309017ff36e01f84420c9" } | ||
| incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "dd57b430dee7c0b163f4035fef2280cd1935036c" } | ||
| orchard = { git = "https://github.com/zcash/orchard.git", rev = "3ddf6c49f7484ed1295bd5351317bbfe49e14472" } |
There was a problem hiding this comment.
I have verified that this commit is the current HEAD of orchard/main.
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.