Zsa1 upsteram merge #63
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
Neither of these should have been feature flags, as they gate breaking changes to the Zcash consensus rules (and in some ways are incompatible with each other), while feature flags should be additive.
CI: Rework the test states
Various fixes to Orchard tests
…der a common single-pool test
zcash_client_sqlite: More Orchard tests
zcash_client_sqlite: Add database tables for Orchard
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
zcash_client_sqlite: Implement Orchard scanning
…ights for the anchor.
…apling and Orchard.
…zsa1 # Conflicts: # Cargo.toml # components/zcash_note_encryption/Cargo.toml # components/zcash_note_encryption/src/batch.rs # components/zcash_note_encryption/src/lib.rs # zcash_client_backend/src/proto.rs # zcash_client_backend/src/scan.rs # zcash_primitives/src/sapling/note_encryption.rs # zcash_primitives/src/transaction/components/sapling.rs # zcash_primitives/src/transaction/components/sapling/builder.rs
PaulLaux
reviewed
Jun 13, 2024
There was a problem hiding this comment.
One comment and one question
- this file is empty: zcash_primitives/src/transaction/components/sapling/builder.rs
- why has this changed zcash_primitives/src/transaction/tests/data.rs?
Also, CI seems to fail, is it due to our changes?
PaulLaux
reviewed
Jun 26, 2024
PaulLaux
approved these changes
Jun 26, 2024
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.
Zsa1 is updated to a more current upstream version, commit: c3eace4