diff --git a/COPYING b/COPYING
index f288702d2fa..0a041280bd0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,674 +1,165 @@
-                    GNU GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <https://www.gnu.org/licenses/>.
-
-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:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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
-<https://www.gnu.org/licenses/>.
-
-  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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/COPYING.LESSER b/COPYING.LESSER
deleted file mode 100644
index 65c5ca88a67..00000000000
--- a/COPYING.LESSER
+++ /dev/null
@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go
index 02bc42e1283..8a039e91141 100644
--- a/accounts/abi/abi.go
+++ b/accounts/abi/abi.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go
index 4be73c79010..88d7e0e37ba 100644
--- a/accounts/abi/abi_test.go
+++ b/accounts/abi/abi_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/argument.go b/accounts/abi/argument.go
index eaf4e3fc4f5..ac1fc94a540 100644
--- a/accounts/abi/argument.go
+++ b/accounts/abi/argument.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go
index 035fd43a42b..081b648b0c9 100644
--- a/accounts/abi/bind/auth.go
+++ b/accounts/abi/bind/auth.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go
index 48cf24a7dea..37a2fac452b 100644
--- a/accounts/abi/bind/backend.go
+++ b/accounts/abi/bind/backend.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
index cf14438993a..5572745f804 100644
--- a/accounts/abi/bind/backends/simulated.go
+++ b/accounts/abi/bind/backends/simulated.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go
index 75a24075b9c..84bd902be43 100644
--- a/accounts/abi/bind/backends/simulated_test.go
+++ b/accounts/abi/bind/backends/simulated_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
index cc4683c4d51..425b6997f7e 100644
--- a/accounts/abi/bind/base.go
+++ b/accounts/abi/bind/base.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go
index 5f904962773..256ae94a4c2 100644
--- a/accounts/abi/bind/base_test.go
+++ b/accounts/abi/bind/base_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go
index 97ca9eec9a3..65cf957df12 100644
--- a/accounts/abi/bind/bind.go
+++ b/accounts/abi/bind/bind.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
index fbc9274ca3e..f78003d0d61 100644
--- a/accounts/abi/bind/bind_test.go
+++ b/accounts/abi/bind/bind_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go
index 09233970ee4..713bb27fc96 100644
--- a/accounts/abi/bind/template.go
+++ b/accounts/abi/bind/template.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go
index 007a25f737b..32f9556fe85 100644
--- a/accounts/abi/bind/util.go
+++ b/accounts/abi/bind/util.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go
index 102454a871a..c748a5cc4e6 100644
--- a/accounts/abi/bind/util_test.go
+++ b/accounts/abi/bind/util_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/doc.go b/accounts/abi/doc.go
index 15c90b7bdad..3df6ee2c4da 100644
--- a/accounts/abi/doc.go
+++ b/accounts/abi/doc.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/error.go b/accounts/abi/error.go
index 521182f8111..3172a222433 100644
--- a/accounts/abi/error.go
+++ b/accounts/abi/error.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/event.go b/accounts/abi/event.go
index 53b9acd915c..36a73b1438b 100644
--- a/accounts/abi/event.go
+++ b/accounts/abi/event.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go
index 8767c61a4d2..632e81150be 100644
--- a/accounts/abi/event_test.go
+++ b/accounts/abi/event_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/method.go b/accounts/abi/method.go
index cc818e4932c..b25f1969c2d 100644
--- a/accounts/abi/method.go
+++ b/accounts/abi/method.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/method_test.go b/accounts/abi/method_test.go
index c58f323df04..6dfe4447d4b 100644
--- a/accounts/abi/method_test.go
+++ b/accounts/abi/method_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go
index b8ccdfef484..53c993a0bb5 100644
--- a/accounts/abi/pack.go
+++ b/accounts/abi/pack.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go
index 8f25e70a8a7..19094607b1f 100644
--- a/accounts/abi/pack_test.go
+++ b/accounts/abi/pack_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/packing_test.go b/accounts/abi/packing_test.go
index 07ffc20aab0..63c916d8042 100644
--- a/accounts/abi/packing_test.go
+++ b/accounts/abi/packing_test.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/reflect.go b/accounts/abi/reflect.go
index f9feaf3673f..84d1b34195c 100644
--- a/accounts/abi/reflect.go
+++ b/accounts/abi/reflect.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/reflect_test.go b/accounts/abi/reflect_test.go
index f504cee47c4..0d488092f67 100644
--- a/accounts/abi/reflect_test.go
+++ b/accounts/abi/reflect_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go
index 707cf989077..e54a0a13d39 100644
--- a/accounts/abi/topics.go
+++ b/accounts/abi/topics.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/topics_test.go b/accounts/abi/topics_test.go
index 6e129154065..e2e84246039 100644
--- a/accounts/abi/topics_test.go
+++ b/accounts/abi/topics_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/type.go b/accounts/abi/type.go
index fe678cf4160..6ff822472c2 100644
--- a/accounts/abi/type.go
+++ b/accounts/abi/type.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go
index 010c544d6f5..4e043e6ef5a 100644
--- a/accounts/abi/type_test.go
+++ b/accounts/abi/type_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go
index b578b3e5cba..5750e382e4a 100644
--- a/accounts/abi/unpack.go
+++ b/accounts/abi/unpack.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
index 315d12f37dc..bb89a3c093c 100644
--- a/accounts/abi/unpack_test.go
+++ b/accounts/abi/unpack_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go
index a52ff6de89e..0d64cdb4ca3 100644
--- a/cmd/abigen/main.go
+++ b/cmd/abigen/main.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go
index fd09d54ccf6..5090142eb18 100644
--- a/cmd/bootnode/main.go
+++ b/cmd/bootnode/main.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go
index dc08c1a5114..0beae1a067f 100644
--- a/cmd/evm/compiler.go
+++ b/cmd/evm/compiler.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
index 32196e00a43..05d950f00d9 100644
--- a/cmd/evm/disasm.go
+++ b/cmd/evm/disasm.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go
index 556862301e7..a4d5dce0a00 100644
--- a/cmd/evm/internal/compiler/compiler.go
+++ b/cmd/evm/internal/compiler/compiler.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
index 79899f2439d..86548acd244 100644
--- a/cmd/evm/internal/t8ntool/execution.go
+++ b/cmd/evm/internal/t8ntool/execution.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go
index 22357831be4..638c6fc546e 100644
--- a/cmd/evm/internal/t8ntool/flags.go
+++ b/cmd/evm/internal/t8ntool/flags.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
index 4e665a3b225..5baf2fa34e5 100644
--- a/cmd/evm/internal/t8ntool/transition.go
+++ b/cmd/evm/internal/t8ntool/transition.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 8546de17320..21577d254cc 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index 9eb8c148ec1..ac065d7a63d 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
index 931efdeff58..a76c1d34e08 100644
--- a/cmd/evm/staterunner.go
+++ b/cmd/evm/staterunner.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go
index 0726f7890c9..3911b1d7a5c 100644
--- a/cmd/p2psim/main.go
+++ b/cmd/p2psim/main.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go
index 6fefbea7059..223f1851afb 100644
--- a/cmd/rlpdump/main.go
+++ b/cmd/rlpdump/main.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index ba0c0e4970b..ade05d7760e 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 20a0d9b8d92..8fe36cc8a0c 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/utils/flags/flags.go b/cmd/utils/flags/flags.go
index 7739138d0b5..604fc2c7e83 100644
--- a/cmd/utils/flags/flags.go
+++ b/cmd/utils/flags/flags.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/utils/flags/flags_test.go b/cmd/utils/flags/flags_test.go
index d625a501d0d..e6bd0a31278 100644
--- a/cmd/utils/flags/flags_test.go
+++ b/cmd/utils/flags/flags_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/utils/flags/helpers.go b/cmd/utils/flags/helpers.go
index 740e85abf43..42ba29d30f7 100644
--- a/cmd/utils/flags/helpers.go
+++ b/cmd/utils/flags/helpers.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/cmd/utils/flags_test.go b/cmd/utils/flags_test.go
index 71af5866697..0d26307a46f 100644
--- a/cmd/utils/flags_test.go
+++ b/cmd/utils/flags_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/bitutil/compress.go b/common/bitutil/compress.go
index 2c55a43e061..17886e66b0d 100644
--- a/common/bitutil/compress.go
+++ b/common/bitutil/compress.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go
index c1b5acd03f1..f8d8b53b716 100644
--- a/common/bitutil/compress_test.go
+++ b/common/bitutil/compress_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/bytes.go b/common/bytes.go
index 71725c369a3..1e386278414 100644
--- a/common/bytes.go
+++ b/common/bytes.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/bytes_test.go b/common/bytes_test.go
index 22bdd8d57c1..2b82d63afaa 100644
--- a/common/bytes_test.go
+++ b/common/bytes_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/compiler/helpers.go b/common/compiler/helpers.go
index 25952db4938..0f688f536cb 100644
--- a/common/compiler/helpers.go
+++ b/common/compiler/helpers.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go
index e03af209ed7..1817b380006 100644
--- a/common/compiler/solidity.go
+++ b/common/compiler/solidity.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/compiler/vyper.go b/common/compiler/vyper.go
index 547616c58c5..3680a728e77 100644
--- a/common/compiler/vyper.go
+++ b/common/compiler/vyper.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/compiler/vyper_test.go b/common/compiler/vyper_test.go
index b044cfe7125..13ad279138e 100644
--- a/common/compiler/vyper_test.go
+++ b/common/compiler/vyper_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/debug.go b/common/debug.go
index 49250c8e97a..275bcdd4d42 100644
--- a/common/debug.go
+++ b/common/debug.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/fdlimit/fdlimit_bsd.go b/common/fdlimit/fdlimit_bsd.go
index 08d8ab11b78..b32775bc268 100644
--- a/common/fdlimit/fdlimit_bsd.go
+++ b/common/fdlimit/fdlimit_bsd.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/fdlimit/fdlimit_darwin.go b/common/fdlimit/fdlimit_darwin.go
index 806b062e6d3..c59be293476 100644
--- a/common/fdlimit/fdlimit_darwin.go
+++ b/common/fdlimit/fdlimit_darwin.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/fdlimit/fdlimit_test.go b/common/fdlimit/fdlimit_test.go
index beec58376a1..c8078d4377d 100644
--- a/common/fdlimit/fdlimit_test.go
+++ b/common/fdlimit/fdlimit_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/fdlimit/fdlimit_unix.go b/common/fdlimit/fdlimit_unix.go
index 94669768055..2f3ac908cc8 100644
--- a/common/fdlimit/fdlimit_unix.go
+++ b/common/fdlimit/fdlimit_unix.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/fdlimit/fdlimit_windows.go b/common/fdlimit/fdlimit_windows.go
index 4696977e894..c7897072626 100644
--- a/common/fdlimit/fdlimit_windows.go
+++ b/common/fdlimit/fdlimit_windows.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/format.go b/common/format.go
index 43a51bd5875..a2b5281de18 100644
--- a/common/format.go
+++ b/common/format.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/math/big.go b/common/math/big.go
index 9888fe4da56..f2e41637bcf 100644
--- a/common/math/big.go
+++ b/common/math/big.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/math/big_test.go b/common/math/big_test.go
index 958058c6c17..3d183ed319d 100644
--- a/common/math/big_test.go
+++ b/common/math/big_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/math/integer.go b/common/math/integer.go
index 4c2023fa8f2..97ccde6c95b 100644
--- a/common/math/integer.go
+++ b/common/math/integer.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/math/integer_test.go b/common/math/integer_test.go
index a955ed9c9f9..3cbe377fb65 100644
--- a/common/math/integer_test.go
+++ b/common/math/integer_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/mclock/mclock.go b/common/mclock/mclock.go
index 78f98b45688..add14bf55b8 100644
--- a/common/mclock/mclock.go
+++ b/common/mclock/mclock.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/mclock/simclock.go b/common/mclock/simclock.go
index f30e39b772d..6b1b7893f78 100644
--- a/common/mclock/simclock.go
+++ b/common/mclock/simclock.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/mclock/simclock_test.go b/common/mclock/simclock_test.go
index 755c66a1207..0eb1bd71d82 100644
--- a/common/mclock/simclock_test.go
+++ b/common/mclock/simclock_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/path.go b/common/path.go
index 8b18ef14bf5..8ea216dfb45 100644
--- a/common/path.go
+++ b/common/path.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go
index 7f80b9af8da..197ed18c12d 100644
--- a/common/prque/lazyqueue.go
+++ b/common/prque/lazyqueue.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/prque/lazyqueue_test.go b/common/prque/lazyqueue_test.go
index 561409bfce2..e7edfc64bc1 100644
--- a/common/prque/lazyqueue_test.go
+++ b/common/prque/lazyqueue_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/size.go b/common/size.go
index 3e910c7b63a..bd221b8b119 100644
--- a/common/size.go
+++ b/common/size.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/size_test.go b/common/size_test.go
index c01da21d5a8..b92cce048bf 100644
--- a/common/size_test.go
+++ b/common/size_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/test_utils.go b/common/test_utils.go
index 24db0fec514..455c7069034 100644
--- a/common/test_utils.go
+++ b/common/test_utils.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/types.go b/common/types.go
index f7488b97537..dac051aec3a 100644
--- a/common/types.go
+++ b/common/types.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/types_test.go b/common/types_test.go
index ed473d717ef..26dd0810256 100644
--- a/common/types_test.go
+++ b/common/types_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/common/u256/big.go b/common/u256/big.go
index f502100ae8a..f03cba28ef7 100644
--- a/common/u256/big.go
+++ b/common/u256/big.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/aura/aura.go b/consensus/aura/aura.go
index b63b417ce20..087f1a4c56d 100644
--- a/consensus/aura/aura.go
+++ b/consensus/aura/aura.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/aura/config.go b/consensus/aura/config.go
index 66fabd875b3..b554e84fc7a 100644
--- a/consensus/aura/config.go
+++ b/consensus/aura/config.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/aura/rolling_finality.go b/consensus/aura/rolling_finality.go
index 549d2e7b832..b277237d65c 100644
--- a/consensus/aura/rolling_finality.go
+++ b/consensus/aura/rolling_finality.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/clique/api.go b/consensus/clique/api.go
index ac90aa97af8..d95707bc51b 100644
--- a/consensus/clique/api.go
+++ b/consensus/clique/api.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
index 31919fc6df8..c2bb55f47c9 100644
--- a/consensus/clique/clique.go
+++ b/consensus/clique/clique.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go
index 1dc9447c2db..c70c81ea086 100644
--- a/consensus/clique/clique_test.go
+++ b/consensus/clique/clique_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go
index 18ebe634de7..57e394483ce 100644
--- a/consensus/clique/snapshot.go
+++ b/consensus/clique/snapshot.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
index e67323679da..7dc0fb48918 100644
--- a/consensus/clique/snapshot_test.go
+++ b/consensus/clique/snapshot_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/consensus.go b/consensus/consensus.go
index 806a75723d3..f707873aea8 100644
--- a/consensus/consensus.go
+++ b/consensus/consensus.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/errors.go b/consensus/errors.go
index b8bf81dcfc5..c0dbc846a9f 100644
--- a/consensus/errors.go
+++ b/consensus/errors.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go
index 7d7b30d842a..00c2b207dfb 100644
--- a/consensus/ethash/algorithm.go
+++ b/consensus/ethash/algorithm.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go
index 0998c3ff5c3..f25d55ed65e 100644
--- a/consensus/ethash/algorithm_test.go
+++ b/consensus/ethash/algorithm_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go
index 995ba1aeef8..b4b678bda14 100644
--- a/consensus/ethash/api.go
+++ b/consensus/ethash/api.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
index 321691bbd96..5d21daabec3 100644
--- a/consensus/ethash/consensus.go
+++ b/consensus/ethash/consensus.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go
index 8c94da964a1..0cbe8bc5c24 100644
--- a/consensus/ethash/consensus_test.go
+++ b/consensus/ethash/consensus_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/difficulty.go b/consensus/ethash/difficulty.go
index ae6386b8517..6368d79e580 100644
--- a/consensus/ethash/difficulty.go
+++ b/consensus/ethash/difficulty.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go
index 5a136ef9309..e416ad4bc65 100644
--- a/consensus/ethash/ethash.go
+++ b/consensus/ethash/ethash.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go
index d1e50595f53..5a206646feb 100644
--- a/consensus/ethash/ethash_test.go
+++ b/consensus/ethash/ethash_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go
index b34df20d62e..209c81d9fc0 100644
--- a/consensus/ethash/sealer.go
+++ b/consensus/ethash/sealer.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go
index 8b548d617fb..07b65125024 100644
--- a/consensus/ethash/sealer_test.go
+++ b/consensus/ethash/sealer_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go
index 198c30ab4c2..98536d151bd 100644
--- a/consensus/misc/dao.go
+++ b/consensus/misc/dao.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go
index 329f4af2f57..ba23002226e 100644
--- a/consensus/misc/eip1559.go
+++ b/consensus/misc/eip1559.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/misc/eip1559_test.go b/consensus/misc/eip1559_test.go
index 5d380bffa43..e443ab664ec 100644
--- a/consensus/misc/eip1559_test.go
+++ b/consensus/misc/eip1559_test.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/misc/eip4844.go b/consensus/misc/eip4844.go
index 7c8e79852d4..44d2d2921d5 100644
--- a/consensus/misc/eip4844.go
+++ b/consensus/misc/eip4844.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/misc/eip4844_test.go b/consensus/misc/eip4844_test.go
index 7f77c91a280..04e9b287871 100644
--- a/consensus/misc/eip4844_test.go
+++ b/consensus/misc/eip4844_test.go
@@ -1,4 +1,7 @@
-// Copyright 2022 The go-ethereum and Erigon Authors
+// Copyright 2022 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go
index 11b1498da83..17590afecda 100644
--- a/consensus/misc/gaslimit.go
+++ b/consensus/misc/gaslimit.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/asm/asm.go b/core/asm/asm.go
index aa34ce916b7..02ad6f1deca 100644
--- a/core/asm/asm.go
+++ b/core/asm/asm.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/asm/asm_test.go b/core/asm/asm_test.go
index 764f42b4678..5c3756a51ac 100644
--- a/core/asm/asm_test.go
+++ b/core/asm/asm_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/asm/compiler.go b/core/asm/compiler.go
index e118df0d3e9..beb470faf2e 100644
--- a/core/asm/compiler.go
+++ b/core/asm/compiler.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/asm/compiler_test.go b/core/asm/compiler_test.go
index c99ec73d026..71474430e91 100644
--- a/core/asm/compiler_test.go
+++ b/core/asm/compiler_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/asm/lex_test.go b/core/asm/lex_test.go
index 8b746794389..44ec281994d 100644
--- a/core/asm/lex_test.go
+++ b/core/asm/lex_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/asm/lexer.go b/core/asm/lexer.go
index 28a72a74ebd..7d51dc6ac2d 100644
--- a/core/asm/lexer.go
+++ b/core/asm/lexer.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/block_validator.go b/core/block_validator.go
index ebe78ed342a..33b7bd753ff 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/block_validator_test.go b/core/block_validator_test.go
index 12c8d62b197..eef98578457 100644
--- a/core/block_validator_test.go
+++ b/core/block_validator_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/blockchain.go b/core/blockchain.go
index 791e2e397da..c3c0882544c 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/blocks.go b/core/blocks.go
index 76b8b3e5256..a11f3c4b687 100644
--- a/core/blocks.go
+++ b/core/blocks.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/chain_makers.go b/core/chain_makers.go
index 4ff2dcd5f2f..f535df9a091 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/error.go b/core/error.go
index 282dd524f5e..7957ff032e1 100644
--- a/core/error.go
+++ b/core/error.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/events.go b/core/events.go
index 4af83615862..2b3884e2701 100644
--- a/core/events.go
+++ b/core/events.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/evm.go b/core/evm.go
index 1fcd0598d3a..ac1f79b742e 100644
--- a/core/evm.go
+++ b/core/evm.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go
index 9a0f6438fb2..53a42d8e4ea 100644
--- a/core/forkid/forkid.go
+++ b/core/forkid/forkid.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
index f9c6b4fde39..f167619dcb2 100644
--- a/core/forkid/forkid_test.go
+++ b/core/forkid/forkid_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/gaspool.go b/core/gaspool.go
index 39e623e40dd..053d2ea8dad 100644
--- a/core/gaspool.go
+++ b/core/gaspool.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/genesis_write.go b/core/genesis_write.go
index 570aa21822d..828a6041790 100644
--- a/core/genesis_write.go
+++ b/core/genesis_write.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/mkalloc.go b/core/mkalloc.go
index 312d6265d84..5d8846805f7 100644
--- a/core/mkalloc.go
+++ b/core/mkalloc.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/rawdb/accessors_canonical_reader_test.go b/core/rawdb/accessors_canonical_reader_test.go
index 1ad6a003da1..d467940a7c4 100644
--- a/core/rawdb/accessors_canonical_reader_test.go
+++ b/core/rawdb/accessors_canonical_reader_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go
index e2ecfadc360..6fab74bb420 100644
--- a/core/rawdb/accessors_chain.go
+++ b/core/rawdb/accessors_chain.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go
index c0a4d8dfb09..cc50f731ed2 100644
--- a/core/rawdb/accessors_chain_test.go
+++ b/core/rawdb/accessors_chain_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go
index 85637e0d5f6..f08b63cb8ad 100644
--- a/core/rawdb/accessors_indexes.go
+++ b/core/rawdb/accessors_indexes.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go
index 45e35876831..b8155a700d1 100644
--- a/core/rawdb/accessors_indexes_test.go
+++ b/core/rawdb/accessors_indexes_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go
index 9c19d6cb0b1..a0eff1430f2 100644
--- a/core/rawdb/accessors_metadata.go
+++ b/core/rawdb/accessors_metadata.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/rlp_test.go b/core/rlp_test.go
index 606637f8594..d0ae0449e28 100644
--- a/core/rlp_test.go
+++ b/core/rlp_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/access_list.go b/core/state/access_list.go
index 1c623b3fb8c..def16c023ae 100644
--- a/core/state/access_list.go
+++ b/core/state/access_list.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/database.go b/core/state/database.go
index 1c15e7ad8b2..2789e1cd86f 100644
--- a/core/state/database.go
+++ b/core/state/database.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/database_test.go b/core/state/database_test.go
index e3d9f58fcea..3ccfe4cbe1d 100644
--- a/core/state/database_test.go
+++ b/core/state/database_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/dump.go b/core/state/dump.go
index b40219627c3..d92a58b3535 100644
--- a/core/state/dump.go
+++ b/core/state/dump.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/intra_block_state.go b/core/state/intra_block_state.go
index ff3b7daa844..2d6bd07442f 100644
--- a/core/state/intra_block_state.go
+++ b/core/state/intra_block_state.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/intra_block_state_test.go b/core/state/intra_block_state_test.go
index c8346fdb93c..256637b35a1 100644
--- a/core/state/intra_block_state_test.go
+++ b/core/state/intra_block_state_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/journal.go b/core/state/journal.go
index 83421af11c7..becb6a400a7 100644
--- a/core/state/journal.go
+++ b/core/state/journal.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/plain_readonly.go b/core/state/plain_readonly.go
index f6c7a7e638f..80aaece8203 100644
--- a/core/state/plain_readonly.go
+++ b/core/state/plain_readonly.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/state_object.go b/core/state/state_object.go
index 808ced8c1da..3f68a74ed54 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/state_object_test.go b/core/state/state_object_test.go
index f364025d92a..ed7457a8ad0 100644
--- a/core/state/state_object_test.go
+++ b/core/state/state_object_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/state_test.go b/core/state/state_test.go
index f80f5a650fd..bd388d6953e 100644
--- a/core/state/state_test.go
+++ b/core/state/state_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state/transient_storage.go b/core/state/transient_storage.go
index 976080b8e08..898c0cf7b85 100644
--- a/core/state/transient_storage.go
+++ b/core/state/transient_storage.go
@@ -1,4 +1,7 @@
-// Copyright 2022 The go-ethereum and Erigon Authors
+// Copyright 2022 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state_processor.go b/core/state_processor.go
index e8b2e4b19db..7816ab570c7 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/state_transition.go b/core/state_transition.go
index b75e925394e..57ed99a201c 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/tracing/hooks.go b/core/tracing/hooks.go
index bcf4b58404b..84954d0fff0 100644
--- a/core/tracing/hooks.go
+++ b/core/tracing/hooks.go
@@ -1,4 +1,7 @@
-// Copyright 2024 The go-ethereum and Erigon Authors
+// Copyright 2024 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/tx_cacher.go b/core/tx_cacher.go
index 0ad517648be..9fedd04b89d 100644
--- a/core/tx_cacher.go
+++ b/core/tx_cacher.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/access_list_tx.go b/core/types/access_list_tx.go
index e233e4e262e..ab875d29155 100644
--- a/core/types/access_list_tx.go
+++ b/core/types/access_list_tx.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/block.go b/core/types/block.go
index 3b2d13a31a6..e32148d122b 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/block_test.go b/core/types/block_test.go
index e467051640e..d5d4a47ec03 100644
--- a/core/types/block_test.go
+++ b/core/types/block_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index a675a75b807..4971270bcc6 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go
index 42aff34180a..8cb0e3b1ddb 100644
--- a/core/types/bloom9_test.go
+++ b/core/types/bloom9_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go
index 890e83c719e..2a0200c5ffe 100644
--- a/core/types/dynamic_fee_tx.go
+++ b/core/types/dynamic_fee_tx.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/genesis.go b/core/types/genesis.go
index f73d52cdfd5..0d8c509d27b 100644
--- a/core/types/genesis.go
+++ b/core/types/genesis.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/hashing.go b/core/types/hashing.go
index 84d6fddf9f0..6bc56ad31a0 100644
--- a/core/types/hashing.go
+++ b/core/types/hashing.go
@@ -1,4 +1,7 @@
-// Copyniright 2014 The go-ethereum and Erigon Authors
+// Copyniright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/legacy_tx.go b/core/types/legacy_tx.go
index d9608e8afa3..30258aa00a7 100644
--- a/core/types/legacy_tx.go
+++ b/core/types/legacy_tx.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/log.go b/core/types/log.go
index c9787e26986..0b83c60fdf6 100644
--- a/core/types/log.go
+++ b/core/types/log.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/log_test.go b/core/types/log_test.go
index c696711bd46..38c11939834 100644
--- a/core/types/log_test.go
+++ b/core/types/log_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/receipt.go b/core/types/receipt.go
index 745838b7c6e..1f770ca7f73 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go
index 7dc5a4c83d9..c0c03dfd11f 100644
--- a/core/types/receipt_test.go
+++ b/core/types/receipt_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/transaction.go b/core/types/transaction.go
index ad30b0156fc..2bd4f534142 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index a970c9f9820..17c67b584a1 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go
index 281cb47ec2b..63ab9cc86e3 100644
--- a/core/types/transaction_signing_test.go
+++ b/core/types/transaction_signing_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go
index 52d7e1c5e6e..8528b64aad8 100644
--- a/core/types/transaction_test.go
+++ b/core/types/transaction_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/types/withdrawal.go b/core/types/withdrawal.go
index 4330e38ff29..0600cc209c2 100644
--- a/core/types/withdrawal.go
+++ b/core/types/withdrawal.go
@@ -1,4 +1,7 @@
-// Copyright 2022 The go-ethereum and Erigon Authors
+// Copyright 2022 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/analysis.go b/core/vm/analysis.go
index 4922fecc4db..7443a20720b 100644
--- a/core/vm/analysis.go
+++ b/core/vm/analysis.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go
index 6cf026c1f16..888d262d603 100644
--- a/core/vm/analysis_test.go
+++ b/core/vm/analysis_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/common.go b/core/vm/common.go
index 8f8a0eb55a2..5182ce8f7fa 100644
--- a/core/vm/common.go
+++ b/core/vm/common.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/contract.go b/core/vm/contract.go
index 563cf9429f2..7c86c5b1c12 100644
--- a/core/vm/contract.go
+++ b/core/vm/contract.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index 198a592d23a..b9c182f1e29 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go
index 21b64619d0e..09cc20bccfb 100644
--- a/core/vm/contracts_test.go
+++ b/core/vm/contracts_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/doc.go b/core/vm/doc.go
index 6409bab7a1e..14fc6503aba 100644
--- a/core/vm/doc.go
+++ b/core/vm/doc.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/eips.go b/core/vm/eips.go
index d740f2563be..064b5048b1e 100644
--- a/core/vm/eips.go
+++ b/core/vm/eips.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/errors.go b/core/vm/errors.go
index 598f258191a..1706e611447 100644
--- a/core/vm/errors.go
+++ b/core/vm/errors.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/evm.go b/core/vm/evm.go
index 220b1334291..5f57e0547cf 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/gas.go b/core/vm/gas.go
index 38c129bed15..ff18f090957 100644
--- a/core/vm/gas.go
+++ b/core/vm/gas.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go
index a4a8ac61e93..189d6ecc370 100644
--- a/core/vm/gas_table.go
+++ b/core/vm/gas_table.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/gas_table_test.go b/core/vm/gas_table_test.go
index 02a2d727062..e7e19c1c686 100644
--- a/core/vm/gas_table_test.go
+++ b/core/vm/gas_table_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index d1e5f244ac5..ebac3c6d212 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go
index 3ffe19e4e4d..18c63c8e4c6 100644
--- a/core/vm/instructions_test.go
+++ b/core/vm/instructions_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/interface.go b/core/vm/interface.go
index 76e676d65e4..2a8934b3712 100644
--- a/core/vm/interface.go
+++ b/core/vm/interface.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
index 3ca81b51058..ad5ab585bf3 100644
--- a/core/vm/interpreter.go
+++ b/core/vm/interpreter.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index e82e09cc79d..15c4fbe43fd 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/logger.go b/core/vm/logger.go
index 17c570fae80..28778787950 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/memory.go b/core/vm/memory.go
index d5520f6fcf1..8f342230978 100644
--- a/core/vm/memory.go
+++ b/core/vm/memory.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go
index 0c50e9b11a9..e3cb1355632 100644
--- a/core/vm/memory_table.go
+++ b/core/vm/memory_table.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go
index 434c3a609d0..ae81e88d9eb 100644
--- a/core/vm/opcodes.go
+++ b/core/vm/opcodes.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go
index 0bf58bc734d..98f2c2d23d3 100644
--- a/core/vm/operations_acl.go
+++ b/core/vm/operations_acl.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/runtime/doc.go b/core/vm/runtime/doc.go
index 85049248246..b10736696fa 100644
--- a/core/vm/runtime/doc.go
+++ b/core/vm/runtime/doc.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go
index 48de7d9fa1f..afead15ddd0 100644
--- a/core/vm/runtime/env.go
+++ b/core/vm/runtime/env.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
index f8bbf4cd91a..6353f229d73 100644
--- a/core/vm/runtime/runtime.go
+++ b/core/vm/runtime/runtime.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go
index 848a94e76c1..bb029e24a79 100644
--- a/core/vm/runtime/runtime_example_test.go
+++ b/core/vm/runtime/runtime_example_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go
index 158d0697993..a91e59cc314 100644
--- a/core/vm/runtime/runtime_test.go
+++ b/core/vm/runtime/runtime_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/stack/stack.go b/core/vm/stack/stack.go
index 313b0e69713..23b039afab0 100644
--- a/core/vm/stack/stack.go
+++ b/core/vm/stack/stack.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go
index a52ccd0e16c..beec375aa14 100644
--- a/core/vm/stack_table.go
+++ b/core/vm/stack_table.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 5c19c893914..c8948fa0008 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index 81eb4573174..649000b031e 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
index 640562d5445..551c1b45256 100644
--- a/crypto/signature_cgo.go
+++ b/crypto/signature_cgo.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/crypto/signature_nocgo.go b/crypto/signature_nocgo.go
index 7e8e8981642..70a125463ee 100644
--- a/crypto/signature_nocgo.go
+++ b/crypto/signature_nocgo.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/crypto/signature_test.go b/crypto/signature_test.go
index 5721ff16457..98f63301821 100644
--- a/crypto/signature_test.go
+++ b/crypto/signature_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/erigon-lib/common/hexutil/json.go b/erigon-lib/common/hexutil/json.go
index 85bbd12f8e1..b9d27068c07 100644
--- a/erigon-lib/common/hexutil/json.go
+++ b/erigon-lib/common/hexutil/json.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/erigon-lib/kv/membatch/database_test.go b/erigon-lib/kv/membatch/database_test.go
index 539345328d9..135fdf55507 100644
--- a/erigon-lib/kv/membatch/database_test.go
+++ b/erigon-lib/kv/membatch/database_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/api.go b/eth/api.go
index 290b8d9348e..377c19338e1 100644
--- a/eth/api.go
+++ b/eth/api.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/api_backend.go b/eth/api_backend.go
index 240adf630c6..a771b06ee9f 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/backend.go b/eth/backend.go
index 21e873444d2..06024e54c82 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/bloombits.go b/eth/bloombits.go
index e5ffc4250bc..524a65086a3 100644
--- a/eth/bloombits.go
+++ b/eth/bloombits.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/discovery.go b/eth/discovery.go
index 06a970f887f..1059b0459c3 100644
--- a/eth/discovery.go
+++ b/eth/discovery.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
index 1f7ac511fd2..98c94dae9dc 100644
--- a/eth/ethconfig/config.go
+++ b/eth/ethconfig/config.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/ethconfig/tx_pool.go b/eth/ethconfig/tx_pool.go
index b3638e0e47a..f7701499ecf 100644
--- a/eth/ethconfig/tx_pool.go
+++ b/eth/ethconfig/tx_pool.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/filters/api.go b/eth/filters/api.go
index d207c750615..75e9f627d7f 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go
index 00e2304cc2f..68945848f02 100644
--- a/eth/filters/api_test.go
+++ b/eth/filters/api_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go
index ae4404e56a6..3e345c46b8a 100644
--- a/eth/filters/filter_system_test.go
+++ b/eth/filters/filter_system_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go
index 68fa1a35a4a..170135b9330 100644
--- a/eth/filters/filter_test.go
+++ b/eth/filters/filter_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go
index 1e83e3e8e40..35399d18fda 100644
--- a/eth/gasprice/feehistory.go
+++ b/eth/gasprice/feehistory.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go
index b6a34f2e0ba..9f432cb3733 100644
--- a/eth/gasprice/feehistory_test.go
+++ b/eth/gasprice/feehistory_test.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go
index d460d784166..4b4bc52b24c 100644
--- a/eth/gasprice/gasprice.go
+++ b/eth/gasprice/gasprice.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go
index c954bc33c14..0f519626fe4 100644
--- a/eth/gasprice/gasprice_test.go
+++ b/eth/gasprice/gasprice_test.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/protocols/eth/discovery.go b/eth/protocols/eth/discovery.go
index d2d80398053..c4bfbcc1a01 100644
--- a/eth/protocols/eth/discovery.go
+++ b/eth/protocols/eth/discovery.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/protocols/eth/handler.go b/eth/protocols/eth/handler.go
index 8b16601fc97..5d1f1a052f6 100644
--- a/eth/protocols/eth/handler.go
+++ b/eth/protocols/eth/handler.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go
index 15377f58816..bc545a5318f 100644
--- a/eth/protocols/eth/handler_test.go
+++ b/eth/protocols/eth/handler_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go
index 49d31a1d5e0..cab1cd3b0c7 100644
--- a/eth/protocols/eth/handlers.go
+++ b/eth/protocols/eth/handlers.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go
index 9451fc95cbc..b4b22565dee 100644
--- a/eth/protocols/eth/protocol.go
+++ b/eth/protocols/eth/protocol.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/protocols/eth/protocol_test.go b/eth/protocols/eth/protocol_test.go
index 9a39bc82122..48b0b0e880d 100644
--- a/eth/protocols/eth/protocol_test.go
+++ b/eth/protocols/eth/protocol_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/internal/tracetest/calltrace_test.go b/eth/tracers/internal/tracetest/calltrace_test.go
index 2a5cebdfb99..ad72a37a060 100644
--- a/eth/tracers/internal/tracetest/calltrace_test.go
+++ b/eth/tracers/internal/tracetest/calltrace_test.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/internal/tracetest/prestate_test.go b/eth/tracers/internal/tracetest/prestate_test.go
index 2f47174666f..36f4ed7f8bc 100644
--- a/eth/tracers/internal/tracetest/prestate_test.go
+++ b/eth/tracers/internal/tracetest/prestate_test.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/js/bigint.go b/eth/tracers/js/bigint.go
index 853f818cff7..999aeadcc6c 100644
--- a/eth/tracers/js/bigint.go
+++ b/eth/tracers/js/bigint.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/js/goja.go b/eth/tracers/js/goja.go
index a92ee836eae..c0c2d12c7eb 100644
--- a/eth/tracers/js/goja.go
+++ b/eth/tracers/js/goja.go
@@ -1,4 +1,7 @@
-// Copyright 2022 The go-ethereum and Erigon Authors
+// Copyright 2022 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/js/internal/tracers/4byte_tracer_legacy.js b/eth/tracers/js/internal/tracers/4byte_tracer_legacy.js
index 6a56da35aeb..478aa5fb13e 100644
--- a/eth/tracers/js/internal/tracers/4byte_tracer_legacy.js
+++ b/eth/tracers/js/internal/tracers/4byte_tracer_legacy.js
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
@@ -29,25 +32,25 @@
 //   }
 {
 	// ids aggregates the 4byte ids found.
-	ids : {},
+	ids: { },
 
 	// callType returns 'false' for non-calls, or the peek-index for the first param
 	// after 'value', i.e. meminstart.
-	callType: function(opstr){
-		switch(opstr){
-		case "CALL": case "CALLCODE":
-			// gas, addr, val, memin, meminsz, memout, memoutsz
-			return 3; // stack ptr to memin
+	callType: function(opstr) {
+		switch (opstr) {
+			case "CALL": case "CALLCODE":
+				// gas, addr, val, memin, meminsz, memout, memoutsz
+				return 3; // stack ptr to memin
 
-		case "DELEGATECALL": case "STATICCALL":
-			// gas, addr, memin, meminsz, memout, memoutsz
-			return 2; // stack ptr to memin
+			case "DELEGATECALL": case "STATICCALL":
+				// gas, addr, memin, meminsz, memout, memoutsz
+				return 2; // stack ptr to memin
 		}
 		return false;
 	},
 
 	// store save the given identifier and datasize.
-	store: function(id, size){
+	store: function(id, size) {
 		var key = "" + toHex(id) + "-" + size;
 		this.ids[key] = this.ids[key] + 1 || 1;
 	},
@@ -67,7 +70,7 @@
 		var inSz = log.stack.peek(ct + 1).valueOf();
 		if (inSz >= 4) {
 			var inOff = log.stack.peek(ct).valueOf();
-			this.store(log.memory.slice(inOff, inOff + 4), inSz-4);
+			this.store(log.memory.slice(inOff, inOff + 4), inSz - 4);
 		}
 	},
 
@@ -79,7 +82,7 @@
 	result: function(ctx) {
 		// Save the outer calldata also
 		if (ctx.input.length >= 4) {
-			this.store(slice(ctx.input, 0, 4), ctx.input.length-4)
+			this.store(slice(ctx.input, 0, 4), ctx.input.length - 4)
 		}
 		return this.ids;
 	},
diff --git a/eth/tracers/js/internal/tracers/bigram_tracer.js b/eth/tracers/js/internal/tracers/bigram_tracer.js
index 3ff7cf3995e..96990f68dea 100644
--- a/eth/tracers/js/internal/tracers/bigram_tracer.js
+++ b/eth/tracers/js/internal/tracers/bigram_tracer.js
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
@@ -16,29 +19,29 @@
 
 {
     // hist is the counters of opcode bigrams
-    hist: {},
+    hist: { },
     // lastOp is last operation
     lastOp: '',
-    // execution depth of last op
-    lastDepth: 0,
-    // step is invoked for every opcode that the VM executes.
-    step: function(log, db) {
-        var op = log.op.toString();
-        var depth = log.getDepth();
-        if (depth == this.lastDepth){
-            var key = this.lastOp+'-'+op;
-            if (this.hist[key]){
-                this.hist[key]++;
-            }
-            else {
-                this.hist[key] = 1;
-            }
-        }
-        this.lastOp = op;
-        this.lastDepth = depth;
-    },
+        // execution depth of last op
+        lastDepth: 0,
+            // step is invoked for every opcode that the VM executes.
+            step: function(log, db) {
+                var op = log.op.toString();
+                var depth = log.getDepth();
+                if (depth == this.lastDepth) {
+                    var key = this.lastOp + '-' + op;
+                    if (this.hist[key]) {
+                        this.hist[key]++;
+                    }
+                    else {
+                        this.hist[key] = 1;
+                    }
+                }
+                this.lastOp = op;
+                this.lastDepth = depth;
+            },
     // fault is invoked when the actual execution of an opcode fails.
-    fault: function(log, db) {},
+    fault: function(log, db) { },
     // result is invoked when all the opcodes have been iterated over and returns
     // the final result of the tracing.
     result: function(ctx) {
diff --git a/eth/tracers/js/internal/tracers/call_tracer_legacy.js b/eth/tracers/js/internal/tracers/call_tracer_legacy.js
index 9351291fd11..a5ab02c76a4 100644
--- a/eth/tracers/js/internal/tracers/call_tracer_legacy.js
+++ b/eth/tracers/js/internal/tracers/call_tracer_legacy.js
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
@@ -20,146 +23,146 @@
 	// callstack is the current recursive call stack of the EVM execution.
 	callstack: [{}],
 
-	// descended tracks whether we've just descended from an outer transaction into
-	// an inner call.
-	descended: false,
+		// descended tracks whether we've just descended from an outer transaction into
+		// an inner call.
+		descended: false,
 
-	// step is invoked for every opcode that the VM executes.
-	step: function(log, db) {
-		// Capture any errors immediately
-		var error = log.getError();
-		if (error !== undefined) {
-			this.fault(log, db);
-			return;
-		}
-		// We only care about system opcodes, faster if we pre-check once
-		var syscall = (log.op.toNumber() & 0xf0) == 0xf0;
-		if (syscall) {
-			var op = log.op.toString();
-		}
-		// If a new contract is being created, add to the call stack
-		if (syscall && (op == 'CREATE' || op == "CREATE2")) {
-			var inOff = log.stack.peek(1).valueOf();
-			var inEnd = inOff + log.stack.peek(2).valueOf();
-
-			// Assemble the internal call report and store for completion
-			var call = {
-				type:    op,
-				from:    toHex(log.contract.getAddress()),
-				input:   toHex(log.memory.slice(inOff, inEnd)),
-				gasIn:   log.getGas(),
-				gasCost: log.getCost(),
-				value:   '0x' + log.stack.peek(0).toString(16)
-			};
-			this.callstack.push(call);
-			this.descended = true
-			return;
-		}
-		// If a contract is being self destructed, gather that as a subcall too
-		if (syscall && op == 'SELFDESTRUCT') {
-			var left = this.callstack.length;
-			if (this.callstack[left-1].calls === undefined) {
-				this.callstack[left-1].calls = [];
-			}
-			this.callstack[left-1].calls.push({
-				type:    op,
-				from:    toHex(log.contract.getAddress()),
-				to:      toHex(toAddress(log.stack.peek(0).toString(16))),
-				gasIn:   log.getGas(),
-				gasCost: log.getCost(),
-				value:   '0x' + db.getBalance(log.contract.getAddress()).toString(16)
-			});
-			return
-		}
-		// If a new method invocation is being done, add to the call stack
-		if (syscall && (op == 'CALL' || op == 'CALLCODE' || op == 'DELEGATECALL' || op == 'STATICCALL')) {
-			// Skip any pre-compile invocations, those are just fancy opcodes
-			var to = toAddress(log.stack.peek(1).toString(16));
-			if (isPrecompiled(to)) {
-				return
-			}
-			var off = (op == 'DELEGATECALL' || op == 'STATICCALL' ? 0 : 1);
-
-			var inOff = log.stack.peek(2 + off).valueOf();
-			var inEnd = inOff + log.stack.peek(3 + off).valueOf();
+			// step is invoked for every opcode that the VM executes.
+			step: function(log, db) {
+				// Capture any errors immediately
+				var error = log.getError();
+				if (error !== undefined) {
+					this.fault(log, db);
+					return;
+				}
+				// We only care about system opcodes, faster if we pre-check once
+				var syscall = (log.op.toNumber() & 0xf0) == 0xf0;
+				if (syscall) {
+					var op = log.op.toString();
+				}
+				// If a new contract is being created, add to the call stack
+				if (syscall && (op == 'CREATE' || op == "CREATE2")) {
+					var inOff = log.stack.peek(1).valueOf();
+					var inEnd = inOff + log.stack.peek(2).valueOf();
 
-			// Assemble the internal call report and store for completion
-			var call = {
-				type:    op,
-				from:    toHex(log.contract.getAddress()),
-				to:      toHex(to),
-				input:   toHex(log.memory.slice(inOff, inEnd)),
-				gasIn:   log.getGas(),
-				gasCost: log.getCost(),
-				outOff:  log.stack.peek(4 + off).valueOf(),
-				outLen:  log.stack.peek(5 + off).valueOf()
-			};
-			if (op != 'DELEGATECALL' && op != 'STATICCALL') {
-				call.value = '0x' + log.stack.peek(2).toString(16);
-			}
-			this.callstack.push(call);
-			this.descended = true
-			return;
-		}
-		// If we've just descended into an inner call, retrieve it's true allowance. We
-		// need to extract if from within the call as there may be funky gas dynamics
-		// with regard to requested and actually given gas (2300 stipend, 63/64 rule).
-		if (this.descended) {
-			if (log.getDepth() >= this.callstack.length) {
-				this.callstack[this.callstack.length - 1].gas = log.getGas();
-			} else {
-				// TODO(karalabe): The call was made to a plain account. We currently don't
-				// have access to the true gas amount inside the call and so any amount will
-				// mostly be wrong since it depends on a lot of input args. Skip gas for now.
-			}
-			this.descended = false;
-		}
-		// If an existing call is returning, pop off the call stack
-		if (syscall && op == 'REVERT') {
-			this.callstack[this.callstack.length - 1].error = "execution reverted";
-			return;
-		}
-		if (log.getDepth() == this.callstack.length - 1) {
-			// Pop off the last call and get the execution results
-			var call = this.callstack.pop();
+					// Assemble the internal call report and store for completion
+					var call = {
+						type: op,
+						from: toHex(log.contract.getAddress()),
+						input: toHex(log.memory.slice(inOff, inEnd)),
+						gasIn: log.getGas(),
+						gasCost: log.getCost(),
+						value: '0x' + log.stack.peek(0).toString(16)
+					};
+					this.callstack.push(call);
+					this.descended = true
+					return;
+				}
+				// If a contract is being self destructed, gather that as a subcall too
+				if (syscall && op == 'SELFDESTRUCT') {
+					var left = this.callstack.length;
+					if (this.callstack[left - 1].calls === undefined) {
+						this.callstack[left - 1].calls = [];
+					}
+					this.callstack[left - 1].calls.push({
+						type: op,
+						from: toHex(log.contract.getAddress()),
+						to: toHex(toAddress(log.stack.peek(0).toString(16))),
+						gasIn: log.getGas(),
+						gasCost: log.getCost(),
+						value: '0x' + db.getBalance(log.contract.getAddress()).toString(16)
+					});
+					return
+				}
+				// If a new method invocation is being done, add to the call stack
+				if (syscall && (op == 'CALL' || op == 'CALLCODE' || op == 'DELEGATECALL' || op == 'STATICCALL')) {
+					// Skip any pre-compile invocations, those are just fancy opcodes
+					var to = toAddress(log.stack.peek(1).toString(16));
+					if (isPrecompiled(to)) {
+						return
+					}
+					var off = (op == 'DELEGATECALL' || op == 'STATICCALL' ? 0 : 1);
 
-			if (call.type == 'CREATE' || call.type == "CREATE2") {
-				// If the call was a CREATE, retrieve the contract address and output code
-				call.gasUsed = '0x' + bigInt(call.gasIn - call.gasCost - log.getGas()).toString(16);
-				delete call.gasIn; delete call.gasCost;
+					var inOff = log.stack.peek(2 + off).valueOf();
+					var inEnd = inOff + log.stack.peek(3 + off).valueOf();
 
-				var ret = log.stack.peek(0);
-				if (!ret.equals(0)) {
-					call.to     = toHex(toAddress(ret.toString(16)));
-					call.output = toHex(db.getCode(toAddress(ret.toString(16))));
-				} else if (call.error === undefined) {
-					call.error = "internal failure"; // TODO(karalabe): surface these faults somehow
+					// Assemble the internal call report and store for completion
+					var call = {
+						type: op,
+						from: toHex(log.contract.getAddress()),
+						to: toHex(to),
+						input: toHex(log.memory.slice(inOff, inEnd)),
+						gasIn: log.getGas(),
+						gasCost: log.getCost(),
+						outOff: log.stack.peek(4 + off).valueOf(),
+						outLen: log.stack.peek(5 + off).valueOf()
+					};
+					if (op != 'DELEGATECALL' && op != 'STATICCALL') {
+						call.value = '0x' + log.stack.peek(2).toString(16);
+					}
+					this.callstack.push(call);
+					this.descended = true
+					return;
 				}
-			} else {
-				// If the call was a contract call, retrieve the gas usage and output
-				if (call.gas !== undefined) {
-					call.gasUsed = '0x' + bigInt(call.gasIn - call.gasCost + call.gas - log.getGas()).toString(16);
+				// If we've just descended into an inner call, retrieve it's true allowance. We
+				// need to extract if from within the call as there may be funky gas dynamics
+				// with regard to requested and actually given gas (2300 stipend, 63/64 rule).
+				if (this.descended) {
+					if (log.getDepth() >= this.callstack.length) {
+						this.callstack[this.callstack.length - 1].gas = log.getGas();
+					} else {
+						// TODO(karalabe): The call was made to a plain account. We currently don't
+						// have access to the true gas amount inside the call and so any amount will
+						// mostly be wrong since it depends on a lot of input args. Skip gas for now.
+					}
+					this.descended = false;
 				}
-				var ret = log.stack.peek(0);
-				if (!ret.equals(0)) {
-					call.output = toHex(log.memory.slice(call.outOff, call.outOff + call.outLen));
-				} else if (call.error === undefined) {
-					call.error = "internal failure"; // TODO(karalabe): surface these faults somehow
+				// If an existing call is returning, pop off the call stack
+				if (syscall && op == 'REVERT') {
+					this.callstack[this.callstack.length - 1].error = "execution reverted";
+					return;
 				}
-				delete call.gasIn; delete call.gasCost;
-				delete call.outOff; delete call.outLen;
-			}
-			if (call.gas !== undefined) {
-				call.gas = '0x' + bigInt(call.gas).toString(16);
-			}
-			// Inject the call into the previous one
-			var left = this.callstack.length;
-			if (this.callstack[left-1].calls === undefined) {
-				this.callstack[left-1].calls = [];
-			}
-			this.callstack[left-1].calls.push(call);
-		}
-	},
+				if (log.getDepth() == this.callstack.length - 1) {
+					// Pop off the last call and get the execution results
+					var call = this.callstack.pop();
+
+					if (call.type == 'CREATE' || call.type == "CREATE2") {
+						// If the call was a CREATE, retrieve the contract address and output code
+						call.gasUsed = '0x' + bigInt(call.gasIn - call.gasCost - log.getGas()).toString(16);
+						delete call.gasIn; delete call.gasCost;
+
+						var ret = log.stack.peek(0);
+						if (!ret.equals(0)) {
+							call.to = toHex(toAddress(ret.toString(16)));
+							call.output = toHex(db.getCode(toAddress(ret.toString(16))));
+						} else if (call.error === undefined) {
+							call.error = "internal failure"; // TODO(karalabe): surface these faults somehow
+						}
+					} else {
+						// If the call was a contract call, retrieve the gas usage and output
+						if (call.gas !== undefined) {
+							call.gasUsed = '0x' + bigInt(call.gasIn - call.gasCost + call.gas - log.getGas()).toString(16);
+						}
+						var ret = log.stack.peek(0);
+						if (!ret.equals(0)) {
+							call.output = toHex(log.memory.slice(call.outOff, call.outOff + call.outLen));
+						} else if (call.error === undefined) {
+							call.error = "internal failure"; // TODO(karalabe): surface these faults somehow
+						}
+						delete call.gasIn; delete call.gasCost;
+						delete call.outOff; delete call.outLen;
+					}
+					if (call.gas !== undefined) {
+						call.gas = '0x' + bigInt(call.gas).toString(16);
+					}
+					// Inject the call into the previous one
+					var left = this.callstack.length;
+					if (this.callstack[left - 1].calls === undefined) {
+						this.callstack[left - 1].calls = [];
+					}
+					this.callstack[left - 1].calls.push(call);
+				}
+			},
 
 	// fault is invoked when the actual execution of an opcode fails.
 	fault: function(log, db) {
@@ -182,10 +185,10 @@
 		// Flatten the failed call into its parent
 		var left = this.callstack.length;
 		if (left > 0) {
-			if (this.callstack[left-1].calls === undefined) {
-				this.callstack[left-1].calls = [];
+			if (this.callstack[left - 1].calls === undefined) {
+				this.callstack[left - 1].calls = [];
 			}
-			this.callstack[left-1].calls.push(call);
+			this.callstack[left - 1].calls.push(call);
 			return;
 		}
 		// Last call failed too, leave it in the stack
@@ -196,14 +199,14 @@
 	// the final result of the tracing.
 	result: function(ctx, db) {
 		var result = {
-			type:    ctx.type,
-			from:    toHex(ctx.from),
-			to:      toHex(ctx.to),
-			value:   '0x' + ctx.value.toString(16),
-			gas:     '0x' + bigInt(ctx.gas).toString(16),
+			type: ctx.type,
+			from: toHex(ctx.from),
+			to: toHex(ctx.to),
+			value: '0x' + ctx.value.toString(16),
+			gas: '0x' + bigInt(ctx.gas).toString(16),
 			gasUsed: '0x' + bigInt(ctx.gasUsed).toString(16),
-			input:   toHex(ctx.input),
-			output:  toHex(ctx.output),
+			input: toHex(ctx.input),
+			output: toHex(ctx.output),
 		};
 		if (this.callstack[0].calls !== undefined) {
 			result.calls = this.callstack[0].calls;
@@ -213,7 +216,7 @@
 		} else if (ctx.error !== undefined) {
 			result.error = ctx.error;
 		}
-		if (result.error !== undefined && (result.error !== "execution reverted" || result.output ==="0x")) {
+		if (result.error !== undefined && (result.error !== "execution reverted" || result.output === "0x")) {
 			delete result.output;
 		}
 		return this.finalize(result);
@@ -224,16 +227,16 @@
 	// to users who don't interpret it, just display it.
 	finalize: function(call) {
 		var sorted = {
-			type:    call.type,
-			from:    call.from,
-			to:      call.to,
-			value:   call.value,
-			gas:     call.gas,
+			type: call.type,
+			from: call.from,
+			to: call.to,
+			value: call.value,
+			gas: call.gas,
 			gasUsed: call.gasUsed,
-			input:   call.input,
-			output:  call.output,
-			error:   call.error,
-			calls:   call.calls,
+			input: call.input,
+			output: call.output,
+			error: call.error,
+			calls: call.calls,
 		}
 		for (var key in sorted) {
 			if (sorted[key] === undefined) {
@@ -241,7 +244,7 @@
 			}
 		}
 		if (sorted.calls !== undefined) {
-			for (var i=0; i<sorted.calls.length; i++) {
+			for (var i = 0; i < sorted.calls.length; i++) {
 				sorted.calls[i] = this.finalize(sorted.calls[i]);
 			}
 		}
diff --git a/eth/tracers/js/internal/tracers/evmdis_tracer.js b/eth/tracers/js/internal/tracers/evmdis_tracer.js
index a434f73bee7..931be391897 100644
--- a/eth/tracers/js/internal/tracers/evmdis_tracer.js
+++ b/eth/tracers/js/internal/tracers/evmdis_tracer.js
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
@@ -17,9 +20,9 @@
 // evmdisTracer returns sufficient information from a trace to perform evmdis-style
 // disassembly.
 {
-	stack: [{ops: []}],
+	stack: [{ ops: [] }],
 
-	npushes: {0: 0, 1: 1, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1, 7: 1, 8: 1, 9: 1, 10: 1, 11: 1, 16: 1, 17: 1, 18: 1, 19: 1, 20: 1, 21: 1, 22: 1, 23: 1, 24: 1, 25: 1, 26: 1, 32: 1, 48: 1, 49: 1, 50: 1, 51: 1, 52: 1, 53: 1, 54: 1, 55: 0, 56: 1, 57: 0, 58: 1, 59: 1, 60: 0, 64: 1, 65: 1, 66: 1, 67: 1, 68: 1, 69: 1, 80: 0, 81: 1, 82: 0, 83: 0, 84: 1, 85: 0, 86: 0, 87: 0, 88: 1, 89: 1, 90: 1, 91: 0, 96: 1, 97: 1, 98: 1, 99: 1, 100: 1, 101: 1, 102: 1, 103: 1, 104: 1, 105: 1, 106: 1, 107: 1, 108: 1, 109: 1, 110: 1, 111: 1, 112: 1, 113: 1, 114: 1, 115: 1, 116: 1, 117: 1, 118: 1, 119: 1, 120: 1, 121: 1, 122: 1, 123: 1, 124: 1, 125: 1, 126: 1, 127: 1, 128: 2, 129: 3, 130: 4, 131: 5, 132: 6, 133: 7, 134: 8, 135: 9, 136: 10, 137: 11, 138: 12, 139: 13, 140: 14, 141: 15, 142: 16, 143: 17, 144: 2, 145: 3, 146: 4, 147: 5, 148: 6, 149: 7, 150: 8, 151: 9, 152: 10, 153: 11, 154: 12, 155: 13, 156: 14, 157: 15, 158: 16, 159: 17, 160: 0, 161: 0, 162: 0, 163: 0, 164: 0, 240: 1, 241: 1, 242: 1, 243: 0, 244: 0, 255: 0},
+		npushes: { 0: 0, 1: 1, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1, 7: 1, 8: 1, 9: 1, 10: 1, 11: 1, 16: 1, 17: 1, 18: 1, 19: 1, 20: 1, 21: 1, 22: 1, 23: 1, 24: 1, 25: 1, 26: 1, 32: 1, 48: 1, 49: 1, 50: 1, 51: 1, 52: 1, 53: 1, 54: 1, 55: 0, 56: 1, 57: 0, 58: 1, 59: 1, 60: 0, 64: 1, 65: 1, 66: 1, 67: 1, 68: 1, 69: 1, 80: 0, 81: 1, 82: 0, 83: 0, 84: 1, 85: 0, 86: 0, 87: 0, 88: 1, 89: 1, 90: 1, 91: 0, 96: 1, 97: 1, 98: 1, 99: 1, 100: 1, 101: 1, 102: 1, 103: 1, 104: 1, 105: 1, 106: 1, 107: 1, 108: 1, 109: 1, 110: 1, 111: 1, 112: 1, 113: 1, 114: 1, 115: 1, 116: 1, 117: 1, 118: 1, 119: 1, 120: 1, 121: 1, 122: 1, 123: 1, 124: 1, 125: 1, 126: 1, 127: 1, 128: 2, 129: 3, 130: 4, 131: 5, 132: 6, 133: 7, 134: 8, 135: 9, 136: 10, 137: 11, 138: 12, 139: 13, 140: 14, 141: 15, 142: 16, 143: 17, 144: 2, 145: 3, 146: 4, 147: 5, 148: 6, 149: 7, 150: 8, 151: 9, 152: 10, 153: 11, 154: 12, 155: 13, 156: 14, 157: 15, 158: 16, 159: 17, 160: 0, 161: 0, 162: 0, 163: 0, 164: 0, 240: 1, 241: 1, 242: 1, 243: 0, 244: 0, 255: 0 },
 
 	// result is invoked when all the opcodes have been iterated over and returns
 	// the final result of the tracing.
@@ -37,52 +40,52 @@
 			frame["error"] = error;
 		} else if (log.getDepth() == this.stack.length) {
 			opinfo = {
-				op:     log.op.toNumber(),
-				depth : log.getDepth(),
+				op: log.op.toNumber(),
+				depth: log.getDepth(),
 				result: [],
 			};
 			if (frame.ops.length > 0) {
 				var prevop = frame.ops[frame.ops.length - 1];
-				for(var i = 0; i < this.npushes[prevop.op]; i++)
+				for (var i = 0; i < this.npushes[prevop.op]; i++)
 					prevop.result.push(log.stack.peek(i).toString(16));
 			}
-			switch(log.op.toString()) {
-			case "CALL": case "CALLCODE":
-				var instart = log.stack.peek(3).valueOf();
-				var insize = log.stack.peek(4).valueOf();
-				opinfo["gas"] = log.stack.peek(0).valueOf();
-				opinfo["to"] = log.stack.peek(1).toString(16);
-				opinfo["value"] = log.stack.peek(2).toString();
-				opinfo["input"] = log.memory.slice(instart, instart + insize);
-				opinfo["error"] = null;
-				opinfo["return"] = null;
-				opinfo["ops"] = [];
-				this.stack.push(opinfo);
-				break;
-			case "DELEGATECALL": case "STATICCALL":
-				var instart = log.stack.peek(2).valueOf();
-				var insize = log.stack.peek(3).valueOf();
-				opinfo["op"] =  log.op.toString();
-				opinfo["gas"] =  log.stack.peek(0).valueOf();
-				opinfo["to"] =  log.stack.peek(1).toString(16);
-				opinfo["input"] =  log.memory.slice(instart, instart + insize);
-				opinfo["error"] =  null;
-				opinfo["return"] =  null;
-				opinfo["ops"] = [];
-				this.stack.push(opinfo);
-				break;
-			case "RETURN": case "REVERT":
-				var out = log.stack.peek(0).valueOf();
-				var outsize = log.stack.peek(1).valueOf();
-				frame.return = log.memory.slice(out, out + outsize);
-				break;
-			case "STOP": case "SELFDESTRUCT":
-				frame.return = log.memory.slice(0, 0);
-				break;
-			case "JUMPDEST":
-				opinfo["pc"] = log.getPC();
+			switch (log.op.toString()) {
+				case "CALL": case "CALLCODE":
+					var instart = log.stack.peek(3).valueOf();
+					var insize = log.stack.peek(4).valueOf();
+					opinfo["gas"] = log.stack.peek(0).valueOf();
+					opinfo["to"] = log.stack.peek(1).toString(16);
+					opinfo["value"] = log.stack.peek(2).toString();
+					opinfo["input"] = log.memory.slice(instart, instart + insize);
+					opinfo["error"] = null;
+					opinfo["return"] = null;
+					opinfo["ops"] = [];
+					this.stack.push(opinfo);
+					break;
+				case "DELEGATECALL": case "STATICCALL":
+					var instart = log.stack.peek(2).valueOf();
+					var insize = log.stack.peek(3).valueOf();
+					opinfo["op"] = log.op.toString();
+					opinfo["gas"] = log.stack.peek(0).valueOf();
+					opinfo["to"] = log.stack.peek(1).toString(16);
+					opinfo["input"] = log.memory.slice(instart, instart + insize);
+					opinfo["error"] = null;
+					opinfo["return"] = null;
+					opinfo["ops"] = [];
+					this.stack.push(opinfo);
+					break;
+				case "RETURN": case "REVERT":
+					var out = log.stack.peek(0).valueOf();
+					var outsize = log.stack.peek(1).valueOf();
+					frame.return = log.memory.slice(out, out + outsize);
+					break;
+				case "STOP": case "SELFDESTRUCT":
+					frame.return = log.memory.slice(0, 0);
+					break;
+				case "JUMPDEST":
+					opinfo["pc"] = log.getPC();
 			}
-			if(log.op.isPush()) {
+			if (log.op.isPush()) {
 				opinfo["len"] = log.op.toNumber() - 0x5e;
 			}
 			frame.ops.push(opinfo);
diff --git a/eth/tracers/js/internal/tracers/noop_tracer_legacy.js b/eth/tracers/js/internal/tracers/noop_tracer_legacy.js
index 8d144797b22..df0a223e009 100644
--- a/eth/tracers/js/internal/tracers/noop_tracer_legacy.js
+++ b/eth/tracers/js/internal/tracers/noop_tracer_legacy.js
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/js/internal/tracers/opcount_tracer.js b/eth/tracers/js/internal/tracers/opcount_tracer.js
index 886a4b91c92..5d59c32dbbf 100644
--- a/eth/tracers/js/internal/tracers/opcount_tracer.js
+++ b/eth/tracers/js/internal/tracers/opcount_tracer.js
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/js/internal/tracers/prestate_tracer_legacy.js b/eth/tracers/js/internal/tracers/prestate_tracer_legacy.js
index 00b5349d65c..c790afdff6e 100644
--- a/eth/tracers/js/internal/tracers/prestate_tracer_legacy.js
+++ b/eth/tracers/js/internal/tracers/prestate_tracer_legacy.js
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
@@ -20,22 +23,22 @@
 	// prestate is the genesis that we're building.
 	prestate: null,
 
-	// lookupAccount injects the specified account into the prestate object.
-	lookupAccount: function(addr, db){
-		var acc = toHex(addr);
-		if (this.prestate[acc] === undefined) {
-			this.prestate[acc] = {
-				balance: '0x' + db.getBalance(addr).toString(16),
-				nonce:   db.getNonce(addr),
-				code:    toHex(db.getCode(addr)),
-				storage: {}
-			};
-		}
-	},
+		// lookupAccount injects the specified account into the prestate object.
+		lookupAccount: function(addr, db) {
+			var acc = toHex(addr);
+			if (this.prestate[acc] === undefined) {
+				this.prestate[acc] = {
+					balance: '0x' + db.getBalance(addr).toString(16),
+					nonce: db.getNonce(addr),
+					code: toHex(db.getCode(addr)),
+					storage: {}
+				};
+			}
+		},
 
 	// lookupStorage injects the specified storage entry of the given account into
 	// the prestate object.
-	lookupStorage: function(addr, key, db){
+	lookupStorage: function(addr, key, db) {
 		var acc = toHex(addr);
 		var idx = toHex(key);
 
@@ -59,10 +62,10 @@
 		this.lookupAccount(ctx.from, db);
 
 		var fromBal = bigInt(this.prestate[toHex(ctx.from)].balance.slice(2), 16);
-		var toBal   = bigInt(this.prestate[toHex(ctx.to)].balance.slice(2), 16);
+		var toBal = bigInt(this.prestate[toHex(ctx.to)].balance.slice(2), 16);
 
-		this.prestate[toHex(ctx.to)].balance   = '0x'+toBal.subtract(ctx.value).toString(16);
-		this.prestate[toHex(ctx.from)].balance = '0x'+fromBal.add(ctx.value).add(ctx.gasUsed * ctx.gasPrice).toString(16);
+		this.prestate[toHex(ctx.to)].balance = '0x' + toBal.subtract(ctx.value).toString(16);
+		this.prestate[toHex(ctx.from)].balance = '0x' + fromBal.add(ctx.value).add(ctx.gasUsed * ctx.gasPrice).toString(16);
 
 		// Decrement the caller's nonce, and remove empty create targets
 		this.prestate[toHex(ctx.from)].nonce--;
@@ -78,7 +81,7 @@
 	// step is invoked for every opcode that the VM executes.
 	step: function(log, db) {
 		// Add the current account if we just started tracing
-		if (this.prestate === null){
+		if (this.prestate === null) {
 			this.prestate = {};
 			// Balance will potentially be wrong here, since this will include the value
 			// sent along with the message. We fix that in 'result()'.
@@ -104,12 +107,12 @@
 			case "CALL": case "CALLCODE": case "DELEGATECALL": case "STATICCALL":
 				this.lookupAccount(toAddress(log.stack.peek(1).toString(16)), db);
 				break;
-			case 'SSTORE':case 'SLOAD':
+			case 'SSTORE': case 'SLOAD':
 				this.lookupStorage(log.contract.getAddress(), toWord(log.stack.peek(0).toString(16)), db);
 				break;
 		}
 	},
 
 	// fault is invoked when the actual execution of an opcode fails.
-	fault: function(log, db) {}
+	fault: function(log, db) { }
 }
diff --git a/eth/tracers/js/internal/tracers/tracers.go b/eth/tracers/js/internal/tracers/tracers.go
index 445a37cb7b2..5af7b26b031 100644
--- a/eth/tracers/js/internal/tracers/tracers.go
+++ b/eth/tracers/js/internal/tracers/tracers.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/js/internal/tracers/trigram_tracer.js b/eth/tracers/js/internal/tracers/trigram_tracer.js
index c29d493c36e..001c7e28ade 100644
--- a/eth/tracers/js/internal/tracers/trigram_tracer.js
+++ b/eth/tracers/js/internal/tracers/trigram_tracer.js
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
@@ -16,31 +19,31 @@
 
 {
     // hist is the map of trigram counters
-    hist: {},
+    hist: { },
     // lastOp is last operation
-    lastOps: ['',''],
-    lastDepth: 0,
-        // step is invoked for every opcode that the VM executes.
-    step: function(log, db) {
-        var depth = log.getDepth();
-        if (depth != this.lastDepth){
-            this.lastOps = ['',''];
-            this.lastDepth = depth;
-            return;
-        }
-        var op = log.op.toString();
-        var key = this.lastOps[0]+'-'+this.lastOps[1]+'-'+op;
-        if (this.hist[key]){
-            this.hist[key]++;
-        }
-        else {
-            this.hist[key] = 1;
-        }
-        this.lastOps[0] = this.lastOps[1];
-        this.lastOps[1] = op;
-    },
+    lastOps: ['', ''],
+        lastDepth: 0,
+            // step is invoked for every opcode that the VM executes.
+            step: function(log, db) {
+                var depth = log.getDepth();
+                if (depth != this.lastDepth) {
+                    this.lastOps = ['', ''];
+                    this.lastDepth = depth;
+                    return;
+                }
+                var op = log.op.toString();
+                var key = this.lastOps[0] + '-' + this.lastOps[1] + '-' + op;
+                if (this.hist[key]) {
+                    this.hist[key]++;
+                }
+                else {
+                    this.hist[key] = 1;
+                }
+                this.lastOps[0] = this.lastOps[1];
+                this.lastOps[1] = op;
+            },
     // fault is invoked when the actual execution of an opcode fails.
-    fault: function(log, db) {},
+    fault: function(log, db) { },
     // result is invoked when all the opcodes have been iterated over and returns
     // the final result of the tracing.
     result: function(ctx) {
diff --git a/eth/tracers/js/internal/tracers/unigram_tracer.js b/eth/tracers/js/internal/tracers/unigram_tracer.js
index 9f45a6b14f7..49a5269c300 100644
--- a/eth/tracers/js/internal/tracers/unigram_tracer.js
+++ b/eth/tracers/js/internal/tracers/unigram_tracer.js
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
@@ -16,22 +19,22 @@
 
 {
     // hist is the map of opcodes to counters
-    hist: {},
+    hist: { },
     // nops counts number of ops
     nops: 0,
-    // step is invoked for every opcode that the VM executes.
-    step: function(log, db) {
-        var op = log.op.toString();
-        if (this.hist[op]){
-            this.hist[op]++;
-        }
-        else {
-            this.hist[op] = 1;
-        }
-        this.nops++;
-    },
+        // step is invoked for every opcode that the VM executes.
+        step: function(log, db) {
+            var op = log.op.toString();
+            if (this.hist[op]) {
+                this.hist[op]++;
+            }
+            else {
+                this.hist[op] = 1;
+            }
+            this.nops++;
+        },
     // fault is invoked when the actual execution of an opcode fails.
-    fault: function(log, db) {},
+    fault: function(log, db) { },
 
     // result is invoked when all the opcodes have been iterated over and returns
     // the final result of the tracing.
diff --git a/eth/tracers/js/tracer_test.go b/eth/tracers/js/tracer_test.go
index 330f5f9fe32..c8ec6d6e24f 100644
--- a/eth/tracers/js/tracer_test.go
+++ b/eth/tracers/js/tracer_test.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/logger/access_list_tracer.go b/eth/tracers/logger/access_list_tracer.go
index 9423e969f4c..09505d15fb6 100644
--- a/eth/tracers/logger/access_list_tracer.go
+++ b/eth/tracers/logger/access_list_tracer.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/logger/logger_json.go b/eth/tracers/logger/logger_json.go
index 344fe3eab65..5b6b1f84f32 100644
--- a/eth/tracers/logger/logger_json.go
+++ b/eth/tracers/logger/logger_json.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/logger/logger_test.go b/eth/tracers/logger/logger_test.go
index 02951b3992f..3a4590f0af8 100644
--- a/eth/tracers/logger/logger_test.go
+++ b/eth/tracers/logger/logger_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go
index cd666fa6d33..3e78f2e8532 100644
--- a/eth/tracers/native/4byte.go
+++ b/eth/tracers/native/4byte.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/native/call.go b/eth/tracers/native/call.go
index 5e65150da95..7bc1732ecea 100644
--- a/eth/tracers/native/call.go
+++ b/eth/tracers/native/call.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/native/mux.go b/eth/tracers/native/mux.go
index 74907fa3cb0..232bc7b167f 100644
--- a/eth/tracers/native/mux.go
+++ b/eth/tracers/native/mux.go
@@ -1,4 +1,7 @@
-// Copyright 2022 The go-ethereum and Erigon Authors
+// Copyright 2022 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/native/noop.go b/eth/tracers/native/noop.go
index 85b2e1cff55..6b02a6249cf 100644
--- a/eth/tracers/native/noop.go
+++ b/eth/tracers/native/noop.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/native/prestate.go b/eth/tracers/native/prestate.go
index d249d37b5c2..f8d8ab4ba36 100644
--- a/eth/tracers/native/prestate.go
+++ b/eth/tracers/native/prestate.go
@@ -1,4 +1,7 @@
-// Copyright 2022 The go-ethereum and Erigon Authors
+// Copyright 2022 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/native/tracer.go b/eth/tracers/native/tracer.go
index fb542a1b69c..cfaa09c6d7e 100644
--- a/eth/tracers/native/tracer.go
+++ b/eth/tracers/native/tracer.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go
index 0d0ffebffab..6d8da6209e8 100644
--- a/eth/tracers/tracer.go
+++ b/eth/tracers/tracer.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go
index b25550068e2..97b3b70af9b 100644
--- a/eth/tracers/tracers.go
+++ b/eth/tracers/tracers.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go
index 875c397e311..bc4d7923c2c 100644
--- a/eth/tracers/tracers_test.go
+++ b/eth/tracers/tracers_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/ethdb/db_interface.go b/ethdb/db_interface.go
index b8fe84db58d..31273659eb0 100644
--- a/ethdb/db_interface.go
+++ b/ethdb/db_interface.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/ethdb/walk.go b/ethdb/walk.go
index 7ddc6c0b2a1..083d33e4877 100644
--- a/ethdb/walk.go
+++ b/ethdb/walk.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go
index 649d21531df..a7b55596a86 100644
--- a/ethstats/ethstats.go
+++ b/ethstats/ethstats.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/event/example_feed_test.go b/event/example_feed_test.go
index 0f4abd13be4..08dc4194be9 100644
--- a/event/example_feed_test.go
+++ b/event/example_feed_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/event/example_scope_test.go b/event/example_scope_test.go
index ee4a180f48e..68eab865c71 100644
--- a/event/example_scope_test.go
+++ b/event/example_scope_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go
index 5618e0506d7..5b936853281 100644
--- a/event/example_subscription_test.go
+++ b/event/example_subscription_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/event/feed.go b/event/feed.go
index 742c21cf8a4..cb5da5451fc 100644
--- a/event/feed.go
+++ b/event/feed.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/event/feed_test.go b/event/feed_test.go
index db8bbfbf954..7eba94a0a4d 100644
--- a/event/feed_test.go
+++ b/event/feed_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/event/subscription.go b/event/subscription.go
index 450fef18e56..08900beb512 100644
--- a/event/subscription.go
+++ b/event/subscription.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/event/subscription_test.go b/event/subscription_test.go
index a3d96f349e9..e156a952548 100644
--- a/event/subscription_test.go
+++ b/event/subscription_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/interfaces.go b/interfaces.go
index 6e35c3f8281..096737f2a6b 100644
--- a/interfaces.go
+++ b/interfaces.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/doc.go b/node/doc.go
index 1557f68f59d..42e87cd2972 100644
--- a/node/doc.go
+++ b/node/doc.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/endpoints.go b/node/endpoints.go
index 370dd818f38..1e68366dcbc 100644
--- a/node/endpoints.go
+++ b/node/endpoints.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/errors.go b/node/errors.go
index 6380dbcd3e4..7c50b8a9a3e 100644
--- a/node/errors.go
+++ b/node/errors.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/lifecycle.go b/node/lifecycle.go
index bf01c258ea3..7ec82297d5c 100644
--- a/node/lifecycle.go
+++ b/node/lifecycle.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/node.go b/node/node.go
index b11d22c9424..8f669669a89 100644
--- a/node/node.go
+++ b/node/node.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/node_example_test.go b/node/node_example_test.go
index 9970f5021c2..de29f89e263 100644
--- a/node/node_example_test.go
+++ b/node/node_example_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/node_test.go b/node/node_test.go
index 4592f7dc264..9a204976d3d 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/nodecfg/config.go b/node/nodecfg/config.go
index 162fcd3cf70..d489639d2c4 100644
--- a/node/nodecfg/config.go
+++ b/node/nodecfg/config.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/nodecfg/config_test.go b/node/nodecfg/config_test.go
index 953f3e6bf13..5b5f55d9265 100644
--- a/node/nodecfg/config_test.go
+++ b/node/nodecfg/config_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/nodecfg/defaults.go b/node/nodecfg/defaults.go
index 788d3ad692a..9dccf99e453 100644
--- a/node/nodecfg/defaults.go
+++ b/node/nodecfg/defaults.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/rpcstack.go b/node/rpcstack.go
index 6e485868305..9b3802b0fb0 100644
--- a/node/rpcstack.go
+++ b/node/rpcstack.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go
index 5d89a633f36..fa7aa9daea1 100644
--- a/node/rpcstack_test.go
+++ b/node/rpcstack_test.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/node/utils_test.go b/node/utils_test.go
index 3485b8c2f36..00b09061b76 100644
--- a/node/utils_test.go
+++ b/node/utils_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dial.go b/p2p/dial.go
index 26b99228070..55d11290897 100644
--- a/p2p/dial.go
+++ b/p2p/dial.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dial_test.go b/p2p/dial_test.go
index bc10f5dcd7d..486fad4c1a7 100644
--- a/p2p/dial_test.go
+++ b/p2p/dial_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/common.go b/p2p/discover/common.go
index 4354a0efc6b..fee6c4fee03 100644
--- a/p2p/discover/common.go
+++ b/p2p/discover/common.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/lookup.go b/p2p/discover/lookup.go
index 3838b7eeb3c..44de68e2386 100644
--- a/p2p/discover/lookup.go
+++ b/p2p/discover/lookup.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index 7d3bbfe1929..1be6cf7b0bf 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go
index 23f6017f129..d95ed5478b4 100644
--- a/p2p/discover/ntp.go
+++ b/p2p/discover/ntp.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index 5aedf7cefc0..d4e12cb0d24 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go
index 186cceb4838..34f77f8e833 100644
--- a/p2p/discover/table_test.go
+++ b/p2p/discover/table_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go
index 19885e4fe6c..fca82b417d1 100644
--- a/p2p/discover/table_util_test.go
+++ b/p2p/discover/table_util_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v4_lookup_test.go b/p2p/discover/v4_lookup_test.go
index 28bc8aff248..5b9c5d39836 100644
--- a/p2p/discover/v4_lookup_test.go
+++ b/p2p/discover/v4_lookup_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go
index ba72b5c9156..8799c07c766 100644
--- a/p2p/discover/v4_udp.go
+++ b/p2p/discover/v4_udp.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go
index c083c19fc45..1e428461cfb 100644
--- a/p2p/discover/v4_udp_test.go
+++ b/p2p/discover/v4_udp_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v4wire/v4wire.go b/p2p/discover/v4wire/v4wire.go
index 0b80c47ee88..154998db94e 100644
--- a/p2p/discover/v4wire/v4wire.go
+++ b/p2p/discover/v4wire/v4wire.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v4wire/v4wire_test.go b/p2p/discover/v4wire/v4wire_test.go
index 422588442d1..da416f9f688 100644
--- a/p2p/discover/v4wire/v4wire_test.go
+++ b/p2p/discover/v4wire/v4wire_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go
index 4517fe9a979..bcc80d9665b 100644
--- a/p2p/discover/v5_udp.go
+++ b/p2p/discover/v5_udp.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go
index d1958c2c9f5..5ca765d0228 100644
--- a/p2p/discover/v5_udp_test.go
+++ b/p2p/discover/v5_udp_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5wire/crypto.go b/p2p/discover/v5wire/crypto.go
index 38cdc2f438a..c6916fba403 100644
--- a/p2p/discover/v5wire/crypto.go
+++ b/p2p/discover/v5wire/crypto.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5wire/crypto_test.go b/p2p/discover/v5wire/crypto_test.go
index bff656c075f..e018b70b32c 100644
--- a/p2p/discover/v5wire/crypto_test.go
+++ b/p2p/discover/v5wire/crypto_test.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5wire/encoding.go b/p2p/discover/v5wire/encoding.go
index 4b8c8d765b5..f8efc0c9e32 100644
--- a/p2p/discover/v5wire/encoding.go
+++ b/p2p/discover/v5wire/encoding.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5wire/encoding_test.go b/p2p/discover/v5wire/encoding_test.go
index d05e35f94dc..71a861e8d93 100644
--- a/p2p/discover/v5wire/encoding_test.go
+++ b/p2p/discover/v5wire/encoding_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5wire/msg.go b/p2p/discover/v5wire/msg.go
index 36f4bbffacd..eec343f89ee 100644
--- a/p2p/discover/v5wire/msg.go
+++ b/p2p/discover/v5wire/msg.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/discover/v5wire/session.go b/p2p/discover/v5wire/session.go
index ec125bde7b5..84518410ffe 100644
--- a/p2p/discover/v5wire/session.go
+++ b/p2p/discover/v5wire/session.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/client.go b/p2p/dnsdisc/client.go
index fb0f5dbd93b..b5456628db4 100644
--- a/p2p/dnsdisc/client.go
+++ b/p2p/dnsdisc/client.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/client_test.go b/p2p/dnsdisc/client_test.go
index f702145a52a..32039dfbb64 100644
--- a/p2p/dnsdisc/client_test.go
+++ b/p2p/dnsdisc/client_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/doc.go b/p2p/dnsdisc/doc.go
index 6c5ec3e8db2..3b00e44278a 100644
--- a/p2p/dnsdisc/doc.go
+++ b/p2p/dnsdisc/doc.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/error.go b/p2p/dnsdisc/error.go
index 4a134fc608a..9f895b63b79 100644
--- a/p2p/dnsdisc/error.go
+++ b/p2p/dnsdisc/error.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/sync.go b/p2p/dnsdisc/sync.go
index 7100a98e14a..444999d609c 100644
--- a/p2p/dnsdisc/sync.go
+++ b/p2p/dnsdisc/sync.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/sync_test.go b/p2p/dnsdisc/sync_test.go
index f5ff83175e5..42ec6bd9a66 100644
--- a/p2p/dnsdisc/sync_test.go
+++ b/p2p/dnsdisc/sync_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/tree.go b/p2p/dnsdisc/tree.go
index 65d6e9bff1f..84dca5ec78a 100644
--- a/p2p/dnsdisc/tree.go
+++ b/p2p/dnsdisc/tree.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/dnsdisc/tree_test.go b/p2p/dnsdisc/tree_test.go
index 68c1f77f55a..aa8efa8e1cb 100644
--- a/p2p/dnsdisc/tree_test.go
+++ b/p2p/dnsdisc/tree_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go
index f960e63d537..8461d6ab2ab 100644
--- a/p2p/enode/idscheme.go
+++ b/p2p/enode/idscheme.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go
index a3a3d3cede2..0d0dc89b0a8 100644
--- a/p2p/enode/idscheme_test.go
+++ b/p2p/enode/idscheme_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/iter.go b/p2p/enode/iter.go
index 44711b74be1..bd5a8ae2b09 100644
--- a/p2p/enode/iter.go
+++ b/p2p/enode/iter.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/iter_test.go b/p2p/enode/iter_test.go
index 95336181260..590b1e6e974 100644
--- a/p2p/enode/iter_test.go
+++ b/p2p/enode/iter_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go
index 1de5d93673d..a4a37f629f8 100644
--- a/p2p/enode/localnode.go
+++ b/p2p/enode/localnode.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go
index 76766ceb6f0..9a0deee4c89 100644
--- a/p2p/enode/localnode_test.go
+++ b/p2p/enode/localnode_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/node.go b/p2p/enode/node.go
index 3c3fb5d6809..ec3a99cac71 100644
--- a/p2p/enode/node.go
+++ b/p2p/enode/node.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go
index 272720e7fe8..08d2bf5ec23 100644
--- a/p2p/enode/node_test.go
+++ b/p2p/enode/node_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go
index 8488c4b97dc..a2661d6fb69 100644
--- a/p2p/enode/nodedb.go
+++ b/p2p/enode/nodedb.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/nodedb_test.go b/p2p/enode/nodedb_test.go
index 7177477b83b..b16253a13b4 100644
--- a/p2p/enode/nodedb_test.go
+++ b/p2p/enode/nodedb_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go
index 5aa5855f73b..c735b6d4a2b 100644
--- a/p2p/enode/urlv4.go
+++ b/p2p/enode/urlv4.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go
index 100fcd40da6..61d6bf12417 100644
--- a/p2p/enode/urlv4_test.go
+++ b/p2p/enode/urlv4_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go
index c21471c64d9..3aa2061318a 100644
--- a/p2p/enr/enr.go
+++ b/p2p/enr/enr.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go
index e24ad12faa0..5d39aa093ee 100644
--- a/p2p/enr/enr_test.go
+++ b/p2p/enr/enr_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go
index d34acf0c222..dee2c1956cf 100644
--- a/p2p/enr/entries.go
+++ b/p2p/enr/entries.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/message.go b/p2p/message.go
index 94e73337a4e..84084b22f0e 100644
--- a/p2p/message.go
+++ b/p2p/message.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/message_test.go b/p2p/message_test.go
index 2ea13b051a9..8db3c3898b6 100644
--- a/p2p/message_test.go
+++ b/p2p/message_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/metrics.go b/p2p/metrics.go
index 3a9b1ac7284..e1d78bcaaaf 100644
--- a/p2p/metrics.go
+++ b/p2p/metrics.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go
index e20c97a59e5..4b25631f57b 100644
--- a/p2p/nat/nat.go
+++ b/p2p/nat/nat.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/nat/nat_test.go b/p2p/nat/nat_test.go
index 55546c9808e..109ba17afee 100644
--- a/p2p/nat/nat_test.go
+++ b/p2p/nat/nat_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/nat/natpmp.go b/p2p/nat/natpmp.go
index ea51d23cb43..d263282ecb2 100644
--- a/p2p/nat/natpmp.go
+++ b/p2p/nat/natpmp.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/nat/natupnp.go b/p2p/nat/natupnp.go
index 568b399eb37..32cb358f804 100644
--- a/p2p/nat/natupnp.go
+++ b/p2p/nat/natupnp.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/nat/natupnp_test.go b/p2p/nat/natupnp_test.go
index 5650265d4e9..46e1b9f78c2 100644
--- a/p2p/nat/natupnp_test.go
+++ b/p2p/nat/natupnp_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/addrutil.go b/p2p/netutil/addrutil.go
index 02fb9840028..0244db009fb 100644
--- a/p2p/netutil/addrutil.go
+++ b/p2p/netutil/addrutil.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/error.go b/p2p/netutil/error.go
index 343766ef1d0..16a1a12158a 100644
--- a/p2p/netutil/error.go
+++ b/p2p/netutil/error.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/error_test.go b/p2p/netutil/error_test.go
index 1608fda7415..7c9c56c04ef 100644
--- a/p2p/netutil/error_test.go
+++ b/p2p/netutil/error_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go
index 1f6015deb92..d74306373b4 100644
--- a/p2p/netutil/iptrack.go
+++ b/p2p/netutil/iptrack.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go
index 9cd4bc7a709..98a66fe486e 100644
--- a/p2p/netutil/iptrack_test.go
+++ b/p2p/netutil/iptrack_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/net.go b/p2p/netutil/net.go
index afe62ef83f0..4631912de4b 100644
--- a/p2p/netutil/net.go
+++ b/p2p/netutil/net.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/net_test.go b/p2p/netutil/net_test.go
index 198492ae650..4bfb5c3da90 100644
--- a/p2p/netutil/net_test.go
+++ b/p2p/netutil/net_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/toobig_notwindows.go b/p2p/netutil/toobig_notwindows.go
index 3676052ffef..b326048b189 100644
--- a/p2p/netutil/toobig_notwindows.go
+++ b/p2p/netutil/toobig_notwindows.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/netutil/toobig_windows.go b/p2p/netutil/toobig_windows.go
index 27ffa734648..32aaa033a2f 100644
--- a/p2p/netutil/toobig_windows.go
+++ b/p2p/netutil/toobig_windows.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/peer.go b/p2p/peer.go
index 9190d355c55..62d3f751bba 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/peer_error.go b/p2p/peer_error.go
index 2298a9cf3d2..776e36fc1ac 100644
--- a/p2p/peer_error.go
+++ b/p2p/peer_error.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/peer_test.go b/p2p/peer_test.go
index 492a6604570..021f2d36b79 100644
--- a/p2p/peer_test.go
+++ b/p2p/peer_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/protocol.go b/p2p/protocol.go
index f5447dda77d..05cc84164d0 100644
--- a/p2p/protocol.go
+++ b/p2p/protocol.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/rlpx/buffer.go b/p2p/rlpx/buffer.go
index ea4fc4a5e33..1335650df59 100644
--- a/p2p/rlpx/buffer.go
+++ b/p2p/rlpx/buffer.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/rlpx/buffer_test.go b/p2p/rlpx/buffer_test.go
index 5809a386210..895d21abfee 100644
--- a/p2p/rlpx/buffer_test.go
+++ b/p2p/rlpx/buffer_test.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/rlpx/rlpx.go b/p2p/rlpx/rlpx.go
index b7d4ae500ef..0ba15dc0bf1 100644
--- a/p2p/rlpx/rlpx.go
+++ b/p2p/rlpx/rlpx.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/rlpx/rlpx_test.go b/p2p/rlpx/rlpx_test.go
index c046f7df9d5..6e3ed9ea4ce 100644
--- a/p2p/rlpx/rlpx_test.go
+++ b/p2p/rlpx/rlpx_test.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/server.go b/p2p/server.go
index 97c2cb92deb..5b1199b4823 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/server_test.go b/p2p/server_test.go
index 9c223b91e42..4dc627925ff 100644
--- a/p2p/server_test.go
+++ b/p2p/server_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go
index a362c0cf05c..ac350571781 100644
--- a/p2p/simulations/adapters/inproc_test.go
+++ b/p2p/simulations/adapters/inproc_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go
index 6496859ee85..9f2bd27f212 100644
--- a/p2p/simulations/adapters/types.go
+++ b/p2p/simulations/adapters/types.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go
index d67f15c0c7b..32d93bc00bb 100644
--- a/p2p/simulations/connect.go
+++ b/p2p/simulations/connect.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/events.go b/p2p/simulations/events.go
index 751b1932f49..4be7b591aed 100644
--- a/p2p/simulations/events.go
+++ b/p2p/simulations/events.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go
index 1074122b6d2..ece86034b01 100644
--- a/p2p/simulations/http.go
+++ b/p2p/simulations/http.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go
index 0e4fb67ac63..9cf5651f27c 100644
--- a/p2p/simulations/mocker.go
+++ b/p2p/simulations/mocker.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go
index 54bcd2bf5d4..738ea6dc78f 100644
--- a/p2p/simulations/network.go
+++ b/p2p/simulations/network.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/pipes/pipes.go b/p2p/simulations/pipes/pipes.go
index 13afa48a231..649a445468f 100644
--- a/p2p/simulations/pipes/pipes.go
+++ b/p2p/simulations/pipes/pipes.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go
index 2cb33cb6c94..9bfca6d530d 100644
--- a/p2p/simulations/simulation.go
+++ b/p2p/simulations/simulation.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go
index 515e5b6672a..68350a2da31 100644
--- a/p2p/simulations/test.go
+++ b/p2p/simulations/test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/transport.go b/p2p/transport.go
index 0f00b765f36..c97e2a0b1bf 100644
--- a/p2p/transport.go
+++ b/p2p/transport.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/transport_test.go b/p2p/transport_test.go
index 1b3eee34c5f..9f76d7fa032 100644
--- a/p2p/transport_test.go
+++ b/p2p/transport_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/util.go b/p2p/util.go
index 1b857e711e3..7db34816383 100644
--- a/p2p/util.go
+++ b/p2p/util.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/p2p/util_test.go b/p2p/util_test.go
index 996fec5f7a8..b66e0ea468e 100644
--- a/p2p/util_test.go
+++ b/p2p/util_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/bootnodes.go b/params/bootnodes.go
index 8c3efdd0b25..4549f1b48f8 100644
--- a/params/bootnodes.go
+++ b/params/bootnodes.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/config.go b/params/config.go
index 4f618ecd162..b3413dcd046 100644
--- a/params/config.go
+++ b/params/config.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/config_test.go b/params/config_test.go
index a2702d5bd80..638e396448b 100644
--- a/params/config_test.go
+++ b/params/config_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/dao.go b/params/dao.go
index 537a0ee8a0a..e50fe5872e1 100644
--- a/params/dao.go
+++ b/params/dao.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/denomination.go b/params/denomination.go
index 02d2d4db4ba..95ace3a5d70 100644
--- a/params/denomination.go
+++ b/params/denomination.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/network_params.go b/params/network_params.go
index a7397cc0384..2686be67cec 100644
--- a/params/network_params.go
+++ b/params/network_params.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/protocol_params.go b/params/protocol_params.go
index 7bbf233ce62..91e6dae0f6b 100644
--- a/params/protocol_params.go
+++ b/params/protocol_params.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/params/version.go b/params/version.go
index 7c5912ec9d4..5cc4d5b6b98 100644
--- a/params/version.go
+++ b/params/version.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/decode.go b/rlp/decode.go
index 9cd94bcd85f..ce10b6065c4 100644
--- a/rlp/decode.go
+++ b/rlp/decode.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/decode_tail_test.go b/rlp/decode_tail_test.go
index 1f21577197b..087a2a23abd 100644
--- a/rlp/decode_tail_test.go
+++ b/rlp/decode_tail_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/decode_test.go b/rlp/decode_test.go
index 426bfd43f1b..1e9ff7d30ff 100644
--- a/rlp/decode_test.go
+++ b/rlp/decode_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/doc.go b/rlp/doc.go
index ab074af3e05..bb0e1552801 100644
--- a/rlp/doc.go
+++ b/rlp/doc.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/encode.go b/rlp/encode.go
index 243f50cb693..2e24d90dad0 100644
--- a/rlp/encode.go
+++ b/rlp/encode.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/encode_test.go b/rlp/encode_test.go
index a55d6011978..aeb9caba9a9 100644
--- a/rlp/encode_test.go
+++ b/rlp/encode_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/encoder_example_test.go b/rlp/encoder_example_test.go
index 2472fa5f576..49e8660afb7 100644
--- a/rlp/encoder_example_test.go
+++ b/rlp/encoder_example_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/iterator.go b/rlp/iterator.go
index 1497ab9f017..4adac54671e 100644
--- a/rlp/iterator.go
+++ b/rlp/iterator.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/iterator_test.go b/rlp/iterator_test.go
index 303c89c1b0c..48016eadce2 100644
--- a/rlp/iterator_test.go
+++ b/rlp/iterator_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/raw.go b/rlp/raw.go
index 332a8c85c3b..39047e40773 100644
--- a/rlp/raw.go
+++ b/rlp/raw.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/raw_test.go b/rlp/raw_test.go
index b0be5806f67..6b606ce6c47 100644
--- a/rlp/raw_test.go
+++ b/rlp/raw_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rlp/typecache.go b/rlp/typecache.go
index 9e0013e8ddb..bc941d6627e 100644
--- a/rlp/typecache.go
+++ b/rlp/typecache.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/client.go b/rpc/client.go
index a73f6cce919..cb492935328 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go
index 108b8c165a0..aa5cce3e3d4 100644
--- a/rpc/client_example_test.go
+++ b/rpc/client_example_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/client_test.go b/rpc/client_test.go
index e9ea23615c3..e597cba7a78 100644
--- a/rpc/client_test.go
+++ b/rpc/client_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/doc.go b/rpc/doc.go
index a6eac298ca9..700e778d5c7 100644
--- a/rpc/doc.go
+++ b/rpc/doc.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/endpoints.go b/rpc/endpoints.go
index cae8b5dd258..f63176e28bb 100644
--- a/rpc/endpoints.go
+++ b/rpc/endpoints.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/errors.go b/rpc/errors.go
index 2f6d8f1a53c..3aaf5ee75f3 100644
--- a/rpc/errors.go
+++ b/rpc/errors.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/handler.go b/rpc/handler.go
index 852fdfb8eec..5ad260e04ce 100644
--- a/rpc/handler.go
+++ b/rpc/handler.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/http.go b/rpc/http.go
index 43d4419dca8..f2008d0b3bc 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/http_test.go b/rpc/http_test.go
index a563bc247f7..67ef2f4b20d 100644
--- a/rpc/http_test.go
+++ b/rpc/http_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/inproc.go b/rpc/inproc.go
index 3856711402c..84c29254c4b 100644
--- a/rpc/inproc.go
+++ b/rpc/inproc.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/ipc.go b/rpc/ipc.go
index 621a71b6083..88eee6103a6 100644
--- a/rpc/ipc.go
+++ b/rpc/ipc.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/json.go b/rpc/json.go
index 077ea7b036e..280ce15902e 100644
--- a/rpc/json.go
+++ b/rpc/json.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/metrics.go b/rpc/metrics.go
index 9a605016081..cb1add82333 100644
--- a/rpc/metrics.go
+++ b/rpc/metrics.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/server.go b/rpc/server.go
index df5c042ef4c..f65519206a7 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/server_test.go b/rpc/server_test.go
index b0e1edf9fd8..14778624f17 100644
--- a/rpc/server_test.go
+++ b/rpc/server_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/service.go b/rpc/service.go
index 1d5412bd1dc..f9ccca20b5f 100644
--- a/rpc/service.go
+++ b/rpc/service.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/stdio.go b/rpc/stdio.go
index deb85b47a29..d4ced13362d 100644
--- a/rpc/stdio.go
+++ b/rpc/stdio.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/subscription.go b/rpc/subscription.go
index 697cae405e2..6bf15f50582 100644
--- a/rpc/subscription.go
+++ b/rpc/subscription.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go
index a41e9b734a3..1783ce60721 100644
--- a/rpc/subscription_test.go
+++ b/rpc/subscription_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/testservice_test.go b/rpc/testservice_test.go
index 441146ff5ee..6c2ce3b2576 100644
--- a/rpc/testservice_test.go
+++ b/rpc/testservice_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/types.go b/rpc/types.go
index a955e58877e..bbd0c6f956d 100644
--- a/rpc/types.go
+++ b/rpc/types.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/types_test.go b/rpc/types_test.go
index 69415353128..214d2999e2d 100644
--- a/rpc/types_test.go
+++ b/rpc/types_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/websocket.go b/rpc/websocket.go
index f685334df8b..2bca95614e0 100644
--- a/rpc/websocket.go
+++ b/rpc/websocket.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/rpc/websocket_test.go b/rpc/websocket_test.go
index 79ead0061e8..ba3601fb0b4 100644
--- a/rpc/websocket_test.go
+++ b/rpc/websocket_test.go
@@ -1,4 +1,7 @@
-// Copyright 2018 The go-ethereum and Erigon Authors
+// Copyright 2018 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/block_test.go b/tests/block_test.go
index 77a73baab92..cc4e10c77fe 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index b9adfb6e559..80230f31b52 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go
index 286ebc4fe79..daab9e53e8e 100644
--- a/tests/difficulty_test.go
+++ b/tests/difficulty_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go
index a9c128c59f6..e45476e7b32 100644
--- a/tests/difficulty_test_util.go
+++ b/tests/difficulty_test_util.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/abi/abifuzzer.go b/tests/fuzzers/abi/abifuzzer.go
index 4560897f080..595520f8180 100644
--- a/tests/fuzzers/abi/abifuzzer.go
+++ b/tests/fuzzers/abi/abifuzzer.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/abi/abifuzzer_test.go b/tests/fuzzers/abi/abifuzzer_test.go
index 3c9dae2cbbb..6e3d7171836 100644
--- a/tests/fuzzers/abi/abifuzzer_test.go
+++ b/tests/fuzzers/abi/abifuzzer_test.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/bitutil/compress_fuzz.go b/tests/fuzzers/bitutil/compress_fuzz.go
index 973c11fd711..7bbb01429b3 100644
--- a/tests/fuzzers/bitutil/compress_fuzz.go
+++ b/tests/fuzzers/bitutil/compress_fuzz.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/bls12381/precompile_fuzzer.go b/tests/fuzzers/bls12381/precompile_fuzzer.go
index b4056e18962..5975a8a4bda 100644
--- a/tests/fuzzers/bls12381/precompile_fuzzer.go
+++ b/tests/fuzzers/bls12381/precompile_fuzzer.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/difficulty/difficulty-fuzz.go b/tests/fuzzers/difficulty/difficulty-fuzz.go
index 9c44d2cc40e..70775cf45a8 100644
--- a/tests/fuzzers/difficulty/difficulty-fuzz.go
+++ b/tests/fuzzers/difficulty/difficulty-fuzz.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/rlp/rlp_fuzzer.go b/tests/fuzzers/rlp/rlp_fuzzer.go
index 03a84b6be53..9ce24188d2b 100644
--- a/tests/fuzzers/rlp/rlp_fuzzer.go
+++ b/tests/fuzzers/rlp/rlp_fuzzer.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/runtime/runtime_fuzz.go b/tests/fuzzers/runtime/runtime_fuzz.go
index e43e507aaff..2fc475fadc2 100644
--- a/tests/fuzzers/runtime/runtime_fuzz.go
+++ b/tests/fuzzers/runtime/runtime_fuzz.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/fuzzers/secp256k1/secp_fuzzer.go b/tests/fuzzers/secp256k1/secp_fuzzer.go
index ed372df6211..d8d00000d5c 100644
--- a/tests/fuzzers/secp256k1/secp_fuzzer.go
+++ b/tests/fuzzers/secp256k1/secp_fuzzer.go
@@ -1,4 +1,7 @@
-// Copyright 2021 The go-ethereum and Erigon Authors
+// Copyright 2021 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/init.go b/tests/init.go
index a92f3a58f64..7a6066ddc74 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/init_test.go b/tests/init_test.go
index 461fb6c6370..de2dafa6b3a 100644
--- a/tests/init_test.go
+++ b/tests/init_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/rlp_test.go b/tests/rlp_test.go
index f9fe0d2e898..f6a907b2ade 100644
--- a/tests/rlp_test.go
+++ b/tests/rlp_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go
index ba78f89524c..66fbfb3723a 100644
--- a/tests/rlp_test_util.go
+++ b/tests/rlp_test_util.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/state_test.go b/tests/state_test.go
index 463de10cfd9..dbc3a5f28f3 100644
--- a/tests/state_test.go
+++ b/tests/state_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 86aa99e2f86..fb61738f26e 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/statedb_chain_test.go b/tests/statedb_chain_test.go
index 9073b9b3c06..5c843e5e814 100644
--- a/tests/statedb_chain_test.go
+++ b/tests/statedb_chain_test.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/transaction_test.go b/tests/transaction_test.go
index c5373849db3..5cae0616317 100644
--- a/tests/transaction_test.go
+++ b/tests/transaction_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go
index 32f20b0d8dc..aa6272cc9cf 100644
--- a/tests/transaction_test_util.go
+++ b/tests/transaction_test_util.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/adapter/ethapi/api.go b/turbo/adapter/ethapi/api.go
index fbd93eb5577..cad98fd1d47 100644
--- a/turbo/adapter/ethapi/api.go
+++ b/turbo/adapter/ethapi/api.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/adapter/ethapi/backend.go b/turbo/adapter/ethapi/backend.go
index 10193433de7..81b9690d35c 100644
--- a/turbo/adapter/ethapi/backend.go
+++ b/turbo/adapter/ethapi/backend.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/cli/helpers.go b/turbo/cli/helpers.go
index 59c5af9618f..52d228c23e3 100644
--- a/turbo/cli/helpers.go
+++ b/turbo/cli/helpers.go
@@ -1,4 +1,7 @@
-// Copyright 2020 The go-ethereum and Erigon Authors
+// Copyright 2020 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/cmdtest/test_cmd.go b/turbo/cmdtest/test_cmd.go
index 9d6c5899d1a..914aad54ace 100644
--- a/turbo/cmdtest/test_cmd.go
+++ b/turbo/cmdtest/test_cmd.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/debug/api.go b/turbo/debug/api.go
index 85fc79f71e2..65324eb6801 100644
--- a/turbo/debug/api.go
+++ b/turbo/debug/api.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/debug/flags.go b/turbo/debug/flags.go
index 70deeeb5f4c..7780151c12a 100644
--- a/turbo/debug/flags.go
+++ b/turbo/debug/flags.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/debug/loudpanic.go b/turbo/debug/loudpanic.go
index e804f7089a8..0019ec5fab8 100644
--- a/turbo/debug/loudpanic.go
+++ b/turbo/debug/loudpanic.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/debug/trace.go b/turbo/debug/trace.go
index 273eda4c8e4..8e6dcbad9b0 100644
--- a/turbo/debug/trace.go
+++ b/turbo/debug/trace.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/debug/trace_fallback.go b/turbo/debug/trace_fallback.go
index 1da652182bb..4845e5ae806 100644
--- a/turbo/debug/trace_fallback.go
+++ b/turbo/debug/trace_fallback.go
@@ -1,4 +1,7 @@
-// Copyright 2016 The go-ethereum and Erigon Authors
+// Copyright 2016 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/stages/blockchain_test.go b/turbo/stages/blockchain_test.go
index a4c872f40c1..894a400f2be 100644
--- a/turbo/stages/blockchain_test.go
+++ b/turbo/stages/blockchain_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/stages/chain_makers_test.go b/turbo/stages/chain_makers_test.go
index d6453e92a04..d550006bdab 100644
--- a/turbo/stages/chain_makers_test.go
+++ b/turbo/stages/chain_makers_test.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/stages/genesis_test.go b/turbo/stages/genesis_test.go
index 302404f5e17..27d0afa888a 100644
--- a/turbo/stages/genesis_test.go
+++ b/turbo/stages/genesis_test.go
@@ -1,4 +1,7 @@
-// Copyright 2017 The go-ethereum and Erigon Authors
+// Copyright 2017 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/testlog/testlog.go b/turbo/testlog/testlog.go
index 935f681279e..546a695b258 100644
--- a/turbo/testlog/testlog.go
+++ b/turbo/testlog/testlog.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/debug.go b/turbo/trie/debug.go
index a5ba5b817d6..e5fe645f8eb 100644
--- a/turbo/trie/debug.go
+++ b/turbo/trie/debug.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/encoding.go b/turbo/trie/encoding.go
index 690d0f9e27c..69a10fd24dc 100644
--- a/turbo/trie/encoding.go
+++ b/turbo/trie/encoding.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/encoding_test.go b/turbo/trie/encoding_test.go
index 9ebffe6538a..8d6bfa72da5 100644
--- a/turbo/trie/encoding_test.go
+++ b/turbo/trie/encoding_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/errors.go b/turbo/trie/errors.go
index 49c52a287fc..c41183b59b1 100644
--- a/turbo/trie/errors.go
+++ b/turbo/trie/errors.go
@@ -1,4 +1,7 @@
-// Copyright 2015 The go-ethereum and Erigon Authors
+// Copyright 2015 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/gen_struct_step.go b/turbo/trie/gen_struct_step.go
index 12f4420706c..d96cb6005c9 100644
--- a/turbo/trie/gen_struct_step.go
+++ b/turbo/trie/gen_struct_step.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/hasher.go b/turbo/trie/hasher.go
index 51f003e1064..cfc5bbbec6a 100644
--- a/turbo/trie/hasher.go
+++ b/turbo/trie/hasher.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/node.go b/turbo/trie/node.go
index 4efb7a3820a..e0b90920525 100644
--- a/turbo/trie/node.go
+++ b/turbo/trie/node.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/retain_list.go b/turbo/trie/retain_list.go
index 11a8e28d5fa..b55c0650468 100644
--- a/turbo/trie/retain_list.go
+++ b/turbo/trie/retain_list.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/stream.go b/turbo/trie/stream.go
index 3f1b9ebb436..d21498a0983 100644
--- a/turbo/trie/stream.go
+++ b/turbo/trie/stream.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/structural_test.go b/turbo/trie/structural_test.go
index 1ff3286e4c3..ca62fbf5930 100644
--- a/turbo/trie/structural_test.go
+++ b/turbo/trie/structural_test.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/trie.go b/turbo/trie/trie.go
index 8ddbcb4dc1a..e98e4fc19b3 100644
--- a/turbo/trie/trie.go
+++ b/turbo/trie/trie.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/trie_test.go b/turbo/trie/trie_test.go
index 95fd0c5f085..4926d1766f2 100644
--- a/turbo/trie/trie_test.go
+++ b/turbo/trie/trie_test.go
@@ -1,4 +1,7 @@
-// Copyright 2014 The go-ethereum and Erigon Authors
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify
diff --git a/turbo/trie/visual.go b/turbo/trie/visual.go
index 55713f5142b..301418144ba 100644
--- a/turbo/trie/visual.go
+++ b/turbo/trie/visual.go
@@ -1,4 +1,7 @@
-// Copyright 2019 The go-ethereum and Erigon Authors
+// Copyright 2019 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
 // This file is part of Erigon.
 //
 // Erigon is free software: you can redistribute it and/or modify