Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(legal): Use correct licenses for tower-batch-control and zebra-network #6927

Merged
merged 2 commits into from
Jun 12, 2023

Conversation

teor2345
Copy link
Contributor

@teor2345 teor2345 commented Jun 12, 2023

Motivation

Some code in Zebra was copied from MIT-only open source projects.

Specifications

The licensing requirement from the MIT license text is:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

https://github.com/tower-rs/tower/blob/bf4ea948346c59a5be03563425a7d9f04aadedf2/LICENSE#L13-L15

The required copyright notice is:

Copyright (c) 2019 Tower Contributors

https://github.com/tower-rs/tower/blob/bf4ea948346c59a5be03563425a7d9f04aadedf2/LICENSE#LL1C1-L1C38

Solution

Legal requirements:

  • Make tower-batch-control and zebra-network MIT-only
  • Include the Tower copyright notice

Other useful changes:

  • Say where the code was copied from
  • Say that the license is deliberately different to the rest of Zebra

Review

@dconnolly is doing PR #6908.

Reviewer Checklist

  • Will the PR name make sense to users?
    • Does it need extra CHANGELOG info? (new features, breaking changes, large changes)
  • Are the PR labels correct?
  • Does the code do what the ticket and PR says?
    • Does it change concurrent code, unsafe code, or consensus rules?
  • How do you know it works? Does it have tests?

Follow Up Work

I opened a ticket in the other developer's tower-batch fork, to let them know the license they copied is incorrect:
chmodas/tower-batch#15

@teor2345 teor2345 added C-bug Category: This is a bug A-docs Area: Documentation P-Critical 🚑 A-legal Area: Changes that could have legal impacts labels Jun 12, 2023
@teor2345 teor2345 self-assigned this Jun 12, 2023
@teor2345 teor2345 requested review from a team as code owners June 12, 2023 23:35
@teor2345 teor2345 requested review from oxarbitrage and removed request for a team June 12, 2023 23:35
@teor2345 teor2345 merged commit 7632aef into publish-tower-batch-control Jun 12, 2023
@teor2345 teor2345 deleted the tower-batch-control-license branch June 12, 2023 23:40
mergify bot pushed a commit that referenced this pull request Jun 13, 2023
* change(crates): Publish tower-batch-control

* Cargo fields for zebra-test

* Cargo fields for tower-fallback

* Cargo fields for zebra-chain

* Cargo fields for zebra-consensus

* Cargo fields for zebra-network

* Cargo fields for zebra-node-services

* Cargo fields for zebra-rpc

* Cargo fields for zebra-script

* Cargo fields for zebra-state

* Cargo fields for zebrad

* Cargo fields for zebra-test

* Include zebra-test version and path for zebra-chain

* Include zebra-chain version and path for zebra-node-services

* Include zebra-chain version and path for zebra-script

* Include zebra-chain and zebra-test versions and paths for zebra-state

* Include zebra-* versions and paths for zebra-consensus

* Include zebra-* and tower-fallback versions and paths for tower-batch-control

* Include tower-* versions and paths for zebra-consensus

* Fixed tower-fallback license string

* Remove versions for dev-dependencise

* Update zebra-rpc/Cargo.toml

Co-authored-by: teor <[email protected]>

* tower-batch-control license MUST remain MIT only

* Align zebra-network with upstream tower's MIT license

* Update zebra-test/Cargo.toml

Co-authored-by: teor <[email protected]>

* Update zebra-utils/Cargo.toml

Co-authored-by: teor <[email protected]>

* fix(legal): Use correct licenses for tower-batch-control and zebra-network (#6927)

* Don't modify whitespace

* Resolve rustdoc and cargo-release warnings

* Add missing zebra internal dependency versions

* Workaround missing zebra-utils test dependency in zebrad test-only feature

* Fix missing zebra internal dependency versions

* Add README, home page, and search terms to every crate

* Fix README publish warnings

* Change tower crates to beta versions

* Add zebra-utils to the list of allowed unused dependencies

* Update tower-batch-control/Cargo.toml

* Update tower-fallback/Cargo.toml

---------

Co-authored-by: teor <[email protected]>
mergify bot pushed a commit that referenced this pull request Jun 14, 2023
* Include zebra-* and tower-fallback versions and paths for tower-batch-control

* Remove versions for dev-dependencise

* fix(legal): Use correct licenses for tower-batch-control and zebra-network (#6927)

* Don't modify whitespace

* Resolve rustdoc and cargo-release warnings

* Bump semver

* Re-up Cargo.lock

* Update README.md

Co-authored-by: teor <[email protected]>

* Update book/src/user/docker.md

Co-authored-by: teor <[email protected]>

* Update 'Future Work' section post stable release

* Add release notes to CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: teor <[email protected]>

* Remove Docker container change from the changelog

Co-authored-by: teor <[email protected]>

* Point at the appropriate zebra-* crate versions

* Update ESTIMATED_RELEASE_HEIGHT to 2,121,200

* Add CHANGELOG summary of the 1.0.0 release

* Update CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: teor <[email protected]>

* Bump tower-* beta.* versions and use them

---------

Co-authored-by: teor <[email protected]>
Co-authored-by: Pili Guerra <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-docs Area: Documentation A-legal Area: Changes that could have legal impacts C-bug Category: This is a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants