From ad5610b63cd9479f7dfa4d054f76f070e42f0c97 Mon Sep 17 00:00:00 2001 From: Hanh Date: Sun, 22 Dec 2024 00:06:50 +1000 Subject: [PATCH] feat: reexport download_sapling_parameters --- Cargo.lock | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++--- Cargo.toml | 2 +- zcash-warp | 2 +- 3 files changed, 57 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2650e9a..5980203 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2384,6 +2384,19 @@ dependencies = [ "adler2", ] +[[package]] +name = "minreq" +version = "2.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390" +dependencies = [ + "log", + "once_cell", + "rustls 0.21.12", + "rustls-webpki 0.101.7", + "webpki-roots 0.25.4", +] + [[package]] name = "mio" version = "0.8.11" @@ -3358,6 +3371,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + [[package]] name = "rustls" version = "0.23.18" @@ -3368,7 +3393,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki", + "rustls-webpki 0.102.8", "subtle 2.6.1", "zeroize", ] @@ -3400,6 +3425,16 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustls-webpki" version = "0.102.8" @@ -3521,6 +3556,16 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sec1" version = "0.7.3" @@ -4147,7 +4192,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls", + "rustls 0.23.18", "rustls-pki-types", "tokio", ] @@ -4250,7 +4295,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "webpki-roots", + "webpki-roots 0.26.7", ] [[package]] @@ -4703,6 +4748,12 @@ version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + [[package]] name = "webpki-roots" version = "0.26.7" @@ -5204,6 +5255,7 @@ dependencies = [ "jubjub", "known-folders", "lazy_static", + "minreq", "rand_core 0.6.4", "redjubjub", "sapling-crypto", diff --git a/Cargo.toml b/Cargo.toml index 6a75509..4ce7a1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ zcash_keys = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa zcash_protocol = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa0c7", features = ["local-consensus"] } zcash_client_backend = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa0c7", features = [ "transparent-inputs", "orchard" ] } zcash_primitives = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa0c7", features = [ "transparent-inputs" ] } -zcash_proofs = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa0c7" } +zcash_proofs = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa0c7", features = ["download-params"] } zcash_address = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa0c7" } zcash_encoding = { git = "https://github.com/hhanh00/librustzcash.git", rev = "be5fa0c7" } zcash_note_encryption = "0.4" diff --git a/zcash-warp b/zcash-warp index 6ba2d1e..a3e4ea9 160000 --- a/zcash-warp +++ b/zcash-warp @@ -1 +1 @@ -Subproject commit 6ba2d1e98d5c70f9a4f5e97801fd954825d60541 +Subproject commit a3e4ea9210c07a395d739a255519d3c6e2b36f8e