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.

Sign up for GitHub

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

Update dependencies #808

Merged
merged 7 commits into from
Apr 11, 2023
Merged

Update dependencies #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fcde5e
Migrate to `orchard 0.4.0`
str4d Apr 11, 2023
d2ccd1f
zcash_primitives: Migrate to `fpe 0.6`
str4d Apr 11, 2023
878f3e9
zcash_primitives: Migrate to `sha2 0.10`, `bip0039 0.11`
str4d Apr 11, 2023
43eed3d
zcash_proofs: `directories 5`
str4d Apr 11, 2023
3fb66a8
zcash_client_backend: Migrate to `tonic 0.9`
str4d Apr 11, 2023
6b7c62e
zcash_client_backend: Migrate to `base64 0.21`
str4d Apr 11, 2023
f82866d
Migrate to `bech32 0.9`
str4d Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ codegen-units = 1
[patch.crates-io]
zcash_encoding = { path = "components/zcash_encoding" }
zcash_note_encryption = { path = "components/zcash_note_encryption" }
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we get rid of the path-based dependencies here? IIRC right now we're depending upon the released versions of these crates in zcash_primitives and the other crates.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When I remove that, we end up compiling zcash_note_encryption twice: once for the copy in the workspace, and once for the released version (both of which end up in Cargo.lock). It looks like only the released version gets used as a dependency, so maybe it's fine? In any case, changing this is sort of out-of-scope for this PR, because patch dependencies are only used in the local workspace; they don't affect downstream crate users.

orchard = { git = "https://github.com/zcash/orchard.git", rev = "bdcf15ba2141f94f031c195140219a99335d96d5" }
2 changes: 1 addition & 1 deletion components/zcash_address/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ categories = ["cryptography::cryptocurrencies", "encoding"]
keywords = ["zcash", "address", "sapling", "unified"]

[dependencies]
bech32 = "0.8"
bech32 = "0.9"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

AFAICT this dependency is not exposed, so we can cut a point release of zcash_address at the same time we cut zcash_primitives 0.11 et al.

bs58 = { version = "0.4", features = ["check"] }
f4jumble = { version = "0.1", path = "../f4jumble" }
zcash_encoding = { version = "0.2", path = "../zcash_encoding" }
Expand Down
3 changes: 2 additions & 1 deletion zcash_client_backend/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ and this library adheres to Rust's notion of
## [Unreleased]

### Changed
- Bumped dependencies to `bls12_381 0.8`, `group 0.13`,
- Bumped dependencies to `bls12_381 0.8`, `group 0.13`, `orchard 0.4`,
`tonic 0.9`, `base64 0.21`, `bech32 0.9`.
- The dependency on `zcash_primitives` no longer enables the `multicore` feature
by default in order to support compilation under `wasm32-wasi`. Users of other
platforms may need to include an explicit dependency on `zcash_primitives`
Expand Down
10 changes: 5 additions & 5 deletions zcash_client_backend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ zcash_primitives = { version = "0.10", path = "../zcash_primitives", default-fea
time = "0.2"

# - Encodings
base64 = "0.13"
bech32 = "0.8"
base64 = "0.21"
bech32 = "0.9"
bs58 = { version = "0.4", features = ["check"] }

# - Errors
Expand All @@ -44,7 +44,7 @@ tracing = "0.1"

# - Protobuf interfaces and gRPC bindings
prost = "0.11"
tonic = { version = "0.8", optional = true }
tonic = { version = "0.9", optional = true }

# - Secret management
secrecy = "0.8"
Expand All @@ -53,7 +53,7 @@ subtle = "2.2.3"
# - Shielded protocols
bls12_381 = "0.8"
group = "0.13"
orchard = { version = "0.3", default-features = false }
orchard = { version = "0.4", default-features = false }

# - Test dependencies
proptest = { version = "1.0.0", optional = true }
Expand All @@ -72,7 +72,7 @@ crossbeam-channel = "0.5"
rayon = "1.5"

[build-dependencies]
tonic-build = "0.8"
tonic-build = "0.9"
which = "4"

[dev-dependencies]
Expand Down
Loading