Skip to content

Commit

Permalink
Merge pull request #552 from zcash/update-deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
str4d committed May 10, 2022
2 parents 7a1e9fd + 9ebbd42 commit 4dc0f46
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
6 changes: 0 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,5 @@ panic = 'abort'
codegen-units = 1

[patch.crates-io]
halo2_gadgets = { git = "https://github.com/zcash/halo2.git", rev = "30f92f3f4b785ea2a32392bf65c1b08f0411567c" }
halo2_proofs = { git = "https://github.com/zcash/halo2.git", rev = "30f92f3f4b785ea2a32392bf65c1b08f0411567c" }
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "9b4c1bdbe0517e3a7a8f285d6048a37d472ba3bc" }
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "f23e3d89507849a24543121839eea6f40b141aff" }
orchard = { git = "https://github.com/zcash/orchard", rev = "15007026b1181b14f45c5c8cbf32e4fe86bc8d6b" }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "0e912de3000fe165daf58ad98d1a22f1a66e7f18" }
zcash_encoding = { path = "components/zcash_encoding" }
zcash_note_encryption = { path = "components/zcash_note_encryption" }
2 changes: 1 addition & 1 deletion zcash_client_backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ base64 = "0.13"
ff = "0.12"
group = "0.12"
hex = "0.4"
hdwallet = { version = "0.3.0", optional = true }
hdwallet = { version = "0.3.1", optional = true }
jubjub = "0.9"
log = "0.4"
nom = "7"
Expand Down
10 changes: 5 additions & 5 deletions zcash_primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ equihash = { version = "0.1", path = "../components/equihash" }
ff = "0.12"
fpe = "0.5"
group = "0.12"
hdwallet = { version = "0.3.0", optional = true }
hdwallet = { version = "0.3.1", optional = true }
hex = "0.4"
incrementalmerkletree = "=0.3.0-beta.2"
incrementalmerkletree = "0.3"
jubjub = "0.9"
lazy_static = "1"
memuse = "0.2"
nonempty = "0.7"
orchard = "=0.1.0-beta.3"
orchard = "0.1"
proptest = { version = "1.0.0", optional = true }
rand = "0.8"
rand_core = "0.6"
Expand All @@ -55,10 +55,10 @@ features = ["pre-zip-212"]
criterion = "0.3"
proptest = "1.0.0"
rand_xorshift = "0.3"
orchard = { version = "=0.1.0-beta.3", features = ["test-dependencies"] }
orchard = { version = "0.1", features = ["test-dependencies"] }

[target.'cfg(unix)'.dev-dependencies]
pprof = { version = "=0.6.1", features = ["criterion", "flamegraph"] }
pprof = { version = "0.8", features = ["criterion", "flamegraph"] } # MSRV 1.56

[features]
transparent-inputs = ["bs58", "hdwallet", "ripemd", "secp256k1"]
Expand Down

0 comments on commit 4dc0f46

Please sign in to comment.