Skip to content

Commit

Permalink
Switch orchard dependency to 0.6.1 and remove notices about the BOSL …
Browse files Browse the repository at this point in the history
…license

exception, which are no longer needed.

Signed-off-by: Daira Emma Hopwood <[email protected]>
  • Loading branch information
daira committed Dec 18, 2023
1 parent 79e499e commit 6358a62
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 62 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jubjub = "0.10"

# - Orchard
nonempty = "0.7"
orchard = { version = "0.6", default-features = false }
orchard = { version = "0.6.1", default-features = false }

# - Transparent
hdwallet = "0.4"
Expand Down
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/zcash/orchard/blob/main/COPYING> 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
Expand Down
10 changes: 0 additions & 10 deletions zcash_client_backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions zcash_client_sqlite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions zcash_extensions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions zcash_primitives/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions zcash_proofs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6358a62

Please sign in to comment.