From c7b0f3df3238c201376fbf13ef56b168d9fe3bc7 Mon Sep 17 00:00:00 2001 From: Daira Emma Hopwood Date: Mon, 18 Dec 2023 17:23:02 +0000 Subject: [PATCH] Switch orchard dependency to 0.7 and remove notices about the BOSL license exception, which are no longer needed. Signed-off-by: Daira Emma Hopwood --- Cargo.toml | 2 +- README.md | 11 ----------- zcash_client_backend/README.md | 10 ---------- zcash_client_sqlite/README.md | 10 ---------- zcash_extensions/README.md | 10 ---------- zcash_primitives/README.md | 10 ---------- zcash_proofs/README.md | 10 ---------- 7 files changed, 1 insertion(+), 62 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b66c8c36b2..a57b0e3e80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ jubjub = "0.10" # - Orchard nonempty = "0.7" -orchard = { version = "0.6", default-features = false } +orchard = { version = "0.7", default-features = false } # - Transparent hdwallet = "0.4" diff --git a/README.md b/README.md index c10053bd85..3df799fe0e 100644 --- a/README.md +++ b/README.md @@ -16,17 +16,6 @@ All code in this workspace is licensed under either of at your option. -Downstream code forks should note that some (but not all) of these crates -and components depend 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 for details of which -derived works can make use of this exception, and the `README.md` files in -subdirectories for which crates and components this applies to. - ### Contribution Unless you explicitly state otherwise, any contribution intentionally diff --git a/zcash_client_backend/README.md b/zcash_client_backend/README.md index eb8a6cd613..af9a7ff879 100644 --- a/zcash_client_backend/README.md +++ b/zcash_client_backend/README.md @@ -13,16 +13,6 @@ Licensed under either of at your option. -Downstream code forks should note that 'zcash_client_backend' 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 diff --git a/zcash_client_sqlite/README.md b/zcash_client_sqlite/README.md index fb71ab098b..af077e8d59 100644 --- a/zcash_client_sqlite/README.md +++ b/zcash_client_sqlite/README.md @@ -24,16 +24,6 @@ Licensed under either of at your option. -Downstream code forks should note that 'zcash_client_sqlite' 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 diff --git a/zcash_extensions/README.md b/zcash_extensions/README.md index 0b38603caf..b0af0d6cec 100644 --- a/zcash_extensions/README.md +++ b/zcash_extensions/README.md @@ -12,16 +12,6 @@ Licensed under either of at your option. -Downstream code forks should note that 'zcash_extensions' 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 diff --git a/zcash_primitives/README.md b/zcash_primitives/README.md index efa356ba3e..02a0c33a10 100644 --- a/zcash_primitives/README.md +++ b/zcash_primitives/README.md @@ -12,16 +12,6 @@ Licensed under either of at your option. -Downstream code forks should note that 'zcash_primitives' 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 diff --git a/zcash_proofs/README.md b/zcash_proofs/README.md index ccbdcfd73f..f365c5a38c 100644 --- a/zcash_proofs/README.md +++ b/zcash_proofs/README.md @@ -13,16 +13,6 @@ Licensed under either of at your option. -Downstream code forks should note that 'zcash_proofs' 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