v1.8.0-beta2

checkpoint & track orchard notes update balance command allow mixed pool transactions
adityapk00 · Aug 8, 2022 · 7608df0 · 7608df0
1 parent 6536876
commit 7608df0
Show file tree

Hide file tree

Showing 21 changed files with 836 additions and 185 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,9 +8,18 @@ members = [
 debug = false
 
 [patch.crates-io]
-zcash_address = { git = "https://github.com/zcash/librustzcash", rev = "09567fc280463f5797a77f1d764205be8ad8e64a"}
-zcash_primitives = { git = "https://github.com/zcash/librustzcash", rev = "09567fc280463f5797a77f1d764205be8ad8e64a"}
-zcash_client_backend = { git = "https://github.com/zcash/librustzcash", rev = "09567fc280463f5797a77f1d764205be8ad8e64a"}
-zcash_note_encryption = { git = "https://github.com/zcash/librustzcash", rev = "09567fc280463f5797a77f1d764205be8ad8e64a"}
-zcash_encoding = { git = "https://github.com/zcash/librustzcash", rev = "09567fc280463f5797a77f1d764205be8ad8e64a"}
-zcash_proofs = { git = "https://github.com/zcash/librustzcash", rev = "09567fc280463f5797a77f1d764205be8ad8e64a"}
+zcash_address = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_primitives = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_client_backend = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_note_encryption = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_encoding = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_proofs = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+orchard = { git = "https://github.com/adityapk00/orchard", rev = "0a960a380f4e9c3472c9260f3df61cd5e50d51b0" }
+
+#zcash_address = { path = "../librustzcash/components/zcash_address/" }
+#zcash_primitives = { path = "../librustzcash/zcash_primitives/" }
+#zcash_client_backend = { path = "../librustzcash/zcash_client_backend" }
+#zcash_note_encryption = { path = "../librustzcash/components/zcash_note_encryption" }
+#zcash_encoding = { path = "../librustzcash/components/zcash_encoding/" }
+#zcash_proofs = { path = "../librustzcash/zcash_proofs/" }
+#orchard = { path = "../orchard/" }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zecwallet-cli"
-version = "1.8.0-beta1"
+version = "1.8.0-beta2"
 edition = "2018"
 
 [dependencies]

diff --git a/cli/src/version.rs b/cli/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "1.8.0-beta1";
+pub const VERSION: &str = "1.8.0-beta2";
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -49,6 +49,8 @@ group = "0.12"
 rust-embed = { version = "6.3.0", features = ["debug-embed"] }
 
 orchard = "0.2.0"
+incrementalmerkletree = "0.3"
+
 zcash_address = "0.1.0"
 zcash_primitives = { version = "0.7.0", features = ["transparent-inputs"] }
 zcash_client_backend = "0.5.0"