From 9a010d42ff53828f48def8da96539897f8265745 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 13 Oct 2022 21:23:09 +0000 Subject: [PATCH 1/3] zcash_note_encryption: Clean up changelog and readme We no longer depend on the previously-mentioned dependencies. --- components/zcash_note_encryption/CHANGELOG.md | 1 - components/zcash_note_encryption/README.md | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/components/zcash_note_encryption/CHANGELOG.md b/components/zcash_note_encryption/CHANGELOG.md index 4db12f98e..eb1681e2d 100644 --- a/components/zcash_note_encryption/CHANGELOG.md +++ b/components/zcash_note_encryption/CHANGELOG.md @@ -13,7 +13,6 @@ and this library adheres to Rust's notion of ### Changed - MSRV is now 1.56.1. -- Migrated to `group 0.13`. - `zcash_note_encryption::Domain` now requires `epk` to be converted to `Domain::PreparedEphemeralPublicKey` before being passed to `Domain::ka_agree_dec`. diff --git a/components/zcash_note_encryption/README.md b/components/zcash_note_encryption/README.md index ffa132516..612b7a64f 100644 --- a/components/zcash_note_encryption/README.md +++ b/components/zcash_note_encryption/README.md @@ -22,16 +22,6 @@ Licensed under either of at your option. -Downstream code forks should note that 'zcash_note_encryption' depends on the -'orchard' crate, which is licensed under the -[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -A license exception is provided allowing some derived works that are linked or -combined with the 'orchard' crate to be copied or distributed under the original -licenses (in this case MIT / Apache 2.0), provided that the included portions of -the 'orchard' code remain subject to BOSL. -See https://github.com/zcash/orchard/blob/main/COPYING for details of which -derived works can make use of this exception. - ### Contribution Unless you explicitly state otherwise, any contribution intentionally From 8f068b3b71cc8bef6e86ef44b357360417cb5683 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 13 Oct 2022 21:35:39 +0000 Subject: [PATCH 2/3] zcash_note_encryption 0.2.0 --- components/zcash_note_encryption/CHANGELOG.md | 2 ++ components/zcash_note_encryption/Cargo.toml | 2 +- zcash_client_backend/Cargo.toml | 2 +- zcash_primitives/Cargo.toml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/zcash_note_encryption/CHANGELOG.md b/components/zcash_note_encryption/CHANGELOG.md index eb1681e2d..676ef9bfc 100644 --- a/components/zcash_note_encryption/CHANGELOG.md +++ b/components/zcash_note_encryption/CHANGELOG.md @@ -6,6 +6,8 @@ and this library adheres to Rust's notion of [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [0.2.0] - 2022-10-13 ### Added - `zcash_note_encryption::Domain`: - `Domain::PreparedEphemeralPublicKey` associated type. diff --git a/components/zcash_note_encryption/Cargo.toml b/components/zcash_note_encryption/Cargo.toml index a2751a466..51812e036 100644 --- a/components/zcash_note_encryption/Cargo.toml +++ b/components/zcash_note_encryption/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zcash_note_encryption" description = "Note encryption for Zcash transactions" -version = "0.1.0" +version = "0.2.0" authors = [ "Jack Grigg ", "Kris Nuttycombe " diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml index cbceb49f5..5bdd1f376 100644 --- a/zcash_client_backend/Cargo.toml +++ b/zcash_client_backend/Cargo.toml @@ -44,7 +44,7 @@ time = "0.2" tracing = "0.1" zcash_address = { version = "0.1", path = "../components/zcash_address" } zcash_encoding = { version = "0.1", path = "../components/zcash_encoding" } -zcash_note_encryption = { version = "0.1", path = "../components/zcash_note_encryption" } +zcash_note_encryption = { version = "0.2", path = "../components/zcash_note_encryption" } zcash_primitives = { version = "0.7", path = "../zcash_primitives" } [build-dependencies] diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index d04de19c1..91d6e7db1 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -50,7 +50,7 @@ zcash_address = { version = "0.1", path = "../components/zcash_address" } zcash_encoding = { version = "0.1", path = "../components/zcash_encoding" } [dependencies.zcash_note_encryption] -version = "0.1" +version = "0.2" path = "../components/zcash_note_encryption" features = ["pre-zip-212"] From cf5af3edbca5ae3e013774f909a051579cf15f49 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 13 Oct 2022 21:42:46 +0000 Subject: [PATCH 3/3] Point to `orchard` commit with `zcash_note_encryption 0.2` --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 874cb4da5..cc0491b3f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,6 @@ codegen-units = 1 [patch.crates-io] zcash_encoding = { path = "components/zcash_encoding" } zcash_note_encryption = { path = "components/zcash_note_encryption" } -orchard = { git = "https://github.com/zcash/orchard.git", rev = "33f1c1141e50adb68715f3359bd75378b4756cca" } +orchard = { git = "https://github.com/zcash/orchard.git", rev = "4035a97d178f99bb889f4d7ed26c59378fa88961" } schemer = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } schemer-rusqlite = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" }