Skip to content

Commit

Permalink
Merge pull request #808 from zcash/orchard-0.4
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
str4d authored Apr 11, 2023
2 parents 4f0dd21 + f82866d commit f2f9903
Show file tree
Hide file tree
Showing 11 changed files with 201 additions and 57 deletions.
1 change: 0 additions & 1 deletion Cargo.toml
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" }
orchard = { git = "https://github.com/zcash/orchard.git", rev = "bdcf15ba2141f94f031c195140219a99335d96d5" }
2 changes: 1 addition & 1 deletion components/zcash_address/Cargo.toml
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"
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
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
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

0 comments on commit f2f9903

Please sign in to comment.