From dc6d8289b21e83b1d746c883e4f6c8b9e2199e56 Mon Sep 17 00:00:00 2001 From: Hanh Date: Thu, 24 Oct 2024 12:24:22 +1000 Subject: [PATCH] Support fo Xpub and Xprv keys --- Cargo.lock | 21 +++++++++++---------- Cargo.toml | 14 +++++++------- zcash-warp | 2 +- zkool | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ca9e11..0d31961 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1224,7 +1224,7 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "equihash" version = "0.2.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "blake2b_simd", "byteorder", @@ -1249,7 +1249,7 @@ dependencies = [ [[package]] name = "f4jumble" version = "0.1.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "blake2b_simd", ] @@ -4923,6 +4923,7 @@ dependencies = [ "bincode", "bip32", "blake2b_simd", + "bs58", "cbindgen", "chacha20", "chrono", @@ -4989,7 +4990,7 @@ dependencies = [ [[package]] name = "zcash_address" version = "0.5.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "bech32 0.9.1", "bs58", @@ -5001,7 +5002,7 @@ dependencies = [ [[package]] name = "zcash_client_backend" version = "0.13.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "base64 0.21.7", "bech32 0.9.1", @@ -5042,7 +5043,7 @@ dependencies = [ [[package]] name = "zcash_encoding" version = "0.2.1" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "byteorder", "nonempty", @@ -5051,7 +5052,7 @@ dependencies = [ [[package]] name = "zcash_keys" version = "0.3.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "bech32 0.9.1", "bip32", @@ -5092,7 +5093,7 @@ dependencies = [ [[package]] name = "zcash_primitives" version = "0.17.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "aes", "bip32", @@ -5131,7 +5132,7 @@ dependencies = [ [[package]] name = "zcash_proofs" version = "0.17.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "bellman", "blake2b_simd", @@ -5153,7 +5154,7 @@ dependencies = [ [[package]] name = "zcash_protocol" version = "0.3.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "document-features", "incrementalmerkletree", @@ -5254,7 +5255,7 @@ dependencies = [ [[package]] name = "zip321" version = "0.1.0" -source = "git+https://github.com/hhanh00/librustzcash.git?rev=bc5c4b2e#bc5c4b2eb70d5e3639eb3b38c338abd9b9970910" +source = "git+https://github.com/hhanh00/librustzcash.git?rev=ad6cf70a#ad6cf70a1c109d3eccd6f8620dd373277f5c8373" dependencies = [ "base64 0.21.7", "nom", diff --git a/Cargo.toml b/Cargo.toml index 4f690f2..0e4c577 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,13 +53,13 @@ clap = { version = "4.5.16", features = ["derive"] } clap-repl = "0.3.0" console = "0.15.8" -zcash_keys = { git = "https://github.com/hhanh00/librustzcash.git", rev = "bc5c4b2e", features = ["sapling", "orchard", "test-dependencies"] } -zcash_protocol = { git = "https://github.com/hhanh00/librustzcash.git", rev = "bc5c4b2e", features = ["local-consensus"] } -zcash_client_backend = { git = "https://github.com/hhanh00/librustzcash.git", rev = "bc5c4b2e", features = [ "transparent-inputs", "orchard" ] } -zcash_primitives = { git = "https://github.com/hhanh00/librustzcash.git", rev = "bc5c4b2e", features = [ "transparent-inputs" ] } -zcash_proofs = { git = "https://github.com/hhanh00/librustzcash.git", rev = "bc5c4b2e" } -zcash_address = { git = "https://github.com/hhanh00/librustzcash.git", rev = "bc5c4b2e" } -zcash_encoding = { git = "https://github.com/hhanh00/librustzcash.git", rev = "bc5c4b2e" } +zcash_keys = { git = "https://github.com/hhanh00/librustzcash.git", rev = "ad6cf70a", features = ["sapling", "orchard", "test-dependencies"] } +zcash_protocol = { git = "https://github.com/hhanh00/librustzcash.git", rev = "ad6cf70a", features = ["local-consensus"] } +zcash_client_backend = { git = "https://github.com/hhanh00/librustzcash.git", rev = "ad6cf70a", features = [ "transparent-inputs", "orchard" ] } +zcash_primitives = { git = "https://github.com/hhanh00/librustzcash.git", rev = "ad6cf70a", features = [ "transparent-inputs" ] } +zcash_proofs = { git = "https://github.com/hhanh00/librustzcash.git", rev = "ad6cf70a" } +zcash_address = { git = "https://github.com/hhanh00/librustzcash.git", rev = "ad6cf70a" } +zcash_encoding = { git = "https://github.com/hhanh00/librustzcash.git", rev = "ad6cf70a" } zcash_note_encryption = "0.4" [patch.crates-io] diff --git a/zcash-warp b/zcash-warp index 6d021fa..795cdff 160000 --- a/zcash-warp +++ b/zcash-warp @@ -1 +1 @@ -Subproject commit 6d021fab92433008bc1c82822f9cac428094c804 +Subproject commit 795cdff23e08a47d503c56c2a0613b2c4c3af6fe diff --git a/zkool b/zkool index 6516038..aa6c71a 160000 --- a/zkool +++ b/zkool @@ -1 +1 @@ -Subproject commit 6516038fda32d7aa6410643025c031af7e1bab86 +Subproject commit aa6c71a8af19f2ddd4dd8b0d811abad517338bff