v0.4.0 release

.github/workflows/publication.yml

@@ -14,5 +14,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: cargo login ${{ secrets.CRATES_IO_TOKEN }}
-      - run: cd derive && cargo publish --all-features; sleep 30
-      - run: cargo publish --all-features; sleep 30
+      - run: cargo publish --all-features

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "descriptor-wallet"
-version = "0.4.0-rc.1"
+version = "0.4.0"
 license = "Apache-2.0"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 description = "Library for building descriptor-based bitcoin wallets"
 repository = "https://github.com/rust-bitcoin/descriptor-wallet"
 homepage = "https://lnp-bp.org"
-keywords = ["bitcoin", "wallet", "cryptocurrency", "cryptography", "bip32"]
+keywords = ["bitcoin", "wallet", "cryptocurrency", "descriptor", "miniscript"]
 categories = ["cryptography::cryptocurrencies", "encoding", "parsing"]
 readme = "README.md"
 edition = "2018"

slip132/src/lib.rs

@@ -7,9 +7,9 @@
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache 2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 #![recursion_limit = "256"]
 // Coding conventions

src/address.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use std::convert::{TryFrom, TryInto};
 use std::fmt::{self, Display, Formatter};

src/bip32/components.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use regex::Regex;
 use std::fmt::{self, Display, Formatter};

src/bip32/mod.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 mod components;
 mod path;

src/bip32/path.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 #[cfg(feature = "serde")]
 use serde_with::{As, DisplayFromStr};

src/bip32/pubkeychain.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;

src/bip32/range.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use std::cmp::Ordering;
 use std::convert::TryFrom;

src/bip32/traits.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use bitcoin::util::bip32::{ChildNumber, DerivationPath};
 

src/bip32/xpubref.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use std::str::FromStr;
 

src/blockchain.rs

@@ -1,18 +1,16 @@
-// Rust language amplification library providing multiple generic trait
-// implementations, type wrappers, derive macros and other language enhancements
-//
-// Written in 2019-2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
-//     Martin Habovstiak <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 //! Blockchain-specific data types useful for wallets
 

src/descriptor/contract.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;

src/descriptor/deduction.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use amplify::Wrapper;
 use std::convert::TryFrom;

src/descriptor/derive.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use bitcoin::Script;
 use miniscript::{MiniscriptKey, TranslatePk2};

src/descriptor/generator.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 #[cfg(feature = "serde")]
 use serde_with::{As, DisplayFromStr};

src/descriptor/legacy.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 // TODO: Move this back to BPro library
 

src/descriptor/mod.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 //! General workflow for working with ScriptPubkey* types:
 //! ```text

src/descriptor/script.rs

@@ -1,15 +1,16 @@
-// LNP/BP Core Library implementing LNPBP specifications & standards
-// Written in 2020 by
+// Descriptor wallet library extending bitcoin & miniscript functionality
+// by LNP/BP Association (https://lnp-bp.org)
+// Written in 2020-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //
 // To the extent possible under law, the author(s) have dedicated all
 // copyright and related and neighboring rights to this software to
 // the public domain worldwide. This software is distributed without
 // any warranty.
 //
-// You should have received a copy of the MIT License
+// You should have received a copy of the Apache-2.0 License
 // along with this software.
-// If not, see <https://opensource.org/licenses/MIT>.
+// If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 #[cfg(feature = "serde")]
 use serde_with::{hex::Hex, As, DisplayFromStr};