Merge pull request #801 from AloeareV/librustzcash_update

latest librustzcash with additional rpc_server_build
zingolabs · Jan 31, 2024 · a7d148e · a7d148e
2 parents f8c914a + 354a1bd
commit a7d148e
Show file tree

Hide file tree

Showing 26 changed files with 474 additions and 394 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,19 +17,21 @@ resolver = "2"
 
 [workspace.dependencies]
 clap = "4.4"
-zcash_address = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc.2.1" }
-zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc.2.1", features = ["lightwalletd-tonic"] }
-zcash_encoding = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc.2.1" }
+sapling-crypto = "0.1.0"
+zcash_address = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc_4" }
+zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc_4", features = ["lightwalletd-tonic"] }
+zcash_encoding = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc_4" }
+zcash_keys = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc_4", features = ["orchard"] }
 zcash_note_encryption = "0.4"
-zcash_primitives = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc.2.1" }
-zcash_proofs = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc.2.1" }
-orchard = "0.6"
+zcash_primitives = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc_4" }
+zcash_proofs = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zingo_rc_4" }
+orchard = "0.7"
 tonic-build = "0.10"
 tempdir = "0.3"
 portpicker = "0.1"
 incrementalmerkletree = { version = "0.5" }
 futures = "0.3.15"
-shardtree = "0.1"
+shardtree = "0.2"
 build_utils = { path = "./build_utils" }
 http = "0.2.4"
 hyper = { version = "0.14", features = ["full"] }

diff --git a/darkside-tests/Cargo.toml b/darkside-tests/Cargo.toml
@@ -38,6 +38,7 @@ zcash_address = { workspace = true }
 zcash_client_backend = { workspace = true }
 shardtree = { workspace = true }
 serde_json = "1.0.107"
+sapling-crypto.workspace = true
 
 [build-dependencies]
 tonic-build = { workspace = true }