Bump version to 5.0.6

Delay Index Caching On Startup

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

LICENSE

@@ -0,0 +1,674 @@
+                    GNU 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>.

log4j2.properties

@@ -6,40 +6,6 @@ rootLogger.level = info
 rootLogger.appenderRef.console.ref = stdout
 rootLogger.appenderRef.rolling.ref = FILE
 
-### additional debug options (in case of problems eg. 202411
-
-#to see more QDN details - add the stuff below
-#logger.arbitrary.name = org.qortal.arbitrary
-#logger.arbitrary.level = trace
-
-#to see more QDN networking details - add stuff below
-#logger.arbitrarycontroller.name = org.qortal.controller.arbitrary
-#logger.arbitrarycontroller.level = debug
-
-# Support optional, Network Task debugging
-#logger.networkTask.name = org.qortal.network.task
-#logger.networkTask.level = debug
-
-# Support optional, Network Task tracing
-#logger.networkTask.name = org.qortal.network.task
-#logger.networkTask.level = trace
-
-# Support optional, Block debugging
-#logger.block.name = org.qortal.block
-#logger.block.level = debug
-
-# Support optional, Block tracing
-#logger.block.name = org.qortal.block
-#logger.block.level = trace
-
-## see more details for RNSNetork, RNSPeer
-#logger.RNSNetwork.name = org.qortal.network.RNSNetwork
-#logger.RNSNetwork.level = debug
-#logger.RNSPeer.name = org.qortal.network.RNSPeer
-#logger.RNSPeer.level = debug
-
-### end additional debug options
-
 # Suppress extraneous bitcoinj library output
 logger.bitcoinj.name = org.bitcoinj
 logger.bitcoinj.level = error
@@ -52,10 +18,6 @@ logger.hsqldb.level = warn
 logger.hsqldbRepository.name = org.qortal.repository.hsqldb
 logger.hsqldbRepository.level = debug
 
-## Support optional, controller repository debugging
-#logger.controllerRepository.name = org.qortal.controller.repository
-#logger.controllerRepository.level = debug
-
 # Suppress extraneous Jersey warning
 logger.jerseyInject.name = org.glassfish.jersey.internal.inject.Providers
 logger.jerseyInject.level = off

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.qortal</groupId>
 	<artifactId>qortal</artifactId>
-	<version>5.0.5</version>
+	<version>5.0.6</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,18 +53,12 @@
 		<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
 		<protobuf.version>3.25.3</protobuf.version>
 		<replacer.version>1.5.3</replacer.version>
-		<reticulum.version>9b27cb6</reticulum.version>
-		<jinjava.version>2.8.0</jinjava.version>
 		<simplemagic.version>1.17</simplemagic.version>
+		<slf4j.version>1.7.36</slf4j.version>
 		<swagger-api.version>2.0.10</swagger-api.version>
 		<swagger-ui.version>5.18.2</swagger-ui.version>
 		<upnp.version>1.2</upnp.version>
 		<xz.version>1.10</xz.version>
-   	<lombok.version>1.18.30</lombok.version>
-   	<jackson.version>2.16.1</jackson.version>
-		<slf4j.version>2.0.12</slf4j.version>
-    <nitrite.version>4.3.0</nitrite.version>
-    <junit.version>5.9.2</junit.version>
 	</properties>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
@@ -457,41 +451,13 @@
 			<id>project.local</id>
 			<name>project</name>
 			<url>file:${project.basedir}/lib</url>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
 		</repository>
 		<!-- jitpack for build-on-demand of altcoinj -->
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
 		</repository>
 	</repositories>
-	<!--
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.dizitart</groupId>
-          <artifactId>nitrite-bom</artifactId>
-          <version>${nitrite.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-bom</artifactId>
-          <version>${log4j.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-      </dependencies>
-  	</dependencyManagement>
-    -->
 	<dependencies>
 		<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/build-helper-maven-plugin -->
 		<dependency>
@@ -539,13 +505,6 @@
 			<artifactId>altcoinj</artifactId>
 			<version>${altcoinj.version}</version>
 		</dependency>
-		<!-- Build Reticulum from Source -->
-		<dependency>
-			<!--<groupId>com.github.sergst83</groupId>-->
-			<groupId>com.github.jschulthess</groupId>
-			<artifactId>reticulum-network-stack</artifactId>
-			<version>${reticulum.version}</version>
-		</dependency>
 		<!-- Utilities -->
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
@@ -624,33 +583,35 @@
 			<artifactId>guava</artifactId>
 			<version>${guava.version}</version>
 		</dependency>
-    <!-- logging: slf4j -->
+		<!-- Logging: log4j2 -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<!-- redirect slf4j to log4j2 -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<!-- redirect java.utils.logging to log4j2 -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jul</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<!-- Logging: slf4j used by Jetty/Jersey -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
-    <dependency>
-       <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-slf4j2-impl</artifactId>
-       <version>${log4j.version}</version>
-    </dependency>
-		<!-- Logging: log4j2 -->
-    <dependency>
-       <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-core</artifactId>
-       <version>${log4j.version}</version>
-    </dependency>
-    <dependency>
-    <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-api</artifactId>
-       <version>${log4j.version}</version>
-    </dependency>
-    <dependency>
-       <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-jul</artifactId>
-       <version>${log4j.version}</version>
-     </dependency> 
 		<!-- Servlet related -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -783,22 +744,15 @@
 		</dependency>
 		-->
 		<!-- BouncyCastle for crypto, including TLS secure networking -->
-    <!--
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15to18</artifactId>
 			<version>${bouncycastle.version}</version>
 		</dependency>
-		-->
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bctls-jdk15to18</artifactId>
 			<version>${bouncycastle.version}</version>
-		</dependency><!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15to18 -->
-		<dependency>
-		    <groupId>org.bouncycastle</groupId>
-		    <artifactId>bcprov-jdk15to18</artifactId>
-		    <version>${bouncycastle.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
@@ -841,137 +795,7 @@
 			<artifactId>jaxb-runtime</artifactId>
 			<version>${jaxb-runtime.version}</version>
 		</dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.16.1</version>
-    </dependency>
-    <!-- already declared earlier
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.14.0</version>
-    </dependency>
-    -->
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.4</version>
-    </dependency>
-    <!-- already declared earlier
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.26.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    -->
-    <!-- note: covered ? -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.msgpack</groupId>
-      <artifactId>jackson-dataformat-msgpack</artifactId>
-      <version>0.9.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>${lombok.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.70</version>
-    </dependency>
-    <dependency>
-      <groupId>com.macasaet.fernet</groupId>
-      <artifactId>fernet-java8</artifactId>
-      <version>1.5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.igormaznitsa</groupId>
-      <artifactId>jbbp</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
-      <!--<version>4.1.106.Final</version>-->
-      <version>5.0.0.Alpha2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.seancfoley</groupId>
-      <artifactId>ipaddress</artifactId>
-      <version>5.4.2</version>
-    </dependency>
-    <!-- Nitrite Modules -->
-    <dependency>
-        <groupId>org.dizitart</groupId>
-        <artifactId>nitrite</artifactId>
-        <version>${nitrite.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.dizitart</groupId>
-        <artifactId>nitrite-mvstore-adapter</artifactId>
-        <version>${nitrite.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>2.3.230</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2-mvstore</artifactId>
-      <version>2.3.230</version>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <version>5.10.0</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/com.hubspot.jinjava/jinjava -->
-    <dependency>
-      <groupId>com.hubspot.jinjava</groupId>
-      <artifactId>jinjava</artifactId>
-      <version>${jinjava.version}</version>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
-    <dependency>
-      <groupId>org.reflections</groupId>
-      <artifactId>reflections</artifactId>
-    <version>0.10.2</version>
-</dependency>
-
-<dependency>
+		<dependency>
 <groupId>org.apache.tika</groupId>
 <artifactId>tika-core</artifactId>
 <version>3.1.0</version> 

src/main/java/org/qortal/api/model/ConnectedPeer.java

@@ -43,10 +43,7 @@ public class ConnectedPeer {
     }
 
     public ConnectedPeer(Peer peer) {
-
         this.direction = peer.isOutbound() ? Direction.OUTBOUND : Direction.INBOUND;
-        //this.handshakeStatus = peer.getHandshakeStatus();
-        //this.lastPing = peer.getLastPing();
         this.handshakeStatus = peer.getHandshakeStatus();
         this.lastPing = peer.getLastPing();
 

src/main/java/org/qortal/api/resource/ArbitraryResource.java

@@ -30,6 +30,7 @@ import org.qortal.arbitrary.misc.Category;
 import org.qortal.arbitrary.misc.Service;
 import org.qortal.controller.Controller;
 import org.qortal.controller.arbitrary.ArbitraryDataCacheManager;
+import org.qortal.controller.arbitrary.ArbitraryDataHostMonitor;
 import org.qortal.controller.arbitrary.ArbitraryDataRenderManager;
 import org.qortal.controller.arbitrary.ArbitraryDataStorageManager;
 import org.qortal.controller.arbitrary.ArbitraryMetadataManager;
@@ -43,6 +44,8 @@ import org.qortal.data.arbitrary.ArbitraryResourceMetadata;
 import org.qortal.data.arbitrary.ArbitraryResourceStatus;
 import org.qortal.data.arbitrary.IndexCache;
 import org.qortal.data.naming.NameData;
+import org.qortal.data.transaction.ArbitraryHostedDataInfo;
+import org.qortal.data.transaction.ArbitraryHostedDataItemInfo;
 import org.qortal.data.transaction.ArbitraryTransactionData;
 import org.qortal.data.transaction.TransactionData;
 import org.qortal.list.ResourceListManager;
@@ -83,8 +86,8 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.tika.Tika;
@@ -94,7 +97,6 @@ import org.apache.tika.mime.MimeTypes;
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.media.multipart.FormDataParam;
-import static org.qortal.api.ApiError.REPOSITORY_ISSUE;
 
 @Path("/arbitrary")
 @Tag(name = "Arbitrary")
@@ -514,25 +516,33 @@ public class ArbitraryResource {
 			summary = "List arbitrary transactions hosted by this node",
 			responses = {
 					@ApiResponse(
-							content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = ArbitraryTransactionData.class))
+							content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = ArbitraryHostedDataInfo.class))
 					)
 			}
 	)
 	@ApiErrors({ApiError.REPOSITORY_ISSUE})
-	public List<ArbitraryTransactionData> getHostedTransactions(@HeaderParam(Security.API_KEY_HEADER) String apiKey,
-																@Parameter(ref = "limit") @QueryParam("limit") Integer limit,
-																@Parameter(ref = "offset") @QueryParam("offset") Integer offset) {
-		Security.checkApiCallAllowed(request);
+	public ArbitraryHostedDataInfo getHostedTransactions(@Parameter(ref = "limit") @QueryParam("limit") Integer limit,
+																@Parameter(ref = "offset") @QueryParam("offset") Integer offset,
+																   @QueryParam("name") String name) {
 
-		try (final Repository repository = RepositoryManager.getRepository()) {
+		Stream<ArbitraryHostedDataItemInfo> stream = ArbitraryDataHostMonitor.getInstance().getHostedDataItemInfos().stream();
 
-			List<ArbitraryTransactionData> hostedTransactions = ArbitraryDataStorageManager.getInstance().listAllHostedTransactions(repository, limit, offset);
-
-			return hostedTransactions;
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
+		// if name is set, then filter by name
+		if( name != null && !"".equals(name)) {
+			stream = stream.filter( info -> info.getName().startsWith(name));
 		}
+
+		// always sort from the greatest total space to the least total space
+		List<ArbitraryHostedDataItemInfo> hostedTransactions
+			= stream.sorted(Comparator.comparing(ArbitraryHostedDataItemInfo::getTotalSpace).reversed())
+				.collect(Collectors.toList());
+
+		int count = hostedTransactions.size();
+		long totalSpace = hostedTransactions.stream().collect(Collectors.summingLong(ArbitraryHostedDataItemInfo::getTotalSpace));
+
+		List<ArbitraryHostedDataItemInfo> items = ArbitraryTransactionUtils.limitOffsetTransactions(hostedTransactions, limit, offset);
+
+		return new ArbitraryHostedDataInfo(count, totalSpace, items);
 	}
 
 	@GET

src/main/java/org/qortal/api/resource/PeersResource.java

@@ -24,7 +24,6 @@ import org.qortal.data.network.PeerData;
 import org.qortal.network.Network;
 import org.qortal.network.Peer;
 import org.qortal.network.PeerAddress;
-import org.qortal.network.PeerAddressFactory;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
@@ -197,8 +196,7 @@ public class PeersResource {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.NO_TIME_SYNC);
 
 		try {
-            //PeerAddress peerAddress = PeerAddress.fromString(address);
-            PeerAddress peerAddress = PeerAddressFactory.create("address", address);
+			PeerAddress peerAddress = PeerAddress.fromString(address);
 
 			List<PeerAddress> newPeerAddresses = new ArrayList<>(1);
 			newPeerAddresses.add(peerAddress);
@@ -210,9 +208,7 @@ public class PeersResource {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_NETWORK_ADDRESS);
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		} catch (ReflectiveOperationException e) {
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS, e);
-        }
+		}
 	}
 
 	@DELETE
@@ -251,8 +247,7 @@ public class PeersResource {
 		Security.checkApiCallAllowed(request);
 
 		try {
-			//PeerAddress peerAddress = PeerAddress.fromString(address);
-            PeerAddress peerAddress = PeerAddressFactory.create("address", address);
+			PeerAddress peerAddress = PeerAddress.fromString(address);
 
 			boolean wasKnown = Network.getInstance().forgetPeer(peerAddress);
 			return wasKnown ? "true" : "false";
@@ -262,9 +257,7 @@ public class PeersResource {
 			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		} catch (ReflectiveOperationException e) {
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS, e);
-        }
+		}
 	}
 
 	@DELETE
@@ -331,8 +324,7 @@ public class PeersResource {
 
 		try {
 			// Try to resolve passed address to make things easier
-			//PeerAddress peerAddress = PeerAddress.fromString(targetPeerAddress);
-            PeerAddress peerAddress = PeerAddressFactory.create("address", targetPeerAddress);
+			PeerAddress peerAddress = PeerAddress.fromString(targetPeerAddress);
 			InetSocketAddress resolvedAddress = peerAddress.toSocketAddress();
 
 			List<Peer> peers = Network.getInstance().getImmutableHandshakedPeers();
@@ -357,9 +349,7 @@ public class PeersResource {
 		} catch (UnknownHostException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
 		} catch (DataException e) {
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-        } catch (ReflectiveOperationException e) {
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS, e);
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		} catch (InterruptedException e) {
 			return null;
 		}

src/main/java/org/qortal/api/restricted/resource/AdminResource.java

@@ -36,7 +36,6 @@ import org.qortal.data.system.DbConnectionInfo;
 import org.qortal.network.Network;
 import org.qortal.network.Peer;
 import org.qortal.network.PeerAddress;
-import org.qortal.network.PeerAddressFactory;
 import org.qortal.repository.ReindexManager;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
@@ -677,8 +676,7 @@ public class AdminResource {
 
 		try {
 			// Try to resolve passed address to make things easier
-			//PeerAddress peerAddress = PeerAddress.fromString(targetPeerAddress);
-            PeerAddress peerAddress = PeerAddressFactory.create("address", targetPeerAddress);
+			PeerAddress peerAddress = PeerAddress.fromString(targetPeerAddress);
 			InetSocketAddress resolvedAddress = peerAddress.toSocketAddress();
 
 			List<Peer> peers = Network.getInstance().getImmutableHandshakedPeers();
@@ -708,9 +706,7 @@ public class AdminResource {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
 		} catch (InterruptedException e) {
 			return SynchronizationResult.NO_BLOCKCHAIN_LOCK.name();
-		} catch (ReflectiveOperationException e) {
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS, e);
-        }
+		}
 	}
 
 	@GET

src/main/java/org/qortal/controller/ForeignFeesManager.java

@@ -1199,4 +1199,4 @@ public class ForeignFeesManager implements Listener {
             LOGGER.warn("no support for locking fee import: blockchain = " + lockingForeignFeeData.getBlockchain());
         }
     }
-}
+}

src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java

@@ -93,7 +93,7 @@ public class ArbitraryDataCleanupManager extends Thread {
 			allArbitraryTransactionsInDescendingOrder = new ArrayList<>(0);
 		}
 
-		Set<ArbitraryTransactionData> processedTransactions = new HashSet<>();
+		Set<ArbitraryTransactionDataHashWrapper> processedTransactions = new HashSet<>();
 
 		try {
 			while (!isStopping) {
@@ -167,7 +167,7 @@ public class ArbitraryDataCleanupManager extends Thread {
 							continue;
 						}
 
-						boolean mostRecentTransaction = processedTransactions.add(arbitraryTransactionData);
+						boolean mostRecentTransaction = processedTransactions.add(new ArbitraryTransactionDataHashWrapper(arbitraryTransactionData));
 
 						// Check if we have the complete file
 						boolean completeFileExists = ArbitraryTransactionUtils.completeFileExists(arbitraryTransactionData);
@@ -215,7 +215,7 @@ public class ArbitraryDataCleanupManager extends Thread {
 
 							ArbitraryTransactionUtils.deleteCompleteFileAndChunks(arbitraryTransactionData);
 
-							Optional<ArbitraryTransactionData> moreRecentPutTransaction
+							Optional<ArbitraryTransactionDataHashWrapper> moreRecentPutTransaction
 								= processedTransactions.stream()
 									.filter(data -> data.equals(arbitraryTransactionData))
 									.findAny();
@@ -229,7 +229,7 @@ public class ArbitraryDataCleanupManager extends Thread {
 										arbitraryTransactionData.getService().name(),
 										"deleting data due to replacement",
 										arbitraryTransactionData.getTimestamp(),
-										moreRecentPutTransaction.get().getTimestamp()
+										moreRecentPutTransaction.get().getData().getTimestamp()
 									)
 								);
 							}

src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFolderInfo.java

@@ -0,0 +1,21 @@
+package org.qortal.controller.arbitrary;
+
+public class ArbitraryDataFolderInfo {
+
+    private long totalSpace;
+
+    private int chunkCount;
+
+    public ArbitraryDataFolderInfo(long totalSpace, int chunkCount) {
+        this.totalSpace = totalSpace;
+        this.chunkCount = chunkCount;
+    }
+
+    public long getTotalSpace() {
+        return totalSpace;
+    }
+
+    public int getChunkCount() {
+        return chunkCount;
+    }
+}

src/main/java/org/qortal/controller/arbitrary/ArbitraryDataHostMonitor.java

@@ -0,0 +1,216 @@
+package org.qortal.controller.arbitrary;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.qortal.data.transaction.ArbitraryHostedDataItemInfo;
+import org.qortal.data.transaction.ArbitraryTransactionData;
+import org.qortal.data.transaction.TransactionData;
+import org.qortal.repository.Repository;
+import org.qortal.repository.RepositoryManager;
+import org.qortal.settings.Settings;
+import org.qortal.utils.Base58;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Class ArbitraryDataHostMonitor
+ */
+public class ArbitraryDataHostMonitor extends Thread{
+
+    private static final Logger LOGGER = LogManager.getLogger(ArbitraryDataHostMonitor.class);
+
+    /**
+     * Hosted Data Item Infos
+     *
+     * Where all the monitored data hosts are collected.
+     */
+    private List<ArbitraryHostedDataItemInfo> hostedDataItemInfos = new ArrayList<>();
+
+    private static ArbitraryDataHostMonitor instance;
+    private volatile boolean isStopping = false;
+
+    /**
+     * Get Instance
+     *
+     * @return the singleton for this class
+     */
+    public static ArbitraryDataHostMonitor getInstance() {
+        if (instance == null)
+            instance = new ArbitraryDataHostMonitor();
+
+        return instance;
+    }
+
+
+    @Override
+    public void run() {
+
+        if( !Settings.getInstance().isQdnEnabled() || !Settings.getInstance().isHostMonitorEnabled() ) return;
+
+        Thread.currentThread().setName("Arbitrary Data Host Manager");
+        Thread.currentThread().setPriority(MIN_PRIORITY);
+
+        final Path dataPath = Paths.get(Settings.getInstance().getDataPath());
+        final Path tempPath = Paths.get(Settings.getInstance().getTempDataPath());
+
+        while( true ) {
+
+            // Walk through 3 levels of the file tree and find directories that are greater than 32 characters in length
+            // Also exclude the _temp and _misc paths if present
+
+            try {
+                // Wait 10 minutes (600 seconds)
+                Thread.sleep(600_000);
+
+                if( isStopping ) break;
+
+                LOGGER.info("Collecting index paths ...");
+
+                List<Path> indexPaths
+                        = Files.walk(dataPath, 2)
+                        .filter(Files::isDirectory)
+                        .filter(path -> !path.toAbsolutePath().toString().contains(tempPath.toAbsolutePath().toString())
+                                && !path.toString().contains("_misc"))
+                        .collect(Collectors.toList());
+
+                LOGGER.info("Collected {} index paths", indexPaths.size());
+
+                Map<String,ArbitraryDataFolderInfo> currentSignatures = new HashMap<>();
+
+                // for each index path, pause and get the valid signatures and folder info
+                for (Path indexPath : indexPaths) {
+
+                    if( isStopping ) break;
+
+                    Thread.sleep(10);
+
+                    List<Path> paths = Files.walk(indexPath, 1)
+                            .filter(Files::isDirectory)
+                            .filter(path -> path.getFileName().toString().length() > 32)
+                            .collect(Collectors.toList());
+
+                    for (Path path : paths) {
+                        String[] contents = path.toFile().list();
+                        if (contents == null || contents.length == 0) {
+                            // Ignore empty directories
+                            continue;
+                        }
+
+                        String signature58 = path.getFileName().toString();
+
+                        currentSignatures.put(signature58, new ArbitraryDataFolderInfo(getDirectorySize(path), contents.length));
+                    }
+                }
+
+                if( isStopping ) break;
+
+                LOGGER.info("current signatures updated {}", currentSignatures.size());
+
+                List<byte[]> currentSignaturesDecoded = new ArrayList<>(currentSignatures.size());
+
+                // decode all current data signatures
+                for( String currentSignature : currentSignatures.keySet() ) {
+                    currentSignaturesDecoded.add(Base58.decode(currentSignature));
+                }
+
+                // get all transaction data for current signatures
+                List<TransactionData> currentTransactions;
+                try (final Repository repository = RepositoryManager.getRepository()) {
+
+                    currentTransactions = repository.getTransactionRepository().fromSignatures(currentSignaturesDecoded);
+
+                    LOGGER.info("data count = {}", currentTransactions.size());
+                }
+
+                List<ArbitraryHostedDataItemInfo> hostedTransactions = new ArrayList<>(currentTransactions.size());
+
+                // for each current transaction, create hosted data item info
+                for( TransactionData currentTransaction : currentTransactions ) {
+
+                    String signature58 = Base58.encode(currentTransaction.getSignature());
+                    ArbitraryDataFolderInfo dataFolderInfo = currentSignatures.get(signature58);
+
+                    hostedTransactions.add(new ArbitraryHostedDataItemInfo((ArbitraryTransactionData) currentTransaction, dataFolderInfo));
+                }
+
+                synchronized (this.hostedDataItemInfos) {
+                    this.hostedDataItemInfos.clear();
+                    this.hostedDataItemInfos.addAll(hostedTransactions);
+                }
+
+                // Wait 100 minutes (6,000 seconds)
+                Thread.sleep(6_000_000);
+            } catch (IOException | UncheckedIOException e) {
+                LOGGER.warn("Unable to walk through hosted data: {}", e.getMessage());
+            } catch(InterruptedException e) {
+                if(!isStopping) {
+                    LOGGER.error(e.getMessage());
+                }
+            } catch (Exception e) {
+                LOGGER.error(e.getMessage(), e);
+            }
+        }
+    }
+
+    /**
+     * Get Directory Size
+     *
+     * @param path the path to the directory
+     *
+     * @return the directory size in bytes
+     *
+     * @throws IOException
+     */
+    public static long getDirectorySize(Path path) throws IOException {
+        long totalSize = 0;
+
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(path)) {
+            for (Path entry : stream) {
+                if (Files.isDirectory(entry)) {
+                    totalSize += getDirectorySize(entry);
+                } else {
+                    totalSize += Files.size(entry);
+                }
+            }
+        }
+
+        return totalSize;
+    }
+
+    /**
+     * Get Hosted Data Item Infos
+     *
+     * @return a copy of the infos
+     */
+    public List<ArbitraryHostedDataItemInfo> getHostedDataItemInfos() {
+
+        List<ArbitraryHostedDataItemInfo> copy;
+
+        synchronized (this.hostedDataItemInfos){
+            copy = new ArrayList<>(this.hostedDataItemInfos);
+        }
+
+        return copy;
+    }
+
+    /**
+     * Shutdown
+     *
+     * Shutdown this thread.
+     */
+    public void shutdown() {
+        isStopping = true;
+        this.interrupt();
+        instance = null;
+    }
+}

src/main/java/org/qortal/controller/arbitrary/PeerMessage.java

@@ -1,31 +1,18 @@
 package org.qortal.controller.arbitrary;
 
-import org.qortal.controller.Controller;
 import org.qortal.network.Peer;
 import org.qortal.network.message.Message;
-//import org.apache.logging.log4j.LogManager;
-//import org.apache.logging.log4j.Logger;
 
 public class PeerMessage {
     Peer peer;
     Message message;
-    //private static final Logger LOGGER = LogManager.getLogger(PeerMessage.class);
 
     public PeerMessage(Peer peer, Message message) {
-        this.peer = (Peer) peer;
+        this.peer = peer;
         this.message = message;
     }
 
     public Peer getPeer() {
-        //try {
-        //    if (Class.forName("org.qortal.network.Peer").isInstance(peer)) {
-        //        return (Peer) peer;
-        //    } else {
-        //        return (ReticulumPeer) peer;
-        //    }
-        //}  catch (ClassNotFoundException e) {
-        //    LOGGER.error("Could not find peer class", e);
-        //}
         return peer;
     }
 

src/main/java/org/qortal/crosschain/Bitcoin.java

@@ -78,7 +78,6 @@ public class Bitcoin extends Bitcoiny {
 					new Server("electrum.bitrefill.com", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.brainshome.de", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.emzy.de", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.kcicom.net", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.kendigisland.xyz", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.thomasfischbach.de", Server.ConnectionType.SSL, 50002),
 					new Server("electrum-btc.leblancnet.us", Server.ConnectionType.SSL, 50002),
@@ -92,7 +91,6 @@ public class Bitcoin extends Bitcoiny {
 					new Server("electrumx-core.1209k.com", Server.ConnectionType.SSL, 50002),
 					new Server("elx.bitske.com", Server.ConnectionType.SSL, 50002),
 					new Server("exs.dyshek.org", Server.ConnectionType.SSL, 50002),
-					new Server("fortress.qtornado.com", Server.ConnectionType.SSL, 50002),
 					new Server("guichet.centure.cc", Server.ConnectionType.SSL, 50002),
 					new Server("hodl.artyomk13.me", Server.ConnectionType.SSL, 50002),
 					new Server("hodlers.beer", Server.ConnectionType.SSL, 50002),

src/main/java/org/qortal/crosschain/Bitcoiny.java

@@ -21,8 +21,6 @@ import org.qortal.utils.Amounts;
 import org.qortal.utils.BitTwiddling;
 import org.qortal.utils.NTP;
 
-import java.time.Duration;
-import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -69,6 +67,13 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 */
 	private final BlockchainCache blockchainCache = new BlockchainCache();
 
+	/**
+	 * Executor
+	 *
+	 * Executor service to manage all Electrum server access.
+	 */
+	private static ExecutorService EXECUTOR = Executors.newFixedThreadPool(Settings.getInstance().getElectrumThreadCount());
+
 	// Constructors and instance
 
 	protected Bitcoiny(BitcoinyBlockchainProvider blockchainProvider, Context bitcoinjContext, String currencyCode, Coin feePerKb) {
@@ -225,79 +230,16 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	// TODO: don't return bitcoinj-based objects like TransactionOutput, use BitcoinyTransaction.Output instead
 	public List<TransactionOutput> getUnspentOutputs(String base58Address, boolean includeUnconfirmed) throws ForeignBlockchainException {
 
-		ExecutorService executor = Executors.newFixedThreadPool(5);
-
-		List<TransactionOutput> outputs = getUnspentOutputsWithExecutor(base58Address, includeUnconfirmed, executor);
-
-		// Shutdown the executor and wait for all tasks to complete
-		executor.shutdown();
-		try {
-			if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
-				executor.shutdownNow();
-			}
-		} catch (InterruptedException ex) {
-			executor.shutdownNow();
-			Thread.currentThread().interrupt();
-		}
-
-		return outputs;
-	}
-
-	/**
-	 * Get Unspent Outputs With Executor
-	 *
-	 * Get unspent outputs using an executor to get the outputs in parallel.
-	 *
-	 * @param base58Address the master foreign key for address generation
-	 * @param includeUnconfirmed true to include unconfirmed outputs, otherwise false
-	 * @param executor the executor to run the multi-threaded fetching
-	 *
-	 * @return the outputs
-	 *
-	 * @throws ForeignBlockchainException
-	 */
-	private List<TransactionOutput> getUnspentOutputsWithExecutor(String base58Address, boolean includeUnconfirmed, ExecutorService executor) throws ForeignBlockchainException {
-		List<Future<Optional<TransactionOutput>>> futures = getUnspentOutputsAsync(base58Address, includeUnconfirmed, executor);
-
-		List<TransactionOutput> outputs = new ArrayList<>(futures.size());
-
-		try {
-			for( Future<Optional<TransactionOutput>> future : futures) {
-
-				Optional<TransactionOutput> outputOptional = future.get();
-
-				if( outputOptional.isPresent() ) {
-					outputs.add(outputOptional.get());
-				}
-			}
-		} catch (InterruptedException | ExecutionException e) {
-			throw new ForeignBlockchainException(e.getMessage());
-		}
-		return outputs;
-	}
-
-	/**
-	 * Get Unspent Outputs Asynchronously
-	 *
-	 * Get unspent outputs using an executor to get the outputs in parallel.
-	 *
-	 * @param base58Address the master foreign key for address generation
-	 * @param includeUnconfirmed true to include unconfirmed outputs, otherwise false
-	 * @param executor the executor to run the multi-threaded fetching
-	 *
-	 * @return the outputs
-	 *
-	 * @throws ForeignBlockchainException
-	 */
-	private List<Future<Optional<TransactionOutput>>> getUnspentOutputsAsync(String base58Address, boolean includeUnconfirmed, ExecutorService executor) throws ForeignBlockchainException {
 		List<UnspentOutput> unspentOutputs = this.blockchainProvider.getUnspentOutputs(addressToScriptPubKey(base58Address), includeUnconfirmed);
 
-		List<Future<Optional<TransactionOutput>>> unspentTransactionOutputs = new ArrayList<>();
+		List<Optional<TransactionOutput>> unspentTransactionOutputs = new ArrayList<>();
 		for (UnspentOutput unspentOutput : unspentOutputs) {
-			unspentTransactionOutputs.add( executor.submit( () -> getTransactionOutput(unspentOutput)));
+			unspentTransactionOutputs.add( getTransactionOutput(unspentOutput));
 		}
 
-		return unspentTransactionOutputs;
+		return unspentTransactionOutputs.stream().filter(Optional::isPresent)
+				.map(Optional::get)
+				.collect(Collectors.toList());
 	}
 
 	/**
@@ -572,54 +514,49 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 * @param key58 BIP32/HD extended Bitcoin private/public key
 	 * @return unspent BTC balance, or null if unable to determine balance
 	 */
-	public Long getWalletBalance(String key58) throws ForeignBlockchainException {
-		Long balance = 0L;
+public Long getWalletBalance(String key58) throws ForeignBlockchainException {
+	Long balance = 0L;
 
-		ExecutorService executor = Executors.newFixedThreadPool(50);
+	// Get all wallet addresses (via recursive gap-limit logic)
+	Set<String> walletAddresses = this.getWalletAddressesWithExecutor(key58, EXECUTOR);
 
-		List<Future<Optional<TransactionOutput>>> allUnspentOutputs = new ArrayList<>();
-		Set<String> walletAddresses = this.getWalletAddressesWithExecutor(key58, executor);
+	try {
+		List<Future<List<TransactionOutput>>> futures = new ArrayList<>();
 
-		try {
-			List<Future<List<Future<Optional<TransactionOutput>>>>> addressOutputLists = new ArrayList<>();
-
-			// for ech wallet address, spawn a thread to fetch unspent outputs
-			for (String address : walletAddresses) {
-				addressOutputLists.add(executor.submit(() -> this.getUnspentOutputsAsync(address, true, executor)));
-			}
-
-			// collect address outputs as they are ready
-			for( Future<List<Future<Optional<TransactionOutput>>>> addressOutputs : addressOutputLists) {
-				allUnspentOutputs.addAll( addressOutputs.get() );
-			}
-
-			// use the address outputs to sum up a balance
-			for (Future<Optional<TransactionOutput>> optionalFuture : allUnspentOutputs) {
-				Optional<TransactionOutput> transactionOutput = optionalFuture.get();
-				if (transactionOutput.isPresent() && !transactionOutput.get().isAvailableForSpending()) {
-					continue;
+		// Parallel fetch of unspent outputs per address
+		for (String address : walletAddresses) {
+			futures.add(EXECUTOR.submit(() -> {
+				try {
+					return this.getUnspentOutputs(address, true);
+				} catch (Exception e) {
+					LOGGER.warn("⚠️ Failed to fetch outputs for address {}", address, e);
+					return Collections.emptyList();
 				}
-				balance += transactionOutput.get().getValue().value;
-			}
-
-			// Shutdown the executor and wait for all tasks to complete
-			executor.shutdown();
-			try {
-				if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
-					executor.shutdownNow();
-				}
-			} catch (InterruptedException ex) {
-				LOGGER.error(ex.getMessage(), ex);
-				executor.shutdownNow();
-				Thread.currentThread().interrupt();
-			}
-		} catch (Exception e) {
-			LOGGER.error(e.getMessage(), e);
+			}));
 		}
 
-		return balance;
+		List<TransactionOutput> unspentOutputs = new ArrayList<>();
+
+		// Wait for all futures to complete
+		for (Future<List<TransactionOutput>> future : futures) {
+			
+				unspentOutputs.addAll(future.get(10, TimeUnit.SECONDS)); // No timeout needed
+		
+		}
+
+		// Sum up the available unspent outputs
+		for (TransactionOutput unspentOutput : unspentOutputs) {
+			if (unspentOutput.isAvailableForSpending()) {
+				balance += unspentOutput.getValue().value;
+			}
+		}
+	} catch (Exception e) {
+		LOGGER.error("Unexpected error in getWalletBalance: {}", e.getMessage(), e);
 	}
 
+	return balance;
+}
+
 	public Long getWalletBalanceFromBitcoinj(String key58) {
 		Context.propagate(bitcoinjContext);
 
@@ -643,104 +580,142 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 		return balance;
 	}
 
-	public List<SimpleTransaction> getWalletTransactions(String key58) throws ForeignBlockchainException {
-		try {
-			// Serve from the cache if it's recent, and matches this xpub
-			if (Objects.equals(transactionsCacheXpub, key58)) {
-				if (transactionsCache != null && transactionsCacheTimestamp != null) {
-					Long now = NTP.getTime();
-					boolean isCacheStale = (now != null && now - transactionsCacheTimestamp >= TRANSACTIONS_CACHE_TIMEOUT);
-					if (!isCacheStale) {
-						return transactionsCache;
-					}
+public List<SimpleTransaction> getWalletTransactions(String key58) throws ForeignBlockchainException {
+	try {
+		// Serve from cache if valid
+		if (Objects.equals(transactionsCacheXpub, key58)) {
+			if (transactionsCache != null && transactionsCacheTimestamp != null) {
+				Long now = NTP.getTime();
+				boolean isCacheStale = (now != null && now - transactionsCacheTimestamp >= TRANSACTIONS_CACHE_TIMEOUT);
+				if (!isCacheStale) {
+					return transactionsCache;
 				}
 			}
-
-			Context.propagate(bitcoinjContext);
-
-			Wallet wallet = walletFromDeterministicKey58(key58);
-			DeterministicKeyChain keyChain = wallet.getActiveKeyChain();
-
-			keyChain.setLookaheadSize(Bitcoiny.WALLET_KEY_LOOKAHEAD_INCREMENT);
-			keyChain.maybeLookAhead();
-
-			List<DeterministicKey> keys = new ArrayList<>(keyChain.getLeafKeys());
-
-			// prepare an executor and start a list to collect transactions asynchronouly
-			ExecutorService executor = Executors.newFixedThreadPool(50);
-			List<Future<Optional<BitcoinyTransaction>>> futures = new ArrayList<>();
-
-			// determine the keys and collect the addresses
-			Set<String> keySet = processKeysWithTransactionFutures(executor, keys, keyChain, futures, 0);
-
-			// start a list to collect the transactions when they are ready from the asynchronous threads
-			Set<BitcoinyTransaction> walletTransactions = Collections.synchronizedSet(new HashSet<>());
-
-			// for each transaction fetched from an asynchronous thread,
-			// process the transaction for the wallet
-			for( Future<Optional<BitcoinyTransaction>> future : futures ) {
-
-				Optional<BitcoinyTransaction> transactionOptional = future.get();
-
-				if( transactionOptional.isPresent() ) {
-					BitcoinyTransaction transaction = transactionOptional.get();
-					walletTransactions.add(transaction);
-
-					// if the transaction is confirmed, then cache it for later use
-					if( transaction.timestamp != null ) {
-						this.blockchainCache.addTransactionByHash(transaction.txHash, transaction);
-					}
-				}
-			}
-
-			// Shutdown the executor and wait for all tasks to complete
-			executor.shutdown();
-			try {
-				if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
-					executor.shutdownNow();
-				}
-			} catch (InterruptedException ex) {
-				executor.shutdownNow();
-				Thread.currentThread().interrupt();
-			}
-
-			Comparator<SimpleTransaction> newestTimestampFirstComparator = Comparator.comparingLong(SimpleTransaction::getTimestamp).reversed();
-
-			// convert to simple transactions
-			List<SimpleTransaction> simpleTransactions
-				= walletTransactions.parallelStream()
-					.map(t -> convertToSimpleTransaction(t, keySet))
-					.collect(Collectors.toList());
-
-			// add null timestamps first, probably unconfirmed
-			transactionsCache
-				= simpleTransactions.stream()
-					.filter(t -> t.getTimestamp() == null)
-					.collect(Collectors.toList());
-
-			// Update cache and return
-			transactionsCache.addAll(
-				simpleTransactions.stream()
-					.filter( t -> t.getTimestamp() != null)
-					.sorted(newestTimestampFirstComparator)
-					.collect(Collectors.toList())
-			);
-
-			transactionsCacheTimestamp = NTP.getTime();
-			transactionsCacheXpub = key58;
-
-			return transactionsCache;
-		} catch ( ForeignBlockchainException e) {
-			LOGGER.error(e.getMessage(), e);
-			throw e;
-		} catch (ExecutionException | InterruptedException e) {
-			LOGGER.error(e.getMessage(), e);
-			throw new ForeignBlockchainException( "execution or interruption exception when calling foreign chain");
-		} catch( Exception e ) {
-			LOGGER.error(e.getMessage(), e);
-			return new ArrayList<>(0);
 		}
+
+		Context.propagate(bitcoinjContext);
+
+		Wallet wallet = walletFromDeterministicKey58(key58);
+		DeterministicKeyChain keyChain = wallet.getActiveKeyChain();
+
+		keyChain.setLookaheadSize(Bitcoiny.WALLET_KEY_LOOKAHEAD_INCREMENT);
+		keyChain.maybeLookAhead();
+
+		List<DeterministicKey> keys = new ArrayList<>(keyChain.getLeafKeys());
+
+		// Use thread-safe list for futures
+		List<Future<Optional<BitcoinyTransaction>>> futures = Collections.synchronizedList(new ArrayList<>());
+
+
+		// Fetch keys with transaction checks
+		Set<String> keySet = processKeysWithTransactionFuturesIterative(EXECUTOR, keys, keyChain, futures);
+
+		// Collect transactions from futures
+		Set<BitcoinyTransaction> walletTransactions = Collections.synchronizedSet(new HashSet<>());
+		for (Future<Optional<BitcoinyTransaction>> future : futures) {
+			Optional<BitcoinyTransaction> transactionOptional = future.get(10, TimeUnit.SECONDS);
+
+			if (transactionOptional.isPresent()) {
+				BitcoinyTransaction transaction = transactionOptional.get();
+				walletTransactions.add(transaction);
+
+				// Cache confirmed transactions
+				if (transaction.timestamp != null) {
+					this.blockchainCache.addTransactionByHash(transaction.txHash, transaction);
+				}
+			}
+		}
+
+		Comparator<SimpleTransaction> newestTimestampFirstComparator =
+			Comparator.comparingLong(SimpleTransaction::getTimestamp).reversed();
+
+		// Convert to simplified form
+		List<SimpleTransaction> simpleTransactions = walletTransactions.parallelStream()
+			.map(t -> convertToSimpleTransaction(t, keySet))
+			.collect(Collectors.toList());
+
+		// Unconfirmed transactions (null timestamp)
+		transactionsCache = simpleTransactions.stream()
+			.filter(t -> t.getTimestamp() == null)
+			.collect(Collectors.toList());
+
+		// Add confirmed transactions sorted by timestamp
+		transactionsCache.addAll(
+			simpleTransactions.stream()
+				.filter(t -> t.getTimestamp() != null)
+				.sorted(newestTimestampFirstComparator)
+				.collect(Collectors.toList())
+		);
+
+		// Update cache metadata
+		transactionsCacheTimestamp = NTP.getTime();
+		transactionsCacheXpub = key58;
+
+		return transactionsCache;
+	} catch (ForeignBlockchainException e) {
+		LOGGER.error(e.getMessage(), e);
+		throw e;
+	} catch (ExecutionException | InterruptedException e) {
+		LOGGER.error(e.getMessage(), e);
+		throw new ForeignBlockchainException("Execution or interruption exception when calling foreign chain");
+	} catch (Exception e) {
+		LOGGER.error(e.getMessage(), e);
+		return new ArrayList<>(0);
 	}
+}
+
+	private Set<String> processKeysWithTransactionFuturesIterative(
+	ExecutorService executor,
+	List<DeterministicKey> initialKeys,
+	DeterministicKeyChain keyChain,
+	List<Future<Optional<BitcoinyTransaction>>> futures
+) throws ForeignBlockchainException {
+
+	Set<String> keySet = new HashSet<>();
+	int unusedCounter = 0;
+
+	List<DeterministicKey> keysToProcess = new ArrayList<>(initialKeys);
+
+	while (!keysToProcess.isEmpty()) {
+		List<Future<Boolean>> transactionChecks = new ArrayList<>(keysToProcess.size());
+		boolean foundTransaction = false;
+
+		for (DeterministicKey dKey : keysToProcess) {
+			Address address = Address.fromKey(this.params, dKey, ScriptType.P2PKH);
+			keySet.add(address.toString());
+
+			// Schedule transaction check
+			transactionChecks.add(executor.submit(() -> getTransactions(address, futures, executor)));
+		}
+
+		// Wait for transaction check results
+		for (Future<Boolean> check : transactionChecks) {
+			try {
+				if (check.get()) {
+					foundTransaction = true;
+				}
+			} catch (Exception e) {
+				LOGGER.warn("Failed to check transaction for key", e);
+			}
+		}
+
+		if (foundTransaction) {
+			unusedCounter = 0;
+		} else {
+			unusedCounter += WALLET_KEY_LOOKAHEAD_INCREMENT;
+		}
+
+		if (unusedCounter >= Settings.getInstance().getGapLimit()) {
+			LOGGER.debug("Reached gap limit of " + unusedCounter + ", stopping key discovery.");
+			break;
+		}
+
+		// Generate next batch of keys
+		keysToProcess = generateMoreKeys(keyChain);
+	}
+
+	return keySet;
+}
 
 	/**
 	 * Process Keys With Transaction Futures
@@ -821,18 +796,15 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 		// return list
 		List<AddressInfo> infos = new ArrayList<>();
 
-		// for the asynchronous thread tasks below
-		ExecutorService executor = Executors.newFixedThreadPool(50);
-
 		// generate keys asynchronously
-		Set<DeterministicKey> walletKeys = getWalletKeysWithExecutor(key58, executor);
+		Set<DeterministicKey> walletKeys = getWalletKeysWithExecutor(key58, EXECUTOR);
 
 		// collect all address info build tasks
 		List<Future<AddressInfo>> futures = new ArrayList<>(walletKeys.size());
 
 		// build info for each key, one address per key
 		for(DeterministicKey key : walletKeys) {
-			futures.add(executor.submit(() -> buildAddressInfo(key)));
+			futures.add(EXECUTOR.submit(() -> buildAddressInfo(key)));
 		}
 
 		try {
@@ -844,18 +816,6 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 			LOGGER.error(e.getMessage(), e);
 		}
 
-		// Shutdown the executor and wait for all tasks to complete
-		executor.shutdown();
-		try {
-			if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
-				executor.shutdownNow();
-			}
-		} catch (InterruptedException e) {
-			LOGGER.error(e.getMessage(), e);
-			executor.shutdownNow();
-			Thread.currentThread().interrupt();
-		}
-
 		return infos.stream()
 				.sorted(new PathComparator(1))
 				.collect(Collectors.toList());
@@ -884,22 +844,8 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	public Set<String> getWalletAddresses(String key58) throws ForeignBlockchainException {
 		Context.propagate(bitcoinjContext);
 
-		// for asynchronous processing
-		ExecutorService executor = Executors.newFixedThreadPool(50);
-
 		// generate keys asynchronously and get the addresses, return value
-		Set<String> addresses = getWalletAddressesWithExecutor(key58, executor);
-
-		// Shutdown the executor and wait for all tasks to complete
-		executor.shutdown();
-		try {
-			if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
-				executor.shutdownNow();
-			}
-		} catch (InterruptedException ex) {
-			executor.shutdownNow();
-			Thread.currentThread().interrupt();
-		}
+		Set<String> addresses = getWalletAddressesWithExecutor(key58, EXECUTOR);
 
 		return addresses;
 	}
@@ -938,7 +884,8 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 		keyChain.setLookaheadSize(Bitcoiny.WALLET_KEY_LOOKAHEAD_INCREMENT);
 		keyChain.maybeLookAhead();
 
-		Set<String> keySet = processKeys(executor, new ArrayList<>(keyChain.getLeafKeys()), keyChain, 0);
+		Set<String> keySet = processKeysIterative(executor, keyChain);
+
 
 		return keySet;
 	}
@@ -968,6 +915,91 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 		return keySet;
 	}
 
+
+private Set<String> processKeysIterative(ExecutorService executor, DeterministicKeyChain keyChain) {
+    Set<String> allAddresses = new HashSet<>();
+    int unusedCounter = 0;
+    int batchCount = 0;
+    int gapLimit = Settings.getInstance().getGapLimit(); // e.g. 20
+    boolean continueProcessing = true;
+
+    while (continueProcessing) {
+        // Generate a batch of new keys
+        List<DeterministicKey> batch = keyChain.getLeafKeys().subList(
+            allAddresses.size(), 
+            Math.min(allAddresses.size() + WALLET_KEY_LOOKAHEAD_INCREMENT, keyChain.getLeafKeys().size())
+        );
+
+        if (batch.isEmpty()) {
+            // Ask keyChain to generate more if needed
+            keyChain.setLookaheadSize(allAddresses.size() + WALLET_KEY_LOOKAHEAD_INCREMENT);
+            keyChain.maybeLookAhead();
+
+            // Try to get new keys again
+            batch = keyChain.getLeafKeys().subList(
+                allAddresses.size(), 
+                Math.min(allAddresses.size() + WALLET_KEY_LOOKAHEAD_INCREMENT, keyChain.getLeafKeys().size())
+            );
+
+            if (batch.isEmpty()) {
+                LOGGER.warn("⚠️ No more keys to process.");
+                break;
+            }
+        }
+
+        batchCount++;
+        boolean foundTxInBatch = false;
+
+        List<Future<Boolean>> futures = new ArrayList<>();
+
+        for (DeterministicKey dKey : batch) {
+            Address address = Address.fromKey(this.params, dKey, ScriptType.P2PKH);
+            allAddresses.add(address.toString());
+
+            // First check cache
+            if (this.blockchainCache.keyHasHistory(dKey)) {
+                foundTxInBatch = true;
+                LOGGER.debug("Cached transaction found for {}", address);
+            } else {
+                // Submit async transaction check
+                futures.add(executor.submit(() -> {
+                    boolean hasTx = checkForTransactions(dKey, address);
+                    if (hasTx) LOGGER.debug("Live transaction found for {}", address);
+                    return hasTx;
+                }));
+            }
+        }
+
+        // Wait for async results
+        for (Future<Boolean> future : futures) {
+            try {
+                if (future.get(10, TimeUnit.SECONDS)) {
+                    foundTxInBatch = true;
+                }
+            } catch (Exception e) {
+                LOGGER.warn("Failed transaction check", e);
+            }
+        }
+
+        if (foundTxInBatch) {
+            unusedCounter = 0; // Reset on successful discovery
+        } else {
+            unusedCounter += WALLET_KEY_LOOKAHEAD_INCREMENT;
+        }
+
+        LOGGER.debug("Batch {}: Processed {} keys, unusedCounter = {}", batchCount, batch.size(), unusedCounter);
+
+        if (unusedCounter >= gapLimit) {
+            LOGGER.debug("Reached gap limit of {} unused keys, stopping.", gapLimit);
+            continueProcessing = false;
+        }
+    }
+
+    LOGGER.debug("Discovered {} total addresses in {} batches", allAddresses.size(), batchCount);
+    return allAddresses;
+}
+
+
 	/**
 	 * Process Keys
 	 *
@@ -1429,15 +1461,13 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 
 		@Override
 		public List<UTXO> getOpenTransactionOutputs(List<ECKey> keys) throws UTXOProviderException {
-			ExecutorService executor = Executors.newFixedThreadPool(50);
-
-			Set<String> addresses = bitcoiny.processKeys(executor, this.keyChain.getLeafKeys(), this.keyChain, 0);
+			Set<String> addresses = bitcoiny.processKeys(EXECUTOR, this.keyChain.getLeafKeys(), this.keyChain, 0);
 
 			List<Future<UTXO>> futures = new ArrayList<>();
 
 			try {
 				for( String address : addresses ) {
-					futures.addAll( bitcoiny.getUTXOsAsync( address, true, executor) );
+					futures.addAll( bitcoiny.getUTXOsAsync( address, true, EXECUTOR) );
 				}
 
 				List<UTXO> utxos = new ArrayList<>(futures.size());

src/main/java/org/qortal/crosschain/ElectrumServer.java

@@ -38,6 +38,7 @@ public class ElectrumServer {
 
         this.socket = new Socket();
         this.socket.connect(endpoint, timeout);
+        this.socket.setSoTimeout(timeout);
         this.socket.setTcpNoDelay(true);
 
         if (this.server.getConnectionType() == ElectrumX.Server.ConnectionType.SSL) {

src/main/java/org/qortal/data/network/PeerData.java

@@ -2,14 +2,11 @@ package org.qortal.data.network;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.qortal.network.PeerAddress;
-import org.qortal.network.PeerAddressFactory;
-import org.qortal.network.ReticulumPeerAddress;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
-//import org.qortal.network.RNSCommon.PeerType;
 
 // All properties to be converted to JSON via JAXB
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -29,8 +26,6 @@ public class PeerData {
 	private Long lastMisbehaved;
 	private Long addedWhen;
 	private String addedBy;
-    private PeerData peerData;
-    //private PeerType peerType;
 
 	/** The number of consecutive times we failed to sync with this peer */
 	private int failedSyncCount = 0;
@@ -56,10 +51,9 @@ public class PeerData {
 
 	public PeerData(PeerAddress peerAddress) {
 		this(peerAddress, null, null, null, null, null);
-        //this.peerType = PeerType.IP;
 	}
 
-    // Getters / setters
+	// Getters / setters
 
 	// Don't let JAXB use this getter
 	@XmlTransient
@@ -112,10 +106,6 @@ public class PeerData {
 		this.failedSyncCount++;
 	}
 
-  //public void setPeerType(PeerType pt) {
-  //  this.peerType = pt;
-  //}
-
 	// Pretty peerAddress getter for JAXB
 	@XmlElement(name = "address")
 	protected String getPrettyAddress() {

src/main/java/org/qortal/data/transaction/ArbitraryHostedDataInfo.java

@@ -0,0 +1,45 @@
+package org.qortal.data.transaction;
+
+import org.qortal.arbitrary.misc.Service;
+import org.qortal.controller.arbitrary.ArbitraryDataFolderInfo;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import java.util.List;
+
+// All properties to be converted to JSON via JAXB
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ArbitraryHostedDataInfo {
+
+	private long count;
+
+	private long totalSpace;
+
+	private List<ArbitraryHostedDataItemInfo> items;
+
+	// Constructors
+
+	// For JAXB
+	protected ArbitraryHostedDataInfo() {
+		super();
+	}
+
+	public ArbitraryHostedDataInfo(long count, long totalSpace, List<ArbitraryHostedDataItemInfo> items) {
+
+		this.count = count;
+		this.totalSpace = totalSpace;
+		this.items = items;
+	}
+
+	public long getCount() {
+		return count;
+	}
+
+	public long getTotalSpace() {
+		return totalSpace;
+	}
+
+	public List<ArbitraryHostedDataItemInfo> getItems() {
+		return items;
+	}
+}

src/main/java/org/qortal/data/transaction/ArbitraryHostedDataItemInfo.java

@@ -0,0 +1,96 @@
+package org.qortal.data.transaction;
+
+import org.qortal.arbitrary.misc.Service;
+import org.qortal.controller.arbitrary.ArbitraryDataFolderInfo;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
+// All properties to be converted to JSON via JAXB
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ArbitraryHostedDataItemInfo {
+	private int chunkCount;
+	private long totalSpace;
+	private ArbitraryTransactionData.DataType dataType;
+	private ArbitraryTransactionData.Compression compression;
+	private ArbitraryTransactionData.Method method;
+	private String identifier;
+	private long timestamp;
+	private byte[] signature;
+	private String creatorAddress;
+	private Service service;
+	private int size;
+	private String name;
+
+	// Constructors
+
+	// For JAXB
+	protected ArbitraryHostedDataItemInfo() {
+		super();
+	}
+
+	public ArbitraryHostedDataItemInfo(ArbitraryTransactionData data, ArbitraryDataFolderInfo info) {
+
+		this.timestamp = data.getTimestamp();
+		this.signature = data.getSignature();
+		this.creatorAddress = data.getCreatorAddress();
+		this.service = data.getService();
+		this.size = data.getSize();
+		this.name = data.getName();
+		this.identifier = data.getIdentifier();
+		this.method = data.getMethod();
+		this.compression = data.getCompression();
+		this.dataType = data.getDataType();
+
+		this.totalSpace = info.getTotalSpace();
+		this.chunkCount = info.getChunkCount();
+	}
+
+	public int getChunkCount() {
+		return chunkCount;
+	}
+
+	public long getTotalSpace() {
+		return totalSpace;
+	}
+
+	public ArbitraryTransactionData.DataType getDataType() {
+		return dataType;
+	}
+
+	public ArbitraryTransactionData.Compression getCompression() {
+		return compression;
+	}
+
+	public ArbitraryTransactionData.Method getMethod() {
+		return method;
+	}
+
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	public byte[] getSignature() {
+		return signature;
+	}
+
+	public String getCreatorAddress() {
+		return creatorAddress;
+	}
+
+	public Service getService() {
+		return service;
+	}
+
+	public int getSize() {
+		return size;
+	}
+
+	public String getName() {
+		return name;
+	}
+}

src/main/java/org/qortal/network/IPPeerAddress.java

@@ -1,142 +0,0 @@
-package org.qortal.network;
-
-import com.google.common.net.HostAndPort;
-import com.google.common.net.InetAddresses;
-import org.qortal.settings.Settings;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.net.*;
-
-/**
- * Convenience class for encapsulating/parsing/rendering/converting IP peer addresses
- * including late-stage resolving before actual use by a socket.
- */
-// All properties to be converted to JSON via JAXB
-@XmlAccessorType(XmlAccessType.FIELD)
-public class IPPeerAddress implements PeerAddress {
-
-	// Properties
-	private String host;
-	private int port;
-
-    @PeerAddressCtor("host-port")
-	private IPPeerAddress(String host, int port) {
-		this.host = host;
-		this.port = port;
-	}
-
-    @PeerAddressCtor("address")
-    public IPPeerAddress(String address) {
-      IPPeerAddress ip = IPPeerAddress.fromString(address);
-      this.host = ip.host;
-      this.port = ip.port;
-    }
-
-	// Constructors
-
-	// For JAXB
-	protected IPPeerAddress() {
-	}
-
-	/** Constructs new IPPeerAddress using remote address from passed connected socket. */
-	public static IPPeerAddress fromSocket(Socket socket) {
-		InetSocketAddress socketAddress = (InetSocketAddress) socket.getRemoteSocketAddress();
-		InetAddress address = socketAddress.getAddress();
-
-		String host = InetAddresses.toAddrString(address);
-
-		// Make sure we encapsulate IPv6 addresses in brackets
-		if (address instanceof Inet6Address)
-			host = "[" + host + "]";
-
-		return new IPPeerAddress(host, socketAddress.getPort());
-	}
-
-	/**
-	 * Constructs new IPPeerAddress using hostname or literal IP address and optional port.<br>
-	 * Literal IPv6 addresses must be enclosed within square brackets.
-	 * <p>
-	 * Examples:
-	 * <ul>
-	 * <li>peer.example.com
-	 * <li>peer.example.com:9084
-	 * <li>192.0.2.1
-	 * <li>192.0.2.1:9084
-	 * <li>[2001:db8::1]
-	 * <li>[2001:db8::1]:9084
-	 * </ul>
-	 * <p>
-	 * Not allowed:
-	 * <ul>
-	 * <li>2001:db8::1
-	 * <li>2001:db8::1:9084
-	 * </ul>
-	 */
-	public static IPPeerAddress fromString(String addressString) throws IllegalArgumentException {
-		boolean isBracketed = addressString.startsWith("[");
-
-		// Attempt to parse string into host and port
-		HostAndPort hostAndPort = HostAndPort.fromString(addressString).withDefaultPort(Settings.getInstance().getDefaultListenPort()).requireBracketsForIPv6();
-
-		String host = hostAndPort.getHost();
-		if (host.isEmpty())
-			throw new IllegalArgumentException("Empty host part");
-
-		// Validate IP literals by attempting to convert to InetAddress, without DNS lookups
-		if (host.contains(":") || host.matches("[0-9.]+"))
-			InetAddresses.forString(host);
-
-		// If we've reached this far then we have a valid address
-
-		// Make sure we encapsulate IPv6 addresses in brackets
-		if (isBracketed)
-			host = "[" + host + "]";
-
-		return new IPPeerAddress(host, hostAndPort.getPort());
-	}
-
-	// Getters
-
-	/** Returns hostname or literal IP address, bracketed if IPv6 */
-	public String getHost() {
-		return this.host;
-	}
-
-	public int getPort() {
-		return this.port;
-	}
-
-	// Conversions
-
-	/** Returns InetSocketAddress for use with Socket.connect(), or throws UnknownHostException if address could not be resolved by DNS lookup. */
-	public InetSocketAddress toSocketAddress() throws UnknownHostException {
-		// Attempt to construct new InetSocketAddress with DNS lookups.
-		// There's no control here over whether IPv6 or IPv4 will be used.
-		InetSocketAddress socketAddress = new InetSocketAddress(this.host, this.port);
-
-		// If we couldn't resolve then return null
-		if (socketAddress.isUnresolved())
-			throw new UnknownHostException();
-
-		return socketAddress;
-	}
-
-	@Override
-	public String toString() {
-		return this.host + ":" + this.port;
-	}
-
-	// Utilities
-
-	/** Returns true if other IPPeerAddress has same port and same case-insensitive host part, without DNS lookups */
-	public boolean equals(IPPeerAddress other) {
-		// Ports must match
-		if (this.port != other.port)
-			return false;
-
-		// Compare host parts but without DNS lookups
-		return this.host.equalsIgnoreCase(other.host);
-	}
-
-}

src/main/java/org/qortal/network/Network.java

@@ -40,11 +40,6 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static io.reticulum.link.LinkStatus.ACTIVE;
-import static java.util.Objects.nonNull;
-import static org.apache.commons.codec.binary.Hex.encodeHexString;
 
 // For managing peers
 public class Network {
@@ -161,8 +156,6 @@ public class Network {
 
     private volatile boolean isShuttingDown = false;
 
-    private static volatile RNS rns;
-
     // Constructors
 
     private Network() {
@@ -171,10 +164,6 @@ public class Network {
         minOutboundPeers = Settings.getInstance().getMinOutboundPeers();
         maxPeers = Settings.getInstance().getMaxPeers();
 
-        // Instantiate Reticulum
-        rns = RNS.getInstance();
-        //rns = new RNS();
-
         // We'll use a cached thread pool but with more aggressive timeout.
         ExecutorService networkExecutor = new ThreadPoolExecutor(2,
                 Settings.getInstance().getMaxNetworkThreadPoolSize(),
@@ -185,10 +174,6 @@ public class Network {
     }
 
     public void start() throws IOException, DataException {
-
-        // initialize Retciculum and start Reticulum thread
-        rns.start();
-
         // Grab P2P port from settings
         int listenPort = Settings.getInstance().getListenPort();
 
@@ -238,14 +223,9 @@ public class Network {
                 Long addedWhen = NTP.getTime();
                 String addedBy = "fixedNetwork";
                 List<PeerAddress> peerAddresses = new ArrayList<>();
-                try {
-                    for (String address : fixedNetwork) {
-                        //PeerAddress peerAddress = PeerAddress.fromString(address);
-                        PeerAddress peerAddress = PeerAddressFactory.create("address", address); // only IPPeer
-                        peerAddresses.add(peerAddress);
-                    }
-                } catch (ReflectiveOperationException e) {
-                    LOGGER.error("Can't add peer address to fixed network: {}", e.getMessage());
+                for (String address : fixedNetwork) {
+                    PeerAddress peerAddress = PeerAddress.fromString(address);
+                    peerAddresses.add(peerAddress);
                 }
                 List<PeerData> peers = peerAddresses.stream()
                         .map(peerAddress -> new PeerData(peerAddress, addedWhen, addedBy))
@@ -327,10 +307,7 @@ public class Network {
 
     public List<PeerData> getAllKnownPeers() {
         synchronized (this.allKnownPeers) {
-            //return new ArrayList<>(this.allKnownPeers);
-            return Stream.concat(this.allKnownPeers.stream(), RNS.getInstance().getAllKnownPeers().stream())
-                    .distinct()
-                    .collect(Collectors.toList());
+            return new ArrayList<>(this.allKnownPeers);
         }
     }
 
@@ -371,75 +348,65 @@ public class Network {
 
     public boolean requestDataFromPeer(String peerAddressString, byte[] signature) {
         if (peerAddressString != null) {
-            //PeerAddress peerAddress = PeerAddress.fromString(peerAddressString);
-            try {
-                //PeerAddress peerAddress = null;
-                PeerData peerData = null;
+            PeerAddress peerAddress = PeerAddress.fromString(peerAddressString);
+            PeerData peerData = null;
 
-                final PeerAddress peerAddress = PeerAddressFactory.create("address", peerAddressString);
+            // Reuse an existing PeerData instance if it's already in the known peers list
+            synchronized (this.allKnownPeers) {
+                peerData = this.allKnownPeers.stream()
+                        .filter(knownPeerData -> knownPeerData.getAddress().equals(peerAddress))
+                        .findFirst()
+                        .orElse(null);
+            }
 
-                // Reuse an existing PeerData instance if it's already in the known peers list
-                synchronized (this.allKnownPeers) {
-                    peerData = this.allKnownPeers.stream()
-                            .filter(knownPeerData -> knownPeerData.getAddress().equals(peerAddress))
-                            .findFirst()
-                            .orElse(null);
-                }
+            if (peerData == null) {
+                // Not a known peer, so we need to create one
+                Long addedWhen = NTP.getTime();
+                String addedBy = "requestDataFromPeer";
+                peerData = new PeerData(peerAddress, addedWhen, addedBy);
+            }
 
-                if (peerData == null) {
-                    // Not a known peer, so we need to create one
-                    Long addedWhen = NTP.getTime();
-                    String addedBy = "requestDataFromPeer";
-                    peerData = new PeerData(peerAddress, addedWhen, addedBy);
-                }
+            if (peerData == null) {
+                LOGGER.info("PeerData is null when trying to request data from peer {}", peerAddressString);
+                return false;
+            }
 
-                if (peerData == null) {
-                    LOGGER.info("PeerData is null when trying to request data from peer {}", peerAddressString);
+            // Check if we're already connected to and handshaked with this peer
+            Peer connectedPeer = this.getImmutableConnectedPeers().stream()
+                        .filter(p -> p.getPeerData().getAddress().equals(peerAddress))
+                        .findFirst()
+                        .orElse(null);
+
+            boolean isConnected = (connectedPeer != null);
+
+            boolean isHandshaked = this.getImmutableHandshakedPeers().stream()
+                    .anyMatch(p -> p.getPeerData().getAddress().equals(peerAddress));
+
+            if (isConnected && isHandshaked) {
+                // Already connected
+                return this.requestDataFromConnectedPeer(connectedPeer, signature);
+            }
+            else {
+                // We need to connect to this peer before we can request data
+                try {
+                    if (!isConnected) {
+                        // Add this signature to the list of pending requests for this peer
+                        LOGGER.debug("Making connection to peer {} to request files for signature {}...", peerAddressString, Base58.encode(signature));
+                        Peer peer = new Peer(peerData);
+                        peer.setIsDataPeer(true);
+                        peer.addPendingSignatureRequest(signature);
+                        return this.connectPeer(peer);
+                        // If connection (and handshake) is successful, data will automatically be requested
+                    }
+                    else if (!isHandshaked) {
+                        LOGGER.info("Peer {} is connected but not handshaked. Not attempting a new connection.", peerAddress);
+                        return false;
+                    }
+
+                } catch (InterruptedException e) {
+                    LOGGER.info("Interrupted when connecting to peer {}", peerAddress);
                     return false;
                 }
-
-                // Check if we're already connected to and handshaked with this peer
-                Peer connectedPeer = this.getImmutableConnectedPeers().stream()
-                            .filter(p -> p.getPeerData().getAddress().equals(peerAddress))
-                            .findFirst()
-                            .orElse(null);
-
-                boolean isConnected = (connectedPeer != null);
-
-                boolean isHandshaked = this.getImmutableHandshakedPeers().stream()
-                        .anyMatch(p -> p.getPeerData().getAddress().equals(peerAddress));
-
-                if (isConnected && isHandshaked) {
-                    // Already connected
-                    return this.requestDataFromConnectedPeer(connectedPeer, signature);
-                }
-                else {
-                    // We need to connect to this peer before we can request data
-                    try {
-                        if (!isConnected) {
-                            // Add this signature to the list of pending requests for this peer
-                            LOGGER.debug("Making connection to peer {} to request files for signature {}...", peerAddressString, Base58.encode(signature));
-                            //Peer peer = new Peer(peerData);
-                            Peer peer = PeerFactory.create("peer-data", peerData);
-                            peer.setIsDataPeer(true);
-                            peer.addPendingSignatureRequest(signature);
-                            return this.connectPeer(peer);
-                            // If connection (and handshake) is successful, data will automatically be requested
-                        }
-                        else if (!isHandshaked) {
-                            LOGGER.info("Peer {} is connected but not handshaked. Not attempting a new connection.", peerAddress);
-                            return false;
-                        }
-
-                    } catch (InterruptedException e) {
-                        LOGGER.info("Interrupted when connecting to peer {}", peerAddress);
-                        return false;
-                    } catch (ReflectiveOperationException e) {
-                        LOGGER.warn("Exception when trying to request data from peer {}", peerAddress, e);
-                    }
-                }
-            } catch (ReflectiveOperationException e) {
-                LOGGER.error("Can't create peer address: {}", e.getMessage());
             }
         }
         return false;
@@ -544,15 +511,10 @@ public class Network {
 
     public static void installInitialPeers(Repository repository) throws DataException {
         for (String address : INITIAL_PEERS) {
-            try {
-                //PeerAddress peerAddress = PeerAddress.fromString(address);
-                PeerAddress peerAddress = PeerAddressFactory.create("address", address);
+            PeerAddress peerAddress = PeerAddress.fromString(address);
 
-                PeerData peerData = new PeerData(peerAddress, System.currentTimeMillis(), "INIT");
-                repository.getNetworkRepository().save(peerData);
-            } catch (ReflectiveOperationException e) {
-                LOGGER.error("Can't create peer address: {}", e.getMessage());
-            }
+            PeerData peerData = new PeerData(peerAddress, System.currentTimeMillis(), "INIT");
+            repository.getNetworkRepository().save(peerData);
         }
 
         repository.saveChanges();
@@ -788,17 +750,8 @@ public class Network {
 
         // Pick candidate
         PeerData peerData = peers.get(peerIndex);
-        //Peer newPeer = new Peer(peerData);
-        //newPeer.setIsDataPeer(false);
-
-        Peer newPeer = null;
-        try {
-            newPeer = PeerFactory.create("peer-data", peerData);
-            newPeer.setIsDataPeer(false);
-            return newPeer;
-        } catch (ReflectiveOperationException e) {
-            LOGGER.error("Error while creating peer from peerData", e);
-        }
+        Peer newPeer = new Peer(peerData);
+        newPeer.setIsDataPeer(false);
 
         // Update connection attempt info
         peerData.setLastAttempted(now);
@@ -981,14 +934,8 @@ public class Network {
     }
 
     public void peerMisbehaved(Peer peer) {
-        try {
-            if (Class.forName("org.qortal.network.Peer").isInstance(peer)) {
-                PeerData peerData = (PeerData) peer.getPeerData();
-                peerData.setLastMisbehaved(NTP.getTime());
-            }
-        } catch(ClassNotFoundException e){
-            LOGGER.error("class 'Peer' not found", e);
-        }
+        PeerData peerData = peer.getPeerData();
+        peerData.setLastMisbehaved(NTP.getTime());
     }
 
     /**
@@ -1149,15 +1096,10 @@ public class Network {
 
         // If inbound peer, use listen port and socket address to recreate first entry
         if (!peer.isOutbound()) {
-            try {
-                String host = peer.getPeerData().getAddress().getHost();
-                //PeerAddress sendingPeerAddress = PeerAddress.fromString(host + ":" + peerPort);
-                PeerAddress sendingPeerAddress = PeerAddressFactory.create("host-port", host, peerPort);
-                LOGGER.trace("PEERS_V2 sending peer's listen address: {}", sendingPeerAddress.toString());
-                peerV2Addresses.add(0, sendingPeerAddress);
-            } catch (ReflectiveOperationException e) {
-                LOGGER.error("Can't create peer address: {}", e.getMessage());
-            }
+            String host = peer.getPeerData().getAddress().getHost();
+            PeerAddress sendingPeerAddress = PeerAddress.fromString(host + ":" + peerPort);
+            LOGGER.trace("PEERS_V2 sending peer's listen address: {}", sendingPeerAddress.toString());
+            peerV2Addresses.add(0, sendingPeerAddress);
         }
 
         opportunisticMergePeers(peer.toString(), peerV2Addresses);
@@ -1195,7 +1137,6 @@ public class Network {
         // FUTURE: we may want to disconnect from this peer if we've finished requesting data from it
 
         // Start regular pings
-        // Note: For Reticulum peers regular ping is enabled the moment a Link is established
         peer.startPings();
 
         // Only the outbound side needs to send anything (after we've received handshake-completing response).
@@ -1272,9 +1213,7 @@ public class Network {
 
                 // Don't send 'local' addresses if peer is not 'local'.
                 // e.g. don't send localhost:9084 to node4.qortal.org
-                //var p = PeerFactory.create("address", address);
-                //if (!peer.isLocal() && p.isAddressLocal(address)) {
-                if (!peer.isLocal()) {
+                if (!peer.isLocal() && Peer.isAddressLocal(address)) {
                     continue;
                 }
 
@@ -1480,11 +1419,8 @@ public class Network {
         try {
             InetSocketAddress knownAddress = peerAddress.toSocketAddress();
 
-            //List<Peer> peers = this.getImmutableConnectedPeers().stream()
-            //        .filter(peer -> Peer.addressEquals(knownAddress, peer.getResolvedAddress()))
-            //        .collect(Collectors.toList());
             List<Peer> peers = this.getImmutableConnectedPeers().stream()
-                    .filter(peer -> knownAddress.equals(peer.getResolvedAddress()))
+                    .filter(peer -> Peer.addressEquals(knownAddress, peer.getResolvedAddress()))
                     .collect(Collectors.toList());
 
             for (Peer peer : peers) {
@@ -1503,10 +1439,6 @@ public class Network {
             return;
         }
 
-        // prune ReticulumPeer(s), primarily any peer that has no ACTIVE link
-        //RNS.getInstance().prunePeers();
-        rns.prunePeers();
-
         // Disconnect peers that are stuck during handshake
         // Needs a mutable copy of the unmodifiableList
         List<Peer> handshakePeers = new ArrayList<>(this.getImmutableConnectedPeers());
@@ -1648,31 +1580,6 @@ public class Network {
             }
         }
 
-        //// shutdown Reticulum peers and instance
-        //// gracefully close links of peers that point to us
-        //for (ReticulumPeer p: RNS.getInstance().getIncomingPeers()) {
-        //    var pl = p.getPeerLink();
-        //    if (nonNull(pl) & (pl.getStatus() == ACTIVE)) {
-        //        p.sendCloseToRemote(pl);
-        //    }
-        //}
-        //// gracefully disconnect outgoing peers
-        //for (ReticulumPeer p: RNS.getInstance().getLinkedPeers()) {
-        //    LOGGER.info("shutting down peer: {}", encodeHexString(p.getDestinationHash()));
-        //    p.shutdown();
-        //    try {
-        //        TimeUnit.SECONDS.sleep(1); // allow for peers to disconnect gracefully
-        //    } catch (InterruptedException e) {
-        //        LOGGER.error("exception: ", e);
-        //    }
-        //}
-        //// shut down Reticulum
-        //LOGGER.info("Shutting down Reticulum...");
-        //RNS.getInstance().getReticulum().exitHandler();
-
-        // shutdown Reticulum, try to gracefully shut down peers
-        rns.shutdown();
-
         // Stop processing threads
         try {
             if (!this.networkEPC.shutdown(5000)) {

src/main/java/org/qortal/network/PeerAddress.java

@@ -1,21 +1,134 @@
 package org.qortal.network;
 
-import org.qortal.repository.DataException;
+import com.google.common.net.HostAndPort;
+import com.google.common.net.InetAddresses;
+import org.qortal.settings.Settings;
 
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import java.net.*;
 
-public interface PeerAddress {
+/**
+ * Convenience class for encapsulating/parsing/rendering/converting peer addresses
+ * including late-stage resolving before actual use by a socket.
+ */
+// All properties to be converted to JSON via JAXB
+@XmlAccessorType(XmlAccessType.FIELD)
+public class PeerAddress {
 
-    InetSocketAddress toSocketAddress() throws UnknownHostException;
+	// Properties
+	private String host;
+	private int port;
 
-    // ReticulumPeer "address"
-    default byte[] getDestinationHash() { return null; }
-    default void setDestinationHash(byte[] hash) { return; }
+	private PeerAddress(String host, int port) {
+		this.host = host;
+		this.port = port;
+	}
+
+	// Constructors
+
+	// For JAXB
+	protected PeerAddress() {
+	}
+
+	/** Constructs new PeerAddress using remote address from passed connected socket. */
+	public static PeerAddress fromSocket(Socket socket) {
+		InetSocketAddress socketAddress = (InetSocketAddress) socket.getRemoteSocketAddress();
+		InetAddress address = socketAddress.getAddress();
+
+		String host = InetAddresses.toAddrString(address);
+
+		// Make sure we encapsulate IPv6 addresses in brackets
+		if (address instanceof Inet6Address)
+			host = "[" + host + "]";
+
+		return new PeerAddress(host, socketAddress.getPort());
+	}
+
+	/**
+	 * Constructs new PeerAddress using hostname or literal IP address and optional port.<br>
+	 * Literal IPv6 addresses must be enclosed within square brackets.
+	 * <p>
+	 * Examples:
+	 * <ul>
+	 * <li>peer.example.com
+	 * <li>peer.example.com:9084
+	 * <li>192.0.2.1
+	 * <li>192.0.2.1:9084
+	 * <li>[2001:db8::1]
+	 * <li>[2001:db8::1]:9084
+	 * </ul>
+	 * <p>
+	 * Not allowed:
+	 * <ul>
+	 * <li>2001:db8::1
+	 * <li>2001:db8::1:9084
+	 * </ul>
+	 */
+	public static PeerAddress fromString(String addressString) throws IllegalArgumentException {
+		boolean isBracketed = addressString.startsWith("[");
+
+		// Attempt to parse string into host and port
+		HostAndPort hostAndPort = HostAndPort.fromString(addressString).withDefaultPort(Settings.getInstance().getDefaultListenPort()).requireBracketsForIPv6();
+
+		String host = hostAndPort.getHost();
+		if (host.isEmpty())
+			throw new IllegalArgumentException("Empty host part");
+
+		// Validate IP literals by attempting to convert to InetAddress, without DNS lookups
+		if (host.contains(":") || host.matches("[0-9.]+"))
+			InetAddresses.forString(host);
+
+		// If we've reached this far then we have a valid address
+
+		// Make sure we encapsulate IPv6 addresses in brackets
+		if (isBracketed)
+			host = "[" + host + "]";
+
+		return new PeerAddress(host, hostAndPort.getPort());
+	}
+
+	// Getters
+
+	/** Returns hostname or literal IP address, bracketed if IPv6 */
+	public String getHost() {
+		return this.host;
+	}
+
+	public int getPort() {
+		return this.port;
+	}
+
+	// Conversions
+
+	/** Returns InetSocketAddress for use with Socket.connect(), or throws UnknownHostException if address could not be resolved by DNS lookup. */
+	public InetSocketAddress toSocketAddress() throws UnknownHostException {
+		// Attempt to construct new InetSocketAddress with DNS lookups.
+		// There's no control here over whether IPv6 or IPv4 will be used.
+		InetSocketAddress socketAddress = new InetSocketAddress(this.host, this.port);
+
+		// If we couldn't resolve then return null
+		if (socketAddress.isUnresolved())
+			throw new UnknownHostException();
+
+		return socketAddress;
+	}
+
+	@Override
+	public String toString() {
+		return this.host + ":" + this.port;
+	}
+
+	// Utilities
+
+	/** Returns true if other PeerAddress has same port and same case-insensitive host part, without DNS lookups */
+	public boolean equals(PeerAddress other) {
+		// Ports must match
+		if (this.port != other.port)
+			return false;
+
+		// Compare host parts but without DNS lookups
+		return this.host.equalsIgnoreCase(other.host);
+	}
 
-    // IPPeer "address" components
-    default String getHost() { return null; }
-    default int getPort() { return -1; }
 }
-

src/main/java/org/qortal/network/PeerAddressCtor.java

@@ -1,11 +0,0 @@
-package org.qortal.network;
-
-import java.lang.annotation.*;
-
-/** Tag a constructor with this so the factory can find it by key. */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.CONSTRUCTOR)
-public @interface PeerAddressCtor {
-    String value();            // the "key" you pass in at runtime
-}
-

src/main/java/org/qortal/network/PeerAddressFactory.java

@@ -1,36 +0,0 @@
-package org.qortal.network;
-
-import org.reflections.Reflections;
-import java.lang.reflect.Constructor;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-public final class PeerAddressFactory {
-
-    private static final ConcurrentMap<String, Constructor<?>> REGISTRY = new ConcurrentHashMap<>();
-
-    /* static init block – scan the classpath once */
-    static {
-        Reflections reflections = new Reflections("org.qortal.network");
-        Set<Class<? extends PeerAddress>> subTypes = reflections.getSubTypesOf(PeerAddress.class);
-        for (Class<?> impl : subTypes) {
-            for (Constructor<?> con : impl.getDeclaredConstructors()) {
-                if (con.isAnnotationPresent(PeerAddressCtor.class)) {
-                    String key = con.getAnnotation(PeerAddressCtor.class).value();
-                    con.setAccessible(true);
-                    REGISTRY.put(key, con);
-                }
-            }
-        }
-    }
-
-    /** Creates the instance chosen by 'key'. Var-args are forwarded literally. */
-    public static PeerAddress create(String key, Object... args)
-            throws ReflectiveOperationException {
-        Constructor<?> c = REGISTRY.get(key);
-        if (c == null) throw new IllegalArgumentException("No @PeerAddressCtor '" + key + "'");
-        return (PeerAddress) c.newInstance(args);
-    }
-}
-

src/main/java/org/qortal/network/PeerCtor.java

@@ -1,11 +0,0 @@
-package org.qortal.network;
-
-import java.lang.annotation.*;
-
-/** Tag a constructor with this so the factory can find it by key. */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.CONSTRUCTOR)
-public @interface PeerCtor {
-    String value();            // the "key" you pass in at runtime
-}
-

src/main/java/org/qortal/network/PeerFactory.java

@@ -1,36 +0,0 @@
-package org.qortal.network;
-
-import org.reflections.Reflections;
-import java.lang.reflect.Constructor;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-public final class PeerFactory {
-
-    private static final ConcurrentMap<String, Constructor<?>> REGISTRY = new ConcurrentHashMap<>();
-
-    /* static init block – scan the classpath once */
-    static {
-        Reflections reflections = new Reflections("org.qortal.network");
-        Set<Class<? extends Peer>> subTypes = reflections.getSubTypesOf(Peer.class);
-        for (Class<?> impl : subTypes) {
-            for (Constructor<?> con : impl.getDeclaredConstructors()) {
-                if (con.isAnnotationPresent(PeerCtor.class)) {
-                    String key = con.getAnnotation(PeerCtor.class).value();
-                    con.setAccessible(true);
-                    REGISTRY.put(key, con);
-                }
-            }
-        }
-    }
-
-    /** Creates the instance chosen by 'key'. Var-args are forwarded literally. */
-    public static Peer create(String key, Object... args)
-            throws ReflectiveOperationException {
-        Constructor<?> c = REGISTRY.get(key);
-        if (c == null) throw new IllegalArgumentException("No @PeerCtor '" + key + "'");
-        return (Peer) c.newInstance(args);
-    }
-}
-

src/main/java/org/qortal/network/PeerSendManagement.java

@@ -20,10 +20,6 @@ public class PeerSendManagement {
         return peerSendManagers.computeIfAbsent(peer.toString(), p -> new PeerSendManager(peer));
     }
 
-    //public PeerSendManager getOrCreateSendManager(ReticulumPeer peer) {
-    //    return peerSendManagers.computeIfAbsent(peer.toString(), p -> new PeerSendManager(peer));
-    //}
-
     private PeerSendManagement() {
 
         ScheduledExecutorService cleaner = Executors.newSingleThreadScheduledExecutor();

src/main/java/org/qortal/network/PeerSendManager.java

@@ -7,9 +7,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.qortal.network.message.Message;
 
-import org.qortal.network.ReticulumPeer;
-import static org.apache.commons.codec.binary.Hex.encodeHexString;
-
 public class PeerSendManager {
     private static final Logger LOGGER = LogManager.getLogger(PeerSendManager.class);
 
@@ -20,7 +17,6 @@ public class PeerSendManager {
     private static final long COOLDOWN_DURATION_MS = 20_000;
 
     private final Peer peer;
-    //private final ReticulumPeer rnsPeer;
     private final BlockingQueue<TimedMessage> queue = new LinkedBlockingQueue<>();
     private final ExecutorService executor;
     private final AtomicInteger failureCount = new AtomicInteger(0);
@@ -33,23 +29,12 @@ public class PeerSendManager {
         this.peer = peer;
         this.executor = Executors.newSingleThreadExecutor(r -> {
             Thread t = new Thread(r);
-            //t.setName("PeerSendManager-" + peer.getResolvedAddress().getHostString() + "-" + threadCount.getAndIncrement());
-            t.setName("PeerSendManager-" + peer.getPeerIndexString() + "-" + threadCount.getAndIncrement());
+            t.setName("PeerSendManager-" + peer.getResolvedAddress().getHostString() + "-" + threadCount.getAndIncrement());
             return t;
         });
         start();
     }
 
-    //public PeerSendManager(ReticulumPeer peer) {
-    //    this.rnsPeer = peer;
-    //    this.executor = Executors.newSingleThreadExecutor(r -> {
-    //        Thread t = new Thread(r);
-    //        t.setName("PeerSendManager-" + encodeHexString(peer.getDestinationHash()) + "-" + threadCount.getAndIncrement());
-    //        return t;
-    //    });
-    //    start();
-    //}
-
     private void start() {
         executor.submit(() -> {
             while (!Thread.currentThread().isInterrupted()) {

src/main/java/org/qortal/network/RNS.java

@@ -1,873 +0,0 @@
-package org.qortal.network;
-
-import io.reticulum.Reticulum;
-import io.reticulum.Transport;
-import io.reticulum.interfaces.ConnectionInterface;
-import io.reticulum.destination.Destination;
-import io.reticulum.destination.DestinationType;
-import io.reticulum.destination.Direction;
-import io.reticulum.destination.ProofStrategy;
-import io.reticulum.identity.Identity;
-import io.reticulum.link.Link;
-//import io.reticulum.link.LinkStatus;
-//import io.reticulum.constant.LinkConstant;
-//import static io.reticulum.constant.ReticulumConstant.MTU;
-//import io.reticulum.buffer.Buffer;
-//import io.reticulum.buffer.BufferedRWPair;
-import io.reticulum.packet.Packet;
-import io.reticulum.packet.PacketReceipt;
-import io.reticulum.packet.PacketReceiptStatus;
-import io.reticulum.transport.AnnounceHandler;
-//import static io.reticulum.link.TeardownSession.DESTINATION_CLOSED;
-//import static io.reticulum.link.TeardownSession.INITIATOR_CLOSED;
-//import static io.reticulum.link.TeardownSession.TIMEOUT;
-import static io.reticulum.link.LinkStatus.ACTIVE;
-//import static io.reticulum.link.LinkStatus.STALE;
-import static io.reticulum.link.LinkStatus.CLOSED;
-import static io.reticulum.link.LinkStatus.PENDING;
-//import static io.reticulum.link.LinkStatus.HANDSHAKE;
-//import static io.reticulum.packet.PacketContextType.LINKCLOSE;
-//import static io.reticulum.identity.IdentityKnownDestination.recall;
-import static io.reticulum.utils.IdentityUtils.concatArrays;
-//import static io.reticulum.constant.ReticulumConstant.TRUNCATED_HASHLENGTH;
-import static io.reticulum.constant.ReticulumConstant.CONFIG_FILE_NAME;
-import lombok.Data;
-//import lombok.Setter;
-//import lombok.Getter;
-import lombok.Synchronized;
-
-//import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.qortal.repository.DataException;
-import org.qortal.settings.Settings;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
-//import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import static java.nio.file.StandardOpenOption.CREATE;
-import static java.nio.file.StandardOpenOption.WRITE;
-import java.nio.file.Files;
-import java.nio.file.Path;
-//import java.nio.channels.SelectionKey;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-//import static java.util.Objects.isNull;
-//import static java.util.Objects.isNull;
-import static java.util.Objects.nonNull;
-//import static org.apache.commons.lang3.BooleanUtils.isTrue;
-//import static org.apache.commons.lang3.BooleanUtils.isFalse;
-
-import java.io.File;
-import java.util.*;
-//import java.util.Random;
-//import java.util.Scanner;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.*;
-//import java.util.concurrent.atomic.AtomicLong;
-//import java.util.concurrent.locks.Lock;
-//import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Function;
-import java.time.Instant;
-import java.util.stream.Collectors;
-//import java.net.InetAddress;
-//import java.net.UnknownHostException;
-
-import static org.apache.commons.codec.binary.Hex.encodeHexString;
-//import org.qortal.utils.ExecuteProduceConsume;
-//import org.qortal.utils.ExecuteProduceConsume.StatsSnapshot;
-import org.qortal.utils.NTP;
-//import org.qortal.utils.NamedThreadFactory;
-import org.qortal.network.message.Message;
-import org.qortal.network.message.BlockSummariesV2Message;
-import org.qortal.network.message.TransactionSignaturesMessage;
-import org.qortal.network.message.GetUnconfirmedTransactionsMessage;
-import org.qortal.data.network.PeerData;
-import org.qortal.controller.Controller;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.data.block.BlockData;
-import org.qortal.data.block.BlockSummaryData;
-import org.qortal.data.transaction.TransactionData;
-
-// logging
-import lombok.extern.slf4j.Slf4j;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-
-// templates
-import com.hubspot.jinjava.Jinjava;
-import com.google.common.collect.Maps;
-
-@Data
-@Slf4j
-public class RNS {
-//public class RNS extends Thread {
-
-    public Reticulum reticulum;
-    //private static final String APP_NAME = "qortal";
-    static final String APP_NAME = Settings.getInstance().isTestNet() ? RNSCommon.TESTNET_APP_NAME: RNSCommon.MAINNET_APP_NAME;
-    static final Integer TARGET_PORT = Settings.getInstance().isTestNet() ? RNSCommon.TESTNET_IF_TCP_PORT: RNSCommon.MAINNET_IF_TCP_PORT;
-    //static final String defaultConfigPath = ".reticulum"; // if empty will look in Reticulums default paths
-    static final String defaultConfigPath = Settings.getInstance().isTestNet() ? RNSCommon.defaultRNSConfigPathTestnet: RNSCommon.defaultRNSConfigPath;
-    private final int MAX_PEERS = Settings.getInstance().getReticulumMaxPeers();
-    private final int MIN_DESIRED_CORE_PEERS = Settings.getInstance().getReticulumMinDesiredCorePeers();
-    private final int MIN_DESIRED_DATA_PEERS = Settings.getInstance().getReticulumMinDesiredDataPeers();
-    // How long [ms] between pruning of peers
-	private long PRUNE_INTERVAL = 1 * 64 * 1000L; // ms;
-    
-    Identity serverIdentity;
-    public Destination baseDestination;
-    public Destination dataDestination;
-    private volatile boolean isShuttingDown = false;
-
-    /**
-     * Maintain two lists for each subset of peers
-     *  => a synchronizedList, modified when peers are added/removed
-     *  => an immutable List, automatically rebuild to mirror synchronizedList, served to consumers
-     *  linkedPeers are "initiators" (containing initiator reticulum Link), actively doing work.
-     *  incomimgPeers are "non-initiators", the passive end of bidirectional Reticulum Buffers.
-     */
-    private final List<ReticulumPeer> linkedPeers = Collections.synchronizedList(new ArrayList<>());
-    private List<ReticulumPeer> immutableLinkedPeers = Collections.emptyList();
-    private final List<ReticulumPeer> incomingPeers = Collections.synchronizedList(new ArrayList<>());
-    private List<ReticulumPeer> immutableIncomingPeers = Collections.emptyList();
-
-    //private final ExecuteProduceConsume rnsNetworkEPC;
-    private static final long NETWORK_EPC_KEEPALIVE = 1000L; // 1 second
-    private int totalThreadCount = 0;
-    //private final int reticulumMaxNetworkThreadPoolSize = Settings.getInstance().getReticulumMaxNetworkThreadPoolSize();
-
-    // replicating a feature from Network.class needed in for base Message.java,
-    // just in case the classic TCP/IP Networking is turned off.
-    private static final byte[] MAINNET_MESSAGE_MAGIC = new byte[]{0x51, 0x4f, 0x52, 0x54}; // QORT
-    private static final byte[] TESTNET_MESSAGE_MAGIC = new byte[]{0x71, 0x6f, 0x72, 0x54}; // qorT
-    private static final int BROADCAST_CHAIN_TIP_DEPTH = 7; // (~1440 bytes)
-    /**
-     * How long between informational broadcasts to all ACTIVE peers, in milliseconds.
-     */
-    private static final long BROADCAST_INTERVAL = 30 * 1000L; // ms
-    /**
-     * Link low-level ping interval and timeout
-     */
-    private static final long LINK_PING_INTERVAL = 55 * 1000L; // ms
-    private static final long LINK_UNREACHABLE_TIMEOUT = 3 * LINK_PING_INTERVAL;
-
-    //private static final Logger logger = LoggerFactory.getLogger(RNS.class);
-    
-    // Constructor
-    public RNS () {
-        log.info("RNS constructor");
-        try {
-            //String configPath = new java.io.File(defaultConfigPath).getCanonicalPath();
-            log.info("creating config in {}", defaultConfigPath);
-            initConfig(defaultConfigPath);
-            //reticulum = new Reticulum(configPath);
-            reticulum = new Reticulum(defaultConfigPath);
-            var identitiesPath = reticulum.getStoragePath().resolve("identities");
-            if (Files.notExists(identitiesPath)) {
-                Files.createDirectories(identitiesPath);
-            }
-        } catch (IOException e) {
-            log.error("unable to create Reticulum network", e);
-        }
-        log.info("reticulum instance created");
-        log.debug("reticulum instance created: {}", reticulum);
-    }
-
-    // Note: potentially create persistent serverIdentity (utility rnid) and load it from file
-    //public void start() throws IOException, DataException {
-    public void start() {
-
-        // create identity either from file or new (creating new keys)
-        var serverIdentityPath = reticulum.getStoragePath().resolve("identities/"+APP_NAME);
-        if (Files.isReadable(serverIdentityPath)) {
-            serverIdentity = Identity.fromFile(serverIdentityPath);
-            log.info("server identity loaded from file {}", serverIdentityPath);
-        } else {
-            serverIdentity = new Identity();
-            log.info("APP_NAME: {}, storage path: {}", APP_NAME, serverIdentityPath);
-            log.info("new server identity created dynamically.");
-            // save it back to file by default for next start (possibly add setting to override)
-            try {
-                Files.write(serverIdentityPath, serverIdentity.getPrivateKey(), CREATE, WRITE);
-                log.info("serverIdentity written back to file");
-            } catch (IOException e) {
-                log.error("Error while saving serverIdentity to {}", serverIdentityPath, e);
-            }
-        }
-        log.debug("Server Identity: {}", serverIdentity.toString());
-
-        // show the ifac_size of the configured interfaces (debug code)
-        for (ConnectionInterface i: Transport.getInstance().getInterfaces() ) {
-            log.info("interface {}, length: {}", i.getInterfaceName(), i.getIfacSize());
-        }
-
-        baseDestination = new Destination(
-            serverIdentity,
-            Direction.IN,
-            DestinationType.SINGLE,
-            APP_NAME,
-            "core"
-        );
-        log.info("Destination {} {} running", encodeHexString(baseDestination.getHash()), baseDestination.getName());
-        dataDestination = new Destination(
-            serverIdentity,
-            Direction.IN,
-            DestinationType.SINGLE,
-            APP_NAME,
-            "qdn"
-        );
-        log.info("Destination {} {} running", encodeHexString(dataDestination.getHash()), dataDestination.getName());
-   
-        baseDestination.setProofStrategy(ProofStrategy.PROVE_ALL);
-        baseDestination.setAcceptLinkRequests(true);
-        dataDestination.setProofStrategy(ProofStrategy.PROVE_APP);
-        dataDestination.setAcceptLinkRequests(true);
-        
-        baseDestination.setLinkEstablishedCallback(this::baseClientConnected);
-        dataDestination.setLinkEstablishedCallback(this::dataClientConnected);
-        Transport.getInstance().registerAnnounceHandler(new QAnnounceHandler());
-        Transport.getInstance().registerAnnounceHandler(new QAnnounceHandler("qortal.qdn"));
-        log.debug("announceHandlers: {}", Transport.getInstance().getAnnounceHandlers());
-        // do a first announce
-        baseDestination.announce();
-        log.debug("Sent initial announce from {} ({})", encodeHexString(baseDestination.getHash()), baseDestination.getName());
-        // announce QDN destination
-        dataDestination.announce();
-    }
-
-    private void initConfig(String configDir) throws IOException {
-        File configDir1 = new File(configDir);
-        if (!configDir1.exists()) {
-            configDir1.mkdir();
-        }
-        var configPath = Path.of(configDir1.getAbsolutePath());
-        Path configFile = configPath.resolve(CONFIG_FILE_NAME);
-        var localhost = InetAddress.getLocalHost();
-        var fqdn = localhost.getCanonicalHostName();
-        var isReticulumGateway = Settings.getInstance().getReticulumIsGateway();
-        var reticulumDesiredClientInterfaces =  Settings.getInstance().getReticulumDesiredClientInterfaces();
-        var reticulumTcpGatewayServers = Arrays.stream(Settings.getInstance().getReticulumTcpGatewayServers()).collect(Collectors.toList());
-        reticulumTcpGatewayServers.remove(fqdn);
-        Map<String, Object> context = Maps.newHashMap();
-
-        //log.info("fqdn: {}, reticulumTcpGatewayServers: {}", fqdn, reticulumTcpGatewayServers);
-
-        if (Files.notExists(configFile)) {
-            try {
-                // jinjava variables set in context:
-                // * tcp_gateway_servers: list of nodes with a TCPServerInterface
-                // * num_client_interfaces: number of client interfaces to gateways be configured
-                // * host_fqdn: host FQDN
-                // * qortal_network_name: either "qortal" or "qortaltest" (from isTestnet)
-                // * is_reticulum_gateway: one of the instances (Qortal core or RNS) has
-                //                         at least one Gateway interface
-                // * is_test_net: String "true" or "false" (from isTestNet)
-                // * target_port: target port for TCPServerInterface (only)
-                // * use_python_rns: use local shared python rnsd (has to provide a gateway interface)
-                // * python_rns_if_port: rnsd TCPServerInterface port (if rnsd gateway is a TCPServerInterface)
-                var jnj = new Jinjava();
-                var reticulumGateways = StringUtils.join(reticulumTcpGatewayServers, " ");
-                log.info("reticulumGateways: {}", reticulumGateways);
-                context.put("tcp_gateway_servers",  reticulumGateways);
-                context.put("num_client_interfaces", reticulumDesiredClientInterfaces);
-                context.put("host_fqdn", fqdn);
-                context.put("qortal_network_name",  APP_NAME);
-                context.put("target_port", TARGET_PORT);
-                context.put("is_reticulum_gateway", isReticulumGateway ? "true" : "false");
-                //context.put("is_test_net", Settings.getInstance().isTestNet() ? "true" : "false");
-                context.put("use_python_rns", Settings.getInstance().getReticulumUsePythonRNS() ? "true" : "false");
-                context.put("python_rns_if_port", Settings.getInstance().getReticulumPythonRNSGatewayPort());
-
-                // render config.yml from template
-                log.info("Rendering new Reticulum configuration file from resource {}", RNSCommon.jinjaConfigTemplateName  );
-                var templateResourceInpuSteam = this.getClass().getClassLoader().getResourceAsStream(RNSCommon.jinjaConfigTemplateName);
-                //var template = new Scanner(templateResourceInputSteam).useDelimiter("\n").next();
-                var template = new BufferedReader(new InputStreamReader(templateResourceInpuSteam)).lines().parallel().collect(Collectors.joining("\n"));
-                //log.info("template: {}", template);
-                var renderedConfig = jnj.render(template, context);
-                //log.info("rendered template - {}", renderedConfig);
-                Files.write(configFile, renderedConfig.getBytes(), CREATE, WRITE);
-            } catch (Exception e) {
-                log.error("Failed to render config file - creating fallback default  config file", e);
-                var defaultConfig = this.getClass().getClassLoader().getResourceAsStream(RNSCommon.defaultRNSConfig);
-                if (Settings.getInstance().isTestNet()) {
-                    defaultConfig = this.getClass().getClassLoader().getResourceAsStream(RNSCommon.defaultRNSConfigTestnet);
-                }
-                Files.copy(defaultConfig, configFile, StandardCopyOption.REPLACE_EXISTING);
-            }
-        } else {
-            log.debug("Reticulum config exists, skipping.");
-        }
-    }
-
-    public void broadcast(Function<ReticulumPeer, Message> peerMessageBuilder) {
-        for (ReticulumPeer peer : getActiveImmutableLinkedPeers()) {
-            if (this.isShuttingDown) {
-                return;
-            }
-    
-            Message message = peerMessageBuilder.apply(peer);
-    
-            if (message == null) {
-                continue;
-            }
-    
-            var pl = peer.getPeerLink();
-            if (nonNull(pl) && (pl.getStatus() == ACTIVE)) {
-                peer.sendMessage(message);
-            }
-        }
-    }
-
-    public void broadcastOurChain() {
-        BlockData latestBlockData = Controller.getInstance().getChainTip();
-        int latestHeight = latestBlockData.getHeight();
-
-        log.debug("broadcastOurChain latestHeight: {}", latestHeight);
-        try (final Repository repository = RepositoryManager.getRepository()) {
-            List<BlockSummaryData> latestBlockSummaries = repository.getBlockRepository().getBlockSummaries(latestHeight - BROADCAST_CHAIN_TIP_DEPTH, latestHeight);
-            Message latestBlockSummariesMessage = new BlockSummariesV2Message(latestBlockSummaries);
-
-            broadcast(broadcastPeer -> latestBlockSummariesMessage);
-        } catch (DataException e) {
-            log.warn("Couldn't broadcast our chain tip info", e);
-        }
-    }
-
-    public Message buildNewTransactionMessage(ReticulumPeer peer, TransactionData transactionData) {
-        // In V2 we send out transaction signature only and peers can decide whether to request the full transaction
-        return new TransactionSignaturesMessage(Collections.singletonList(transactionData.getSignature()));
-    }
-
-    public Message buildGetUnconfirmedTransactionsMessage(ReticulumPeer peer) {
-        return new GetUnconfirmedTransactionsMessage();
-    }
-
-    public void shutdown() {
-        this.isShuttingDown = true;
-        log.info("shutting down Reticulum");
-        
-        // gracefully close links of peers that point to us
-        for (ReticulumPeer p: incomingPeers) {
-            var pl = p.getPeerLink();
-            if (nonNull(pl) & (pl.getStatus() == ACTIVE)) {
-                p.sendCloseToRemote(pl);
-            }
-        }
-        // Disconnect peers gracefully and terminate Reticulum
-        for (ReticulumPeer p: linkedPeers) {
-            log.info("shutting down peer: {}", encodeHexString(p.getDestinationHash()));
-            //log.debug("peer: {}", p);
-            p.shutdown();
-            try {
-                TimeUnit.MILLISECONDS.sleep(200); // allow for peers to disconnect gracefully
-            } catch (InterruptedException e) {
-                log.error("exception: ", e);
-            }
-            //var pl = p.getPeerLink();
-            //if (nonNull(pl) & (pl.getStatus() == ACTIVE)) {
-            //    pl.teardown();
-            //}
-        }
-        //// Stop processing threads (the "server loop")
-        //try {
-        //    if (!this.rnsNetworkEPC.shutdown(5000)) {
-        //        log.warn("RNSNetwork threads failed to terminate");
-        //    }
-        //} catch (InterruptedException e) {
-        //    log.warn("Interrupted while waiting for RNS networking threads to terminate");
-        //}
-        // Note: we still need to get the packet timeout callback to work...
-        reticulum.exitHandler();
-    }
-
-    public void sendCloseToRemote(Link link) {
-        if (nonNull(link)) {
-            var data = concatArrays("close::".getBytes(UTF_8),link.getDestination().getHash());
-            Packet closePacket = new Packet(link, data);
-            var packetReceipt = closePacket.send();
-            packetReceipt.setDeliveryCallback(this::closePacketDelivered);
-            packetReceipt.setTimeoutCallback(this::packetTimedOut);
-        } else {
-            log.debug("can't send to null link");
-        }
-    }
-
-    public void closePacketDelivered(PacketReceipt receipt) {
-        var rttString = "";
-        if (receipt.getStatus() == PacketReceiptStatus.DELIVERED) {
-            var rtt = receipt.getRtt();    // rtt (Java) is in miliseconds
-            //log.info("qqp - packetDelivered - rtt: {}", rtt);
-            if (rtt >= 1000) {
-                rtt = Math.round((float) rtt / 1000);
-                rttString = String.format("%d seconds", rtt);
-            } else {
-                rttString = String.format("%d miliseconds", rtt);
-            }
-            log.info("Shutdown packet confirmation received from {}, round-trip time is {}",
-                    encodeHexString(receipt.getDestination().getHash()), rttString);
-        }
-    }
-
-    public void packetTimedOut(PacketReceipt receipt) {
-        log.info("packet timed out, receipt status: {}", receipt.getStatus());
-    }
-
-    public void baseClientConnected(Link link) {
-        //link.setLinkClosedCallback(this::clientDisconnected);
-        //link.setPacketCallback(this::serverPacketReceived);
-        log.info("baseClientConnected - link hash: {}, {}", link.getHash(), encodeHexString(link.getHash()));
-        ReticulumPeer newPeer = new ReticulumPeer(link);
-        newPeer.setPeerLinkHash(link.getHash());
-        newPeer.setPeerAspect(RNSCommon.PeerAspect.BASE);
-        newPeer.setMessageMagic(getMessageMagic());
-        // make sure the peer has a channel and buffer
-        newPeer.getOrInitPeerBuffer();
-        addIncomingPeer(newPeer);
-        log.info("***> Base client connected, base link: {}", encodeHexString(link.getLinkId()));
-    }
-
-    public void dataClientConnected(Link link) {
-        //link.setLinkClosedCallback(this::clientDisconnected);
-        //link.setPacketCallback(this::serverPacketReceived);
-        log.info("dataClientConnected - link hash: {}, {}", link.getHash(), encodeHexString(link.getHash()));
-        ReticulumPeer newPeer = new ReticulumPeer(link);
-        newPeer.setPeerLinkHash(link.getHash());
-        newPeer.setPeerAspect(RNSCommon.PeerAspect.DATA);
-        newPeer.setMessageMagic(getMessageMagic());
-        // make sure the peer has a channel and buffer
-        newPeer.getOrInitPeerBuffer();
-        addIncomingPeer(newPeer);
-        log.info("***> Data Client connected, data link: {}", encodeHexString(link.getLinkId()));
-    }
-
-    public void clientDisconnected(Link link) {
-        log.info("***> Client disconnected");
-    }
-
-    public void serverPacketReceived(byte[] message, Packet packet) {
-        var msgText = new String(message, StandardCharsets.UTF_8);
-        log.info("Received data on link - message: {}, destinationHash: {}", msgText, encodeHexString(packet.getDestinationHash()));
-    }
-
-    //public void announceBaseDestination () {
-    //    getBaseDestination().announce();
-    //}
-
-    private class QAnnounceHandler implements AnnounceHandler {
-        String aspectFilter;
-
-        QAnnounceHandler(String aspectFilter) {
-            this.aspectFilter = aspectFilter;
-        }
-
-        QAnnounceHandler() {
-            this.aspectFilter = "qortal.core";
-        }
-
-        @Override
-        public String getAspectFilter() {
-            //return "qortal.core";
-            return this.aspectFilter;
-        }
-
-        @Override
-        @Synchronized
-        public void receivedAnnounce(byte[] destinationHash, Identity announcedIdentity, byte[] appData) {
-            var peerExists = false;
-            var activePeerCount = 0; 
-            //var network = Network.getInstance();
-
-            log.info("Received an announce from {}", encodeHexString(destinationHash));
-
-            if (nonNull(appData)) {
-                log.debug("The announce contained the following app data: {}", new String(appData, UTF_8));
-            }
-
-            // add to peer list if we can use more peers
-            //synchronized (this) {
-            var lps =  RNS.getInstance().getImmutableLinkedPeers();
-            for (ReticulumPeer p: lps) {
-                var pl = p.getPeerLink();
-                if ((nonNull(pl) && (pl.getStatus() == ACTIVE))) {
-                    activePeerCount = activePeerCount + 1;
-                }
-            }
-            if (activePeerCount < MAX_PEERS) {
-                for (ReticulumPeer p: lps) {
-                    if (Arrays.equals(p.getDestinationHash(), destinationHash)) {
-                        log.info("QAnnounceHandler - peer exists - found peer matching destinationHash");
-                        if (nonNull(p.getPeerLink())) {
-                            log.info("peer link: {}, status: {}",
-                                    encodeHexString(p.getPeerLink().getLinkId()), p.getPeerLink().getStatus());
-                        }
-                        peerExists = true;
-                        if (p.getPeerLink().getStatus() != ACTIVE) {
-                            p.getOrInitPeerLink();
-                        }
-                        break;
-                    } else {
-                        if (nonNull(p.getPeerLink())) {
-                            log.info("QAnnounceHandler - other peer - link: {}, status: {}",
-                                    encodeHexString(p.getPeerLink().getLinkId()), p.getPeerLink().getStatus());
-                            if (p.getPeerLink().getStatus() == CLOSED) {
-                                // mark peer for deletion on nexe pruning
-                                p.setDeleteMe(true);
-                            }
-                        } else {
-                            log.info("QAnnounceHandler - peer link is null");
-                        }
-                    }
-                }
-                if (!peerExists) {
-                    ReticulumPeer newPeer = getNewPeer(destinationHash, announcedIdentity);
-                    addLinkedPeer(newPeer);
-                    //network.addConnectedPeer(newPeer);
-                    log.info("added new {} ReticulumPeer, destinationHash: {}",
-                            newPeer.getPeerAspect(), encodeHexString(destinationHash));
-                }
-            }
-        }
-
-        private ReticulumPeer getNewPeer(byte[] destinationHash, Identity announcedIdentity) {
-            ReticulumPeer newPeer = new ReticulumPeer(destinationHash);
-            newPeer.setServerIdentity(announcedIdentity);
-            newPeer.setIsInitiator(true);
-            if (getAspectFilter() == "qortal.qdn") {
-                // data peer
-                newPeer.setPeerAspect(RNSCommon.PeerAspect.DATA);
-                newPeer.setIsDataPeer(true);
-            } else {
-                // core peer
-                newPeer.setPeerAspect(RNSCommon.PeerAspect.BASE);
-                newPeer.setIsDataPeer(false);
-            }
-            newPeer.setMessageMagic(getMessageMagic());
-            return newPeer;
-        }
-    }
-
-    private static class SingletonContainer {
-        private static final RNS INSTANCE = new RNS();
-    }
-
-    public static RNS getInstance() {
-        return SingletonContainer.INSTANCE;
-    }
-
-    public List<ReticulumPeer> getActiveImmutableLinkedPeers() {
-        List<ReticulumPeer> activePeers = Collections.synchronizedList(new ArrayList<>());
-        for (ReticulumPeer p: this.immutableLinkedPeers) {
-            if (nonNull(p.getPeerLink()) && (p.getPeerLink().getStatus() == ACTIVE)) {
-                activePeers.add(p);
-            }
-        }
-        return activePeers;
-    }
-
-    // note: we already have a lobok getter for this
-    //public List<ReticulumPeer> getImmutableLinkedPeers() {
-    //    return this.immutableLinkedPeers;
-    //}
-
-    public void addLinkedPeer(ReticulumPeer peer) {
-        this.linkedPeers.add(peer);
-        this.immutableLinkedPeers = List.copyOf(this.linkedPeers); // thread safe
-        //var network = Network.getInstance();
-        //network.addHandshakedPeer(peer);
-    }
-
-    public void removePeer(ReticulumPeer peer) {
-        if (peer.isInitiator) {
-            removeLinkedPeer(peer);
-        } else {
-            removeIncomingPeer(peer);
-        }
-    }
-
-    public void removeLinkedPeer(ReticulumPeer peer) {
-        //if (nonNull(peer.getPeerBuffer())) {
-        //    peer.getPeerBuffer().close();
-        //}
-        if (nonNull(peer.getPeerLink())) {
-            peer.getPeerLink().teardown();
-        }
-        var p = this.linkedPeers.remove(this.linkedPeers.indexOf(peer)); // thread safe
-        this.immutableLinkedPeers = List.copyOf(this.linkedPeers);
-        // TODO: which list in network do we add ACTIVE ReticulumPeer ?
-        //var network = Network.getInstance();
-        //network.removeHandshakedPeer(peer);
-    }
-
-    // note: we already have a lobok getter for this
-    //public List<ReticulumPeer> getLinkedPeers() {
-    //    //synchronized(this.linkedPeers) {
-    //        //return new ArrayList<>(this.linkedPeers);
-    //        return this.linkedPeers;
-    //    //}
-    //}
-
-    public void addIncomingPeer(ReticulumPeer peer) {
-        this.incomingPeers.add(peer);
-        this.immutableIncomingPeers = List.copyOf(this.incomingPeers);
-    }
-
-    public void removeIncomingPeer(ReticulumPeer peer) {
-        if (nonNull(peer.getPeerLink())) {
-            peer.getPeerLink().teardown();
-        }
-        var p = this.incomingPeers.remove(this.incomingPeers.indexOf(peer));
-        this.immutableIncomingPeers = List.copyOf(this.incomingPeers);
-    }
-
-    // note: we already have a lobok getter for this
-    //public List<ReticulumPeer> getIncomingPeers() {
-    //    return this.incomingPeers;
-    //}
-    //public List<ReticulumPeer> getImmutableIncomingPeers() {
-    //    return this.immutableIncomingPeers;
-    //}
-
-    // TODO, methods for: getAvailablePeer
-
-    private Boolean isUnreachable(ReticulumPeer peer) {
-        var result = peer.getDeleteMe();
-        var now = Instant.now();
-        var peerLastAccessTimestamp = peer.getLastAccessTimestamp();
-        if (peerLastAccessTimestamp.isBefore(now.minusMillis(LINK_UNREACHABLE_TIMEOUT))) {
-            result = true;
-        }
-        return result;
-    }
-
-    public void peerMisbehaved(Peer peer) {
-        try {
-            if (Class.forName("org.qortal.network.ReticulumPeer").isInstance(peer)) {
-                PeerData peerData = peer.getPeerData();
-                peerData.setLastMisbehaved(NTP.getTime());
-            }
-        } catch (ClassNotFoundException e) {
-            log.error("class 'ReticulumPeer' not found", e);
-        }
-
-        //// Only update repository if outbound/initiator peer
-        //if (peer.getIsInitiator()) {
-        //    try (Repository repository = RepositoryManager.getRepository()) {
-        //        synchronized (this.allKnownPeers) {
-        //            repository.getNetworkRepository().save(peerData);
-        //            repository.saveChanges();
-        //        }
-        //    } catch (DataException e) {
-        //        log.warn("Repository issue while updating peer synchronization info", e);
-        //    }
-        //}
-    }
-
-    public List<ReticulumPeer> getNonActiveIncomingPeers() {
-        var ips = getIncomingPeers();
-        List<ReticulumPeer> result = Collections.synchronizedList(new ArrayList<>());
-        Link pl;
-        for (ReticulumPeer p: ips) {
-            pl = p.getPeerLink();
-            if (nonNull(pl)) {
-                if (pl.getStatus() != ACTIVE) {
-                    result.add(p);
-                }
-            } else {
-                result.add(p);
-            }
-        }
-        return result;
-    }
-
-    //@Synchronized
-    public void prunePeers() throws DataException {
-        // prune initiator peers
-        //var peerList = getImmutableLinkedPeers();
-        Link pLink;
-        List<ReticulumPeer> initiatorPeerList = getImmutableLinkedPeers();
-        List<ReticulumPeer> initiatorActivePeerList = getActiveImmutableLinkedPeers();
-        List<ReticulumPeer> incomingPeerList = getImmutableIncomingPeers();
-        int numActiveIncomingPeers = incomingPeerList.size() - getNonActiveIncomingPeers().size();
-        List<PeerData> allKnownReticulumPeers = new ArrayList<>();
-        //var network = Network.getInstance();
-        log.info("number of links (linkedPeers (active) / incomingPeers (active) before prunig: {} ({}), {} ({})",
-                initiatorPeerList.size(), getActiveImmutableLinkedPeers().size(),
-                incomingPeerList.size(), numActiveIncomingPeers);
-        for (ReticulumPeer p: initiatorActivePeerList) {
-            //pLink = p.getOrInitPeerLink();
-            p.pingRemote();
-        }
-        for (ReticulumPeer p : initiatorPeerList) {
-            pLink = p.getPeerLink();
-            if (nonNull(pLink)) {
-                if (p.getPeerTimedOut()) {
-                    // options: keep in case peer reconnects or remove => we'll remove it
-                    removeLinkedPeer(p);
-                    //network.removeHandshakedPeer(p);
-                    continue;
-                }
-                if (pLink.getStatus() == ACTIVE) {
-                    continue;
-                }
-                if ((pLink.getStatus() == CLOSED) || (p.getDeleteMe()))  {
-                    removeLinkedPeer(p);
-                    //network.removeHandshakedPeer(p);
-                    continue;
-                }
-                if (pLink.getStatus() == PENDING) {
-                    pLink.teardown();
-                    removeLinkedPeer(p);
-                    //network.removeOutboundHandshakedPeer(p);
-                    continue;
-                }
-            }
-        }
-        // prune non-initiator peers
-        List<ReticulumPeer> inaps = getNonActiveIncomingPeers();
-        incomingPeerList = this.incomingPeers;
-        for (ReticulumPeer p: incomingPeerList) {
-            pLink = p.getOrInitPeerLink();
-            if (nonNull(pLink) && (pLink.getStatus() == ACTIVE)) {
-                // make false active links to timeout (and teardown in timeout callback)
-                // note: actual removal of peer happens on the following pruning run.
-                p.pingRemote();
-            }
-        }
-        for (ReticulumPeer p: inaps) {
-            pLink = p.getPeerLink();
-            if (nonNull(pLink)) {
-                // could be eg. PENDING
-                pLink.teardown();
-            }
-            removeIncomingPeer(p);
-        }
-        initiatorPeerList = getImmutableLinkedPeers();
-        initiatorActivePeerList = getActiveImmutableLinkedPeers();
-        incomingPeerList = getImmutableIncomingPeers();
-        numActiveIncomingPeers = incomingPeerList.size() - getNonActiveIncomingPeers().size();
-        log.info("number of links (linkedPeers (active) / incomingPeers (active) after prunig: {} ({}), {} ({})",
-                initiatorPeerList.size(), getActiveImmutableLinkedPeers().size(),
-                incomingPeerList.size(), numActiveIncomingPeers);
-        maybeAnnounce(getBaseDestination(), RNSCommon.PeerAspect.BASE);
-        maybeAnnounce(getDataDestination(), RNSCommon.PeerAspect.DATA);
-    }
-
-    public void maybeAnnounce(Destination d, RNSCommon.PeerAspect pa) {
-        var activePeers = getActiveImmutableLinkedPeers();
-        int corePeerCount = 0;
-        int dataPeerCount = 0;
-        for (Peer p: activePeers) {
-            if (p.isDataPeer()) {
-                dataPeerCount++;
-            } else {
-                corePeerCount++;
-            }
-        }
-        if ((corePeerCount <= MIN_DESIRED_CORE_PEERS) && (pa == RNSCommon.PeerAspect.BASE)) {
-            log.info("Active core peers ({}) <= desired core peers ({}). Announcing", corePeerCount, MIN_DESIRED_CORE_PEERS);
-            d.announce();
-        }
-        if ((dataPeerCount <= MIN_DESIRED_DATA_PEERS) && (pa == RNSCommon.PeerAspect.DATA)) {
-            log.info("Active qdn peers ({}) <= desired data peers ({}). Announcing", dataPeerCount, MIN_DESIRED_CORE_PEERS);
-            d.announce();
-        }
-    }
-
-    /**
-     * Helper methods
-     */
-
-    public List<PeerData> getAllKnownPeers() {
-        return getImmutableIncomingPeers().stream()
-                .map(ReticulumPeer::getPeerData)
-                .collect(Collectors.toList());
-    }
-
-    public List<PeerData> getAllKnownCorePeers() {
-        return getImmutableIncomingPeers().stream()
-                .filter(p -> p.isDataPeer())
-                .map(ReticulumPeer::getPeerData)
-                .collect(Collectors.toList());
-    }
-
-    public List<PeerData> getAllKnownDataPeers() {
-        return getImmutableIncomingPeers().stream()
-                .filter(p -> !p.isDataPeer())
-                .map(ReticulumPeer::getPeerData)
-                .collect(Collectors.toList());
-    }
-
-    public ReticulumPeer findPeerByLink(Link link) {
-        List<ReticulumPeer> lps =  RNS.getInstance().getImmutableLinkedPeers();
-        ReticulumPeer peer = null;
-        for (ReticulumPeer p : lps) {
-            var pLink = p.getPeerLink();
-            if (nonNull(pLink)) {
-                if (Arrays.equals(pLink.getDestination().getHash(),link.getDestination().getHash())) {
-                    log.info("found peer matching destinationHash: {}", encodeHexString(link.getDestination().getHash()));
-                    peer = p;
-                    break;
-                }
-            }
-        }
-        return peer;
-    }
-
-    public ReticulumPeer findPeerByDestinationHash(byte[] dhash) {
-        List<ReticulumPeer> lps =  RNS.getInstance().getImmutableLinkedPeers();
-        ReticulumPeer peer = null;
-        for (ReticulumPeer p : lps) {
-            if (Arrays.equals(p.getDestinationHash(), dhash)) {
-                log.info("found peer matching destinationHash: {}", encodeHexString(dhash));
-                peer = p;
-                break;
-            }
-        }
-        return peer;
-    }
-
-    //public void removePeer(ReticulumPeer peer) {
-    //    List<ReticulumPeer> peerList = this.linkedPeers;
-    //    if (nonNull(peer)) {
-    //        peerList.remove(peer);
-    //    }
-    //}
-
-    public byte[] getMessageMagic() {
-        return Settings.getInstance().isTestNet() ? TESTNET_MESSAGE_MAGIC : MAINNET_MESSAGE_MAGIC;
-    }
-
-    public String getOurNodeId() {
-        return this.serverIdentity.toString();
-    }
-
-    protected byte[] getOurPublicKey() {
-        return this.serverIdentity.getPublicKey();
-    }
-
-    // Network methods Reticulum implementation
-
-    /** Builds either (legacy) HeightV2Message or (newer) BlockSummariesV2Message, depending on peer version.
-     *
-     *  @return Message, or null if DataException was thrown.
-     */
-    public Message buildHeightOrChainTipInfo(ReticulumPeer peer) {
-        // peer only used for version check
-        int latestHeight = Controller.getInstance().getChainHeight();
-
-        try (final Repository repository = RepositoryManager.getRepository()) {
-            List<BlockSummaryData> latestBlockSummaries = repository.getBlockRepository().getBlockSummaries(latestHeight - BROADCAST_CHAIN_TIP_DEPTH, latestHeight);
-            return new BlockSummariesV2Message(latestBlockSummaries);
-        } catch (DataException e) {
-            return null;
-        }
-    }
-
-}
-

src/main/java/org/qortal/network/RNSCommon.java

@@ -1,52 +0,0 @@
-package org.qortal.network;
-
-public class RNSCommon {
-
-    /**
-     * Destination application name
-     */
-    public static String MAINNET_APP_NAME = "qortal";      // production
-    public static String TESTNET_APP_NAME = "qortaltest";  // test net
-
-    /**
-     * Configuration path relative to the Qortal launch directory
-     */
-    public static String defaultRNSConfigPath = ".reticulum";
-    public static String defaultRNSConfigPathTestnet = ".reticulum_test";
-
-    /**
-     * Default config
-     */
-    public static String defaultRNSConfig = "reticulum_default_config.yml";
-    public static String defaultRNSConfigTestnet = "reticulum_default_testnet_config.yml";
-
-    /**
-     * Reticulum port for TCP Client interfaces
-     */
-    public static Integer MAINNET_IF_TCP_PORT = 4242;
-    public static Integer TESTNET_IF_TCP_PORT = 4240;
-
-    /**
-     * Reticulum Jinjava configuration template name
-     */
-    public static String jinjaConfigTemplateName = "reticulum_config_template.jinja";
-
-    /**
-     * Qortal Peer "aspect". For Reticulum, this translates to aspects:
-     * BASE ~= "qortal.core"
-     * DATA ~= "qortal.qdn"
-     */
-    public enum PeerAspect {
-        BASE,
-        DATA;
-    }
-
-    ///**
-    // * Qortal Peer Type
-    // */
-    //public enum PeerType {
-    //    IP,
-    //    RETICULUM;
-    //}
-
-}

src/main/java/org/qortal/network/ReticulumPeerAddress.java

@@ -1,49 +0,0 @@
-package org.qortal.network;
-
-//import lombok.Data;
-//import lombok.extern.slf4j.Slf4j;
-//import org.qortal.settings.Settings;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.net.InetSocketAddress;
-import static org.apache.commons.codec.binary.Hex.encodeHexString;
-
-/**
- * Convenience class for encapsulating/parsing/rendering/converting IP peer addresses
- * including late-stage resolving before actual use by a socket.
- */
-// All properties to be converted to JSON via JAXB
-//@Data
-//@Slf4j
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ReticulumPeerAddress implements PeerAddress {
-
-    byte[] dhash;
-
-	// Constructors
-
-	// For JAXB
-	protected ReticulumPeerAddress() {
-	}
-
-    @PeerAddressCtor("destination-hash")
-	public ReticulumPeerAddress(byte[] dhash) {
-      this.dhash = dhash;
-  }
-
-    @Override
-    public byte[] getDestinationHash() { return dhash; }
-
-    public static ReticulumPeerAddress fromString(String addressString) throws IllegalArgumentException {
-        return null;
-    }
-
-    @Override
-    public InetSocketAddress toSocketAddress() {
-        return null;
-    }
-    @Override
-    public String toString() { return encodeHexString(dhash); }
-
-    }

src/main/java/org/qortal/network/message/Message.java

@@ -9,8 +9,6 @@ import java.io.IOException;
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Network message for sending over network, or unpacked data received from network.
@@ -35,7 +33,6 @@ import org.apache.logging.log4j.Logger;
  * </p>
  */
 public abstract class Message {
-    private static final Logger LOGGER = LogManager.getLogger(Message.class);
 
 	// MAGIC(4) + TYPE(4) + HAS-ID(1) + ID?(4) + DATA-SIZE(4) + CHECKSUM?(4) + DATA?(*)
 	private static final int MAGIC_LENGTH = 4;
@@ -98,11 +95,9 @@ public abstract class Message {
 			byte[] messageMagic = new byte[MAGIC_LENGTH];
 			readOnlyBuffer.get(messageMagic);
 
-			if (!Arrays.equals(messageMagic, Network.getInstance().getMessageMagic())) {
-				LOGGER.info("xyz - mM: {}, Network getMessageMagic: {}", messageMagic, Network.getInstance().getMessageMagic());
+			if (!Arrays.equals(messageMagic, Network.getInstance().getMessageMagic()))
 				// Didn't receive correct Message "magic"
 				throw new MessageException("Received incorrect message 'magic'");
-			}
 
 			// Find supporting object
 			int typeValue = readOnlyBuffer.getInt();

src/main/java/org/qortal/network/message/PeersV2Message.java

@@ -2,7 +2,6 @@ package org.qortal.network.message;
 
 import com.google.common.primitives.Ints;
 import org.qortal.network.PeerAddress;
-import org.qortal.network.PeerAddressFactory;
 import org.qortal.settings.Settings;
 
 import java.io.ByteArrayOutputStream;
@@ -73,16 +72,12 @@ public class PeersV2Message extends Message {
 			String addressString = new String(addressBytes, StandardCharsets.UTF_8);
 
 			try {
-				//PeerAddress peerAddress = PeerAddress.fromString(addressString);
-                PeerAddress peerAddress = (PeerAddress) PeerAddressFactory.create("address", addressString);
+				PeerAddress peerAddress = PeerAddress.fromString(addressString);
 				peerAddresses.add(peerAddress);
 			} catch (IllegalArgumentException e) {
 				throw new MessageException("Invalid peer address in received PEERS_V2 message");
-			} catch (ReflectiveOperationException e) {
-                throw new MessageException("Failed to create peer address from received PEERS_V2 message");
-            }
-
-        }
+			}
+		}
 
 		return new PeersV2Message(id, peerAddresses);
 	}

src/main/java/org/qortal/network/task/ChannelAcceptTask.java

@@ -5,9 +5,7 @@ import org.apache.logging.log4j.Logger;
 import org.qortal.controller.arbitrary.ArbitraryDataFileManager;
 import org.qortal.network.Network;
 import org.qortal.network.Peer;
-import org.qortal.network.IPPeer;
 import org.qortal.network.PeerAddress;
-import org.qortal.network.IPPeerAddress;
 import org.qortal.settings.Settings;
 import org.qortal.utils.ExecuteProduceConsume.Task;
 import org.qortal.utils.NTP;
@@ -56,7 +54,7 @@ public class ChannelAcceptTask implements Task {
             return;
         }
 
-        PeerAddress address = (PeerAddress) IPPeerAddress.fromSocket(socketChannel.socket());
+        PeerAddress address = PeerAddress.fromSocket(socketChannel.socket());
         List<String> fixedNetwork = Settings.getInstance().getFixedNetwork();
         if (fixedNetwork != null && !fixedNetwork.isEmpty() && network.ipNotInFixedList(address, fixedNetwork)) {
             try {
@@ -121,11 +119,11 @@ public class ChannelAcceptTask implements Task {
 
             LOGGER.debug("Connection accepted from peer {}", address);
 
-            newPeer = new IPPeer(socketChannel);
+            newPeer = new Peer(socketChannel);
             if (isDataPeer) {
                 newPeer.setMaxConnectionAge(Settings.getInstance().getMaxDataPeerConnectionTime() * 1000L);
             }
-            ((IPPeer) newPeer).setIsDataPeer(isDataPeer);
+            newPeer.setIsDataPeer(isDataPeer);
             network.addConnectedPeer(newPeer);
 
         } catch (IOException e) {

src/main/java/org/qortal/network/task/ReticulumMessageTask.java

@@ -1,30 +0,0 @@
-package org.qortal.network.task;
-
-import org.qortal.network.Network;
-import org.qortal.network.ReticulumPeer;
-import org.qortal.network.message.Message;
-import org.qortal.utils.ExecuteProduceConsume.Task;
-
-public class ReticulumMessageTask implements Task {
-    private final ReticulumPeer peer;
-    private final Message nextMessage;
-    private final String name;
-
-    public ReticulumMessageTask(ReticulumPeer peer, Message nextMessage) {
-        this.peer = peer;
-        this.nextMessage = nextMessage;
-        this.name = "MessageTask::" + peer + "::" + nextMessage.getType();
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void perform() throws InterruptedException {
-        //RNSNetwork.getInstance().onMessage(peer, nextMessage);
-        // TODO: what do we do in the Reticulum case?
-        // Note: this is automatically handled (asynchronously) by the RNSPeer peerBufferReady callback
-    }
-}

src/main/java/org/qortal/network/task/ReticulumPingTask.java

@@ -1,45 +0,0 @@
-package org.qortal.network.task;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.qortal.network.ReticulumPeer;
-import org.qortal.network.message.Message;
-import org.qortal.network.message.MessageType;
-import org.qortal.network.message.PingMessage;
-import org.qortal.network.message.MessageException;
-import org.qortal.utils.ExecuteProduceConsume.Task;
-import org.qortal.utils.NTP;
-
-public class ReticulumPingTask implements Task {
-    private static final Logger LOGGER = LogManager.getLogger(PingTask.class);
-
-    private final ReticulumPeer peer;
-    private final Long now;
-    private final String name;
-
-    public ReticulumPingTask(ReticulumPeer peer, Long now) {
-        this.peer = peer;
-        this.now = now;
-        this.name = "PingTask::" + peer;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void perform() throws InterruptedException {
-        PingMessage pingMessage = new PingMessage();
-
-        // Note: Even though getResponse would work, we can use
-        //       peer.sendMessage(pingMessage) using Reticulum buffer instead.
-        //       More efficient and saves room for other request/response tasks.
-        //peer.getResponse(pingMessage);
-        // Note: We chose asynchronous for ping, no need to block queues for this.
-        peer.sendMessage(pingMessage);
-
-        //// task is not over here (Reticulum is asynchronous)
-        //peer.setLastPing(NTP.getTime() - now);
-    }
-}

src/main/java/org/qortal/repository/hsqldb/HSQLDBNetworkRepository.java

@@ -2,8 +2,6 @@ package org.qortal.repository.hsqldb;
 
 import org.qortal.data.network.PeerData;
 import org.qortal.network.PeerAddress;
-import org.qortal.network.PeerAddressFactory;
-import org.qortal.network.message.MessageException;
 import org.qortal.repository.DataException;
 import org.qortal.repository.NetworkRepository;
 
@@ -33,8 +31,7 @@ public class HSQLDBNetworkRepository implements NetworkRepository {
 			// NOTE: do-while because checkedExecute() above has already called rs.next() for us
 			do {
 				String address = resultSet.getString(1);
-				//PeerAddress peerAddress = PeerAddress.fromString(address);
-                PeerAddress peerAddress = (PeerAddress) PeerAddressFactory.create("address", address);
+				PeerAddress peerAddress = PeerAddress.fromString(address);
 
 				Long lastConnected = resultSet.getLong(2);
 				if (lastConnected == 0 && resultSet.wasNull())
@@ -62,9 +59,7 @@ public class HSQLDBNetworkRepository implements NetworkRepository {
 			throw new DataException("Refusing to fetch invalid peer from repository", e);
 		} catch (SQLException e) {
 			throw new DataException("Unable to fetch peers from repository", e);
-		} catch (ReflectiveOperationException e) {
-            throw new DataException("Failed to create peer address from repository", e);
-        }
+		}
 	}
 
 	@Override

src/main/java/org/qortal/settings/Settings.java

@@ -545,7 +545,22 @@ public class Settings {
 	 */
 	private int rebuildArbitraryResourceCacheTaskPeriod = 24;
 
-	// Domain mapping
+	/**
+	 * Electrum Thread Count
+	 *
+	 * The number of threads ready to access Electrum servers for the supported foreign coins.
+	 */
+    private int electrumThreadCount = 12;
+
+	/**
+	 * Host Monitor Enabled
+	 *
+	 * The Host Monitor is a thread that runs in the background. It crawls through the QDN data directory to monitor
+	 * what is in there. If set to false, then it will not run.
+	 */
+    private  boolean hostMonitorEnabled = false;
+
+    // Domain mapping
 	public static class ThreadLimit {
 		private String messageType;
 		private Integer limit;
@@ -614,36 +629,6 @@ public class Settings {
 		}
 	}
 
-	// Related to mesh networking
-
-    public enum NetworkType {
-        IP,
-        RETICULUM;
-    }
-	/** Preferred network (from above, one of "IP","RETICULUM") */
-	private String preferredNetwork = NetworkType.RETICULUM.name();
-	/** Maximum number of Reticulum peers allowed. */
-	private int reticulumMaxPeers = 55;
-	/** Minimum number of Reticulum Core peers desired. */
-	private int reticulumMinDesiredCorePeers = 5;
-    /** Minimum number of Reticulum Data peers desired. */
-    private int reticulumMinDesiredDataPeers = 8;
-	/** Maximum number of task executor network threads */
-	//private int reticulumMaxNetworkThreadPoolSize = 89;
-	/** Node provides a TCPServerInterface or other "qortal"/"qortaltest" gateway interface */
-	private boolean reticulumHasServerInterface = false;
-	/** Number of desired client Interfaces (taken from core server list) */
-	private int reticulumDesiredClientInterfaces = 1;
-	/** Array of core Reticulum server hostnames. TCP only */
-	private String[] reticulumTcpGatewayServers = new String[]{
-			"phantom.mobilefabrik.com",
-			"phantom.tuergass.net"
-	};
-	/** There is a Python rnsd running on the node with a gateway inteface to use */
-	private boolean reticulumUsePythonRNS = false;
-	/** Specify the port if reticulumUsePythonRNS=true and rnsd has a TCPServerInterface */
-	private int reticulumPythonRNSGatewayPort = 4242;
-
 	// Constructors
 
 	private Settings() {
@@ -1401,42 +1386,6 @@ public class Settings {
 		return connectionPoolMonitorEnabled;
 	}
 
-	public NetworkType getPreferredNetwork () {
-		if (this.preferredNetwork.compareToIgnoreCase("RETICULUM") == 0) {
-            return NetworkType.RETICULUM;
-        } else {
-            return NetworkType.IP;
-        }
-	}
-
-	public int getReticulumMaxPeers() {
-		return this.reticulumMaxPeers;
-	}
-
-	public int getReticulumMinDesiredCorePeers() {
-		return this.reticulumMinDesiredCorePeers;
-	}
-
-    public int getReticulumMinDesiredDataPeers() {
-        return this.reticulumMinDesiredDataPeers;
-    }
-
-	//public int getReticulumMaxNetworkThreadPoolSize() {
-	//	return this.reticulumMaxNetworkThreadPoolSize;
-  	//}
-
-	public boolean getReticulumIsGateway() { return this.reticulumHasServerInterface; }
-
-	public int getReticulumDesiredClientInterfaces() { return this.reticulumDesiredClientInterfaces; }
-
-	public String[] getReticulumTcpGatewayServers() {
-		return this.reticulumTcpGatewayServers;
-	}
-
-	public boolean getReticulumUsePythonRNS() { return this.reticulumUsePythonRNS; }
-
-	public int getReticulumPythonRNSGatewayPort() { return this.reticulumPythonRNSGatewayPort; }
-
 	public int getBuildArbitraryResourcesBatchSize() {
 		return buildArbitraryResourcesBatchSize;
 	}
@@ -1460,4 +1409,12 @@ public class Settings {
 	public int getRebuildArbitraryResourceCacheTaskPeriod() {
 		return rebuildArbitraryResourceCacheTaskPeriod;
 	}
+
+	public int getElectrumThreadCount() {
+		return electrumThreadCount;
+	}
+
+	public boolean isHostMonitorEnabled() {
+		return hostMonitorEnabled;
+	}
 }

src/main/java/org/qortal/utils/ArbitraryIndexUtils.java

@@ -58,8 +58,8 @@ public class ArbitraryIndexUtils {
             }
         };
 
-        // delay 1 second
-        timer.scheduleAtFixedRate(task, 1_000, frequency * 60_000);
+        // delay by the frequency
+        timer.scheduleAtFixedRate(task, frequency * 60_000, frequency * 60_000);
     }
 
     private static void fillCache(IndexCache instance) throws DataException, IOException {

src/main/java/org/qortal/utils/ArbitraryTransactionUtils.java

@@ -396,8 +396,7 @@ public class ArbitraryTransactionUtils {
         return filesRelocatedCount;
     }
 
-    public static List<ArbitraryTransactionData> limitOffsetTransactions(List<ArbitraryTransactionData> transactions,
-                                                                         Integer limit, Integer offset) {
+    public static <T> List<T> limitOffsetTransactions(List<T> transactions, Integer limit, Integer offset) {
         if (limit != null && limit == 0) {
             limit = null;
         }

src/main/resources/reticulum_config_template.jinja

@@ -1,68 +0,0 @@
----
-# Reticulum server config
-#
-# Qortal settings (settins.json) used for generation of this config:
-# "reticulumHasServerInterface": node has gateway interface [boolean]
-# "reticulumDesiredClientInterfaces": how many TCP server interfaces
-#                                      to generate [integer] (deafault: 1)
-# "reticulumTcpGatewayServers": list of TCP Gateway node fqdn[:port] strings
-#                               (port optional) [json list]
-# "reticulumUsePythonRNS": there is a Python shared rnsd on on the node [boolean]
-#                          Note: the rnsd instance must have a gateway interface
-# "reticulumPythonRNSGatewayPort": the port to the desired PythonRNS interface [int]
-
-reticulum:
-
-  # Unless we have a native gateway interface we don't need routing
-  enable_transport: false
-
-  share_instance: false
-
-  # default used by RNS
-  #shared_instance_port: 37428
-  #instance_control_port: 37429
-  # we'll use a different default port
-  shared_instance_port: 37438
-  instance_control_port: 37439
-
-  panic_on_interface_error: false
-
-interfaces:
-
-  # This interface enables communication with other
-  # link-local Reticulum nodes over UDP. It does not
-  # need any functional IP infrastructure like routers
-  # or DHCP servers, but will require that at least link-
-  # local IPv6 is enabled in your operating system.
-  "Default Interface":
-    type: AutoInterface
-    enabled: true
-
-{% if use_python_rns %}
-  # gateway node: client to local Python RNS instance
-  "TCP Client Interface qortal local":
-    type: TCPClientInterface
-    enabled: true
-    target_host: localhost
-    target_port: {{ python_rns_if_port }}
-    network_name: {{ qortal_network_name }}
-{% endif %}
-{%- set gateway_servers = tcp_gateway_servers|split(' ')|shuffle -%}
-{%- for item in gateway_servers -%}
-  {%- set fqdn_port_list = item|split(':') -%}
-  {%- if fqdn_port_list|length > 1 -%}
-    {%- set item_fqdn = fqdn_port_list[0] -%}
-    {%- set item_target_port = fqdn_port_list[1] -%}
-  {%- else -%}
-    {%- set item_fqdn = item -%}
-    {%- set item_target_port = target_port -%}
-  {%- endif -%}
-  {% if (loop.index <= num_client_interfaces) and (item_fqdn != host_fqdn) %}
-  "TCP Client Interface qortal {{ item_fqdn }}":
-    type: TCPClientInterface
-    enabled: true
-    target_host: {{ item_fqdn }}
-    target_port: {{ item_target_port }}
-    network_name: {{ qortal_network_name }}
-  {% endif %}
-{%- endfor -%}

src/main/resources/reticulum_default_config.yml

@@ -1,93 +0,0 @@
----
-# You should probably edit it to include any additional,
-# interfaces and settings you might need.
-
-# Only the most basic options are included in this default
-# configuration. To see a more verbose, and much longer,
-# configuration example, you can run the command:
-# rnsd --exampleconfig
-
-reticulum:
-
-  # If you enable Transport, your system will route traffic
-  # for other peers, pass announces and serve path requests.
-  # This should only be done for systems that are suited to
-  # act as transport nodes, ie. if they are stationary and
-  # always-on. This directive is optional and can be removed
-  # for brevity.
-
-  enable_transport: false
-
-  # By default, the first program to launch the Reticulum
-  # Network Stack will create a shared instance, that other
-  # programs can communicate with. Only the shared instance
-  # opens all the configured interfaces directly, and other
-  # local programs communicate with the shared instance over
-  # a local socket. This is completely transparent to the
-  # user, and should generally be turned on. This directive
-  # is optional and can be removed for brevity.
-
-  share_instance: false
-
-  # If you want to run multiple *different* shared instances
-  # on the same system, you will need to specify different
-  # shared instance ports for each. The defaults are given
-  # below, and again, these options can be left out if you
-  # don't need them.
-
-  #shared_instance_port: 37428
-  #instance_control_port: 37429
-  shared_instance_port: 37438
-  instance_control_port: 37439
-
-  # You can configure Reticulum to panic and forcibly close
-  # if an unrecoverable interface error occurs, such as the
-  # hardware device for an interface disappearing. This is
-  # an optional directive, and can be left out for brevity.
-  # This behaviour is disabled by default.
-
-  panic_on_interface_error: false
-
-
-# The interfaces section defines the physical and virtual
-# interfaces Reticulum will use to communicate on. This
-# section will contain examples for a variety of interface
-# types. You can modify these or use them as a basis for
-# your own config, or simply remove the unused ones.
-
-interfaces:
-
-  # This interface enables communication with other
-  # link-local Reticulum nodes over UDP. It does not
-  # need any functional IP infrastructure like routers
-  # or DHCP servers, but will require that at least link-
-  # local IPv6 is enabled in your operating system, which
-  # should be enabled by default in almost any OS. See
-  # the Reticulum Manual for more configuration options.
-  "Default Interface":
-    type: AutoInterface
-    enabled: true
-
-  # This interface enables communication with a "backbone"
-  # server over TCP.
-  # Note: others may be added for redundancy
-  "TCP Client Interface mobilefabrik":
-    type: TCPClientInterface
-    enabled: true
-    target_host: phantom.mobilefabrik.com
-    target_port: 4242
-    network_name: qortal
-
-  # This interface turns this Reticulum instance into a
-  # server other clients can connect to over TCP.
-  # To enable this instance to route traffic the above
-  # setting "enable_transport" needs to be set (to true).
-  # Note: this interface type is not yet supported by
-  #       reticulum-network-stack.
-  #"TCP Server Interface":
-  #  type: TCPServerInterface
-  #  enabled: true
-  #  listen_ip: 0.0.0.0
-  #  listen_port: 4242
-  #  network_name: qortal
-

src/main/resources/reticulum_default_testnet_config.yml

@@ -1,93 +0,0 @@
----
-# You should probably edit it to include any additional,
-# interfaces and settings you might need.
-
-# Only the most basic options are included in this default
-# configuration. To see a more verbose, and much longer,
-# configuration example, you can run the command:
-# rnsd --exampleconfig
-
-reticulum:
-
-  # If you enable Transport, your system will route traffic
-  # for other peers, pass announces and serve path requests.
-  # This should only be done for systems that are suited to
-  # act as transport nodes, ie. if they are stationary and
-  # always-on. This directive is optional and can be removed
-  # for brevity.
-
-  enable_transport: false
-
-  # By default, the first program to launch the Reticulum
-  # Network Stack will create a shared instance, that other
-  # programs can communicate with. Only the shared instance
-  # opens all the configured interfaces directly, and other
-  # local programs communicate with the shared instance over
-  # a local socket. This is completely transparent to the
-  # user, and should generally be turned on. This directive
-  # is optional and can be removed for brevity.
-
-  share_instance: false
-
-  # If you want to run multiple *different* shared instances
-  # on the same system, you will need to specify different
-  # shared instance ports for each. The defaults are given
-  # below, and again, these options can be left out if you
-  # don't need them.
-
-  #shared_instance_port: 37428
-  #instance_control_port: 37429
-  shared_instance_port: 37438
-  instance_control_port: 37439
-
-  # You can configure Reticulum to panic and forcibly close
-  # if an unrecoverable interface error occurs, such as the
-  # hardware device for an interface disappearing. This is
-  # an optional directive, and can be left out for brevity.
-  # This behaviour is disabled by default.
-
-  panic_on_interface_error: false
-
-
-# The interfaces section defines the physical and virtual
-# interfaces Reticulum will use to communicate on. This
-# section will contain examples for a variety of interface
-# types. You can modify these or use them as a basis for
-# your own config, or simply remove the unused ones.
-
-interfaces:
-
-  # This interface enables communication with other
-  # link-local Reticulum nodes over UDP. It does not
-  # need any functional IP infrastructure like routers
-  # or DHCP servers, but will require that at least link-
-  # local IPv6 is enabled in your operating system, which
-  # should be enabled by default in almost any OS. See
-  # the Reticulum Manual for more configuration options.
-  "Default Interface":
-    type: AutoInterface
-    enabled: true
-
-  # This interface enables communication with a "backbone"
-  # server over TCP.
-  # Note: others may be added for redundancy
-  "TCP Client Interface mobilefabrik":
-    type: TCPClientInterface
-    enabled: true
-    target_host: phantom.mobilefabrik.com
-    target_port: 4242
-    network_name: qortaltest
-
-  # This interface turns this Reticulum instance into a
-  # server other clients can connect to over TCP.
-  # To enable this instance to route traffic the above
-  # setting "enable_transport" needs to be set (to true).
-  # Note: this interface type is not yet supported by
-  #       reticulum-network-stack.
-  #"TCP Server Interface":
-  #  type: TCPServerInterface
-  #  enabled: true
-  #  listen_ip: 0.0.0.0
-  #  listen_port: 4242
-  #  network_name: qortaltest
-

src/test/java/org/qortal/test/network/RNSNetworkTest.java

@@ -1,70 +0,0 @@
-package org.qortal.test.network;
-
-import org.apache.commons.lang3.StringUtils;
-//import org.junit.Before;
-//import org.junit.Ignore;
-import org.junit.Test;
-
-//import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-//import java.util.Arrays;
-
-import static io.reticulum.constant.ReticulumConstant.ETC_DIR;
-import static org.apache.commons.lang3.SystemUtils.USER_HOME;
-//import static org.junit.Assert.assertNotNull;
-
-class ReticulumTest {
-
-    //@Test
-    //void t() throws DecoderException {
-    //    System.out.println(Arrays.toString(Hex.decodeHex("adf54d882c9a9b80771eb4995d702d4a3e733391b2a0f53f416d9f907e55cff8")));
-    //    System.out.println(2 + 1 + (128 / 8) * 2);
-    //}
-
-    @Test
-    void path() {
-        System.out.println(initConfig(null));
-    }
-
-    //@Test
-    //void testConfigYamlParse() throws IOException {
-    //    var config = ConfigObj.initConfig(Path.of(getSystemClassLoader().getResource("reticulum.default.yml").getPath()));
-    //    assertNotNull(config);
-    //}
-
-    //@Test
-    //void testHKDF() {
-    //    var ifac_netname = "name";
-    //    var ifac_netkey = "password";
-    //    var ifacOrigin = new byte[]{};
-    //    ifacOrigin = ArrayUtils.addAll(ifacOrigin, getSha256Digest().digest(ifac_netname.getBytes(UTF_8)));
-    //    ifacOrigin = ArrayUtils.addAll(ifacOrigin, getSha256Digest().digest(ifac_netkey.getBytes(UTF_8)));
-    //
-    //    var ifacOriginHash = getSha256Digest().digest(ifacOrigin);
-    //
-    //    var HKDF = new HKDFBytesGenerator(new SHA256Digest());
-    //    HKDF.init(new HKDFParameters(ifacOriginHash, IFAC_SALT, new byte[0]));
-    //    var result = new byte[64];
-    //    var len = HKDF.generateBytes(result, 0, result.length);
-    //
-    //    assertNotNull(Hex.encodeHexString(result));
-    //}
-
-    private String initConfig(String configDir) {
-        if (StringUtils.isNotBlank(configDir)) {
-            return configDir;
-        } else {
-            if (Files.isDirectory(Path.of(ETC_DIR)) && Files.exists(Path.of(ETC_DIR, "config"))) {
-                return ETC_DIR;
-            } else if (
-                    Files.isDirectory(Path.of(USER_HOME, ".config", "reticulum"))
-                            && Files.exists(Path.of(USER_HOME, ".config", "reticulum", "config"))
-            ) {
-                return Path.of(USER_HOME, ".config", "reticulum").toString();
-            } else {
-                return Path.of(USER_HOME, ".reticulum").toString();
-            }
-        }
-    }
-}

start.sh

@@ -48,9 +48,6 @@ JVM_MEMORY_ARGS="-XX:MaxRAMPercentage=50 -XX:+UseG1GC -Xss1024k"
 nohup nice -n 20 java \
 	-Djava.net.preferIPv4Stack=false \
 	${JVM_MEMORY_ARGS} \
-  --add-opens=java.base/java.lang=ALL-UNNAMED \
-  --add-opens=java.base/java.net=ALL-UNNAMED \
-  --illegal-access=warn \
 	-jar qortal.jar \
 	1>run.log 2>&1 &