Skip to content

Commit

Permalink
update zcash
Browse files Browse the repository at this point in the history
  • Loading branch information
conradoplg committed Mar 24, 2022
1 parent 579c0c0 commit 465ba58
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "depend/zcash"]
path = depend/zcash
url = https://github.com/ZcashFoundation/zcashd.git
branch = zcash_script_v5_api
branch = nu5-consensus
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ external-secp = []

[dependencies]
blake2b_simd = "1"
halo2 = "0.1.0-beta.1"
incrementalmerkletree = "0.2"
halo2 = "0.1.0-beta.3"
incrementalmerkletree = "0.3.0-beta.1"
libc = "0.2"
memuse = "0.2"
orchard = "=0.1.0-beta.1"
orchard = "=0.1.0-beta.2"
rand_core = "0.6"
tracing = "0.1"
zcash_encoding = "0.0"
Expand Down Expand Up @@ -110,8 +110,8 @@ exactly=1

[patch.crates-io]
# From zcashd
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "ff243b4f0055d89d3abb526e234688a09c3d8cb7" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "ff243b4f0055d89d3abb526e234688a09c3d8cb7" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "ff243b4f0055d89d3abb526e234688a09c3d8cb7" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
# From zcash_primitives
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "576683b9f2865f1118c309017ff36e01f84420c9" }
2 changes: 1 addition & 1 deletion depend/zcash
Submodule zcash updated 154 files

0 comments on commit 465ba58

Please sign in to comment.