diff --git a/Cargo.toml b/Cargo.toml
index 3410feedf..60c3ee65e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,8 @@ members = [
"parity-path",
"plain_hasher",
"rlp",
+ "rlp-derive",
+ "runtime",
"transaction-pool",
"trace-time",
"triehash",
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 94a9ed024..000000000
--- a/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program 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.
-
- This program 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 this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
diff --git a/rlp/LICENSE-APACHE2 b/LICENSE-APACHE2
similarity index 100%
rename from rlp/LICENSE-APACHE2
rename to LICENSE-APACHE2
diff --git a/rlp/LICENSE-MIT b/LICENSE-MIT
similarity index 95%
rename from rlp/LICENSE-MIT
rename to LICENSE-MIT
index cd8fdd2b9..b2d52b66d 100644
--- a/rlp/LICENSE-MIT
+++ b/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
index 927c9dc9c..546bc458e 100644
--- 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
index 8b4f05682..21486e7a2 100644
--- a/contract-address/Cargo.toml
+++ b/contract-address/Cargo.toml
@@ -2,7 +2,7 @@
name = "contract-address"
version = "0.3.0"
authors = ["Parity Technologies "]
-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
index 1d4068d7d..787f8b06f 100644
--- 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , 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
index 1edf138b9..6c13f6f0a 100644
--- 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
index f9f9960fb..cbf9112a0 100644
--- a/ethbloom/Cargo.toml
+++ b/ethbloom/Cargo.toml
@@ -3,7 +3,7 @@ name = "ethbloom"
version = "0.8.1"
authors = ["Parity Technologies "]
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
index 005cfd88f..f3de3b7b0 100644
--- 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 or the MIT license
+// , 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
index 5fd6883ce..647528eb9 100644
--- 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 or the MIT license
+// , 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
index 49a18214f..c12f5cab8 100644
--- 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 or the MIT license
+// , 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
index 6fad76681..6b214e75b 100644
--- 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
index 8153ea823..b706f2873 100644
--- a/ethereum-types/Cargo.toml
+++ b/ethereum-types/Cargo.toml
@@ -2,7 +2,7 @@
name = "ethereum-types"
version = "0.8.0"
authors = ["Parity Technologies "]
-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
index 9fe385c5b..9e2057dec 100644
--- 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 or the MIT license
+// , 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
index 9bc756ba0..d94ae57c0 100644
--- 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 or the MIT license
+// , 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
index 5cf35feae..87d09541c 100644
--- 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 or the MIT license
+// , 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
index 4a92241cf..15796c3c7 100644
--- 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 or the MIT license
diff --git a/fixed-hash/CHANGELOG.md b/fixed-hash/CHANGELOG.md
index adf179a5e..f486d7847 100644
--- 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
index c12d35c57..41bf7d237 100644
--- a/fixed-hash/Cargo.toml
+++ b/fixed-hash/Cargo.toml
@@ -2,7 +2,7 @@
name = "fixed-hash"
version = "0.5.2"
authors = ["Parity Technologies "]
-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
index 46f5c7748..e7fdf0e4c 100644
--- 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 or the MIT license
diff --git a/fixed-hash/src/lib.rs b/fixed-hash/src/lib.rs
index 027ba2284..748101c9f 100644
--- 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 or the MIT license
diff --git a/fixed-hash/src/tests.rs b/fixed-hash/src/tests.rs
index da14bed13..33c1956b7 100644
--- 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 or the MIT license
+// , 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
index c1208e434..429e3bc13 100644
--- 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
index 3d7d88943..49c9506dd 100644
--- 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 "]
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
index 5c5794bf5..97e9ee13d 100644
--- 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , 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
index e66650b39..e9f410672 100644
--- 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , 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
index f2f80a709..3da9b9203 100644
--- a/kvdb-memorydb/CHANGELOG.md
+++ b/kvdb-memorydb/CHANGELOG.md
@@ -5,6 +5,7 @@ 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.0] - 2019-02-05
- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)
@@ -18,7 +19,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` to `u32`
diff --git a/kvdb-memorydb/Cargo.toml b/kvdb-memorydb/Cargo.toml
index 954a1e117..24d6a9991 100644
--- a/kvdb-memorydb/Cargo.toml
+++ b/kvdb-memorydb/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.4.0"
authors = ["Parity Technologies "]
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
index 1f40d24cc..51bac41f0 100644
--- 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , 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;
diff --git a/kvdb-rocksdb/CHANGELOG.md b/kvdb-rocksdb/CHANGELOG.md
index 10710343c..840e60b2f 100644
--- a/kvdb-rocksdb/CHANGELOG.md
+++ b/kvdb-rocksdb/CHANGELOG.md
@@ -6,8 +6,12 @@ The format is based on [Keep a Changelog].
## [Unreleased]
+## [0.6.0] - 2019-02-28
+- License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
+- Added `get_statistics` method and `enable_statistics` config parameter. [#347](https://github.com/paritytech/parity-common/pull/347)
+
## [0.5.0] - 2019-02-05
-- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332
+- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)
## [0.4.2] - 2019-02-04
### Fixes
@@ -21,10 +25,10 @@ The format is based on [Keep a Changelog].
- Support querying memory footprint via `MallocSizeOf` trait. [#292](https://github.com/paritytech/parity-common/pull/292)
## [0.3.0] - 2019-12-19
-- Use `get_pinned` API to save one allocation for each call to `get()` (See [PR #274](https://github.com/paritytech/parity-common/pull/274) for details)
-- Rename `drop_column` to `remove_last_column` (See [PR #274](https://github.com/paritytech/parity-common/pull/274) for details)
-- Rename `get_cf` to `cf` (See [PR #274](https://github.com/paritytech/parity-common/pull/274) for details)
-- Default column support removed from the API (See [PR #278](https://github.com/paritytech/parity-common/pull/278) for details)
+- Use `get_pinned` API to save one allocation for each call to `get()`. [#274](https://github.com/paritytech/parity-common/pull/274)
+- Rename `drop_column` to `remove_last_column`. [#274](https://github.com/paritytech/parity-common/pull/274)
+- Rename `get_cf` to `cf`. [#274](https://github.com/paritytech/parity-common/pull/274)
+- Default column support removed from the API. [#278](https://github.com/paritytech/parity-common/pull/278)
- Column argument type changed from `Option` to `u32`
- Migration
- Column index `None` -> unsupported, `Some(0)` -> `0`, `Some(1)` -> `1`, etc.
@@ -32,16 +36,16 @@ The format is based on [Keep a Changelog].
- `DatabaseConfig::default()` defaults to 1 column
- `Database::with_columns` still accepts `u32`, but panics if `0` is provided
- `Database::open` panics if configuration with 0 columns is provided
-- Add `num_keys(col)` to get an estimate of the number of keys in a column (See [PR #285](https://github.com/paritytech/parity-common/pull/285)).
-- Remove `ElasticArray` and use the new `DBValue` (alias for `Vec`) and `DBKey` types from `kvdb`. (See [PR #282](https://github.com/paritytech/parity-common/pull/282/files))
+- Add `num_keys(col)` to get an estimate of the number of keys in a column. [#285](https://github.com/paritytech/parity-common/pull/285)
+- Remove `ElasticArray` and use the new `DBValue` (alias for `Vec`) and `DBKey` types from `kvdb`. [#282](https://github.com/paritytech/parity-common/pull/282)
## [0.2.0] - 2019-11-28
-- Switched away from using [parity-rocksdb](https://crates.io/crates/parity-rocksdb) in favour of upstream [rust-rocksdb](https://crates.io/crates/rocksdb) (see [PR #257](https://github.com/paritytech/parity-common/pull/257) for details)
-- Revamped configuration handling, allowing per-column memory budgeting (see [PR #256](https://github.com/paritytech/parity-common/pull/256) for details)
+- Switched away from using [parity-rocksdb](https://crates.io/crates/parity-rocksdb) in favour of upstream [rust-rocksdb](https://crates.io/crates/rocksdb). [#257](https://github.com/paritytech/parity-common/pull/257)
+- Revamped configuration handling, allowing per-column memory budgeting. [#256](https://github.com/paritytech/parity-common/pull/256)
### Dependencies
- rust-rocksdb v0.13
## [0.1.6] - 2019-10-24
-- Updated to 2018 edition idioms (https://github.com/paritytech/parity-common/pull/237)
+- Updated to 2018 edition idioms. [#237](https://github.com/paritytech/parity-common/pull/237)
### 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/kvdb-rocksdb/Cargo.toml b/kvdb-rocksdb/Cargo.toml
index 2f67b8d99..bfd75a14d 100644
--- a/kvdb-rocksdb/Cargo.toml
+++ b/kvdb-rocksdb/Cargo.toml
@@ -1,10 +1,10 @@
[package]
name = "kvdb-rocksdb"
-version = "0.5.0"
+version = "0.6.0"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
description = "kvdb implementation backed by RocksDB"
-license = "GPL-3.0"
+license = "MIT/Apache-2.0"
edition = "2018"
[[bench]]
diff --git a/kvdb-rocksdb/benches/bench_read_perf.rs b/kvdb-rocksdb/benches/bench_read_perf.rs
index 3b4cde3cf..8c17d8981 100644
--- a/kvdb-rocksdb/benches/bench_read_perf.rs
+++ b/kvdb-rocksdb/benches/bench_read_perf.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Benchmark RocksDB read performance.
//! The benchmark setup consists in writing `NEEDLES * NEEDLES_TO_HAYSTACK_RATIO` 32-bytes random
diff --git a/kvdb-rocksdb/src/iter.rs b/kvdb-rocksdb/src/iter.rs
index 881aa724e..71482f446 100644
--- a/kvdb-rocksdb/src/iter.rs
+++ b/kvdb-rocksdb/src/iter.rs
@@ -1,18 +1,10 @@
-// Copyright 2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! This module contains an implementation of a RocksDB iterator
//! wrapped inside a `RwLock`. Since `RwLock` "owns" the inner data,
diff --git a/kvdb-rocksdb/src/lib.rs b/kvdb-rocksdb/src/lib.rs
index 40ee0f595..ac8958919 100644
--- a/kvdb-rocksdb/src/lib.rs
+++ b/kvdb-rocksdb/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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
mod iter;
mod stats;
@@ -175,6 +167,12 @@ pub struct DatabaseConfig {
pub columns: u32,
/// Specify the maximum number of info/debug log files to be kept.
pub keep_log_file_num: i32,
+ /// Enable native RocksDB statistics.
+ /// Disabled by default.
+ ///
+ /// It can have a negative performance impact up to 10% according to
+ /// https://github.com/facebook/rocksdb/wiki/Statistics.
+ pub enable_statistics: bool,
}
impl DatabaseConfig {
@@ -223,6 +221,7 @@ impl Default for DatabaseConfig {
compaction: CompactionProfile::default(),
columns: 1,
keep_log_file_num: 1,
+ enable_statistics: false,
}
}
}
@@ -236,7 +235,11 @@ impl MallocSizeOf for DBAndColumns {
fn size_of(&self, ops: &mut parity_util_mem::MallocSizeOfOps) -> usize {
let mut total = self.column_names.size_of(ops)
// we have at least one column always, so we can call property on it
- + self.static_property_or_warn(0, "rocksdb.block-cache-usage");
+ + self.db
+ .property_int_value_cf(self.cf(0), "rocksdb.block-cache-usage")
+ .unwrap_or(Some(0))
+ .map(|x| x as usize)
+ .unwrap_or(0);
for v in 0..self.column_names.len() {
total += self.static_property_or_warn(v, "rocksdb.estimate-table-readers-mem");
@@ -271,6 +274,8 @@ pub struct Database {
config: DatabaseConfig,
path: String,
#[ignore_malloc_size_of = "insignificant"]
+ opts: Options,
+ #[ignore_malloc_size_of = "insignificant"]
write_opts: WriteOptions,
#[ignore_malloc_size_of = "insignificant"]
read_opts: ReadOptions,
@@ -308,6 +313,10 @@ fn is_corrupted(err: &Error) -> bool {
fn generate_options(config: &DatabaseConfig) -> Options {
let mut opts = Options::default();
+ opts.set_report_bg_io_stats(true);
+ if config.enable_statistics {
+ opts.enable_statistics();
+ }
opts.set_use_fsync(false);
opts.create_if_missing(true);
opts.set_max_open_files(config.max_open_files);
@@ -325,12 +334,16 @@ fn generate_block_based_options(config: &DatabaseConfig) -> BlockBasedOptions {
// Set cache size as recommended by
// https://github.com/facebook/rocksdb/wiki/Setup-Options-and-Basic-Tuning#block-cache-size
let cache_size = config.memory_budget() / 3;
- block_opts.set_lru_cache(cache_size);
- // "index and filter blocks will be stored in block cache, together with all other data blocks."
- // See: https://github.com/facebook/rocksdb/wiki/Memory-usage-in-RocksDB#indexes-and-filter-blocks
- block_opts.set_cache_index_and_filter_blocks(true);
- // Don't evict L0 filter/index blocks from the cache
- block_opts.set_pin_l0_filter_and_index_blocks_in_cache(true);
+ if cache_size == 0 {
+ block_opts.disable_cache()
+ } else {
+ block_opts.set_lru_cache(cache_size);
+ // "index and filter blocks will be stored in block cache, together with all other data blocks."
+ // See: https://github.com/facebook/rocksdb/wiki/Memory-usage-in-RocksDB#indexes-and-filter-blocks
+ block_opts.set_cache_index_and_filter_blocks(true);
+ // Don't evict L0 filter/index blocks from the cache
+ block_opts.set_pin_l0_filter_and_index_blocks_in_cache(true);
+ }
block_opts.set_bloom_filter(10, true);
block_opts
@@ -409,6 +422,7 @@ impl Database {
flushing: RwLock::new((0..config.columns).map(|_| HashMap::new()).collect()),
flushing_lock: Mutex::new(false),
path: path.to_owned(),
+ opts,
read_opts,
write_opts,
block_opts,
@@ -715,6 +729,15 @@ impl Database {
None => Ok(()),
}
}
+
+ /// Get RocksDB statistics.
+ pub fn get_statistics(&self) -> HashMap {
+ if let Some(stats) = self.opts.get_statistics() {
+ stats::parse_rocksdb_stats(&stats)
+ } else {
+ HashMap::new()
+ }
+ }
}
// duplicate declaration of methods here to avoid trait import in certain existing cases
@@ -755,6 +778,13 @@ impl KeyValueDB for Database {
}
fn io_stats(&self, kind: kvdb::IoStatsKind) -> kvdb::IoStats {
+ let rocksdb_stats = self.get_statistics();
+ let cache_hit_count = rocksdb_stats.get("block.cache.hit").map(|s| s.count).unwrap_or(0u64);
+ let overall_stats = self.stats.overall();
+ let old_cache_hit_count = overall_stats.raw.cache_hit_count;
+
+ self.stats.tally_cache_hit_count(cache_hit_count - old_cache_hit_count);
+
let taken_stats = match kind {
kvdb::IoStatsKind::Overall => self.stats.overall(),
kvdb::IoStatsKind::SincePrevious => self.stats.since_previous(),
@@ -767,7 +797,7 @@ impl KeyValueDB for Database {
stats.transactions = taken_stats.raw.transactions;
stats.bytes_written = taken_stats.raw.bytes_written;
stats.bytes_read = taken_stats.raw.bytes_read;
-
+ stats.cache_reads = taken_stats.raw.cache_hit_count;
stats.started = taken_stats.started;
stats.span = taken_stats.started.elapsed();
@@ -847,6 +877,7 @@ mod tests {
compaction: CompactionProfile::default(),
columns: 11,
keep_log_file_num: 1,
+ enable_statistics: false,
};
let db = Database::open(&config, tempdir.path().to_str().unwrap()).unwrap();
@@ -984,20 +1015,40 @@ mod tests {
assert_eq!(c.memory_budget(), 45 * MB, "total budget is the sum of the column budget");
}
+ #[test]
+ fn test_stats_parser() {
+ let raw = r#"rocksdb.row.cache.hit COUNT : 1
+rocksdb.db.get.micros P50 : 2.000000 P95 : 3.000000 P99 : 4.000000 P100 : 5.000000 COUNT : 0 SUM : 15
+"#;
+ let stats = stats::parse_rocksdb_stats(raw);
+ assert_eq!(stats["row.cache.hit"].count, 1);
+ assert!(stats["row.cache.hit"].times.is_none());
+ assert_eq!(stats["db.get.micros"].count, 0);
+ let get_times = stats["db.get.micros"].times.unwrap();
+ assert_eq!(get_times.sum, 15);
+ assert_eq!(get_times.p50, 2.0);
+ assert_eq!(get_times.p95, 3.0);
+ assert_eq!(get_times.p99, 4.0);
+ assert_eq!(get_times.p100, 5.0);
+ }
+
#[test]
fn rocksdb_settings() {
const NUM_COLS: usize = 2;
- let mut cfg = DatabaseConfig::with_columns(NUM_COLS as u32);
+ let mut cfg = DatabaseConfig { enable_statistics: true, ..DatabaseConfig::with_columns(NUM_COLS as u32) };
cfg.max_open_files = 123; // is capped by the OS fd limit (typically 1024)
cfg.compaction.block_size = 323232;
cfg.compaction.initial_file_size = 102030;
cfg.memory_budget = [(0, 30), (1, 300)].iter().cloned().collect();
let db_path = TempDir::new("config_test").expect("the OS can create tmp dirs");
- let _db = Database::open(&cfg, db_path.path().to_str().unwrap()).expect("can open a db");
+ let db = Database::open(&cfg, db_path.path().to_str().unwrap()).expect("can open a db");
let mut rocksdb_log = std::fs::File::open(format!("{}/LOG", db_path.path().to_str().unwrap()))
.expect("rocksdb creates a LOG file");
let mut settings = String::new();
+ let statistics = db.get_statistics();
+ assert!(statistics.contains_key("block.cache.hit"));
+
rocksdb_log.read_to_string(&mut settings).unwrap();
// Check column count
assert!(settings.contains("Options for column family [default]"), "no default col");
diff --git a/kvdb-rocksdb/src/stats.rs b/kvdb-rocksdb/src/stats.rs
index 039dd3a88..c028b1948 100644
--- a/kvdb-rocksdb/src/stats.rs
+++ b/kvdb-rocksdb/src/stats.rs
@@ -1,29 +1,74 @@
-// 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use parking_lot::RwLock;
+use std::collections::HashMap;
+use std::str::FromStr;
use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering};
use std::time::Instant;
+#[derive(Default, Clone, Copy)]
pub struct RawDbStats {
pub reads: u64,
pub writes: u64,
pub bytes_written: u64,
pub bytes_read: u64,
pub transactions: u64,
+ pub cache_hit_count: u64,
+}
+
+#[derive(Default, Debug, Clone, Copy)]
+pub struct RocksDbStatsTimeValue {
+ /// 50% percentile
+ pub p50: f64,
+ /// 95% percentile
+ pub p95: f64,
+ /// 99% percentile
+ pub p99: f64,
+ /// 100% percentile
+ pub p100: f64,
+ pub sum: u64,
+}
+
+#[derive(Default, Debug, Clone, Copy)]
+pub struct RocksDbStatsValue {
+ pub count: u64,
+ pub times: Option,
+}
+
+pub fn parse_rocksdb_stats(stats: &str) -> HashMap {
+ stats.lines().map(|line| parse_rocksdb_stats_row(line.splitn(2, ' '))).collect()
+}
+
+fn parse_rocksdb_stats_row<'a>(mut iter: impl Iterator- ) -> (String, RocksDbStatsValue) {
+ const PROOF: &str = "rocksdb statistics format is valid and hasn't changed";
+ const SEPARATOR: &str = " : ";
+ let key = iter.next().expect(PROOF).trim_start_matches("rocksdb.").to_owned();
+ let values = iter.next().expect(PROOF);
+ let value = if values.starts_with("COUNT") {
+ // rocksdb.row.cache.hit COUNT : 0
+ RocksDbStatsValue {
+ count: u64::from_str(values.rsplit(SEPARATOR).next().expect(PROOF)).expect(PROOF),
+ times: None,
+ }
+ } else {
+ // rocksdb.db.get.micros P50 : 0.000000 P95 : 0.000000 P99 : 0.000000 P100 : 0.000000 COUNT : 0 SUM : 0
+ let values: Vec<&str> = values.split_whitespace().filter(|s| *s != ":").collect();
+ let times = RocksDbStatsTimeValue {
+ p50: f64::from_str(values.get(1).expect(PROOF)).expect(PROOF),
+ p95: f64::from_str(values.get(3).expect(PROOF)).expect(PROOF),
+ p99: f64::from_str(values.get(5).expect(PROOF)).expect(PROOF),
+ p100: f64::from_str(values.get(7).expect(PROOF)).expect(PROOF),
+ sum: u64::from_str(values.get(11).expect(PROOF)).expect(PROOF),
+ };
+ RocksDbStatsValue { count: u64::from_str(values.get(9).expect(PROOF)).expect(PROOF), times: Some(times) }
+ };
+ (key, value)
}
impl RawDbStats {
@@ -34,6 +79,7 @@ impl RawDbStats {
bytes_written: self.bytes_written + other.bytes_written,
bytes_read: self.bytes_read + other.bytes_written,
transactions: self.transactions + other.transactions,
+ cache_hit_count: self.cache_hit_count + other.cache_hit_count,
}
}
}
@@ -46,11 +92,7 @@ struct OverallDbStats {
impl OverallDbStats {
fn new() -> Self {
- OverallDbStats {
- stats: RawDbStats { reads: 0, writes: 0, bytes_written: 0, bytes_read: 0, transactions: 0 },
- last_taken: Instant::now(),
- started: Instant::now(),
- }
+ OverallDbStats { stats: RawDbStats::default(), last_taken: Instant::now(), started: Instant::now() }
}
}
@@ -60,6 +102,7 @@ pub struct RunningDbStats {
bytes_written: AtomicU64,
bytes_read: AtomicU64,
transactions: AtomicU64,
+ cache_hit_count: AtomicU64,
overall: RwLock,
}
@@ -76,6 +119,7 @@ impl RunningDbStats {
writes: 0.into(),
bytes_written: 0.into(),
transactions: 0.into(),
+ cache_hit_count: 0.into(),
overall: OverallDbStats::new().into(),
}
}
@@ -100,6 +144,10 @@ impl RunningDbStats {
self.transactions.fetch_add(val, AtomicOrdering::Relaxed);
}
+ pub fn tally_cache_hit_count(&self, val: u64) {
+ self.cache_hit_count.fetch_add(val, AtomicOrdering::Relaxed);
+ }
+
fn take_current(&self) -> RawDbStats {
RawDbStats {
reads: self.reads.swap(0, AtomicOrdering::Relaxed),
@@ -107,6 +155,7 @@ impl RunningDbStats {
bytes_written: self.bytes_written.swap(0, AtomicOrdering::Relaxed),
bytes_read: self.bytes_read.swap(0, AtomicOrdering::Relaxed),
transactions: self.transactions.swap(0, AtomicOrdering::Relaxed),
+ cache_hit_count: self.cache_hit_count.swap(0, AtomicOrdering::Relaxed),
}
}
@@ -117,6 +166,7 @@ impl RunningDbStats {
bytes_written: self.bytes_written.load(AtomicOrdering::Relaxed),
bytes_read: self.bytes_read.load(AtomicOrdering::Relaxed),
transactions: self.transactions.load(AtomicOrdering::Relaxed),
+ cache_hit_count: self.cache_hit_count.load(AtomicOrdering::Relaxed),
}
}
diff --git a/kvdb-shared-tests/CHANGELOG.md b/kvdb-shared-tests/CHANGELOG.md
new file mode 100644
index 000000000..545cf7dff
--- /dev/null
+++ b/kvdb-shared-tests/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Changelog
+
+The format is based on [Keep a Changelog].
+
+[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
+
+## [Unreleased]
diff --git a/kvdb-shared-tests/Cargo.toml b/kvdb-shared-tests/Cargo.toml
index 91259e851..367eef8b6 100644
--- a/kvdb-shared-tests/Cargo.toml
+++ b/kvdb-shared-tests/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.0"
authors = ["Parity Technologies "]
edition = "2018"
description = "Shared tests for kvdb functionality, to be executed against actual implementations"
-license = "GPL-3.0"
+license = "MIT/Apache2.0"
[dependencies]
kvdb = { path = "../kvdb", version = "0.4" }
diff --git a/kvdb-shared-tests/src/lib.rs b/kvdb-shared-tests/src/lib.rs
index 28613c4f3..ca82dc8cd 100644
--- a/kvdb-shared-tests/src/lib.rs
+++ b/kvdb-shared-tests/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Shared tests for kvdb functionality, to be executed against actual implementations.
diff --git a/kvdb-web/CHANGELOG.md b/kvdb-web/CHANGELOG.md
index 69d10f44a..0d4a23ad9 100644
--- a/kvdb-web/CHANGELOG.md
+++ b/kvdb-web/CHANGELOG.md
@@ -5,6 +5,7 @@ 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.0] - 2019-02-05
- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)
@@ -23,4 +24,4 @@ The format is based on [Keep a Changelog].
## [0.1.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/kvdb-web/Cargo.toml b/kvdb-web/Cargo.toml
index a686f6b26..284418ca5 100644
--- a/kvdb-web/Cargo.toml
+++ b/kvdb-web/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
description = "A key-value database for use in browsers"
documentation = "https://docs.rs/kvdb-web/"
-license = "GPL-3.0"
+license = "MIT/Apache2.0"
edition = "2018"
[dependencies]
diff --git a/kvdb-web/src/error.rs b/kvdb-web/src/error.rs
index cd3916174..e88d44636 100644
--- a/kvdb-web/src/error.rs
+++ b/kvdb-web/src/error.rs
@@ -1,18 +1,10 @@
-// Copyright 2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Errors that can occur when working with IndexedDB.
diff --git a/kvdb-web/src/indexed_db.rs b/kvdb-web/src/indexed_db.rs
index 028b60a0a..4593e3007 100644
--- a/kvdb-web/src/indexed_db.rs
+++ b/kvdb-web/src/indexed_db.rs
@@ -1,18 +1,10 @@
-// Copyright 2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Utility functions to interact with IndexedDB browser API.
diff --git a/kvdb-web/src/lib.rs b/kvdb-web/src/lib.rs
index f73426904..5d9878ec2 100644
--- a/kvdb-web/src/lib.rs
+++ b/kvdb-web/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! A key-value database for use in browsers
//!
diff --git a/kvdb-web/tests/indexed_db.rs b/kvdb-web/tests/indexed_db.rs
index fe5d8f6a3..81a765a05 100644
--- a/kvdb-web/tests/indexed_db.rs
+++ b/kvdb-web/tests/indexed_db.rs
@@ -1,18 +1,10 @@
-// Copyright 2019-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! IndexedDB tests.
diff --git a/kvdb/CHANGELOG.md b/kvdb/CHANGELOG.md
index e202aaa7a..c7d38231b 100644
--- a/kvdb/CHANGELOG.md
+++ b/kvdb/CHANGELOG.md
@@ -5,6 +5,7 @@ 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.0] - 2019-01-06
- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)
@@ -21,10 +22,10 @@ The format is based on [Keep a Changelog].
- Default column support removed from the API
- Column argument type changed from `Option` to `u32`
- Migration `None` -> unsupported, `Some(0)` -> `0`, `Some(1)` -> `1`, etc.
-- Remove `ElasticArray` and change `DBValue` to be a type alias for `Vec` and add a `DBKey` backed by a `SmallVec`. (See [PR #282](https://github.com/paritytech/parity-common/pull/282/files))
+- Remove `ElasticArray` and change `DBValue` to be a type alias for `Vec` and add a `DBKey` backed by a `SmallVec`. [#282](https://github.com/paritytech/parity-common/pull/282)
## [0.1.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)
### Changed
-- Migrated to 2018 edition (https://github.com/paritytech/parity-common/pull/205)
+- Migrated to 2018 edition. [#205](https://github.com/paritytech/parity-common/pull/205)
diff --git a/kvdb/Cargo.toml b/kvdb/Cargo.toml
index e6d738877..c955920a9 100644
--- a/kvdb/Cargo.toml
+++ b/kvdb/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.4.0"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
description = "Generic key-value trait"
-license = "GPL-3.0"
+license = "MIT/Apache-2.0"
edition = "2018"
[dependencies]
diff --git a/kvdb/src/io_stats.rs b/kvdb/src/io_stats.rs
index d0de5ce36..2f10dc707 100644
--- a/kvdb/src/io_stats.rs
+++ b/kvdb/src/io_stats.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Generic statistics for key-value databases
diff --git a/kvdb/src/lib.rs b/kvdb/src/lib.rs
index afda4af87..6382145ce 100644
--- a/kvdb/src/lib.rs
+++ b/kvdb/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Key-Value store abstraction.
diff --git a/rlp/license-header b/license-header
similarity index 87%
rename from rlp/license-header
rename to license-header
index 03df169c8..67d3f3a1a 100644
--- a/rlp/license-header
+++ b/license-header
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/parity-bytes/CHANGELOG.md b/parity-bytes/CHANGELOG.md
index cc79bd068..ef8a2633d 100644
--- a/parity-bytes/CHANGELOG.md
+++ b/parity-bytes/CHANGELOG.md
@@ -5,9 +5,10 @@ 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.1.1] - 2019-10-24
### Dependencies
-- Updated dependencies (https://github.com/paritytech/parity-common/pull/239)
-### Added
-- Added no-std support (https://github.com/paritytech/parity-common/pull/154)
+- Updated dependencies. [#239](https://github.com/paritytech/parity-common/pull/239)
+### Added
+- Added no-std support. [#154](https://github.com/paritytech/parity-common/pull/154)
diff --git a/parity-bytes/Cargo.toml b/parity-bytes/Cargo.toml
index e49adce31..582d6560e 100644
--- a/parity-bytes/Cargo.toml
+++ b/parity-bytes/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.1"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
description = "byte utilities for Parity"
-license = "GPL-3.0"
+license = "MIT/Apache2.0"
edition = "2018"
[dependencies]
diff --git a/parity-bytes/src/lib.rs b/parity-bytes/src/lib.rs
index 292a6e160..e269776d4 100644
--- a/parity-bytes/src/lib.rs
+++ b/parity-bytes/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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! General bytes-related utilities.
//!
diff --git a/parity-crypto/CHANGELOG.md b/parity-crypto/CHANGELOG.md
index 591ee42d3..c955084f9 100644
--- a/parity-crypto/CHANGELOG.md
+++ b/parity-crypto/CHANGELOG.md
@@ -1,16 +1,17 @@
# 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.5.0] - 2020-02-08
-- Remove `inv()` from `SecretKey` (breaking) (https://github.com/paritytech/parity-common/pull/258)
-- `Generate::generate()` does not return error (https://github.com/paritytech/parity-common/pull/258)
-- `Secp256k1` is no longer exported (https://github.com/paritytech/parity-common/pull/258)
-- Remove `public_is_valid()` as it is now impossible to create invalid public keys (https://github.com/paritytech/parity-common/pull/258)
-- 0-valued `Secp::Message`s are disallowed (signatures on them are forgeable for all keys) (https://github.com/paritytech/parity-common/pull/258)
-- Switch to upstream `rust-secp256k1` at v0.17.2 (https://github.com/paritytech/parity-common/pull/258)
-- make `rustc_hex` dependency optional (https://github.com/paritytech/parity-common/pull/337)
+- Remove `inv()` from `SecretKey` (breaking). [#258](https://github.com/paritytech/parity-common/pull/258)
+- `Generate::generate()` does not return error. [#258](https://github.com/paritytech/parity-common/pull/258)
+- `Secp256k1` is no longer exported. [#258](https://github.com/paritytech/parity-common/pull/258)
+- Remove `public_is_valid()` as it is now impossible to create invalid public keys. [#258](https://github.com/paritytech/parity-common/pull/258)
+- 0-valued `Secp::Message`s are disallowed (signatures on them are forgeable for all keys). [#258](https://github.com/paritytech/parity-common/pull/258)
+- Switch to upstream `rust-secp256k1` at v0.17.2. [#258](https://github.com/paritytech/parity-common/pull/258)
+- make `rustc_hex` dependency optional. [#337](https://github.com/paritytech/parity-common/pull/337)
diff --git a/parity-crypto/Cargo.toml b/parity-crypto/Cargo.toml
index aa5d7b654..0af20678b 100644
--- a/parity-crypto/Cargo.toml
+++ b/parity-crypto/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.5.0"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
description = "Crypto utils used by ethstore and network."
-license = "GPL-3.0"
+license = "MIT/Apache-2.0"
autobenches = false
edition = "2018"
diff --git a/parity-crypto/benches/bench.rs b/parity-crypto/benches/bench.rs
index 6c13aa369..562c50148 100644
--- a/parity-crypto/benches/bench.rs
+++ b/parity-crypto/benches/bench.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use crate::parity_crypto::publickey::Generator;
use criterion::{criterion_group, criterion_main, Bencher, Criterion};
diff --git a/parity-crypto/src/aes.rs b/parity-crypto/src/aes.rs
index de643dceb..120e4ef3f 100644
--- a/parity-crypto/src/aes.rs
+++ b/parity-crypto/src/aes.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use aes::block_cipher_trait::generic_array::GenericArray;
use aes::{Aes128, Aes256};
diff --git a/parity-crypto/src/digest.rs b/parity-crypto/src/digest.rs
index caf57dd0c..9ec5edf56 100644
--- a/parity-crypto/src/digest.rs
+++ b/parity-crypto/src/digest.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use std::marker::PhantomData;
use std::ops::Deref;
diff --git a/parity-crypto/src/error.rs b/parity-crypto/src/error.rs
index 16d67f504..e1a3cceb0 100644
--- a/parity-crypto/src/error.rs
+++ b/parity-crypto/src/error.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use std::{error::Error as StdError, fmt, result};
diff --git a/parity-crypto/src/hmac/mod.rs b/parity-crypto/src/hmac/mod.rs
index 2b082dd45..6d606fdd7 100644
--- a/parity-crypto/src/hmac/mod.rs
+++ b/parity-crypto/src/hmac/mod.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use std::marker::PhantomData;
use std::ops::Deref;
diff --git a/parity-crypto/src/hmac/test.rs b/parity-crypto/src/hmac/test.rs
index 1633cf37c..a13174784 100644
--- a/parity-crypto/src/hmac/test.rs
+++ b/parity-crypto/src/hmac/test.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use super::*;
use hex_literal::hex;
diff --git a/parity-crypto/src/lib.rs b/parity-crypto/src/lib.rs
index c6bcb5251..c3049716c 100644
--- a/parity-crypto/src/lib.rs
+++ b/parity-crypto/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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Crypto utils used by ethstore and network.
diff --git a/parity-crypto/src/pbkdf2/mod.rs b/parity-crypto/src/pbkdf2/mod.rs
index 099e98893..a3a06e867 100644
--- a/parity-crypto/src/pbkdf2/mod.rs
+++ b/parity-crypto/src/pbkdf2/mod.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
pub struct Salt<'a>(pub &'a [u8]);
pub struct Secret<'a>(pub &'a [u8]);
diff --git a/parity-crypto/src/pbkdf2/test.rs b/parity-crypto/src/pbkdf2/test.rs
index ff8cc685c..b0bed84ad 100644
--- a/parity-crypto/src/pbkdf2/test.rs
+++ b/parity-crypto/src/pbkdf2/test.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use super::*;
diff --git a/parity-crypto/src/publickey/ec_math_utils.rs b/parity-crypto/src/publickey/ec_math_utils.rs
index bd8653b79..5ea82a78a 100644
--- a/parity-crypto/src/publickey/ec_math_utils.rs
+++ b/parity-crypto/src/publickey/ec_math_utils.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Multiple primitives for work with public and secret keys and with secp256k1 curve points
diff --git a/parity-crypto/src/publickey/ecdh.rs b/parity-crypto/src/publickey/ecdh.rs
index 8cdaf793a..93a43bed8 100644
--- a/parity-crypto/src/publickey/ecdh.rs
+++ b/parity-crypto/src/publickey/ecdh.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! ECDH key agreement scheme implemented as a free function.
diff --git a/parity-crypto/src/publickey/ecdsa_signature.rs b/parity-crypto/src/publickey/ecdsa_signature.rs
index ae245cffb..6853b1586 100644
--- a/parity-crypto/src/publickey/ecdsa_signature.rs
+++ b/parity-crypto/src/publickey/ecdsa_signature.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Signature based on ECDSA, algorithm's description: https://en.wikipedia.org/wiki/Elliptic_Curve_Digital_Signature_Algorithm
diff --git a/parity-crypto/src/publickey/ecies.rs b/parity-crypto/src/publickey/ecies.rs
index d7c1354f3..3332f8a94 100644
--- a/parity-crypto/src/publickey/ecies.rs
+++ b/parity-crypto/src/publickey/ecies.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Functions for ECIES scheme encryption and decryption
diff --git a/parity-crypto/src/publickey/error.rs b/parity-crypto/src/publickey/error.rs
index 7f9bfb8e0..5ea8ce391 100644
--- a/parity-crypto/src/publickey/error.rs
+++ b/parity-crypto/src/publickey/error.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Module specific errors.
diff --git a/parity-crypto/src/publickey/extended_keys.rs b/parity-crypto/src/publickey/extended_keys.rs
index 44307fdf2..be682db39 100644
--- a/parity-crypto/src/publickey/extended_keys.rs
+++ b/parity-crypto/src/publickey/extended_keys.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Secret, public keys extended with the entropy (aka chain code), that allows further key derivation
//! Each extended key has 2^31 normal child keys, and 2^31 hardened child keys.
diff --git a/parity-crypto/src/publickey/keypair.rs b/parity-crypto/src/publickey/keypair.rs
index d4fa13b39..f4ac8b287 100644
--- a/parity-crypto/src/publickey/keypair.rs
+++ b/parity-crypto/src/publickey/keypair.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Key pair (public + secret) description.
diff --git a/parity-crypto/src/publickey/keypair_generator.rs b/parity-crypto/src/publickey/keypair_generator.rs
index 3afd86a97..9dea21de6 100644
--- a/parity-crypto/src/publickey/keypair_generator.rs
+++ b/parity-crypto/src/publickey/keypair_generator.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Random key pair generator. Relies on the secp256k1 C-library to generate random data.
diff --git a/parity-crypto/src/publickey/mod.rs b/parity-crypto/src/publickey/mod.rs
index 8d487b5ad..294d67b38 100644
--- a/parity-crypto/src/publickey/mod.rs
+++ b/parity-crypto/src/publickey/mod.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Submodule of crypto utils for working with public key crypto primitives
//! If you are looking for git history please refer to the `ethkey` crate in the `parity-ethereum` repository.
diff --git a/parity-crypto/src/publickey/secret_key.rs b/parity-crypto/src/publickey/secret_key.rs
index 68522ca29..ac938a674 100644
--- a/parity-crypto/src/publickey/secret_key.rs
+++ b/parity-crypto/src/publickey/secret_key.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Secret key implementation.
diff --git a/parity-crypto/src/scrypt.rs b/parity-crypto/src/scrypt.rs
index eea1931b3..15b7e14e1 100644
--- a/parity-crypto/src/scrypt.rs
+++ b/parity-crypto/src/scrypt.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use super::{KEY_LENGTH, KEY_LENGTH_AES};
use crate::error::ScryptError;
diff --git a/parity-path/CHANGELOG.md b/parity-path/CHANGELOG.md
index 927c9dc9c..fc0263835 100644
--- a/parity-path/CHANGELOG.md
+++ b/parity-path/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 GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
diff --git a/parity-path/Cargo.toml b/parity-path/Cargo.toml
index a4096fa73..0c783cf6c 100644
--- a/parity-path/Cargo.toml
+++ b/parity-path/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.2"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
description = "Path utilities"
-license = "GPL-3.0"
+license = "MIT/Apache-2.0"
edition = "2018"
[dependencies]
diff --git a/parity-path/src/lib.rs b/parity-path/src/lib.rs
index c286678ba..997a040be 100644
--- a/parity-path/src/lib.rs
+++ b/parity-path/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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Path utilities
use std::path::Path;
diff --git a/parity-util-mem/CHANGELOG.md b/parity-util-mem/CHANGELOG.md
index 855ea42fe..dbab86b6e 100644
--- a/parity-util-mem/CHANGELOG.md
+++ b/parity-util-mem/CHANGELOG.md
@@ -5,9 +5,10 @@ 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.5.1] - 2019-02-05
-- Add different mode for malloc_size_of_is_0 macro dealing with generics #334. [#332](https://github.com/paritytech/parity-common/pull/334)
+- Add different mode for malloc_size_of_is_0 macro dealing with generics. [#334](https://github.com/paritytech/parity-common/pull/334)
## [0.5.0] - 2019-02-05
- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)
@@ -26,8 +27,8 @@ The format is based on [Keep a Changelog].
- Added default implementation of `MallocSizeOf` for tuples up to 12. [#300](https://github.com/paritytech/parity-common/pull/300)
## [0.3.0] - 2019-12-19
-- Remove `MallocSizeOf` impls for `ElasticArray` and implement it for `SmallVec` (32 and 36). (See [PR #282](https://github.com/paritytech/parity-common/pull/282/files))
+- Remove `MallocSizeOf` impls for `ElasticArray` and implement it for `SmallVec` (32 and 36). [#282](https://github.com/paritytech/parity-common/pull/282)
## [0.2.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/parity-util-mem/Cargo.toml b/parity-util-mem/Cargo.toml
index d9024ea1c..e0539b23c 100644
--- a/parity-util-mem/Cargo.toml
+++ b/parity-util-mem/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.5.1"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
description = "Collection of memory related utilities"
-license = "GPL-3.0"
+license = "MIT/Apache-2.0"
edition = "2018"
[dependencies]
@@ -49,4 +49,4 @@ mimalloc-global = ["mimallocator", "mimalloc-sys"]
# implement additional types
ethereum-impls = ["ethereum-types", "primitive-types"]
# Full estimate: no call to allocator
-estimate-heapsize = []
\ No newline at end of file
+estimate-heapsize = []
diff --git a/parity-util-mem/derive/CHANGELOG.md b/parity-util-mem/derive/CHANGELOG.md
new file mode 100644
index 000000000..545cf7dff
--- /dev/null
+++ b/parity-util-mem/derive/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Changelog
+
+The format is based on [Keep a Changelog].
+
+[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
+
+## [Unreleased]
diff --git a/parity-util-mem/derive/Cargo.toml b/parity-util-mem/derive/Cargo.toml
index cc208049d..b7648ebd2 100644
--- a/parity-util-mem/derive/Cargo.toml
+++ b/parity-util-mem/derive/Cargo.toml
@@ -2,7 +2,7 @@
name = "parity-util-mem-derive"
version = "0.1.0"
authors = ["Parity Technologies "]
-license = "MIT"
+license = "MIT/Apache2.0"
description = "Crate for memory reporting"
repository = "https://github.com/paritytech/pariry-common/parity-util-mem/derive"
diff --git a/parity-util-mem/derive/lib.rs b/parity-util-mem/derive/lib.rs
index c1c1e504e..2331b0aaa 100644
--- a/parity-util-mem/derive/lib.rs
+++ b/parity-util-mem/derive/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! A crate for deriving the MallocSizeOf trait.
//!
diff --git a/parity-util-mem/src/allocators.rs b/parity-util-mem/src/allocators.rs
index d2953ecfb..e159a32d0 100644
--- a/parity-util-mem/src/allocators.rs
+++ b/parity-util-mem/src/allocators.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! default allocator management
//! Features are:
diff --git a/parity-util-mem/src/ethereum_impls.rs b/parity-util-mem/src/ethereum_impls.rs
index 4379b3b0e..c296d2d40 100644
--- a/parity-util-mem/src/ethereum_impls.rs
+++ b/parity-util-mem/src/ethereum_impls.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Implementation of `MallocSize` for common ethereum types: fixed hashes
//! and uints.
diff --git a/parity-util-mem/src/lib.rs b/parity-util-mem/src/lib.rs
index cdea52e42..87b47716a 100644
--- a/parity-util-mem/src/lib.rs
+++ b/parity-util-mem/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Crate for parity memory management related utilities.
//! It includes global allocator choice, heap measurement and
diff --git a/parity-util-mem/src/primitives_impls.rs b/parity-util-mem/src/primitives_impls.rs
index ab5953dcc..cf98bc211 100644
--- a/parity-util-mem/src/primitives_impls.rs
+++ b/parity-util-mem/src/primitives_impls.rs
@@ -1,18 +1,10 @@
-// Copyright 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Implementation of `MallocSize` primitive types.
diff --git a/parity-util-mem/src/sizeof.rs b/parity-util-mem/src/sizeof.rs
index ef63e1000..3d60913e4 100644
--- a/parity-util-mem/src/sizeof.rs
+++ b/parity-util-mem/src/sizeof.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Estimation for heapsize calculation. Usable to replace call to allocator method (for some
//! allocators or simply because we just need a deterministic cunsumption measurement).
diff --git a/parity-util-mem/tests/derive.rs b/parity-util-mem/tests/derive.rs
index 87f8c9f50..4fb5f7328 100644
--- a/parity-util-mem/tests/derive.rs
+++ b/parity-util-mem/tests/derive.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
#![cfg(feature = "std")]
diff --git a/plain_hasher/CHANGELOG.md b/plain_hasher/CHANGELOG.md
index a4bd19586..afc302090 100644
--- a/plain_hasher/CHANGELOG.md
+++ b/plain_hasher/CHANGELOG.md
@@ -1,12 +1,13 @@
# 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)
## [0.2.2] - 2019-10-24
-- Migrated to 2018 edition (https://github.com/paritytech/parity-common/pull/213)
+- Migrated to 2018 edition. [#213](https://github.com/paritytech/parity-common/pull/213)
### 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/plain_hasher/Cargo.toml b/plain_hasher/Cargo.toml
index 2a7f94989..57cf4d0c1 100644
--- a/plain_hasher/Cargo.toml
+++ b/plain_hasher/Cargo.toml
@@ -3,7 +3,7 @@ name = "plain_hasher"
description = "Hasher for 32-byte keys."
version = "0.2.2"
authors = ["Parity Technologies "]
-license = "MIT"
+license = "MIT/Apache2.0"
keywords = ["hash", "hasher"]
homepage = "https://github.com/paritytech/parity-common"
categories = ["no-std"]
diff --git a/plain_hasher/benches/bench.rs b/plain_hasher/benches/bench.rs
index 4ba53bb1a..e14d9d7d7 100644
--- a/plain_hasher/benches/bench.rs
+++ b/plain_hasher/benches/bench.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use std::collections::hash_map::DefaultHasher;
use std::hash::Hasher;
diff --git a/plain_hasher/src/lib.rs b/plain_hasher/src/lib.rs
index 3665995d4..4da4a508b 100644
--- a/plain_hasher/src/lib.rs
+++ b/plain_hasher/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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , 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/primitive-types/CHANGELOG.md b/primitive-types/CHANGELOG.md
index 87ee03e6f..0689eab5a 100644
--- a/primitive-types/CHANGELOG.md
+++ b/primitive-types/CHANGELOG.md
@@ -12,4 +12,4 @@ The format is based on [Keep a Changelog].
## [0.6.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/primitive-types/Cargo.toml b/primitive-types/Cargo.toml
index 3131a001f..e6b53391c 100644
--- a/primitive-types/Cargo.toml
+++ b/primitive-types/Cargo.toml
@@ -2,7 +2,7 @@
name = "primitive-types"
version = "0.6.2"
authors = ["Parity Technologies "]
-license = "Apache-2.0/MIT"
+license = "MIT/Apache2.0"
homepage = "https://github.com/paritytech/parity-common"
description = "Primitive types shared by Ethereum and Substrate"
edition = "2018"
diff --git a/primitive-types/impls/codec/Cargo.toml b/primitive-types/impls/codec/Cargo.toml
index 12fda74f2..4b39c10af 100644
--- a/primitive-types/impls/codec/Cargo.toml
+++ b/primitive-types/impls/codec/Cargo.toml
@@ -2,7 +2,7 @@
name = "impl-codec"
version = "0.4.2"
authors = ["Parity Technologies "]
-license = "Apache-2.0/MIT"
+license = "MIT/Apache2.0"
homepage = "https://github.com/paritytech/parity-common"
description = "Parity Codec serialization support for uint and fixed hash."
edition = "2018"
diff --git a/primitive-types/impls/codec/src/lib.rs b/primitive-types/impls/codec/src/lib.rs
index 9e5714ce0..1a4f2e252 100644
--- a/primitive-types/impls/codec/src/lib.rs
+++ b/primitive-types/impls/codec/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2018 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/primitive-types/impls/rlp/Cargo.toml b/primitive-types/impls/rlp/Cargo.toml
index 62e957c85..85db3c328 100644
--- a/primitive-types/impls/rlp/Cargo.toml
+++ b/primitive-types/impls/rlp/Cargo.toml
@@ -2,7 +2,7 @@
name = "impl-rlp"
version = "0.2.1"
authors = ["Parity Technologies "]
-license = "Apache-2.0/MIT"
+license = "MIT/Apache2.0"
homepage = "https://github.com/paritytech/parity-common"
description = "RLP serialization support for uint and fixed hash."
edition = "2018"
diff --git a/primitive-types/impls/rlp/src/lib.rs b/primitive-types/impls/rlp/src/lib.rs
index 16a711370..e542c6e6e 100644
--- a/primitive-types/impls/rlp/src/lib.rs
+++ b/primitive-types/impls/rlp/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2018 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/primitive-types/impls/serde/CHANGELOG.md b/primitive-types/impls/serde/CHANGELOG.md
index a63cfb2f1..e58aeb12c 100644
--- a/primitive-types/impls/serde/CHANGELOG.md
+++ b/primitive-types/impls/serde/CHANGELOG.md
@@ -8,4 +8,4 @@ The format is based on [Keep a Changelog].
## [0.2.3] - 2019-10-29
### Fixed
-- Fixed a bug in empty slice serialization (https://github.com/paritytech/parity-common/pull/253)
+- Fixed a bug in empty slice serialization. [#253](https://github.com/paritytech/parity-common/pull/253)
diff --git a/primitive-types/impls/serde/Cargo.toml b/primitive-types/impls/serde/Cargo.toml
index a57ada2a2..641a59e6a 100644
--- a/primitive-types/impls/serde/Cargo.toml
+++ b/primitive-types/impls/serde/Cargo.toml
@@ -3,7 +3,7 @@ name = "impl-serde"
version = "0.3.0"
authors = ["Parity Technologies "]
edition = "2018"
-license = "Apache-2.0/MIT"
+license = "MIT/Apache2.0"
homepage = "https://github.com/paritytech/parity-common"
description = "Serde serialization support for uint and fixed hash."
diff --git a/primitive-types/impls/serde/benches/impl_serde.rs b/primitive-types/impls/serde/benches/impl_serde.rs
index d19a97fda..c7a1efea8 100644
--- a/primitive-types/impls/serde/benches/impl_serde.rs
+++ b/primitive-types/impls/serde/benches/impl_serde.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/primitive-types/impls/serde/benches/input.rs b/primitive-types/impls/serde/benches/input.rs
index 00d5efdc5..5673f1f52 100644
--- a/primitive-types/impls/serde/benches/input.rs
+++ b/primitive-types/impls/serde/benches/input.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
/// Hexdecimal string 64 chars (32 bytes)
pub const HEX_64_CHARS: &str = "\"0x6402541b4e3c2ab65306aec48fce5adedc60e3ac465c3d7036c731e0b2e49209\"";
diff --git a/primitive-types/impls/serde/src/lib.rs b/primitive-types/impls/serde/src/lib.rs
index 661ff7c0e..500a60cc4 100644
--- a/primitive-types/impls/serde/src/lib.rs
+++ b/primitive-types/impls/serde/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/primitive-types/impls/serde/src/serialize.rs b/primitive-types/impls/serde/src/serialize.rs
index 431a56ec7..542ac0dc8 100644
--- a/primitive-types/impls/serde/src/serialize.rs
+++ b/primitive-types/impls/serde/src/serialize.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/primitive-types/src/lib.rs b/primitive-types/src/lib.rs
index 5e3f77ec4..0b4af97c8 100644
--- a/primitive-types/src/lib.rs
+++ b/primitive-types/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2018 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp-derive/CHANGELOG.md b/rlp-derive/CHANGELOG.md
new file mode 100644
index 000000000..d7b344b76
--- /dev/null
+++ b/rlp-derive/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Changelog
+
+The format is based on [Keep a Changelog].
+
+[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
+
+## [Unreleased]
+
+## [0.1.0] - 2020-02-13
+- Extracted from parity-ethereum repo. [#343](https://github.com/paritytech/parity-common/pull/343)
diff --git a/rlp-derive/Cargo.toml b/rlp-derive/Cargo.toml
new file mode 100644
index 000000000..de3824a2f
--- /dev/null
+++ b/rlp-derive/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "rlp-derive"
+version = "0.1.0"
+authors = ["Parity Technologies "]
+license = "MIT/Apache-2.0"
+description = "Derive macro for #[derive(RlpEncodable, RlpDecodable)]"
+homepage = "http://parity.io"
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0.14"
+quote = "1.0.2"
+proc-macro2 = "1.0.8"
+
+[dev-dependencies]
+rlp = "0.4.4"
diff --git a/rlp-derive/src/de.rs b/rlp-derive/src/de.rs
new file mode 100644
index 000000000..730c39270
--- /dev/null
+++ b/rlp-derive/src/de.rs
@@ -0,0 +1,163 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use proc_macro2::TokenStream;
+use quote::quote;
+
+struct ParseQuotes {
+ single: TokenStream,
+ list: TokenStream,
+ takes_index: bool,
+}
+
+fn decodable_parse_quotes() -> ParseQuotes {
+ ParseQuotes { single: quote! { rlp.val_at }, list: quote! { rlp.list_at }, takes_index: true }
+}
+
+fn decodable_wrapper_parse_quotes() -> ParseQuotes {
+ ParseQuotes { single: quote! { rlp.as_val }, list: quote! { rlp.as_list }, takes_index: false }
+}
+
+pub fn impl_decodable(ast: &syn::DeriveInput) -> TokenStream {
+ let body = if let syn::Data::Struct(s) = &ast.data {
+ s
+ } else {
+ panic!("#[derive(RlpDecodable)] is only defined for structs.");
+ };
+
+ let mut default_attribute_encountered = false;
+ let stmts: Vec<_> = body
+ .fields
+ .iter()
+ .enumerate()
+ .map(|(i, field)| decodable_field(i, field, decodable_parse_quotes(), &mut default_attribute_encountered))
+ .collect();
+ let name = &ast.ident;
+
+ let impl_block = quote! {
+ impl rlp::Decodable for #name {
+ fn decode(rlp: &rlp::Rlp) -> Result {
+ let result = #name {
+ #(#stmts)*
+ };
+
+ Ok(result)
+ }
+ }
+ };
+
+ quote! {
+ const _: () = {
+ extern crate rlp;
+ #impl_block
+ };
+ }
+}
+
+pub fn impl_decodable_wrapper(ast: &syn::DeriveInput) -> TokenStream {
+ let body = if let syn::Data::Struct(s) = &ast.data {
+ s
+ } else {
+ panic!("#[derive(RlpDecodableWrapper)] is only defined for structs.");
+ };
+
+ let stmt = {
+ let fields: Vec<_> = body.fields.iter().collect();
+ if fields.len() == 1 {
+ let field = fields.first().expect("fields.len() == 1; qed");
+ let mut default_attribute_encountered = false;
+ decodable_field(0, field, decodable_wrapper_parse_quotes(), &mut default_attribute_encountered)
+ } else {
+ panic!("#[derive(RlpEncodableWrapper)] is only defined for structs with one field.")
+ }
+ };
+
+ let name = &ast.ident;
+
+ let impl_block = quote! {
+ impl rlp::Decodable for #name {
+ fn decode(rlp: &rlp::Rlp) -> Result {
+ let result = #name {
+ #stmt
+ };
+
+ Ok(result)
+ }
+ }
+ };
+
+ quote! {
+ const _: () = {
+ extern crate rlp;
+ #impl_block
+ };
+ }
+}
+
+fn decodable_field(
+ mut index: usize,
+ field: &syn::Field,
+ quotes: ParseQuotes,
+ default_attribute_encountered: &mut bool,
+) -> TokenStream {
+ let id = if let Some(ident) = &field.ident {
+ quote! { #ident }
+ } else {
+ let index = syn::Index::from(index);
+ quote! { #index }
+ };
+
+ if *default_attribute_encountered {
+ index -= 1;
+ }
+ let index = quote! { #index };
+
+ let single = quotes.single;
+ let list = quotes.list;
+
+ let attributes = &field.attrs;
+ let default = if let Some(attr) = attributes.iter().find(|attr| attr.path.is_ident("rlp")) {
+ if *default_attribute_encountered {
+ panic!("only 1 #[rlp(default)] attribute is allowed in a struct")
+ }
+ match attr.parse_args() {
+ Ok(proc_macro2::TokenTree::Ident(ident)) if ident == "default" => {}
+ _ => panic!("only #[rlp(default)] attribute is supported"),
+ }
+ *default_attribute_encountered = true;
+ true
+ } else {
+ false
+ };
+
+ if let syn::Type::Path(path) = &field.ty {
+ let ident = &path.path.segments.first().expect("there must be at least 1 segment").ident;
+ let ident_type = ident.to_string();
+ if ident_type == "Vec" {
+ if quotes.takes_index {
+ if default {
+ quote! { #id: #list(#index).unwrap_or_default(), }
+ } else {
+ quote! { #id: #list(#index)?, }
+ }
+ } else {
+ quote! { #id: #list()?, }
+ }
+ } else if quotes.takes_index {
+ if default {
+ quote! { #id: #single(#index).unwrap_or_default(), }
+ } else {
+ quote! { #id: #single(#index)?, }
+ }
+ } else {
+ quote! { #id: #single()?, }
+ }
+ } else {
+ panic!("rlp_derive not supported");
+ }
+}
diff --git a/rlp-derive/src/en.rs b/rlp-derive/src/en.rs
new file mode 100644
index 000000000..9c21bebd2
--- /dev/null
+++ b/rlp-derive/src/en.rs
@@ -0,0 +1,110 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use proc_macro2::TokenStream;
+use quote::quote;
+
+pub fn impl_encodable(ast: &syn::DeriveInput) -> TokenStream {
+ let body = if let syn::Data::Struct(s) = &ast.data {
+ s
+ } else {
+ panic!("#[derive(RlpEncodable)] is only defined for structs.");
+ };
+
+ let stmts: Vec<_> = body.fields.iter().enumerate().map(|(i, field)| encodable_field(i, field)).collect();
+ let name = &ast.ident;
+
+ let stmts_len = stmts.len();
+ let stmts_len = quote! { #stmts_len };
+ let impl_block = quote! {
+ impl rlp::Encodable for #name {
+ fn rlp_append(&self, stream: &mut rlp::RlpStream) {
+ stream.begin_list(#stmts_len);
+ #(#stmts)*
+ }
+ }
+ };
+
+ quote! {
+ const _: () = {
+ extern crate rlp;
+ #impl_block
+ };
+ }
+}
+
+pub fn impl_encodable_wrapper(ast: &syn::DeriveInput) -> TokenStream {
+ let body = if let syn::Data::Struct(s) = &ast.data {
+ s
+ } else {
+ panic!("#[derive(RlpEncodableWrapper)] is only defined for structs.");
+ };
+
+ let stmt = {
+ let fields: Vec<_> = body.fields.iter().collect();
+ if fields.len() == 1 {
+ let field = fields.first().expect("fields.len() == 1; qed");
+ encodable_field(0, field)
+ } else {
+ panic!("#[derive(RlpEncodableWrapper)] is only defined for structs with one field.")
+ }
+ };
+
+ let name = &ast.ident;
+
+ let impl_block = quote! {
+ impl rlp::Encodable for #name {
+ fn rlp_append(&self, stream: &mut rlp::RlpStream) {
+ #stmt
+ }
+ }
+ };
+
+ quote! {
+ const _: () = {
+ extern crate rlp;
+ #impl_block
+ };
+ }
+}
+
+fn encodable_field(index: usize, field: &syn::Field) -> TokenStream {
+ let ident = if let Some(ident) = &field.ident {
+ quote! { #ident }
+ } else {
+ let index = syn::Index::from(index);
+ quote! { #index }
+ };
+
+ let id = quote! { self.#ident };
+
+ if let syn::Type::Path(path) = &field.ty {
+ let top_segment = path.path.segments.first().expect("there must be at least 1 segment");
+ let ident = &top_segment.ident;
+ if ident == "Vec" {
+ let inner_ident = {
+ if let syn::PathArguments::AngleBracketed(angle) = &top_segment.arguments {
+ if let syn::GenericArgument::Type(syn::Type::Path(path)) =
+ angle.args.first().expect("Vec has only one angle bracketed type; qed")
+ {
+ &path.path.segments.first().expect("there must be at least 1 segment").ident
+ } else {
+ panic!("rlp_derive not supported");
+ }
+ } else {
+ unreachable!("Vec has only one angle bracketed type; qed")
+ }
+ };
+ quote! { stream.append_list::<#inner_ident, _>(id); }
+ } else {
+ quote! { stream.append(id); }
+ }
+ } else {
+ panic!("rlp_derive not supported");
+ }
+}
diff --git a/rlp-derive/src/lib.rs b/rlp-derive/src/lib.rs
new file mode 100644
index 000000000..cf6edb4f4
--- /dev/null
+++ b/rlp-derive/src/lib.rs
@@ -0,0 +1,56 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Derive macro for `#[derive(RlpEncodable, RlpDecodable)]`.
+//!
+//! For example of usage see `./tests/rlp.rs`.
+//!
+//! This library also supports up to 1 `#[rlp(default)]` in a struct,
+//! which is similar to [`#[serde(default)]`](https://serde.rs/field-attrs.html#default)
+//! with the caveat that we use the `Default` value if
+//! the field deserialization fails, as we don't serialize field
+//! names and there is no way to tell if it is present or not.
+
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+
+extern crate proc_macro;
+
+mod de;
+mod en;
+
+use de::{impl_decodable, impl_decodable_wrapper};
+use en::{impl_encodable, impl_encodable_wrapper};
+use proc_macro::TokenStream;
+
+#[proc_macro_derive(RlpEncodable, attributes(rlp))]
+pub fn encodable(input: TokenStream) -> TokenStream {
+ let ast = syn::parse(input).unwrap();
+ let gen = impl_encodable(&ast);
+ gen.into()
+}
+
+#[proc_macro_derive(RlpEncodableWrapper)]
+pub fn encodable_wrapper(input: TokenStream) -> TokenStream {
+ let ast = syn::parse(input).unwrap();
+ let gen = impl_encodable_wrapper(&ast);
+ gen.into()
+}
+
+#[proc_macro_derive(RlpDecodable, attributes(rlp))]
+pub fn decodable(input: TokenStream) -> TokenStream {
+ let ast = syn::parse(input).unwrap();
+ let gen = impl_decodable(&ast);
+ gen.into()
+}
+
+#[proc_macro_derive(RlpDecodableWrapper)]
+pub fn decodable_wrapper(input: TokenStream) -> TokenStream {
+ let ast = syn::parse(input).unwrap();
+ let gen = impl_decodable_wrapper(&ast);
+ gen.into()
+}
diff --git a/rlp-derive/tests/rlp.rs b/rlp-derive/tests/rlp.rs
new file mode 100644
index 000000000..24963d323
--- /dev/null
+++ b/rlp-derive/tests/rlp.rs
@@ -0,0 +1,71 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use rlp::{decode, encode};
+use rlp_derive::{RlpDecodable, RlpDecodableWrapper, RlpEncodable, RlpEncodableWrapper};
+
+#[derive(Debug, PartialEq, RlpEncodable, RlpDecodable)]
+struct Item {
+ a: String,
+}
+
+#[derive(Debug, PartialEq, RlpEncodableWrapper, RlpDecodableWrapper)]
+struct ItemWrapper {
+ a: String,
+}
+
+#[test]
+fn test_encode_item() {
+ let item = Item { a: "cat".into() };
+
+ let expected = vec![0xc4, 0x83, b'c', b'a', b't'];
+ let out = encode(&item);
+ assert_eq!(out, expected);
+
+ let decoded = decode(&expected).expect("decode failure");
+ assert_eq!(item, decoded);
+}
+
+#[test]
+fn test_encode_item_wrapper() {
+ let item = ItemWrapper { a: "cat".into() };
+
+ let expected = vec![0x83, b'c', b'a', b't'];
+ let out = encode(&item);
+ assert_eq!(out, expected);
+
+ let decoded = decode(&expected).expect("decode failure");
+ assert_eq!(item, decoded);
+}
+
+#[test]
+fn test_encode_item_default() {
+ #[derive(Debug, PartialEq, RlpEncodable, RlpDecodable)]
+ struct ItemDefault {
+ a: String,
+ /// It works with other attributes.
+ #[rlp(default)]
+ b: Option>,
+ }
+
+ let attack_of = "clones";
+ let item = Item { a: attack_of.into() };
+
+ let expected = vec![0xc7, 0x86, b'c', b'l', b'o', b'n', b'e', b's'];
+ let out = encode(&item);
+ assert_eq!(out, expected);
+
+ let item_default = ItemDefault { a: attack_of.into(), b: None };
+
+ let decoded = decode(&expected).expect("default failure");
+ assert_eq!(item_default, decoded);
+
+ let item_some = ItemDefault { a: attack_of.into(), b: Some(vec![1, 2, 3]) };
+ let out = encode(&item_some);
+ assert_eq!(decode(&out), Ok(item_some));
+}
diff --git a/rlp/CHANGELOG.md b/rlp/CHANGELOG.md
index e0a32ca9b..c817dc6b9 100644
--- a/rlp/CHANGELOG.md
+++ b/rlp/CHANGELOG.md
@@ -1,6 +1,6 @@
# 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/
@@ -8,12 +8,12 @@ The format is based on [Keep a Changelog].
## [0.4.4] - 2019-11-20
### Added
-- Method `Rlp::at_with_offset` (https://github.com/paritytech/parity-common/pull/269)
+- Method `Rlp::at_with_offset`. [#269](https://github.com/paritytech/parity-common/pull/269)
## [0.4.3] - 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)
### Fixed
-- Fixed nested unbounded lists (https://github.com/paritytech/parity-common/pull/203)
+- Fixed nested unbounded lists. [#203](https://github.com/paritytech/parity-common/pull/203)
### Added
-- Added no-std support (https://github.com/paritytech/parity-common/pull/206)
+- Added no-std support. [#206](https://github.com/paritytech/parity-common/pull/206)
diff --git a/rlp/benches/rlp.rs b/rlp/benches/rlp.rs
index 1fcd8b21f..d1de4c93b 100644
--- a/rlp/benches/rlp.rs
+++ b/rlp/benches/rlp.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp/src/error.rs b/rlp/src/error.rs
index d810130b0..a965e5626 100644
--- a/rlp/src/error.rs
+++ b/rlp/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp/src/impls.rs b/rlp/src/impls.rs
index 4f30b8a59..c4815019f 100644
--- a/rlp/src/impls.rs
+++ b/rlp/src/impls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp/src/lib.rs b/rlp/src/lib.rs
index a4c66e2ac..3a913d69f 100644
--- a/rlp/src/lib.rs
+++ b/rlp/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp/src/rlpin.rs b/rlp/src/rlpin.rs
index 6cdfaa808..319723c06 100644
--- a/rlp/src/rlpin.rs
+++ b/rlp/src/rlpin.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp/src/stream.rs b/rlp/src/stream.rs
index 851b845b9..14983d5ef 100644
--- a/rlp/src/stream.rs
+++ b/rlp/src/stream.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp/src/traits.rs b/rlp/src/traits.rs
index 13531a1b6..b5dfa2764 100644
--- a/rlp/src/traits.rs
+++ b/rlp/src/traits.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/rlp/tests/tests.rs b/rlp/tests/tests.rs
index 6f51b9bd3..ac8e8d951 100644
--- a/rlp/tests/tests.rs
+++ b/rlp/tests/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/runtime/CHANGELOG.md b/runtime/CHANGELOG.md
new file mode 100644
index 000000000..e73fb6f28
--- /dev/null
+++ b/runtime/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Changelog
+
+The format is based on [Keep a Changelog].
+
+[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
+
+## [Unreleased]
+
+## [0.1.1] - 2020-02-11
+### Changed
+- Moved to parity common repo, prepared for publishing. [#271](https://github.com/paritytech/parity-common/pull/271)
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
new file mode 100644
index 000000000..ca53759a0
--- /dev/null
+++ b/runtime/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "parity-runtime"
+version = "0.1.1"
+authors = ["Parity Technologies "]
+edition = "2018"
+
+description = "Tokio runtime wrapper"
+license = "GPL-3.0"
+readme = "README.md"
+homepage = "https://www.parity.io/"
+keywords = ["parity", "runtime", "tokio"]
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "CHANGELOG.md"]
+
+[dependencies]
+futures = "0.1"
+tokio = "0.1.22"
+
+[features]
+test-helpers = []
\ No newline at end of file
diff --git a/runtime/README.md b/runtime/README.md
new file mode 100644
index 000000000..7cda2a31f
--- /dev/null
+++ b/runtime/README.md
@@ -0,0 +1,6 @@
+# parity-runtime
+
+Wrapper over tokio runtime. Provides:
+- Customizable runtime with ability to spawn it in different thread models
+- Corresponding runtime executor for tasks
+- Runtime handle
diff --git a/runtime/examples/simple.rs b/runtime/examples/simple.rs
new file mode 100644
index 000000000..6448bcbf6
--- /dev/null
+++ b/runtime/examples/simple.rs
@@ -0,0 +1,41 @@
+// Copyright 2015-2020 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 .
+
+//! Simple example, illustating usage of runtime wrapper.
+
+use futures::{Future, Stream};
+use parity_runtime::Runtime;
+use std::thread::park_timeout;
+use std::time::Duration;
+use tokio::fs::read_dir;
+
+/// Read current directory in a future, which is executed in the created runtime
+fn main() {
+ let fut = read_dir(".")
+ .flatten_stream()
+ .for_each(|dir| {
+ println!("{:?}", dir.path());
+ Ok(())
+ })
+ .map_err(|err| {
+ eprintln!("Error: {:?}", err);
+ ()
+ });
+ let runtime = Runtime::with_default_thread_count();
+ runtime.executor().spawn(fut);
+ let timeout = Duration::from_secs(3);
+ park_timeout(timeout);
+}
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
new file mode 100644
index 000000000..acb1e4b6e
--- /dev/null
+++ b/runtime/src/lib.rs
@@ -0,0 +1,198 @@
+// Copyright 2015-2020 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 .
+
+//! Tokio Runtime wrapper.
+
+use futures::{future, Future, IntoFuture};
+use std::sync::mpsc;
+use std::{fmt, thread};
+pub use tokio::runtime::{Builder as TokioRuntimeBuilder, Runtime as TokioRuntime, TaskExecutor};
+pub use tokio::timer::Delay;
+
+/// Runtime for futures.
+///
+/// Runs in a separate thread.
+pub struct Runtime {
+ executor: Executor,
+ handle: RuntimeHandle,
+}
+
+impl Runtime {
+ fn new(runtime_bldr: &mut TokioRuntimeBuilder) -> Self {
+ let mut runtime = runtime_bldr.build().expect(
+ "Building a Tokio runtime will only fail when mio components \
+ cannot be initialized (catastrophic)",
+ );
+ let (stop, stopped) = futures::oneshot();
+ let (tx, rx) = mpsc::channel();
+ let handle = thread::spawn(move || {
+ tx.send(runtime.executor()).expect("Rx is blocking upper thread.");
+ runtime
+ .block_on(futures::empty().select(stopped).map(|_| ()).map_err(|_| ()))
+ .expect("Tokio runtime should not have unhandled errors.");
+ });
+ let executor = rx.recv().expect("tx is transfered to a newly spawned thread.");
+
+ Runtime {
+ executor: Executor { inner: Mode::Tokio(executor) },
+ handle: RuntimeHandle { close: Some(stop), handle: Some(handle) },
+ }
+ }
+
+ /// Spawns a new tokio runtime with a default thread count on a background
+ /// thread and returns a `Runtime` which can be used to spawn tasks via
+ /// its executor.
+ pub fn with_default_thread_count() -> Self {
+ let mut runtime_bldr = TokioRuntimeBuilder::new();
+ Self::new(&mut runtime_bldr)
+ }
+
+ /// Spawns a new tokio runtime with a the specified thread count on a
+ /// background thread and returns a `Runtime` which can be used to spawn
+ /// tasks via its executor.
+ #[cfg(any(test, feature = "test-helpers"))]
+ pub fn with_thread_count(thread_count: usize) -> Self {
+ let mut runtime_bldr = TokioRuntimeBuilder::new();
+ runtime_bldr.core_threads(thread_count);
+
+ Self::new(&mut runtime_bldr)
+ }
+
+ /// Returns this runtime raw executor.
+ #[cfg(any(test, feature = "test-helpers"))]
+ pub fn raw_executor(&self) -> TaskExecutor {
+ if let Mode::Tokio(ref executor) = self.executor.inner {
+ executor.clone()
+ } else {
+ panic!("Runtime is not initialized in Tokio mode.")
+ }
+ }
+
+ /// Returns runtime executor.
+ pub fn executor(&self) -> Executor {
+ self.executor.clone()
+ }
+}
+
+#[derive(Clone)]
+enum Mode {
+ Tokio(TaskExecutor),
+ // Mode used in tests
+ #[allow(dead_code)]
+ Sync,
+ // Mode used in tests
+ #[allow(dead_code)]
+ ThreadPerFuture,
+}
+
+impl fmt::Debug for Mode {
+ fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+ use self::Mode::*;
+
+ match *self {
+ Tokio(_) => write!(fmt, "tokio"),
+ Sync => write!(fmt, "synchronous"),
+ ThreadPerFuture => write!(fmt, "thread per future"),
+ }
+ }
+}
+
+#[derive(Debug, Clone)]
+pub struct Executor {
+ inner: Mode,
+}
+
+impl Executor {
+ /// Synchronous executor, used for tests.
+ #[cfg(any(test, feature = "test-helpers"))]
+ pub fn new_sync() -> Self {
+ Executor { inner: Mode::Sync }
+ }
+
+ /// Spawns a new thread for each future (use only for tests).
+ #[cfg(any(test, feature = "test-helpers"))]
+ pub fn new_thread_per_future() -> Self {
+ Executor { inner: Mode::ThreadPerFuture }
+ }
+
+ /// Spawn a future on this runtime
+ pub fn spawn(&self, r: R)
+ where
+ R: IntoFuture
- + Send + 'static,
+ R::Future: Send + 'static,
+ {
+ match self.inner {
+ Mode::Tokio(ref executor) => executor.spawn(r.into_future()),
+ Mode::Sync => {
+ let _ = r.into_future().wait();
+ }
+ Mode::ThreadPerFuture => {
+ thread::spawn(move || {
+ let _ = r.into_future().wait();
+ });
+ }
+ }
+ }
+}
+
+impl + Send + 'static> future::Executor for Executor {
+ fn execute(&self, future: F) -> Result<(), future::ExecuteError> {
+ match self.inner {
+ Mode::Tokio(ref executor) => executor.execute(future),
+ Mode::Sync => {
+ let _ = future.wait();
+ Ok(())
+ }
+ Mode::ThreadPerFuture => {
+ thread::spawn(move || {
+ let _ = future.wait();
+ });
+ Ok(())
+ }
+ }
+ }
+}
+
+/// A handle to a runtime. Dropping the handle will cause runtime to shutdown.
+pub struct RuntimeHandle {
+ close: Option>,
+ handle: Option>,
+}
+
+impl From for RuntimeHandle {
+ fn from(el: Runtime) -> Self {
+ el.handle
+ }
+}
+
+impl Drop for RuntimeHandle {
+ fn drop(&mut self) {
+ self.close.take().map(|v| v.send(()));
+ }
+}
+
+impl RuntimeHandle {
+ /// Blocks current thread and waits until the runtime is finished.
+ pub fn wait(mut self) -> thread::Result<()> {
+ self.handle.take().expect("Handle is taken only in `wait`, `wait` is consuming; qed").join()
+ }
+
+ /// Finishes this runtime.
+ pub fn close(mut self) {
+ let _ =
+ self.close.take().expect("Close is taken only in `close` and `drop`. `close` is consuming; qed").send(());
+ }
+}
diff --git a/trace-time/CHANGELOG.md b/trace-time/CHANGELOG.md
index 0231c53a1..300ce6461 100644
--- a/trace-time/CHANGELOG.md
+++ b/trace-time/CHANGELOG.md
@@ -1,12 +1,13 @@
# 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.1.2] - 2019-10-24
-- Migrated to 2018 edition (https://github.com/paritytech/parity-common/pull/232)
+- Migrated to 2018 edition. [#232](https://github.com/paritytech/parity-common/pull/232)
### 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/trace-time/Cargo.toml b/trace-time/Cargo.toml
index f1ec6e9a1..fca5a7619 100644
--- a/trace-time/Cargo.toml
+++ b/trace-time/Cargo.toml
@@ -4,7 +4,7 @@ description = "Easily trace time to execute a scope."
version = "0.1.2"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
-license = "GPL-3.0"
+license = "MIT/Apache2.0"
edition = "2018"
[dependencies]
diff --git a/trace-time/src/lib.rs b/trace-time/src/lib.rs
index 65769ee81..e5ecf2d09 100644
--- a/trace-time/src/lib.rs
+++ b/trace-time/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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Performance timer with logging
diff --git a/transaction-pool/CHANGELOG.md b/transaction-pool/CHANGELOG.md
index bcd99d5a9..431effd94 100644
--- a/transaction-pool/CHANGELOG.md
+++ b/transaction-pool/CHANGELOG.md
@@ -1,12 +1,13 @@
# 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)
## [2.0.2] - 2019-10-24
-- Updated to 2018 edition idioms (https://github.com/paritytech/parity-common/pull/237)
+- Updated to 2018 edition idioms. [#237](https://github.com/paritytech/parity-common/pull/237)
### 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/transaction-pool/Cargo.toml b/transaction-pool/Cargo.toml
index 844607efa..0da12d924 100644
--- a/transaction-pool/Cargo.toml
+++ b/transaction-pool/Cargo.toml
@@ -2,7 +2,7 @@
description = "Generic transaction pool."
name = "transaction-pool"
version = "2.0.2"
-license = "GPL-3.0"
+license = "MIT/Apache2.0"
authors = ["Parity Technologies "]
repository = "https://github.com/paritytech/parity-common"
edition = "2018"
diff --git a/transaction-pool/src/error.rs b/transaction-pool/src/error.rs
index 348082f6a..20935c23b 100644
--- a/transaction-pool/src/error.rs
+++ b/transaction-pool/src/error.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use std::{error, fmt, result};
diff --git a/transaction-pool/src/lib.rs b/transaction-pool/src/lib.rs
index 66e93fffe..dd49fb3a8 100644
--- a/transaction-pool/src/lib.rs
+++ b/transaction-pool/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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Generic Transaction Pool
//!
diff --git a/transaction-pool/src/listener.rs b/transaction-pool/src/listener.rs
index 566b318ee..5a3f1a0c7 100644
--- a/transaction-pool/src/listener.rs
+++ b/transaction-pool/src/listener.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use crate::error::Error;
use std::{
diff --git a/transaction-pool/src/options.rs b/transaction-pool/src/options.rs
index 8e1c1002d..947af30a9 100644
--- a/transaction-pool/src/options.rs
+++ b/transaction-pool/src/options.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
/// Transaction Pool options.
#[derive(Clone, Debug, PartialEq)]
diff --git a/transaction-pool/src/pool.rs b/transaction-pool/src/pool.rs
index 63bb0a07f..2eb324020 100644
--- a/transaction-pool/src/pool.rs
+++ b/transaction-pool/src/pool.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use log::{trace, warn};
use std::collections::{hash_map, BTreeSet, HashMap};
diff --git a/transaction-pool/src/ready.rs b/transaction-pool/src/ready.rs
index 45e85ca29..009eae273 100644
--- a/transaction-pool/src/ready.rs
+++ b/transaction-pool/src/ready.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
/// Transaction readiness.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
diff --git a/transaction-pool/src/replace.rs b/transaction-pool/src/replace.rs
index a278edb80..cbae6319b 100644
--- a/transaction-pool/src/replace.rs
+++ b/transaction-pool/src/replace.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! When queue limits are reached, decide whether to replace an existing transaction from the pool
diff --git a/transaction-pool/src/scoring.rs b/transaction-pool/src/scoring.rs
index 313bd6bc3..b7f75e7fc 100644
--- a/transaction-pool/src/scoring.rs
+++ b/transaction-pool/src/scoring.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! A transactions ordering abstraction.
diff --git a/transaction-pool/src/status.rs b/transaction-pool/src/status.rs
index b9e7656d4..615e40cb7 100644
--- a/transaction-pool/src/status.rs
+++ b/transaction-pool/src/status.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
/// Light pool status.
/// This status is cheap to compute and can be called frequently.
diff --git a/transaction-pool/src/tests/helpers.rs b/transaction-pool/src/tests/helpers.rs
index f757ac8d7..8f6e5fb99 100644
--- a/transaction-pool/src/tests/helpers.rs
+++ b/transaction-pool/src/tests/helpers.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use std::cmp;
use std::collections::HashMap;
diff --git a/transaction-pool/src/tests/mod.rs b/transaction-pool/src/tests/mod.rs
index db5ea2885..2d80b4a3d 100644
--- a/transaction-pool/src/tests/mod.rs
+++ b/transaction-pool/src/tests/mod.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
mod helpers;
mod tx_builder;
diff --git a/transaction-pool/src/tests/tx_builder.rs b/transaction-pool/src/tests/tx_builder.rs
index 83f7b13a0..d543e830e 100644
--- a/transaction-pool/src/tests/tx_builder.rs
+++ b/transaction-pool/src/tests/tx_builder.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use super::{Address, Transaction, H256, U256};
use ethereum_types::BigEndianHash;
diff --git a/transaction-pool/src/transactions.rs b/transaction-pool/src/transactions.rs
index 5fc963d78..4d6d126af 100644
--- a/transaction-pool/src/transactions.rs
+++ b/transaction-pool/src/transactions.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use std::{fmt, mem};
diff --git a/transaction-pool/src/verifier.rs b/transaction-pool/src/verifier.rs
index 991b78ebd..d28e5a55e 100644
--- a/transaction-pool/src/verifier.rs
+++ b/transaction-pool/src/verifier.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
use crate::VerifiedTransaction;
diff --git a/triehash/CHANGELOG.md b/triehash/CHANGELOG.md
index 320e4f84f..88acd4dd1 100644
--- a/triehash/CHANGELOG.md
+++ b/triehash/CHANGELOG.md
@@ -1,14 +1,15 @@
# 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.8.2] - 2019-12-15
-- Added no-std support (https://github.com/paritytech/parity-common/pull/280)
+- Added no-std support. [#280](https://github.com/paritytech/parity-common/pull/280)
## [0.8.1] - 2019-10-24
-- Migrated to 2018 edition (https://github.com/paritytech/parity-common/pull/214)
+- Migrated to 2018 edition. [#214](https://github.com/paritytech/parity-common/pull/214)
### 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/triehash/Cargo.toml b/triehash/Cargo.toml
index a941edaa0..407489469 100644
--- a/triehash/Cargo.toml
+++ b/triehash/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.8.2"
authors = ["Parity Technologies "]
description = "In-memory patricia trie operations"
repository = "https://github.com/paritytech/parity-common"
-license = "GPL-3.0"
+license = "MIT/Apache2.0"
edition = "2018"
[dependencies]
diff --git a/triehash/benches/triehash.rs b/triehash/benches/triehash.rs
index 684484265..14ce0dd6b 100644
--- a/triehash/benches/triehash.rs
+++ b/triehash/benches/triehash.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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , 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 ethereum_types::H256;
diff --git a/triehash/src/lib.rs b/triehash/src/lib.rs
index 81a005826..a60a24998 100644
--- a/triehash/src/lib.rs
+++ b/triehash/src/lib.rs
@@ -1,18 +1,10 @@
-// Copyright 2015-2019 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 .
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
//! Generetes trie root.
//!
diff --git a/uint/CHANGELOG.md b/uint/CHANGELOG.md
index a4214eaf9..c04300e84 100644
--- a/uint/CHANGELOG.md
+++ b/uint/CHANGELOG.md
@@ -1,6 +1,6 @@
# 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/
@@ -8,9 +8,9 @@ The format is based on [Keep a Changelog].
## [0.8.2] - 2019-10-24
### Fixed
-- Fixed 2018 edition imports (https://github.com/paritytech/parity-common/pull/237)
-- Removed `uninitialized` usage (https://github.com/paritytech/parity-common/pull/238)
+- Fixed 2018 edition imports. [#237](https://github.com/paritytech/parity-common/pull/237)
+- Removed `uninitialized` usage. [#238](https://github.com/paritytech/parity-common/pull/238)
### Dependencies
-- Updated dependencies (https://github.com/paritytech/parity-common/pull/239)
+- Updated dependencies. [#239](https://github.com/paritytech/parity-common/pull/239)
### Changed
-- Modified AsRef impl (https://github.com/paritytech/parity-common/pull/196)
+- Modified AsRef impl. [#196](https://github.com/paritytech/parity-common/pull/196)
diff --git a/uint/benches/bigint.rs b/uint/benches/bigint.rs
index ea0284cdd..ec36c576a 100644
--- a/uint/benches/bigint.rs
+++ b/uint/benches/bigint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/uint/examples/modular.rs b/uint/examples/modular.rs
index abc754f82..30b236992 100644
--- a/uint/examples/modular.rs
+++ b/uint/examples/modular.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/uint/fuzz/fuzz_targets/div_mod.rs b/uint/fuzz/fuzz_targets/div_mod.rs
index 7bcf751a8..102407ecc 100644
--- a/uint/fuzz/fuzz_targets/div_mod.rs
+++ b/uint/fuzz/fuzz_targets/div_mod.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
#![no_main]
use libfuzzer_sys::fuzz_target;
diff --git a/uint/fuzz/fuzz_targets/div_mod_word.rs b/uint/fuzz/fuzz_targets/div_mod_word.rs
index 890774c08..285304944 100644
--- a/uint/fuzz/fuzz_targets/div_mod_word.rs
+++ b/uint/fuzz/fuzz_targets/div_mod_word.rs
@@ -1,3 +1,11 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 or the MIT license
+// , at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
#![no_main]
use libfuzzer_sys::fuzz_target;
diff --git a/uint/src/lib.rs b/uint/src/lib.rs
index bba720be8..144c53e32 100644
--- a/uint/src/lib.rs
+++ b/uint/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
diff --git a/uint/src/uint.rs b/uint/src/uint.rs
index 7dd1bca42..493e2e21e 100644
--- a/uint/src/uint.rs
+++ b/uint/src/uint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license
@@ -38,6 +38,23 @@ pub enum FromDecStrErr {
InvalidLength,
}
+#[cfg(feature = "std")]
+impl std::fmt::Display for FromDecStrErr {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(
+ f,
+ "{}",
+ match self {
+ FromDecStrErr::InvalidCharacter => "a character is not in the range 0-9",
+ FromDecStrErr::InvalidLength => "the number is too large for the type",
+ }
+ )
+ }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for FromDecStrErr {}
+
#[macro_export]
#[doc(hidden)]
macro_rules! impl_map_from {
diff --git a/uint/tests/uint_tests.rs b/uint/tests/uint_tests.rs
index ddeb747c3..2e226ad36 100644
--- a/uint/tests/uint_tests.rs
+++ b/uint/tests/uint_tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 Parity Technologies
+// Copyright 2020 Parity Technologies
//
// Licensed under the Apache License, Version 2.0 or the MIT license