Skip to content

Commit 8e7e59a

Browse files
apoelstraapoelstra
committed
Merge rust-bitcoin/rust-bitcoin#1076: Introduce SPDX license identifiers
91ff2f6 Introduce SPDX license identifiers (Tobin C. Harding) Pull request description: When `rust-bitcoin` was started in 2014 the SPDX license list and short identifiers where not a thing. Now that we have short identifiers and they are gaining popularity in other projects we can consider using them. - Add links to the SPDX website in the readme - Shorten the author section to a single line - Remove all the licence information in each file and replace it with an SPDX ID (see https://spdx.dev/ids/#how) Of note: - If the author of a file is explicitly listed, maintain this information - If the 'author' is listed as the generic 'Rust Bitcoin developers' just remove the attribution, this is implicit. This does loose the date info but that can be seen at any time from the git index using `git log --follow --format=%ad --date default <FILE> | tail -1` apoelstra, please confirm that I'm not treading on your toes here, especially, are you ok with the new 'written by' string format? ### Ref - https://spdx.dev/ids/#how - https://spdx.org/licenses/CC0-1.0.html - https://spdx.dev/ids/ ACKs for top commit: apoelstra: ACK 91ff2f6 sanket1729: ACK 91ff2f6. I am also in IDGAF camp, but I like more red lines in diff. Kixunil: ACK 91ff2f6 Tree-SHA512: ca8aac00f015c18ec18de83dfeb50dd6f4f840653c7def85daa2436a339021ada5f3c34ad0cdf6b18e3e39c45a6d58a8313742e4001d467785b10eee7fdbc938
2 parents 07692bb + 89c59ba commit 8e7e59a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+92
-590
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,5 @@ See [CHANGELOG.md](CHANGELOG.md).
158158
## Licensing
159159

160160
The code in this project is licensed under the [Creative Commons CC0 1.0
161-
Universal license](LICENSE).
161+
Universal license](LICENSE). We use the [SPDX license list](https://spdx.org/licenses/) and [SPDX
162+
IDs](https://spdx.dev/ids/).

‎src/blockdata/block.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Rust Bitcoin Library
2-
// Written in 2014 by
3-
// Andrew Poelstra <[email protected]>
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// Written in 2014 by Andrew Poelstra <[email protected]>
2+
// SPDX-License-Identifier: CC0-1.0
143

154
//! Bitcoin blocks.
165
//!

‎src/blockdata/constants.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Rust Bitcoin Library
2-
// Written in 2014 by
3-
// Andrew Poelstra <[email protected]>
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// Written in 2014 by Andrew Poelstra <[email protected]>
2+
// SPDX-License-Identifier: CC0-1.0
143

154
//! Blockdata constants.
165
//!

‎src/blockdata/mod.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Rust Bitcoin Library
2-
// Written in 2014 by
3-
// Andrew Poelstra <[email protected]>
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// Written in 2014 by Andrew Poelstra <[email protected]>
2+
// SPDX-License-Identifier: CC0-1.0
143

154
//! Bitcoin block data.
165
//!

‎src/blockdata/opcodes.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Rust Bitcoin Library
2-
// Written in 2014 by
3-
// Andrew Poelstra <[email protected]>
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// Written in 2014 by Andrew Poelstra <[email protected]>
2+
// SPDX-License-Identifier: CC0-1.0
143

154
//! Bitcoin script opcodes.
165
//!

‎src/blockdata/script.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Rust Bitcoin Library
2-
// Written in 2014 by
3-
// Andrew Poelstra <[email protected]>
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// Written in 2014 by Andrew Poelstra <[email protected]>
2+
// SPDX-License-Identifier: CC0-1.0
143

154
//! Bitcoin scripts.
165
//!

‎src/blockdata/transaction.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Rust Bitcoin Library
2-
// Written in 2014 by
3-
// Andrew Poelstra <[email protected]>
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// Written in 2014 by Andrew Poelstra <[email protected]>
2+
// SPDX-License-Identifier: CC0-1.0
143

154
//! Bitcoin transactions.
165
//!

‎src/blockdata/witness.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: CC0-1.0
2+
13
//! Witness
24
//!
35
//! This module contains the [`Witness`] struct and related methods to operate on it

‎src/consensus/encode.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Rust Bitcoin Library
2-
// Written in 2014 by
3-
// Andrew Poelstra <[email protected]>
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// Written in 2014 by Andrew Poelstra <[email protected]>
2+
// SPDX-License-Identifier: CC0-1.0
143

154
//! Bitcoin consensus-encodable types.
165
//!

‎src/consensus/mod.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
// Rust Bitcoin Library
2-
// Written by
3-
// The Rust Bitcoin developers
4-
//
5-
// To the extent possible under law, the author(s) have dedicated all
6-
// copyright and related and neighboring rights to this software to
7-
// the public domain worldwide. This software is distributed without
8-
// any warranty.
9-
//
10-
// You should have received a copy of the CC0 Public Domain Dedication
11-
// along with this software.
12-
// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
13-
//
1+
// SPDX-License-Identifier: CC0-1.0
142

153
//! Bitcoin consensus.
164
//!

0 commit comments

Comments
 (0)