From 4af28cb6d4c34cd37367bfbc5a700fbe0589ca80 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Dec 2021 16:39:48 +0000 Subject: [PATCH 1/6] incrementalmerkletree 0.2 --- Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0d27b4e7..45da07ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ nonempty = "0.7" serde = { version = "1.0", features = ["derive"] } subtle = "2.3" zcash_note_encryption = "0.0" -incrementalmerkletree = "0.1" +incrementalmerkletree = "0.2" # Developer tooling dependencies plotters = { version = "0.3.0", optional = true } @@ -83,4 +83,3 @@ debug = true [patch.crates-io] zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "76f364593a6d5b190dd23d26f8202adcd031b2d3" } -incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "b7bd6246122a6e9ace8edb51553fbf5228906cbb" } From f468e604e3e9f07b9327550e0994a0d57d4fd631 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Dec 2021 17:05:23 +0000 Subject: [PATCH 2/6] pprof 0.6 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 45da07ad..30b132ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ proptest = "1.0.0" zcash_note_encryption = { version = "0.0", features = ["pre-zip-212"] } [target.'cfg(unix)'.dev-dependencies] -pprof = { version = "0.5", features = ["criterion", "flamegraph"] } +pprof = { version = "0.6", features = ["criterion", "flamegraph"] } [lib] bench = false From af236a34ada1470078f26cf995df23176a8c0153 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Dec 2021 17:06:37 +0000 Subject: [PATCH 3/6] blake2b_simd 1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 30b132ca..f9460f0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ aes = "0.7" arrayvec = "0.7.0" bigint = "4" bitvec = "0.22" -blake2b_simd = "0.5" +blake2b_simd = "1" ff = "0.11" fpe = "0.5" group = "0.11" From bb04300059be0e342520d952026e23d61fc1daea Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Dec 2021 22:08:23 +0000 Subject: [PATCH 4/6] zcash_note_encryption 0.1 --- Cargo.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f9460f0f..d68659bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ reddsa = "0.1" nonempty = "0.7" serde = { version = "1.0", features = ["derive"] } subtle = "2.3" -zcash_note_encryption = "0.0" +zcash_note_encryption = "0.1" incrementalmerkletree = "0.2" # Developer tooling dependencies @@ -47,7 +47,7 @@ plotters = { version = "0.3.0", optional = true } criterion = "0.3" hex = "0.4" proptest = "1.0.0" -zcash_note_encryption = { version = "0.0", features = ["pre-zip-212"] } +zcash_note_encryption = { version = "0.1", features = ["pre-zip-212"] } [target.'cfg(unix)'.dev-dependencies] pprof = { version = "0.6", features = ["criterion", "flamegraph"] } @@ -80,6 +80,3 @@ debug = true [profile.bench] debug = true - -[patch.crates-io] -zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "76f364593a6d5b190dd23d26f8202adcd031b2d3" } From 369b99ee3f233e96f1b01780e420c8d4d7e7b383 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Dec 2021 22:08:58 +0000 Subject: [PATCH 5/6] Add `doc_cfg` annotations --- Cargo.toml | 3 ++- src/address.rs | 1 + src/builder.rs | 1 + src/bundle.rs | 1 + src/keys.rs | 1 + src/note.rs | 1 + src/note/nullifier.rs | 1 + src/primitives/redpallas.rs | 1 + src/tree.rs | 2 ++ src/value.rs | 1 + 10 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d68659bb..5de696ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,8 @@ readme = "README.md" publish = false [package.metadata.docs.rs] -rustdoc-args = [ "--html-in-header", "katex-header.html" ] +all-features = true +rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"] [dependencies] aes = "0.7" diff --git a/src/address.rs b/src/address.rs index 0f61ed26..560e3942 100644 --- a/src/address.rs +++ b/src/address.rs @@ -67,6 +67,7 @@ impl Address { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use proptest::prelude::*; diff --git a/src/builder.rs b/src/builder.rs index df397309..37a2768c 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -568,6 +568,7 @@ impl Bundle, V> { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use incrementalmerkletree::{bridgetree::BridgeTree, Frontier, Tree}; diff --git a/src/bundle.rs b/src/bundle.rs index d095e8da..550b42ca 100644 --- a/src/bundle.rs +++ b/src/bundle.rs @@ -506,6 +506,7 @@ pub struct BundleAuthorizingCommitment(pub Blake2bHash); /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use nonempty::NonEmpty; use pasta_curves::{arithmetic::FieldExt, pallas}; diff --git a/src/keys.rs b/src/keys.rs index e8bd210a..e317f0ca 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -792,6 +792,7 @@ impl SharedSecret { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use proptest::prelude::*; diff --git a/src/note.rs b/src/note.rs index 199971d2..de318194 100644 --- a/src/note.rs +++ b/src/note.rs @@ -249,6 +249,7 @@ pub struct TransmittedNoteCiphertext { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use proptest::prelude::*; diff --git a/src/note/nullifier.rs b/src/note/nullifier.rs index 6090f335..a0ede6fb 100644 --- a/src/note/nullifier.rs +++ b/src/note/nullifier.rs @@ -60,6 +60,7 @@ impl Nullifier { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use group::Group; use pasta_curves::{arithmetic::FieldExt, pallas}; diff --git a/src/primitives/redpallas.rs b/src/primitives/redpallas.rs index 38de97f9..7314dfdd 100644 --- a/src/primitives/redpallas.rs +++ b/src/primitives/redpallas.rs @@ -175,6 +175,7 @@ pub(crate) mod private { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use std::convert::TryFrom; diff --git a/src/tree.rs b/src/tree.rs index d3101e73..c3b3f08b 100644 --- a/src/tree.rs +++ b/src/tree.rs @@ -81,6 +81,7 @@ pub struct MerklePath { } #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] impl From<(incrementalmerkletree::Position, Vec)> for MerklePath { fn from(path: (incrementalmerkletree::Position, Vec)) -> Self { use std::convert::TryInto; @@ -265,6 +266,7 @@ impl<'de> Deserialize<'de> for MerkleHashOrchard { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { #[cfg(test)] use incrementalmerkletree::{ diff --git a/src/value.rs b/src/value.rs index 7152643d..9bdecfc3 100644 --- a/src/value.rs +++ b/src/value.rs @@ -296,6 +296,7 @@ impl ValueCommitment { /// Generators for property testing. #[cfg(any(test, feature = "test-dependencies"))] +#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))] pub mod testing { use pasta_curves::{arithmetic::FieldExt, pallas}; use proptest::prelude::*; From f98431175a0744477f7034f71ae4ed4fe3797965 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Dec 2021 22:10:35 +0000 Subject: [PATCH 6/6] orchard 0.1.0-beta.1 --- Cargo.toml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5de696ed..12c30880 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,19 +1,21 @@ [package] name = "orchard" -version = "0.0.0" +version = "0.1.0-beta.1" authors = [ "Sean Bowe ", "Jack Grigg ", + "Daira Hopwood ", + "Ying Tong Lai ", + "Kris Nuttycombe ", ] edition = "2018" -description = "Sapling on stilts!" +description = "[BETA] The Orchard shielded transaction protocol" license-file = "LICENSE-BOSL" repository = "https://github.com/zcash/orchard" documentation = "https://docs.rs/orchard" readme = "README.md" - -# We are not publishing this yet. -publish = false +categories = ["cryptography::cryptocurrencies"] +keywords = ["zcash"] [package.metadata.docs.rs] all-features = true