Skip to content
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

change(deps): Upgrade zcash_script to 0.1.12 to match zcashd 5.5.0 #6624

Merged
merged 3 commits into from
May 10, 2023

Conversation

teor2345
Copy link
Contributor

@teor2345 teor2345 commented May 7, 2023

Motivation

We need to upgrade to the zcash_script dependency to match zcashd 5.5.0.

Closes #6535

Specifications

Zcash script handling is not specified, so we just run zcashd's code.

Complex Code or Requirements

This is unlikely to be a consensus-critical change, because zcashd has not changed its script handling. However, it has refactored some of its transaction parsing code.

Solution

Review

This is a high priority because it's blocking the missed version updates, which is needed to tag the next release.

Reviewer Checklist

  • Will the PR name make sense to users?
    • Does it need extra CHANGELOG info? (new features, breaking changes, large changes)
  • Are the PR labels correct?
  • Does the code do what the ticket and PR says?
    • Does it change concurrent code, unsafe code, or consensus rules?
  • How do you know it works? Does it have tests?

@teor2345 teor2345 added A-dependencies Area: Dependency file updates A-consensus Area: Consensus rule updates C-enhancement Category: This is an improvement P-High 🔥 A-script Area: Script handling labels May 7, 2023
@teor2345 teor2345 requested a review from a team as a code owner May 7, 2023 22:01
@teor2345 teor2345 self-assigned this May 7, 2023
@teor2345 teor2345 requested a review from a team as a code owner May 7, 2023 22:01
@teor2345 teor2345 requested review from dconnolly and upbqdn and removed request for a team May 7, 2023 22:01
@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label May 7, 2023
@teor2345 teor2345 removed the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label May 7, 2023
@codecov
Copy link

codecov bot commented May 7, 2023

Codecov Report

Merging #6624 (de714a9) into main (6016c9d) will increase coverage by 0.01%.
The diff coverage is 88.57%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6624      +/-   ##
==========================================
+ Coverage   77.92%   77.93%   +0.01%     
==========================================
  Files         309      309              
  Lines       40653    40664      +11     
==========================================
+ Hits        31678    31693      +15     
+ Misses       8975     8971       -4     

deny.toml Show resolved Hide resolved
mergify bot added a commit that referenced this pull request May 8, 2023
mergify bot added a commit that referenced this pull request May 8, 2023
mergify bot added a commit that referenced this pull request May 9, 2023
deny.toml Show resolved Hide resolved
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@oxarbitrage oxarbitrage mentioned this pull request May 9, 2023
38 tasks
@teor2345
Copy link
Contributor Author

teor2345 commented May 9, 2023

@mergify refresh

@mergify
Copy link
Contributor

mergify bot commented May 9, 2023

refresh

✅ Pull request refreshed

mergify bot added a commit that referenced this pull request May 9, 2023
@teor2345 teor2345 changed the title change(deps): Upgrade zcash_script to 0.1.12 change(deps): Upgrade zcash_script to 0.1.12 to match zcashd 5.5.0 May 9, 2023
@teor2345
Copy link
Contributor Author

@Mergifyio refresh

@mergify
Copy link
Contributor

mergify bot commented May 10, 2023

refresh

✅ Pull request refreshed

mergify bot added a commit that referenced this pull request May 10, 2023
@teor2345
Copy link
Contributor Author

@Mergifyio refresh

@mergify
Copy link
Contributor

mergify bot commented May 10, 2023

refresh

✅ Pull request refreshed

mergify bot added a commit that referenced this pull request May 10, 2023
@mergify mergify bot merged commit d07dc7f into main May 10, 2023
@mergify mergify bot deleted the zcash-script-0112 branch May 10, 2023 08:30
@teor2345
Copy link
Contributor Author

Manually use cargo tree to check that we don't depend on any vulnerable orchard versions: we must only depend on orchard 0.4 or later.

I forgot this check when making this PR. orchard was upgraded in that PR, and some other missed updates are handled by PR #6656.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-consensus Area: Consensus rule updates A-dependencies Area: Dependency file updates A-script Area: Script handling C-enhancement Category: This is an improvement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade zcash_script after the zcashd 5.5.0 release
5 participants