Merge branch 'master' into ao-no-overlay

* master: prepare rlp-derive release (#344) Update/change licenses: MIT/Apache2.0 (#342) rlp-derive extracted (#343) Format for readme and changelog corrected (#341) Parity runtime moved to parity common for publication in crates.io (#271) Disable cache if explicit memory budget=0 passed (#339) [parity-crypto] prepare 0.5.0 (#336) [parity crypto]: remove unused depend `rustc_hex` (#337) Update doc comment (#335)
paritytech · Feb 13, 2020 · 488cb36 · 488cb36
2 parents 0784e54 + e5dd7d4
commit 488cb36
Show file tree

Hide file tree

Showing 159 changed files with 1,392 additions and 1,743 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ script:
   - cargo check --all --tests
   - cargo check --all --benches
   - cargo build --all
-  - cargo test --all --exclude uint --exclude fixed-hash
+  - cargo test --all --exclude uint --exclude fixed-hash --exclude parity-crypto
   - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then
     cd contract-address/ && cargo test --features=external_doc && cd ..;
     fi
@@ -48,6 +48,7 @@ script:
   - cd keccak-hash/ && cargo test --no-default-features && cd ..
   - cd plain_hasher/ && cargo test --no-default-features && cargo check --benches && cd ..
   - cd parity-bytes/ && cargo test --no-default-features && cd ..
+  - cd parity-crypto/ && cargo test --all-features && cd ..
   - cd parity-util-mem/ && cargo test --features=estimate-heapsize && cd ..
   - cd parity-util-mem/ && cargo test --features=jemalloc-global && cd ..
   - cd parity-util-mem/ && cargo test --features=mimalloc-global && cd ..

diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,8 @@ members = [
 	"parity-path",
 	"plain_hasher",
 	"rlp",
+	"rlp-derive",
+	"runtime",
 	"transaction-pool",
 	"trace-time",
 	"triehash",

diff --git a/LICENSE b/LICENSE
diff --git a/rlp/LICENSE-APACHE2 → LICENSE-APACHE2 b/rlp/LICENSE-APACHE2 → LICENSE-APACHE2
diff --git a/rlp/LICENSE-MIT → LICENSE-MIT b/rlp/LICENSE-MIT → LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2017 Parity Technologies
+Copyright (c) 2015-2020 Parity Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/contract-address/CHANGELOG.md b/contract-address/CHANGELOG.md
@@ -5,3 +5,4 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+- License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
diff --git a/contract-address/Cargo.toml b/contract-address/Cargo.toml
@@ -2,7 +2,7 @@
 name = "contract-address"
 version = "0.3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-license = "MIT"
+license = "MIT/Apache2.0"
 homepage = "https://github.com/paritytech/parity-common"
 repository = "https://github.com/paritytech/parity-common"
 description = "A utility crate to create an ethereum contract address"

diff --git a/contract-address/src/lib.rs b/contract-address/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
 
 #![cfg_attr(feature = "external_doc", feature(external_doc))]
 #![cfg_attr(feature = "external_doc", doc(include = "../README.md"))]

diff --git a/ethbloom/CHANGELOG.md b/ethbloom/CHANGELOG.md
@@ -6,7 +6,8 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 - Removed `libc` feature. [#317](https://github.com/paritytech/parity-common/pull/317)
+- License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
 
 ## [0.8.1] - 2019-10-24
 ### Dependencies
-- Updated dependencies (https://github.com/paritytech/parity-common/pull/239)
+- Updated dependencies. [#239](https://github.com/paritytech/parity-common/pull/239)
diff --git a/ethbloom/Cargo.toml b/ethbloom/Cargo.toml
@@ -3,7 +3,7 @@ name = "ethbloom"
 version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Ethereum bloom filter"
-license = "MIT"
+license = "MIT/Apache2.0"
 documentation = "https://docs.rs/ethbloom"
 homepage = "https://github.com/paritytech/parity-common"
 repository = "https://github.com/paritytech/parity-common"

diff --git a/ethbloom/benches/bloom.rs b/ethbloom/benches/bloom.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use criterion::{criterion_group, criterion_main, Criterion};
 use ethbloom::{Bloom, Input};
 use hex_literal::hex;

diff --git a/ethbloom/benches/unrolling.rs b/ethbloom/benches/unrolling.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use criterion::{criterion_group, criterion_main, Criterion};
 use crunchy::unroll;
 use rand::RngCore;

diff --git a/ethbloom/src/lib.rs b/ethbloom/src/lib.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 //!
 //! ```
 //! use hex_literal::hex;

diff --git a/ethereum-types/CHANGELOG.md b/ethereum-types/CHANGELOG.md
@@ -1,9 +1,11 @@
 # Changelog
 
-The format is based on [Keep a Changelog]. 
+The format is based on [Keep a Changelog].
 
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+- License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
+
 ### Added
-- uint error type is re-exported (https://github.com/paritytech/parity-common/pull/244)
+- Uint error type is re-exported. [#244](https://github.com/paritytech/parity-common/pull/244)
diff --git a/ethereum-types/Cargo.toml b/ethereum-types/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ethereum-types"
 version = "0.8.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-license = "MIT"
+license = "MIT/Apache2.0"
 homepage = "https://github.com/paritytech/parity-common"
 description = "Ethereum types"
 edition = "2018"

diff --git a/ethereum-types/src/hash.rs b/ethereum-types/src/hash.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use crate::{U128, U256, U512, U64};
 use fixed_hash::*;
 use impl_rlp::impl_fixed_hash_rlp;

diff --git a/ethereum-types/src/lib.rs b/ethereum-types/src/lib.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod hash;

diff --git a/ethereum-types/src/uint.rs b/ethereum-types/src/uint.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use impl_rlp::impl_uint_rlp;
 #[cfg(feature = "serialize")]
 use impl_serde::impl_uint_serde;

diff --git a/ethereum-types/tests/serde.rs b/ethereum-types/tests/serde.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 Parity Technologies
+// Copyright 2020 Parity Technologies
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

diff --git a/fixed-hash/CHANGELOG.md b/fixed-hash/CHANGELOG.md
@@ -6,11 +6,12 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 - Removed `libc` feature. [#317](https://github.com/paritytech/parity-common/pull/317)
+- License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
 
 ## [0.5.2] - 2019-12-19
 ### Fixed
-- re-export `alloc` for both std and no-std to fix compilation (See [PR #268](https://github.com/paritytech/parity-common/pull/268))
+- Re-export `alloc` for both std and no-std to fix compilation. [#268](https://github.com/paritytech/parity-common/pull/268)
 
 ## [0.5.1] - 2019-10-24
 ### Dependencies
-- Updated dependencies (https://github.com/paritytech/parity-common/pull/239)
+- Updated dependencies. [#239](https://github.com/paritytech/parity-common/pull/239)
diff --git a/fixed-hash/Cargo.toml b/fixed-hash/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fixed-hash"
 version = "0.5.2"
 authors = ["Parity Technologies <admin@parity.io>"]
-license = "MIT"
+license = "MIT/Apache2.0"
 homepage = "https://github.com/paritytech/parity-common"
 repository = "https://github.com/paritytech/parity-common"
 description = "Macros to define custom fixed-size hash types"

diff --git a/fixed-hash/src/hash.rs b/fixed-hash/src/hash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

diff --git a/fixed-hash/src/lib.rs b/fixed-hash/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

diff --git a/fixed-hash/src/tests.rs b/fixed-hash/src/tests.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 construct_fixed_hash! { pub struct H32(4); }
 construct_fixed_hash! { pub struct H64(8); }
 construct_fixed_hash! { pub struct H128(16); }

diff --git a/keccak-hash/CHANGELOG.md b/keccak-hash/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Changelog
 
-The format is based on [Keep a Changelog]. 
+The format is based on [Keep a Changelog].
 
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+- License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
 
 ## [0.4.1] - 2019-10-24
 ### Dependencies
-- Updated dependencies (https://github.com/paritytech/parity-common/pull/239)
+- Updated dependencies. [#239](https://github.com/paritytech/parity-common/pull/239)
diff --git a/keccak-hash/Cargo.toml b/keccak-hash/Cargo.toml
@@ -5,7 +5,7 @@ description = "`keccak-hash` is a set of utility functions to facilitate working
 authors = ["Parity Technologies <admin@parity.io>"]
 repository = "https://github.com/paritytech/parity-common"
 readme = "README.md"
-license = "GPL-3.0"
+license = "MIT/Apache-2.0"
 edition = "2018"
 
 [dependencies]

diff --git a/keccak-hash/benches/keccak_256.rs b/keccak-hash/benches/keccak_256.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use keccak_hash::keccak;

diff --git a/keccak-hash/src/lib.rs b/keccak-hash/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 

diff --git a/kvdb-memorydb/CHANGELOG.md b/kvdb-memorydb/CHANGELOG.md
@@ -5,8 +5,9 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+- License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
 ### Breaking
-- Updated to the new `kvdb` interface. [#313](https://github.com/paritytech/parity-common/pull/313) 
+- Updated to the new `kvdb` interface. [#313](https://github.com/paritytech/parity-common/pull/313)
 
 ## [0.4.0] - 2019-02-05
 - Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)
@@ -20,7 +21,6 @@ The format is based on [Keep a Changelog].
 ## [0.2.0] - 2019-12-19
 ### Fixed
 - `iter_from_prefix` behaviour synced with the `kvdb-rocksdb`
-
 ### Changed
 - Default column support removed from the API
   - Column argument type changed from `Option<u32>` to `u32`

diff --git a/kvdb-memorydb/Cargo.toml b/kvdb-memorydb/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.4.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 repository = "https://github.com/paritytech/parity-common"
 description = "A key-value in-memory database that implements the  `KeyValueDB` trait"
-license = "GPL-3.0"
+license = "MIT/Apache-2.0"
 edition = "2018"
 
 [dependencies]

diff --git a/kvdb-memorydb/src/lib.rs b/kvdb-memorydb/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
 
 use kvdb::{DBOp, DBTransaction, DBValue, KeyValueDB};
 use parity_util_mem::MallocSizeOf;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ The format is based on [Keep a Changelog].
		[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/

		## [Unreleased]
		- License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)