[DRAFT] Resolve v2.4.2 merge conflicts and follow-up fixes #79
Conversation
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
The actionlint job in the ZcashFoundation/zebra repository CI reported multiple SC2086 errors. This commit quotes shell variables in push-deploy.yaml to fix the linter failures.
dmidem
changed the title
…ctionObject - need to be fixed - see FIXME comments
…cause of a new interface of new_regtest method)
…te/zip317/tests.rs (because Address::try_from_raw_transparent_p2pkh was removed in librustzcash)
* Quote variables in push-deploy.yaml to pass upstream actionlint checks The actionlint job in the ZcashFoundation/zebra repository CI reported multiple SC2086 errors. This commit quotes shell variables in push-deploy.yaml to fix the linter failures. * Rename nu6 zcash_unstabl flag to nu7, update orchard and librustzcash revisions in Cargo.toml, other small changes * Replace deprecated librustzcash types with updated protocol equivalents * Fix compilation errors occured after the previous commit * Additionally rename nu6 zcash_unstable flag to nu7 in rustdocflags section of .cargo/config.toml * Fix cargo clippy issue * zebra-chain: port TryFrom<HashType>→SighashType from upstream Zebra v2.4.2 (to sync with librustzcash changes) * Removed resolved FIXME * Switch to the latest zsa1 rev of librustzcash
…rc/transaction/tests.rs, refactor those tests to support V5 and V6 in action duplication test
Unrolled the orchard_shielded_data_field! macro into explicit code to match the style used elsewhere in Orchard transaction handling and in upstream ZcashFoundation, which avoids macros there entirely.
…tion.rs to store either Vanilla and ZSA data
…s TX_V6_VERSION_GROUP_ID to align with librustzcash
dmidem
force-pushed
the
zsa1-v2.4.2-fixes
branch
from
3a054f0 to
3a2b832
Compare
dmidem
force-pushed
the
zsa1-v2.4.2-fixes
branch
from
e2956e4 to
362943e
Compare
dmidem
force-pushed
the
zsa1-v2.4.2-fixes
branch
from
738c557 to
51a6976
Compare
…separately with reduced concurrency pending flake fix
dmidem
force-pushed
the
zsa1-v2.4.2-fixes
branch
from
51a6976 to
231ae2a
Compare
dmidem
force-pushed
the
zsa1-v2.4.2-fixes
branch
from
625aebf to
0867495
Compare
dmidem
force-pushed
the
zsa1-v2.4.2-fixes
branch
from
0867495 to
0ad0ea4
Compare
dmidem
force-pushed
the
zsa1-v2.4.2-fixes
branch
from
0ad0ea4 to
f3a730c
Compare
Collaborator
Author
|
Closed in favour of #87 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR contains only my changes on top of the raw auto-merge snapshot in
zsa1-v2.4.2-conflicts. It resolves conflicts and applies the minimal follow-ups needed to build and run against upstreamv2.4.2, i.e. contains: