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 and zcash dependencies #4926

Merged
merged 3 commits into from
Sep 2, 2022
Merged

Conversation

conradoplg
Copy link
Collaborator

@conradoplg conradoplg commented Aug 22, 2022

Motivation

See #4767

To do that we must update zcash_script and related dependencies.

Specifications

Designs

Solution

Update zcash_script which allows us to upgrade the zcash dependencies.

Updates zcash_proofs to upstream again and not our fork, after the Sprout params downloading code was merged.

Closes #4767

Review

This PR is blocked on:

  • Update to zcash 5.2.0 zcash_script#37 being accepted, a release being made, and changing this PR to point to it
  • zcash_proofs being released so that we don't depend on a git commit, which will allow us to remove duplicated dependencies (optional; we may skip this if we want) This may take a while so let's not wait for it

Reviewer Checklist

  • Code implements Specs and Designs
  • Tests for Expected Behaviour
  • Tests for Errors

Follow Up Work

@codecov
Copy link

codecov bot commented Aug 22, 2022

Codecov Report

Merging #4926 (71a2f1a) into main (0c4be38) will increase coverage by 0.12%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #4926      +/-   ##
==========================================
+ Coverage   79.16%   79.29%   +0.12%     
==========================================
  Files         310      310              
  Lines       38900    38900              
==========================================
+ Hits        30797    30844      +47     
+ Misses       8103     8056      -47     

@conradoplg conradoplg marked this pull request as ready for review August 31, 2022 22:37
@conradoplg conradoplg requested review from a team as code owners August 31, 2022 22:37
@conradoplg conradoplg requested review from arya2 and upbqdn and removed request for a team August 31, 2022 22:37
teor2345
teor2345 previously approved these changes Sep 2, 2022
Copy link
Contributor

@teor2345 teor2345 left a comment

Choose a reason for hiding this comment

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

Thanks, this is a big improvement!

@teor2345 teor2345 added A-dependencies Area: Dependency file updates A-rust Area: Updates to Rust code C-enhancement Category: This is an improvement P-Medium ⚡ I-slow Problems with performance or responsiveness labels Sep 2, 2022
@teor2345 teor2345 removed request for arya2 and upbqdn September 2, 2022 02:47
@teor2345
Copy link
Contributor

teor2345 commented Sep 2, 2022

I updated Cargo.lock to resolve merge conflicts with main.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-dependencies Area: Dependency file updates A-rust Area: Updates to Rust code C-enhancement Category: This is an improvement I-slow Problems with performance or responsiveness
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove duplicate orchard crates, change dependencies to zcash/librustzcash
2 participants