From 984fe694489f75c3f895cb677edad28f2396053c Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 1 May 2023 09:19:35 +1000 Subject: [PATCH] bitcoin: Remove attribution from all files Currently we have a mishmash of attribution lines accompanying the SPDX identifier. These lines are basically meaningless because: - The date is often wrong - The original author attributed is not the only contributor to a file - The term "rust bitcoin developers" is basically just noise Just remove all the attribution lines and be done with it. While we are at it add an SPDX line to the few files missing it, whether this license nonsense is even needed is left as an argument for another day. --- bitcoin/src/address.rs | 1 - bitcoin/src/base58.rs | 1 - bitcoin/src/bip158.rs | 1 - bitcoin/src/bip32.rs | 1 - bitcoin/src/blockdata/block.rs | 1 - bitcoin/src/blockdata/constants.rs | 1 - bitcoin/src/blockdata/fee_rate.rs | 2 ++ bitcoin/src/blockdata/locktime/absolute.rs | 1 - bitcoin/src/blockdata/locktime/mod.rs | 1 - bitcoin/src/blockdata/locktime/relative.rs | 1 - bitcoin/src/blockdata/mod.rs | 1 - bitcoin/src/blockdata/opcodes.rs | 1 - bitcoin/src/blockdata/script/borrowed.rs | 1 - bitcoin/src/blockdata/script/builder.rs | 1 - bitcoin/src/blockdata/script/instruction.rs | 1 - bitcoin/src/blockdata/script/mod.rs | 1 - bitcoin/src/blockdata/script/owned.rs | 1 - bitcoin/src/blockdata/script/push_bytes.rs | 2 ++ bitcoin/src/blockdata/script/tests.rs | 2 ++ bitcoin/src/blockdata/transaction.rs | 1 - bitcoin/src/blockdata/weight.rs | 2 ++ bitcoin/src/consensus/encode.rs | 1 - bitcoin/src/consensus/params.rs | 1 - bitcoin/src/consensus/serde.rs | 2 ++ bitcoin/src/crypto/ecdsa.rs | 1 - bitcoin/src/crypto/key.rs | 1 - bitcoin/src/crypto/mod.rs | 1 - bitcoin/src/crypto/taproot.rs | 1 - bitcoin/src/error.rs | 2 ++ bitcoin/src/hash_types.rs | 1 - bitcoin/src/internal_macros.rs | 1 - bitcoin/src/lib.rs | 1 - bitcoin/src/merkle_tree/block.rs | 1 - bitcoin/src/merkle_tree/mod.rs | 1 - bitcoin/src/network/address.rs | 1 - bitcoin/src/network/constants.rs | 1 - bitcoin/src/network/message.rs | 1 - bitcoin/src/network/message_blockdata.rs | 1 - bitcoin/src/network/message_compact_blocks.rs | 2 ++ bitcoin/src/network/message_network.rs | 1 - bitcoin/src/network/mod.rs | 1 - bitcoin/src/parse.rs | 2 ++ bitcoin/src/policy.rs | 1 - bitcoin/src/pow.rs | 1 - bitcoin/src/sign_message.rs | 1 - bitcoin/src/test_macros.rs | 1 - bitcoin/src/util/mod.rs | 1 - 47 files changed, 16 insertions(+), 39 deletions(-) diff --git a/bitcoin/src/address.rs b/bitcoin/src/address.rs index 533a83ef2..606f5ac4f 100644 --- a/bitcoin/src/address.rs +++ b/bitcoin/src/address.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin addresses. diff --git a/bitcoin/src/base58.rs b/bitcoin/src/base58.rs index 99321c10a..98fea7cf4 100644 --- a/bitcoin/src/base58.rs +++ b/bitcoin/src/base58.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Base58 encoder and decoder. diff --git a/bitcoin/src/bip158.rs b/bitcoin/src/bip158.rs index b7009fe88..2f794ca80 100644 --- a/bitcoin/src/bip158.rs +++ b/bitcoin/src/bip158.rs @@ -1,4 +1,3 @@ -// Written in 2019 by Tammas Blummer. // SPDX-License-Identifier: CC0-1.0 // This module was largely copied from https://github.com/rust-bitcoin/murmel/blob/master/src/blockfilter.rs diff --git a/bitcoin/src/bip32.rs b/bitcoin/src/bip32.rs index f30f0d032..31d7fce32 100644 --- a/bitcoin/src/bip32.rs +++ b/bitcoin/src/bip32.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! BIP32 implementation. diff --git a/bitcoin/src/blockdata/block.rs b/bitcoin/src/blockdata/block.rs index 0065903ff..b496787a8 100644 --- a/bitcoin/src/blockdata/block.rs +++ b/bitcoin/src/blockdata/block.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin blocks. diff --git a/bitcoin/src/blockdata/constants.rs b/bitcoin/src/blockdata/constants.rs index b88eeb123..3e55e8dd6 100644 --- a/bitcoin/src/blockdata/constants.rs +++ b/bitcoin/src/blockdata/constants.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Blockdata constants. diff --git a/bitcoin/src/blockdata/fee_rate.rs b/bitcoin/src/blockdata/fee_rate.rs index a0686bdaf..45f83322f 100644 --- a/bitcoin/src/blockdata/fee_rate.rs +++ b/bitcoin/src/blockdata/fee_rate.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + //! Implements `FeeRate` and assoctiated features. use core::fmt; diff --git a/bitcoin/src/blockdata/locktime/absolute.rs b/bitcoin/src/blockdata/locktime/absolute.rs index a755d065f..957a50e08 100644 --- a/bitcoin/src/blockdata/locktime/absolute.rs +++ b/bitcoin/src/blockdata/locktime/absolute.rs @@ -1,4 +1,3 @@ -// Rust Bitcoin Library - Written by the rust-bitcoin developers. // SPDX-License-Identifier: CC0-1.0 //! Provides type [`LockTime`] that implements the logic around nLockTime/OP_CHECKLOCKTIMEVERIFY. diff --git a/bitcoin/src/blockdata/locktime/mod.rs b/bitcoin/src/blockdata/locktime/mod.rs index 5100d702f..c09d3323c 100644 --- a/bitcoin/src/blockdata/locktime/mod.rs +++ b/bitcoin/src/blockdata/locktime/mod.rs @@ -1,4 +1,3 @@ -// Rust Bitcoin Library - Written by the rust-bitcoin developers. // SPDX-License-Identifier: CC0-1.0 //! Provides absolute and relative locktimes. diff --git a/bitcoin/src/blockdata/locktime/relative.rs b/bitcoin/src/blockdata/locktime/relative.rs index 21fb237ef..4d596acc8 100644 --- a/bitcoin/src/blockdata/locktime/relative.rs +++ b/bitcoin/src/blockdata/locktime/relative.rs @@ -1,4 +1,3 @@ -// Rust Bitcoin Library - Written by the rust-bitcoin developers. // SPDX-License-Identifier: CC0-1.0 //! Provides type [`LockTime`] that implements the logic around nSequence/OP_CHECKSEQUENCEVERIFY. diff --git a/bitcoin/src/blockdata/mod.rs b/bitcoin/src/blockdata/mod.rs index 12cc342a7..234f16234 100644 --- a/bitcoin/src/blockdata/mod.rs +++ b/bitcoin/src/blockdata/mod.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin block data. diff --git a/bitcoin/src/blockdata/opcodes.rs b/bitcoin/src/blockdata/opcodes.rs index 296e8a652..76ddbce86 100644 --- a/bitcoin/src/blockdata/opcodes.rs +++ b/bitcoin/src/blockdata/opcodes.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin script opcodes. diff --git a/bitcoin/src/blockdata/script/borrowed.rs b/bitcoin/src/blockdata/script/borrowed.rs index b98071382..aad2f5575 100644 --- a/bitcoin/src/blockdata/script/borrowed.rs +++ b/bitcoin/src/blockdata/script/borrowed.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 use core::convert::{TryFrom, TryInto}; diff --git a/bitcoin/src/blockdata/script/builder.rs b/bitcoin/src/blockdata/script/builder.rs index 56f4fef09..15eaee446 100644 --- a/bitcoin/src/blockdata/script/builder.rs +++ b/bitcoin/src/blockdata/script/builder.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 #[cfg(feature = "bitcoinconsensus")] diff --git a/bitcoin/src/blockdata/script/instruction.rs b/bitcoin/src/blockdata/script/instruction.rs index 25e241ba0..8d8248077 100644 --- a/bitcoin/src/blockdata/script/instruction.rs +++ b/bitcoin/src/blockdata/script/instruction.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 use core::convert::TryInto; diff --git a/bitcoin/src/blockdata/script/mod.rs b/bitcoin/src/blockdata/script/mod.rs index 596f89189..c3cab10f8 100644 --- a/bitcoin/src/blockdata/script/mod.rs +++ b/bitcoin/src/blockdata/script/mod.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin scripts. diff --git a/bitcoin/src/blockdata/script/owned.rs b/bitcoin/src/blockdata/script/owned.rs index feaf27f7d..0eea48969 100644 --- a/bitcoin/src/blockdata/script/owned.rs +++ b/bitcoin/src/blockdata/script/owned.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 #[cfg(doc)] diff --git a/bitcoin/src/blockdata/script/push_bytes.rs b/bitcoin/src/blockdata/script/push_bytes.rs index 141c012c1..ac2b91384 100644 --- a/bitcoin/src/blockdata/script/push_bytes.rs +++ b/bitcoin/src/blockdata/script/push_bytes.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + //! Contains `PushBytes` & co use core::borrow::{Borrow, BorrowMut}; diff --git a/bitcoin/src/blockdata/script/tests.rs b/bitcoin/src/blockdata/script/tests.rs index 1675649eb..464c121f0 100644 --- a/bitcoin/src/blockdata/script/tests.rs +++ b/bitcoin/src/blockdata/script/tests.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + use core::str::FromStr; use hashes::Hash; diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index feebd93de..62b28f616 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin transactions. diff --git a/bitcoin/src/blockdata/weight.rs b/bitcoin/src/blockdata/weight.rs index 99168fbfe..949ecbac9 100644 --- a/bitcoin/src/blockdata/weight.rs +++ b/bitcoin/src/blockdata/weight.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + //! Implements `Weight` and associated features. use core::fmt; diff --git a/bitcoin/src/consensus/encode.rs b/bitcoin/src/consensus/encode.rs index ccd901032..6fc6a5885 100644 --- a/bitcoin/src/consensus/encode.rs +++ b/bitcoin/src/consensus/encode.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin consensus-encodable types. diff --git a/bitcoin/src/consensus/params.rs b/bitcoin/src/consensus/params.rs index 07b5ff8df..cd9cb5bc1 100644 --- a/bitcoin/src/consensus/params.rs +++ b/bitcoin/src/consensus/params.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin consensus parameters. diff --git a/bitcoin/src/consensus/serde.rs b/bitcoin/src/consensus/serde.rs index 01f3de071..c23936351 100644 --- a/bitcoin/src/consensus/serde.rs +++ b/bitcoin/src/consensus/serde.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + //! Serde serialization via consensus encoding //! //! This provides functions for (de)serializing any type as consensus-encoded bytes. diff --git a/bitcoin/src/crypto/ecdsa.rs b/bitcoin/src/crypto/ecdsa.rs index 68743ee39..65f94446d 100644 --- a/bitcoin/src/crypto/ecdsa.rs +++ b/bitcoin/src/crypto/ecdsa.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! ECDSA Bitcoin signatures. diff --git a/bitcoin/src/crypto/key.rs b/bitcoin/src/crypto/key.rs index 14f23e1b9..5182c47a0 100644 --- a/bitcoin/src/crypto/key.rs +++ b/bitcoin/src/crypto/key.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin keys. diff --git a/bitcoin/src/crypto/mod.rs b/bitcoin/src/crypto/mod.rs index a567fc68a..82c412790 100644 --- a/bitcoin/src/crypto/mod.rs +++ b/bitcoin/src/crypto/mod.rs @@ -1,4 +1,3 @@ -// Rust Bitcoin Library - Written by the rust-bitcoin developers. // SPDX-License-Identifier: CC0-1.0 //! Cryptography diff --git a/bitcoin/src/crypto/taproot.rs b/bitcoin/src/crypto/taproot.rs index eddc911d2..ffb34c630 100644 --- a/bitcoin/src/crypto/taproot.rs +++ b/bitcoin/src/crypto/taproot.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin taproot keys. diff --git a/bitcoin/src/error.rs b/bitcoin/src/error.rs index 3d3fb4c87..0dbc61995 100644 --- a/bitcoin/src/error.rs +++ b/bitcoin/src/error.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + //! Contains error types and other error handling tools. use core::fmt; diff --git a/bitcoin/src/hash_types.rs b/bitcoin/src/hash_types.rs index 4fbb85070..b9b9f9890 100644 --- a/bitcoin/src/hash_types.rs +++ b/bitcoin/src/hash_types.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin hash types. diff --git a/bitcoin/src/internal_macros.rs b/bitcoin/src/internal_macros.rs index c48893f83..ae0e54f60 100644 --- a/bitcoin/src/internal_macros.rs +++ b/bitcoin/src/internal_macros.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Internal macros. diff --git a/bitcoin/src/lib.rs b/bitcoin/src/lib.rs index 6013d45a7..1a6f2ea19 100644 --- a/bitcoin/src/lib.rs +++ b/bitcoin/src/lib.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! # Rust Bitcoin Library diff --git a/bitcoin/src/merkle_tree/block.rs b/bitcoin/src/merkle_tree/block.rs index 5cd470a48..1de353cae 100644 --- a/bitcoin/src/merkle_tree/block.rs +++ b/bitcoin/src/merkle_tree/block.rs @@ -1,4 +1,3 @@ -// Written by John L. Jegutanis // SPDX-License-Identifier: CC0-1.0 // // This code was translated from merkleblock.h, merkleblock.cpp and pmt_tests.cpp diff --git a/bitcoin/src/merkle_tree/mod.rs b/bitcoin/src/merkle_tree/mod.rs index f01c2ef19..c120d8fae 100644 --- a/bitcoin/src/merkle_tree/mod.rs +++ b/bitcoin/src/merkle_tree/mod.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin merkle tree functions. diff --git a/bitcoin/src/network/address.rs b/bitcoin/src/network/address.rs index d9544b5cb..3dec4f14c 100644 --- a/bitcoin/src/network/address.rs +++ b/bitcoin/src/network/address.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin network addresses. diff --git a/bitcoin/src/network/constants.rs b/bitcoin/src/network/constants.rs index 1259cb5a4..aceb274d7 100644 --- a/bitcoin/src/network/constants.rs +++ b/bitcoin/src/network/constants.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin network constants. diff --git a/bitcoin/src/network/message.rs b/bitcoin/src/network/message.rs index 1406f7e38..c083945db 100644 --- a/bitcoin/src/network/message.rs +++ b/bitcoin/src/network/message.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin network messages. diff --git a/bitcoin/src/network/message_blockdata.rs b/bitcoin/src/network/message_blockdata.rs index a1a63aba5..64273b7bd 100644 --- a/bitcoin/src/network/message_blockdata.rs +++ b/bitcoin/src/network/message_blockdata.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin blockdata network messages. diff --git a/bitcoin/src/network/message_compact_blocks.rs b/bitcoin/src/network/message_compact_blocks.rs index 8827e5435..662460528 100644 --- a/bitcoin/src/network/message_compact_blocks.rs +++ b/bitcoin/src/network/message_compact_blocks.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + //! //! BIP152 Compact Blocks network messages //! diff --git a/bitcoin/src/network/message_network.rs b/bitcoin/src/network/message_network.rs index 16c41f0cb..b49974f5d 100644 --- a/bitcoin/src/network/message_network.rs +++ b/bitcoin/src/network/message_network.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin network-related network messages. diff --git a/bitcoin/src/network/mod.rs b/bitcoin/src/network/mod.rs index 18855f72b..2e3796867 100644 --- a/bitcoin/src/network/mod.rs +++ b/bitcoin/src/network/mod.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin network support. diff --git a/bitcoin/src/parse.rs b/bitcoin/src/parse.rs index 4da004280..777a5038e 100644 --- a/bitcoin/src/parse.rs +++ b/bitcoin/src/parse.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: CC0-1.0 + use core::convert::TryFrom; use core::fmt; use core::str::FromStr; diff --git a/bitcoin/src/policy.rs b/bitcoin/src/policy.rs index 8390061af..6bda6608e 100644 --- a/bitcoin/src/policy.rs +++ b/bitcoin/src/policy.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin policy. diff --git a/bitcoin/src/pow.rs b/bitcoin/src/pow.rs index 7feb8f3fc..9630ed500 100644 --- a/bitcoin/src/pow.rs +++ b/bitcoin/src/pow.rs @@ -1,4 +1,3 @@ -// Rust Bitcoin Library - Written by the rust-bitcoin developers. // SPDX-License-Identifier: CC0-1.0 //! Proof-of-work related integer types. diff --git a/bitcoin/src/sign_message.rs b/bitcoin/src/sign_message.rs index e4cba47f0..52f445a4f 100644 --- a/bitcoin/src/sign_message.rs +++ b/bitcoin/src/sign_message.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Signature diff --git a/bitcoin/src/test_macros.rs b/bitcoin/src/test_macros.rs index 542ffa2db..cbcbd4bd5 100644 --- a/bitcoin/src/test_macros.rs +++ b/bitcoin/src/test_macros.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Bitcoin serde macros. diff --git a/bitcoin/src/util/mod.rs b/bitcoin/src/util/mod.rs index 7f73179d7..537e35acb 100644 --- a/bitcoin/src/util/mod.rs +++ b/bitcoin/src/util/mod.rs @@ -1,4 +1,3 @@ -// Written in 2014 by Andrew Poelstra // SPDX-License-Identifier: CC0-1.0 //! Utility functions.