Merge remote-tracking branch 'upstream/develop' into evmjit-resolve-jumps

CMakeLists.txt

@@ -1,7 +1,7 @@
 # cmake global
 cmake_minimum_required(VERSION 2.8.12)
 
-set(PROJECT_VERSION "0.9.40")
+set(PROJECT_VERSION "0.9.41")
 if (${CMAKE_VERSION} VERSION_GREATER 3.0)
 	cmake_policy(SET CMP0042 OLD) 	# fix MACOSX_RPATH
 	cmake_policy(SET CMP0048 NEW) 	# allow VERSION argument in project()

CodingStandards.txt

@@ -226,3 +226,15 @@ a. Includes should go in order of lower level (STL -> boost -> libdevcore -> lib
 #include <libethereum/Defaults.h>
 
 b. The only exception to the above rule is the top of a .cpp file where its corresponding header should be located.
+
+13. Logging
+
+Logging should be performed at appropriate verbosities depending on the logging message.
+The more likely a message is to repeat (and thus cuase noise) the higher in verbosity it should be.
+Some rules to keep in mind:
+
+ - Verbosity == 0 -> Reserved for important stuff that users must see and can understand.
+ - Verbosity == 1 -> Reserved for stuff that users don't need to see but can understand.
+ - Verbosity >= 2 -> Anything that is or might be displayed more than once every minute
+ - Verbosity >= 3 -> Anything that only a developer would understand
+ - Verbosity >= 4 -> Anything that is low-level (e.g. peer disconnects, timers being cancelled)

GPLV3_LICENSE

@@ -0,0 +1,673 @@
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            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 <http://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
+<http://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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

LICENSE

@@ -1,673 +1,21 @@
-                       Version 3, 29 June 2007
+The MIT License (MIT)
-
+
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Copyright (c) 2015 <copyright holders>
- Everyone is permitted to copy and distribute verbatim copies
+
- of this license document, but changing it is not allowed.
+Permission is hereby granted, free of charge, to any person obtaining a copy
-
+of this software and associated documentation files (the "Software"), to deal
-                            Preamble
+in the Software without restriction, including without limitation the rights
-
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  The GNU General Public License is a free, copyleft license for
+copies of the Software, and to permit persons to whom the Software is
-software and other kinds of works.
+furnished to do so, subject to the following conditions:
-
+
-  The licenses for most software and other practical works are designed
+The above copyright notice and this permission notice shall be included in
-to take away your freedom to share and change the works.  By contrast,
+all copies or substantial portions of the Software.
-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
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-software for all its users.  We, the Free Software Foundation, use the
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-GNU General Public License for most of our software; it applies also to
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-any other work released this way by its authors.  You can apply it to
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-your programs, too.
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  When we speak of free software, we are referring to freedom, not
+THE SOFTWARE.
-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 <http://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
-<http://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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -43,10 +43,25 @@ See [TODO](https://github.com/ethereum/cpp-ethereum/wiki/TODO)
 
 ### License
 
-See [LICENSE](LICENSE)
+All new contributions are under the [MIT license](http://opensource.org/licenses/MIT).
+See [LICENSE](LICENSE). Some old contributions are under the [GPLv3 license](http://www.gnu.org/licenses/gpl-3.0.en.html). See [GPLV3_LICENSE](GPLV3_LICENSE).
 
 ### Contributing
 
+All new contributions are added under the MIT License. Please refer to the `LICENSE` file in the root directory.
+To state that you accept this fact for all of your contributions please add yourself to the list of external contributors like in the example below.
+
+#### External Contributors
+I hereby place all my contributions in this codebase under an MIT
+licence, as specified [here](http://opensource.org/licenses/MIT).
+- *Name Surname* (**email@domain**)
+
+#### Contribution guideline
+
+Please add yourself in the `@author` doxygen  section of the file your are adding/editing
+with the same wording as the one you listed yourself in the external contributors section above,
+only replacing the word **contribution** by **file**
+
 All development goes in develop branch - please don't submit pull requests to master.
 
 Please read [CodingStandards.txt](CodingStandards.txt) thoroughly before making alterations to the code base. Please do *NOT* use an editor that automatically reformats whitespace away from astylerc or the formatting guidelines as described in [CodingStandards.txt](CodingStandards.txt).

alethzero/AllAccounts.cpp

@@ -19,6 +19,8 @@
  * @date 2015
  */
 
+#if ETH_FATDB
+
 #include "AllAccounts.h"
 #include <sstream>
 #include <QClipboard>
@@ -32,6 +34,8 @@ using namespace dev;
 using namespace az;
 using namespace eth;
 
+DEV_AZ_NOTE_PLUGIN(AllAccounts);
+
 AllAccounts::AllAccounts(MainFace* _m):
 	Plugin(_m, "AllAccounts"),
 	m_ui(new Ui::AllAccounts)
@@ -131,3 +135,4 @@ void AllAccounts::on_accounts_doubleClicked()
 	}
 }
 
+#endif

alethzero/AllAccounts.h

@@ -21,6 +21,8 @@
 
 #pragma once
 
+#if ETH_FATDB
+
 #include <QListWidget>
 #include <QPlainTextEdit>
 #include "MainFace.h"
@@ -58,3 +60,5 @@ private:
 
 }
 }
+
+#endif

alethzero/BrainWallet.cpp

@@ -34,14 +34,12 @@ using namespace dev;
 using namespace az;
 using namespace eth;
 
+DEV_AZ_NOTE_PLUGIN(BrainWallet);
+
 BrainWallet::BrainWallet(MainFace* _m):
 	Plugin(_m, "BrainWallet")
 {
-	QAction* a = new QAction("New Brain Wallet...", main());
+	connect(addMenuItem("New Brain Wallet...", "menuTools", true), SIGNAL(triggered()), SLOT(create()));
-	QMenu* m = _m->findChild<QMenu*>("menuTools");
-	m->addSeparator();
-	m->addAction(a);
-	connect(a, SIGNAL(triggered()), SLOT(create()));
 }
 
 BrainWallet::~BrainWallet()

alethzero/BrainWallet.ui

@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;WARNING: Brain wallets, or human-entropic seeds, are practically and cryptographically insecure. They're a terrible idea for protecteding anything of value and this functionality is here only as a toy.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;That said, if you're intent on using one, make the phrase as long and random as you can. If you're sensible, you'll ask the internet for a list of words to memorise and use those. Write the phrase down on paper and bury it under an oak tree or something - if you forget it, you're screwed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;WARNING: Brain wallets, or human-entropic seeds, are generally a Bad Plan. Unless used properly they're a terrible idea for protecteding anything of value. Read up on them and know the risks before using this functionality!&lt;/span&gt;&lt;/p&gt;&lt;p&gt;That said, if you're intent on using one, make the phrase as long and random as you can. If you're sensible, you'll use the Generate button and memorise the list of words it gives you. This is the only way to guarantee a strong brainwallet. Write the phrase down on paper and bury it under an oak tree or something - if you forget it, you're screwed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -34,7 +34,7 @@
    <item>
     <widget class="QTextEdit" name="seed">
      <property name="placeholderText">
-      <string>Write your seed phrase here. Make it long and random. Don't ever forget it. If you want it to have any chance at being secure, ask a machine to select 13 dictionary words at random.</string>
+      <string>Write your seed phrase here. Make it long and random. Don't ever forget it. If you want it to have any chance at being secure, hit the Generate button and memorize what ends up here.</string>
      </property>
     </widget>
    </item>

alethzero/CMakeLists.txt

@@ -22,7 +22,7 @@ include_directories(${Boost_INCLUDE_DIRS})
 
 find_package (Qt5WebEngine)
 find_package (Qt5WebEngineWidgets)
-if (APPLE)
+if (APPLE AND (NOT "${Qt5Core_VERSION_STRING}" VERSION_LESS "5.5"))
 # TODO: remove indirect dependencies once macdeployqt is fixed
 	find_package (Qt5WebEngineCore)
 	find_package (Qt5DBus)
@@ -41,6 +41,7 @@ qt5_wrap_ui(ui_GasPricing.h GasPricing.ui)
 qt5_wrap_ui(ui_AllAccounts.h AllAccounts.ui)
 qt5_wrap_ui(ui_LogPanel.h LogPanel.ui)
 qt5_wrap_ui(ui_BrainWallet.h BrainWallet.ui)
+qt5_wrap_ui(ui_OtherAccounts.h OtherAccounts.ui)
 
 file(GLOB HEADERS "*.h")
 
@@ -53,7 +54,7 @@ endif ()
 # eth_add_executable is defined in cmake/EthExecutableHelper.cmake
 eth_add_executable(${EXECUTABLE} 
 	ICON alethzero
-	UI_RESOURCES alethzero.icns Main.ui Connect.ui Debugger.ui Transact.ui ExportState.ui GetPassword.ui GasPricing.ui AllAccounts.ui LogPanel.ui BrainWallet.ui
+	UI_RESOURCES alethzero.icns Main.ui Connect.ui Debugger.ui Transact.ui ExportState.ui GetPassword.ui GasPricing.ui AllAccounts.ui LogPanel.ui BrainWallet.ui OtherAccounts.ui
 	WIN_RESOURCES alethzero.rc
 )
 
@@ -63,7 +64,7 @@ target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} Qt5::Widgets)
 target_link_libraries(${EXECUTABLE} Qt5::WebEngine)
 target_link_libraries(${EXECUTABLE} Qt5::WebEngineWidgets)
-if (APPLE)
+if (APPLE AND (NOT "${Qt5Core_VERSION_STRING}" VERSION_LESS "5.5"))
     target_link_libraries(${EXECUTABLE} Qt5::WebEngineCore)
 	target_link_libraries(${EXECUTABLE} Qt5::DBus)
 	target_link_libraries(${EXECUTABLE} Qt5::PrintSupport)

alethzero/Context.cpp

@@ -39,12 +39,17 @@ Context::~Context()
 void dev::az::setValueUnits(QComboBox* _units, QSpinBox* _value, u256 _v)
 {
 	initUnits(_units);
+	if (_v > 0)
+	{
 		_units->setCurrentIndex(0);
 		while (_v > 50000 && _units->currentIndex() < (int)(units().size() - 2))
 		{
 			_v /= 1000;
 			_units->setCurrentIndex(_units->currentIndex() + 1);
 		}
+	}
+	else
+		_units->setCurrentIndex(6);
 	_value->setValue((unsigned)_v);
 }
 

alethzero/Debugger.cpp

@@ -246,8 +246,10 @@ void Debugger::update()
 			ss << dec << "STEP: " << ws.steps << "  |  PC: 0x" << hex << ws.curPC << "  :  " << instructionInfo(ws.inst).name << "  |  ADDMEM: " << dec << ws.newMemSize << " words  |  COST: " << dec << ws.gasCost <<  "  |  GAS: " << dec << ws.gas;
 			ui->debugStateInfo->setText(QString::fromStdString(ss.str()));
 			stringstream s;
-			for (auto const& i: ws.storage)
+			auto keys = dev::keysOf(ws.storage);
-				s << "@" << m_context->prettyU256(i.first) << "&nbsp;&nbsp;&nbsp;&nbsp;" << m_context->prettyU256(i.second) << "<br/>";
+			sort(keys.begin(), keys.end());
+			for (auto const& key: keys)
+				s << "@" << m_context->prettyU256(key) << "&nbsp;&nbsp;&nbsp;&nbsp;" << m_context->prettyU256(ws.storage.at(key)) << "<br/>";
 			ui->debugStorage->setHtml(QString::fromStdString(s.str()));
 		}
 	}
@@ -346,7 +348,7 @@ void Debugger::on_dump_clicked()
 	ofstream f(fn.toStdString());
 	if (f.is_open())
 		for (WorldState const& ws: m_session.history)
-			f << ws.cur << " " << hex << toHex(dev::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(dev::toCompactBigEndian((int)(byte)ws.inst, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
+			f << ws.cur << " " << hex << toHex(dev::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(dev::toCompactBigEndian((unsigned)(byte)ws.inst, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
 }
 
 void Debugger::on_dumpPretty_clicked()
@@ -377,6 +379,6 @@ void Debugger::on_dumpStorage_clicked()
 			if (ws.inst == Instruction::STOP || ws.inst == Instruction::RETURN || ws.inst == Instruction::SUICIDE)
 				for (auto i: ws.storage)
 					f << toHex(dev::toCompactBigEndian(i.first, 1)) << " " << toHex(dev::toCompactBigEndian(i.second, 1)) << endl;
-			f << ws.cur << " " << hex << toHex(dev::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(dev::toCompactBigEndian((int)(byte)ws.inst, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
+			f << ws.cur << " " << hex << toHex(dev::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(dev::toCompactBigEndian((unsigned)(byte)ws.inst, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
 		}
 }

alethzero/LogPanel.cpp

@@ -38,6 +38,8 @@ static QString filterOutTerminal(QString _s)
 	return _s.replace(QRegExp("\x1b\\[(\\d;)?\\d+m"), "");
 }
 
+DEV_AZ_NOTE_PLUGIN(LogPanel);
+
 LogPanel::LogPanel(MainFace* _m):
 	Plugin(_m, "LogPanel"),
 	m_ui(new Ui::LogPanel)

alethzero/MainFace.cpp

@@ -19,11 +19,31 @@
  * @date 2014
  */
 
+#include <QMenu>
 #include "MainFace.h"
 using namespace std;
 using namespace dev;
 using namespace az;
 
+void AccountNamer::noteKnownChanged()
+{
+	if (m_main)
+		m_main->noteKnownAddressesChanged(this);
+}
+
+void AccountNamer::noteNamesChanged()
+{
+	if (m_main)
+		m_main->noteAddressNamesChanged(this);
+}
+
+void MainFace::notePlugin(std::function<Plugin*(MainFace*)> const& _new)
+{
+	if (!s_linkedPlugins)
+		s_linkedPlugins = new std::vector<std::function<Plugin*(MainFace*)>>();
+	s_linkedPlugins->push_back(_new);
+}
+
 Plugin::Plugin(MainFace* _f, std::string const& _name):
 	m_main(_f),
 	m_name(_name)
@@ -54,6 +74,18 @@ void Plugin::addAction(QAction* _a)
 	m_main->addAction(_a);
 }
 
+QAction* Plugin::addMenuItem(QString _n, QString _menuName, bool _sep)
+{
+	QAction* a = new QAction(_n, main());
+	QMenu* m = main()->findChild<QMenu*>(_menuName);
+	if (_sep)
+		m->addSeparator();
+	m->addAction(a);
+	return a;
+}
+
+std::vector<std::function<Plugin*(MainFace*)>>* MainFace::s_linkedPlugins = nullptr;
+
 void MainFace::adoptPlugin(Plugin* _p)
 {
 	m_plugins[_p->name()] = shared_ptr<Plugin>(_p);

alethzero/MainFace.h

@@ -43,28 +43,48 @@ namespace shh { class WhisperHost; }
 namespace az
 {
 
+#define DEV_AZ_NOTE_PLUGIN(ClassName) \
+	static bool s_notePlugin = [](){ MainFace::notePlugin([](MainFace* m){ return new ClassName(m); }); return true; }()
+
 class Plugin;
+class MainFace;
+class Main;
 
 using WatchHandler = std::function<void(dev::eth::LocalisedLogEntries const&)>;
 
 class AccountNamer
 {
+	friend class Main;
+
 public:
 	virtual std::string toName(Address const&) const { return std::string(); }
 	virtual Address toAddress(std::string const&) const { return Address(); }
 	virtual Addresses knownAddresses() const { return Addresses(); }
+
+protected:
+	void noteKnownChanged();
+	void noteNamesChanged();
+
+private:
+	MainFace* m_main = nullptr;
 };
 
 class MainFace: public QMainWindow, public Context
 {
+	Q_OBJECT
+
 public:
 	explicit MainFace(QWidget* _parent = nullptr): QMainWindow(_parent) {}
 
+	static void notePlugin(std::function<Plugin*(MainFace*)> const& _new);
+
 	void adoptPlugin(Plugin* _p);
 	void killPlugins();
 
 	void allChange();
 
+	using Context::render;
+
 	// TODO: tidy - all should be references that throw if module unavailable.
 	// TODO: provide a set of available web3 modules.
 	virtual dev::WebThreeDirect* web3() const = 0;
@@ -77,12 +97,25 @@ public:
 	// Account naming API
 	virtual void install(AccountNamer* _adopt) = 0;
 	virtual void uninstall(AccountNamer* _kill) = 0;
-	virtual void noteAddressesChanged() = 0;
+	virtual void noteKnownAddressesChanged(AccountNamer*) = 0;
+	virtual void noteAddressNamesChanged(AccountNamer*) = 0;
+	virtual Address toAddress(std::string const&) const = 0;
+	virtual std::string toName(Address const&) const = 0;
+	virtual Addresses allKnownAddresses() const = 0;
+
+	virtual void noteSettingsChanged() = 0;
 
 protected:
 	template <class F> void forEach(F const& _f) { for (auto const& p: m_plugins) _f(p.second); }
 	std::shared_ptr<Plugin> takePlugin(std::string const& _name) { auto it = m_plugins.find(_name); std::shared_ptr<Plugin> ret; if (it != m_plugins.end()) { ret = it->second; m_plugins.erase(it); } return ret; }
 
+	static std::vector<std::function<Plugin*(MainFace*)>>* s_linkedPlugins;
+
+signals:
+	void knownAddressesChanged();
+	void addressNamesChanged();
+	void keyManagerChanged();
+
 private:
 	std::unordered_map<std::string, std::shared_ptr<Plugin>> m_plugins;
 };
@@ -98,10 +131,11 @@ public:
 	dev::WebThreeDirect* web3() const { return m_main->web3(); }
 	dev::eth::Client* ethereum() const { return m_main->ethereum(); }
 	std::shared_ptr<dev::shh::WhisperHost> whisper() const { return m_main->whisper(); }
-	MainFace* main() { return m_main; }
+	MainFace* main() const { return m_main; }
 	QDockWidget* dock(Qt::DockWidgetArea _area = Qt::RightDockWidgetArea, QString _title = QString());
 	void addToDock(Qt::DockWidgetArea _area, QDockWidget* _dockwidget, Qt::Orientation _orientation);
 	void addAction(QAction* _a);
+	QAction* addMenuItem(QString _name, QString _menuName, bool _separate = false);
 
 	virtual void onAllChange() {}
 	virtual void readSettings(QSettings const&) {}
@@ -113,6 +147,13 @@ private:
 	QDockWidget* m_dock = nullptr;
 };
 
+class AccountNamerPlugin: public Plugin, public AccountNamer
+{
+protected:
+	AccountNamerPlugin(MainFace* _m, std::string const& _name): Plugin(_m, _name) { main()->install(this); }
+	~AccountNamerPlugin() { main()->uninstall(this); }
+};
+
 }
 
 }

alethzero/MainWin.cpp

@@ -74,9 +74,6 @@
 #include "DappHost.h"
 #include "WebPage.h"
 #include "ExportState.h"
-#include "AllAccounts.h"
-#include "LogPanel.h"
-#include "BrainWallet.h"
 #include "ui_Main.h"
 #include "ui_GetPassword.h"
 #include "ui_GasPricing.h"
@@ -180,7 +177,8 @@ Main::Main(QWidget* _parent):
 
 	ui->configDock->close();
 
-	statusBar()->addPermanentWidget(ui->cacheUsage);
+//	statusBar()->addPermanentWidget(ui->cacheUsage);
+	ui->cacheUsage->hide();
 	statusBar()->addPermanentWidget(ui->balance);
 	statusBar()->addPermanentWidget(ui->peerCount);
 	statusBar()->addPermanentWidget(ui->mineStatus);
@@ -188,7 +186,6 @@ Main::Main(QWidget* _parent):
 	statusBar()->addPermanentWidget(ui->chainStatus);
 	statusBar()->addPermanentWidget(ui->blockCount);
 
-
 	QSettings s("ethereum", "alethzero");
 	m_networkConfig = s.value("peers").toByteArray();
 	bytesConstRef network((byte*)m_networkConfig.data(), m_networkConfig.size());
@@ -266,11 +263,8 @@ Main::Main(QWidget* _parent):
 		}
 	}
 
-#if ETH_FATDB
+	for (auto const& i: *s_linkedPlugins)
-	loadPlugin<dev::az::AllAccounts>();
+		initPlugin(i(this));
-#endif
-	loadPlugin<dev::az::LogPanel>();
-	loadPlugin<dev::az::BrainWallet>();
 }
 
 Main::~Main()
@@ -282,9 +276,12 @@ Main::~Main()
 	// need to be rethought into something more like:
 	// forEach([&](shared_ptr<Plugin> const& p){ finalisePlugin(p.get()); });
 	writeSettings();
+
+	m_destructing = true;
+	killPlugins();
 }
 
-string Main::fromRaw(h256 const&_n, unsigned* _inc)
+string Main::fromRaw(h256 const& _n, unsigned* _inc)
 {
 	if (_n)
 	{
@@ -312,23 +309,57 @@ string Main::fromRaw(h256 const&_n, unsigned* _inc)
 void Main::install(AccountNamer* _adopt)
 {
 	m_namers.insert(_adopt);
+	_adopt->m_main = this;
 	refreshAll();
 }
 
 void Main::uninstall(AccountNamer* _kill)
 {
 	m_namers.erase(_kill);
+	if (!m_destructing)
+		refreshAll();
+}
+
+void Main::noteKnownAddressesChanged(AccountNamer*)
+{
+	emit knownAddressesChanged();
 	refreshAll();
 }
 
-void Main::noteAddressesChanged()
+void Main::noteAddressNamesChanged(AccountNamer*)
 {
+	emit addressNamesChanged();
 	refreshAll();
 }
 
+Address Main::toAddress(string const& _n) const
+{
+	for (AccountNamer* n: m_namers)
+		if (n->toAddress(_n))
+			return n->toAddress(_n);
+	return Address();
+}
+
+string Main::toName(Address const& _a) const
+{
+	for (AccountNamer* n: m_namers)
+		if (!n->toName(_a).empty())
+			return n->toName(_a);
+	return string();
+}
+
+Addresses Main::allKnownAddresses() const
+{
+	Addresses ret;
+	for (AccountNamer* i: m_namers)
+		ret += i->knownAddresses();
+	sort(ret.begin(), ret.end());
+	return ret;
+}
+
 bool Main::confirm() const
 {
-	return ui->natSpec->isChecked();
+	return true; //ui->natSpec->isChecked();
 }
 
 void Main::on_gasPrices_triggered()
@@ -472,7 +503,7 @@ Address Main::getCurrencies() const
 
 bool Main::doConfirm()
 {
-	return ui->confirm->isChecked();
+	return true; //ui->confirm->isChecked();
 }
 
 void Main::installNameRegWatch()
@@ -684,8 +715,6 @@ pair<Address, bytes> Main::fromString(std::string const& _n) const
 		return make_pair(Address(), bytes());
 
 	std::string n = _n;
-	if (n.find("0x") == 0)
-		n.erase(0, 2);
 
 	auto g_newNameReg = getNameReg();
 	if (g_newNameReg)
@@ -699,6 +728,16 @@ pair<Address, bytes> Main::fromString(std::string const& _n) const
 		if (auto a = i->toAddress(_n))
 			return make_pair(a, bytes());
 
+	try {
+		return ICAP::decoded(n).address([&](Address const& a, bytes const& b) -> bytes
+		{
+			return ethereum()->call(a, b).output;
+		}, g_newNameReg);
+	}
+	catch (...) {}
+
+	if (n.find("0x") == 0)
+		n.erase(0, 2);
 	if (n.size() == 40)
 	{
 		try
@@ -717,14 +756,6 @@ pair<Address, bytes> Main::fromString(std::string const& _n) const
 			return make_pair(Address(), bytes());
 		}
 	}
-	else
-		try {
-			return ICAP::decoded(n).address([&](Address const& a, bytes const& b) -> bytes
-			{
-				return ethereum()->call(a, b).output;
-			}, g_newNameReg);
-		}
-		catch (...) {}
 	return make_pair(Address(), bytes());
 }
 
@@ -758,7 +789,7 @@ QString Main::lookup(QString const& _a) const
 
 void Main::on_about_triggered()
 {
-	QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBerlin ÐΞV team, 2014.\nOriginally by Gav Wood. Based on a design by Vitalik Buterin.\n\nThanks to the various contributors including: Tim Hughes, caktux, Eric Lombrozo, Marko Simovic.");
+	QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood and the Berlin ÐΞV team, 2014, 2015.\nSee the README for contributors and credits.");
 }
 
 void Main::on_paranoia_triggered()
@@ -830,6 +861,8 @@ void Main::setPrivateChain(QString const& _private, bool _forceConfigure)
 	ui->usePrivate->setChecked(!m_privateChain.isEmpty());
 
 	CanonBlockChain<Ethash>::forceGenesisExtraData(m_privateChain.isEmpty() ? bytes() : sha3(m_privateChain.toStdString()).asBytes());
+	CanonBlockChain<Ethash>::forceGenesisDifficulty(m_privateChain.isEmpty() ? u256() : c_minimumDifficulty);
+	CanonBlockChain<Ethash>::forceGenesisGasLimit(m_privateChain.isEmpty() ? u256() : u256(1) << 32);
 
 	// rejig blockchain now.
 	writeSettings();
@@ -1208,7 +1241,13 @@ void Main::refreshBalances()
 	for (auto const& address: m_keyManager.accounts())
 	{
 		u256 b = ethereum()->balanceAt(address);
-		QListWidgetItem* li = new QListWidgetItem(QString("<%5> %4 %2: %1 [%3]").arg(formatBalance(b).c_str()).arg(QString::fromStdString(render(address))).arg((unsigned)ethereum()->countAt(address)).arg(QString::fromStdString(m_keyManager.accountName(address))).arg(m_keyManager.haveKey(address) ? "KEY" : "BRAIN"), ui->ourAccounts);
+		QListWidgetItem* li = new QListWidgetItem(
+			QString("<%1> %2: %3 [%4]")
+				.arg(m_keyManager.haveKey(address) ? "KEY" : "BRAIN")
+				.arg(QString::fromStdString(render(address)))
+				.arg(formatBalance(b).c_str())
+				.arg((unsigned)ethereum()->countAt(address))
+			, ui->ourAccounts);
 		li->setData(Qt::UserRole, QByteArray((char const*)address.data(), Address::size));
 		li->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 		li->setCheckState(m_beneficiary == address ? Qt::Checked : Qt::Unchecked);
@@ -1297,7 +1336,6 @@ void Main::refreshPending()
 void Main::refreshBlockCount()
 {
 	auto d = ethereum()->blockChain().details();
-	BlockQueueStatus b = ethereum()->blockQueueStatus();
 	SyncStatus sync = ethereum()->syncStatus();
 	QString syncStatus = QString("PV%1 %2").arg(sync.protocolVersion).arg(EthereumHost::stateName(sync.state));
 	if (sync.state == SyncState::Hashes)
@@ -1305,8 +1343,11 @@ void Main::refreshBlockCount()
 	if (sync.state == SyncState::Blocks || sync.state == SyncState::NewBlocks)
 		syncStatus += QString(": %1/%2").arg(sync.blocksReceived).arg(sync.blocksTotal);
 	ui->syncStatus->setText(syncStatus);
-	ui->chainStatus->setText(QString("%3 importing %4 ready %5 verifying %6 unverified %7 future %8 unknown %9 bad  %1 #%2")
+//	BlockQueueStatus b = ethereum()->blockQueueStatus();
-		.arg(m_privateChain.size() ? "[" + m_privateChain + "] " : c_network == eth::Network::Olympic ? "Olympic" : "Frontier").arg(d.number).arg(b.importing).arg(b.verified).arg(b.verifying).arg(b.unverified).arg(b.future).arg(b.unknown).arg(b.bad));
+//	ui->chainStatus->setText(QString("%3 importing %4 ready %5 verifying %6 unverified %7 future %8 unknown %9 bad  %1 #%2")
+//		.arg(m_privateChain.size() ? "[" + m_privateChain + "] " : c_network == eth::Network::Olympic ? "Olympic" : "Frontier").arg(d.number).arg(b.importing).arg(b.verified).arg(b.verifying).arg(b.unverified).arg(b.future).arg(b.unknown).arg(b.bad));
+	ui->chainStatus->setText(QString("%1 #%2")
+		.arg(m_privateChain.size() ? "[" + m_privateChain + "] " : c_network == eth::Network::Olympic ? "Olympic" : "Frontier").arg(d.number));
 }
 
 void Main::on_turboMining_triggered()
@@ -1902,7 +1943,7 @@ void Main::on_ourAccounts_doubleClicked()
 {
 	auto hba = ui->ourAccounts->currentItem()->data(Qt::UserRole).toByteArray();
 	auto h = Address((byte const*)hba.data(), Address::ConstructFromPointer);
-	qApp->clipboard()->setText(QString::fromStdString(toHex(h.asArray())));
+	qApp->clipboard()->setText(QString::fromStdString(ICAP(h).encoded()) + " (" + QString::fromStdString(h.hex()) + ")");
 }
 
 /*void Main::on_log_doubleClicked()
@@ -2059,6 +2100,7 @@ void Main::on_mine_triggered()
 
 void Main::keysChanged()
 {
+	emit keyManagerChanged();
 	onBalancesChange();
 }
 

alethzero/MainWin.h

@@ -109,7 +109,13 @@ public:
 	// Account naming API.
 	void install(AccountNamer* _adopt) override;
 	void uninstall(AccountNamer* _kill) override;
-	void noteAddressesChanged() override;
+	void noteKnownAddressesChanged(AccountNamer*) override;
+	void noteAddressNamesChanged(AccountNamer*) override;
+	Address toAddress(std::string const&) const override;
+	std::string toName(Address const&) const override;
+	Addresses allKnownAddresses() const override;
+
+	void noteSettingsChanged() override { writeSettings(); }
 
 public slots:
 	void load(QString _file);
@@ -299,6 +305,8 @@ private:
 	Connect m_connect;
 
 	std::unordered_set<AccountNamer*> m_namers;
+
+	bool m_destructing = false;
 };
 
 }

alethzero/OtherAccounts.cpp

@@ -0,0 +1,88 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file OtherAccounts.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2015
+ */
+
+#include "OtherAccounts.h"
+#include <QSettings>
+#include <libdevcore/Log.h>
+#include <libethereum/Client.h>
+#include <ui_OtherAccounts.h>
+using namespace std;
+using namespace dev;
+using namespace az;
+using namespace eth;
+
+DEV_AZ_NOTE_PLUGIN(OtherAccounts);
+
+OtherAccounts::OtherAccounts(MainFace* _m):
+	AccountNamerPlugin(_m, "OtherAccounts")
+{
+	connect(addMenuItem("Register Third-party Address Names...", "menuTools", true), SIGNAL(triggered()), SLOT(import()));
+}
+
+void OtherAccounts::import()
+{
+	QDialog d;
+	Ui_OtherAccounts u;
+	u.setupUi(&d);
+	d.setWindowTitle("Add Named Accounts");
+	if (d.exec() == QDialog::Accepted)
+	{
+		QStringList sl = u.accounts->toPlainText().split("\n");
+		for (QString const& s: sl)
+		{
+			Address addr = dev::eth::toAddress(s.section(QRegExp("[ \\0\\t]+"), 0, 0).toStdString());
+			string name = s.section(QRegExp("[ \\0\\t]+"), 1).toStdString();
+			m_toName[addr] = name;
+			m_toAddress[name] = addr;
+		}
+		main()->noteSettingsChanged();
+		noteKnownChanged();
+	}
+}
+
+void OtherAccounts::readSettings(QSettings const& _s)
+{
+	m_toName.clear();
+	m_toAddress.clear();
+	for (QVariant const& i: _s.value("OtherAccounts", QVariantList()).toList())
+	{
+		QStringList l = i.toStringList();
+		if (l.size() == 2)
+		{
+			m_toName[Address(l[0].toStdString())] = l[1].toStdString();
+			m_toAddress[l[1].toStdString()] = Address(l[0].toStdString());
+		}
+	}
+	noteKnownChanged();
+}
+
+void OtherAccounts::writeSettings(QSettings& _s)
+{
+	QVariantList r;
+	for (auto const& i: m_toName)
+	{
+		QStringList l;
+		l += QString::fromStdString(i.first.hex());
+		l += QString::fromStdString(i.second);
+		r += QVariant(l);
+	}
+	_s.setValue("OtherAccounts", r);
+}

alethzero/OtherAccounts.h

@@ -0,0 +1,55 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file OtherAccounts.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2015
+ */
+
+#pragma once
+
+#include "MainFace.h"
+
+namespace dev
+{
+namespace az
+{
+
+class OtherAccounts: public QObject, public AccountNamerPlugin
+{
+	Q_OBJECT
+
+public:
+	OtherAccounts(MainFace* _m);
+
+protected:
+	std::string toName(Address const& _a) const override { if (m_toName.count(_a)) return m_toName.at(_a); return std::string(); }
+	Address toAddress(std::string const& _n) const override { if (m_toAddress.count(_n)) return m_toAddress.at(_n); return Address(); }
+	Addresses knownAddresses() const override { return keysOf(m_toName); }
+
+private slots:
+	void import();
+
+private:
+	void readSettings(QSettings const&) override;
+	void writeSettings(QSettings&) override;
+
+	std::unordered_map<std::string, Address> m_toAddress;
+	std::unordered_map<Address, std::string> m_toName;
+};
+
+}
+}

alethzero/OtherAccounts.ui

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OtherAccounts</class>
+ <widget class="QDialog" name="OtherAccounts">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>511</width>
+    <height>508</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTextEdit" name="accounts">
+     <property name="placeholderText">
+      <string>Write the accounts you wish to name here, one address/name pair per line, the name following the address split only be a single space character.</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancel">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="create">
+       <property name="text">
+        <string>&amp;Import</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>create</sender>
+   <signal>clicked()</signal>
+   <receiver>OtherAccounts</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>462</x>
+     <y>484</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>449</x>
+     <y>504</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancel</sender>
+   <signal>clicked()</signal>
+   <receiver>OtherAccounts</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>381</x>
+     <y>483</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>351</x>
+     <y>506</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

alethzero/OurAccounts.cpp

@@ -0,0 +1,67 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file OurAccounts.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2015
+ */
+
+#include "OurAccounts.h"
+#include <libdevcore/Log.h>
+#include <libethereum/Client.h>
+#include <libethcore/KeyManager.h>
+using namespace std;
+using namespace dev;
+using namespace az;
+using namespace eth;
+
+DEV_AZ_NOTE_PLUGIN(OurAccounts);
+
+OurAccounts::OurAccounts(MainFace* _m):
+	AccountNamerPlugin(_m, "OurAccounts")
+{
+	connect(main(), SIGNAL(keyManagerChanged()), SLOT(updateNames()));
+	updateNames();
+}
+
+OurAccounts::~OurAccounts()
+{
+}
+
+std::string OurAccounts::toName(Address const& _a) const
+{
+	return main()->keyManager().accountName(_a);
+}
+
+Address OurAccounts::toAddress(std::string const& _n) const
+{
+	if (m_names.count(_n))
+		return m_names.at(_n);
+	return Address();
+}
+
+Addresses OurAccounts::knownAddresses() const
+{
+	return main()->keyManager().accounts();
+}
+
+void OurAccounts::updateNames()
+{
+	m_names.clear();
+	for (Address const& i: main()->keyManager().accounts())
+		m_names[main()->keyManager().accountName(i)] = i;
+	noteKnownChanged();
+}

alethzero/OurAccounts.h

@@ -0,0 +1,52 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file OurAccounts.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2015
+ */
+
+#pragma once
+
+#include "MainFace.h"
+
+namespace dev
+{
+namespace az
+{
+
+class OurAccounts: public QObject, public AccountNamerPlugin
+{
+	Q_OBJECT
+
+public:
+	OurAccounts(MainFace* _m);
+	~OurAccounts();
+
+protected:
+	std::string toName(Address const& _a) const override;
+	Address toAddress(std::string const& _n) const override;
+	Addresses knownAddresses() const override;
+
+private slots:
+	void updateNames();
+
+private:
+	std::unordered_map<std::string, Address> m_names;
+};
+
+}
+}

alethzero/Transact.cpp

@@ -40,6 +40,7 @@
 #include <libnatspec/NatspecExpressionEvaluator.h>
 #include <libethereum/Client.h>
 #include <libethereum/Utility.h>
+#include <libethcore/ICAP.h>
 #include <libethcore/KeyManager.h>
 #if ETH_SERPENT
 #include <libserpent/funcs.h>
@@ -52,10 +53,10 @@ using namespace dev;
 using namespace az;
 using namespace eth;
 
-Transact::Transact(Context* _c, QWidget* _parent):
+Transact::Transact(MainFace* _c, QWidget* _parent):
 	QDialog(_parent),
 	ui(new Ui::Transact),
-	m_context(_c)
+	m_main(_c)
 {
 	ui->setupUi(this);
 
@@ -81,9 +82,10 @@ void Transact::setEnvironment(AddressHash const& _accounts, dev::eth::Client* _e
 	for (auto const& address: m_accounts)
 	{
 		u256 b = ethereum()->balanceAt(address, PendingBlock);
-		QString s = QString("%4 %2: %1").arg(formatBalance(b).c_str()).arg(QString::fromStdString(m_context->render(address))).arg(QString::fromStdString(m_context->keyManager().accountName(address)));
+		QString s = QString("%2: %1").arg(formatBalance(b).c_str()).arg(QString::fromStdString(m_main->render(address)));
 		ui->from->addItem(s);
 	}
+	updateDestination();
 	if (old > -1 && old < ui->from->count())
 		ui->from->setCurrentIndex(old);
 	else if (ui->from->count())
@@ -92,7 +94,7 @@ void Transact::setEnvironment(AddressHash const& _accounts, dev::eth::Client* _e
 
 void Transact::resetGasPrice()
 {
-	setValueUnits(ui->gasPriceUnits, ui->gasPrice, m_context->gasPrice());
+	setValueUnits(ui->gasPriceUnits, ui->gasPrice, m_main->gasPrice());
 }
 
 bool Transact::isCreation() const
@@ -119,11 +121,6 @@ u256 Transact::gasPrice() const
 	return ui->gasPrice->value() * units()[units().size() - 1 - ui->gasPriceUnits->currentIndex()].first;
 }
 
-Address Transact::to() const
-{
-	return m_context->fromString(ui->destination->currentText().toStdString()).first;
-}
-
 u256 Transact::total() const
 {
 	return value() + fee();
@@ -131,16 +128,14 @@ u256 Transact::total() const
 
 void Transact::updateDestination()
 {
-	cwatch << "updateDestination()";
+	// TODO: should be a Qt model.
-	QString s;
+	ui->destination->clear();
-	for (auto i: ethereum()->addresses())
+	ui->destination->addItem("(Create Contract)");
-		if ((s = QString::fromStdString(m_context->pretty(i))).size())
+	for (Address const& a: m_main->allKnownAddresses())
-			// A namereg address
+	{
-			if (ui->destination->findText(s, Qt::MatchExactly | Qt::MatchCaseSensitive) == -1)
+		cdebug << "Adding" << a << m_main->toName(a) << " -> " << (m_main->toName(a) + " (" + ICAP(a).encoded() + ")");
-				ui->destination->addItem(s);
+		ui->destination->addItem(QString::fromStdString(m_main->toName(a) + " (" + ICAP(a).encoded() + ")"), QString::fromStdString(a.hex()));
-	for (int i = 0; i < ui->destination->count(); ++i)
+	}
-		if (ui->destination->itemText(i) != "(Create Contract)" && !to())
-			ui->destination->removeItem(i--);
 }
 
 void Transact::updateFee()
@@ -166,11 +161,14 @@ void Transact::on_destination_currentTextChanged(QString)
 {
 	if (ui->destination->currentText().size() && ui->destination->currentText() != "(Create Contract)")
 	{
-		auto p = m_context->fromString(ui->destination->currentText().toStdString());
+		auto p = toAccount();
 		if (p.first)
-			ui->calculatedName->setText(QString::fromStdString(m_context->render(p.first)));
+			ui->calculatedName->setText(QString::fromStdString(m_main->render(p.first)));
 		else
 			ui->calculatedName->setText("Unknown Address");
+
+//		ui->calculatedName->setText(m_main->toName(a) + " (" + ICAP(a).encoded() + ")");
+
 		if (!p.second.empty())
 		{
 			m_data = p.second;
@@ -202,7 +200,7 @@ void Transact::on_copyUnsigned_clicked()
 		t = Transaction(value(), gasPrice(), ui->gas->value(), m_data, nonce);
 	else
 		// TODO: cache like m_data.
-		t = Transaction(value(), gasPrice(), ui->gas->value(), to(), m_data, nonce);
+		t = Transaction(value(), gasPrice(), ui->gas->value(), toAccount().first, m_data, nonce);
 	qApp->clipboard()->setText(QString::fromStdString(toHex(t.rlp())));
 }
 
@@ -323,9 +321,17 @@ string Transact::natspecNotice(Address _to, bytes const& _data)
 		return "Destination not a contract.";
 }
 
-Address Transact::toAccount()
+pair<Address, bytes> Transact::toAccount()
 {
-	return isCreation() ? Address() : m_context->fromString(ui->destination->currentText().toStdString()).first;
+	pair<Address, bytes> p;
+	if (!isCreation())
+	{
+		if (!ui->destination->currentData().isNull() && ui->destination->currentText() == ui->destination->itemText(ui->destination->currentIndex()))
+			p.first = Address(ui->destination->currentData().toString().trimmed().toStdString());
+		else
+			p = m_main->fromString(ui->destination->currentText().trimmed().toStdString());
+	}
+	return p;
 }
 
 GasRequirements Transact::determineGasRequirements()
@@ -334,22 +340,20 @@ GasRequirements Transact::determineGasRequirements()
 	qint64 baseGas = (qint64)Transaction::gasRequired(m_data, 0);
 
 	Address from = fromAccount();
-	Address to = toAccount();
+	Address to = toAccount().first;
 	ExecutionResult lastGood;
 
 	bool haveUpperBound = false;
 	qint64 lowerBound = baseGas;
 	qint64 upperBound = (qint64)ethereum()->gasLimitRemaining();
-	for (unsigned i = 0; i < 20 && ((haveUpperBound && upperBound - lowerBound > 100) || !haveUpperBound); ++i)	// get to with 100.
+	for (unsigned i = 0; i < 30 && ((haveUpperBound && upperBound - lowerBound > 16) || !haveUpperBound); ++i)	// get to with 100.
 	{
 		qint64 mid = haveUpperBound ? (lowerBound + upperBound) / 2 : upperBound;
-		cdebug << "Trying" << mid;
 		ExecutionResult er;
 		if (isCreation())
-			er = ethereum()->create(from, value(), m_data, mid, gasPrice(), ethereum()->getDefault(), FudgeFactor::Lenient);
+			er = ethereum()->create(from, value(), m_data, mid, gasPrice(), PendingBlock, FudgeFactor::Lenient);
 		else
-			er = ethereum()->call(from, value(), to, m_data, mid, gasPrice(), ethereum()->getDefault(), FudgeFactor::Lenient);
+			er = ethereum()->call(from, value(), to, m_data, mid, gasPrice(), PendingBlock, FudgeFactor::Lenient);
-		cdebug << toString(er.excepted);
 		if (er.excepted == TransactionException::OutOfGas || er.excepted == TransactionException::OutOfGasBase || er.excepted == TransactionException::OutOfGasIntrinsic || er.codeDeposit == CodeDeposit::Failed)
 		{
 			lowerBound = mid;
@@ -446,7 +450,7 @@ void Transact::rejigData()
 
 	// Add Natspec information
 	if (!isCreation())
-		htmlInfo = "<div class=\"info\"><span class=\"icon\">INFO</span> " + QString::fromStdString(natspecNotice(toAccount(), m_data)).toHtmlEscaped() + "</div>" + htmlInfo;
+		htmlInfo = "<div class=\"info\"><span class=\"icon\">INFO</span> " + QString::fromStdString(natspecNotice(toAccount().first, m_data)).toHtmlEscaped() + "</div>" + htmlInfo;
 
 	// Update gas
 	if (ui->gas->value() == ui->gas->minimum())
@@ -481,7 +485,7 @@ Secret Transact::findSecret(u256 _totalReq) const
 		if (b > bestBalance)
 			bestBalance = b, best = i;
 	}
-	return m_context->retrieveSecret(best);
+	return m_main->retrieveSecret(best);
 }
 
 Address Transact::fromAccount()
@@ -514,7 +518,7 @@ void Transact::on_send_clicked()
 		return;
 	}
 
-	Secret s = m_context->retrieveSecret(a);
+	Secret s = m_main->retrieveSecret(a);
 	if (!s)
 		return;
 
@@ -541,7 +545,7 @@ void Transact::on_send_clicked()
 	}
 	else
 		// TODO: cache like m_data.
-		ethereum()->submitTransaction(s, value(), m_context->fromString(ui->destination->currentText().toStdString()).first, m_data, ui->gas->value(), gasPrice(), nonce);
+		ethereum()->submitTransaction(s, value(), toAccount().first, m_data, ui->gas->value(), gasPrice(), nonce);
 	close();
 }
 
@@ -561,9 +565,9 @@ void Transact::on_debug_clicked()
 		Block postState(ethereum()->postState());
 		Transaction t = isCreation() ?
 			Transaction(value(), gasPrice(), ui->gas->value(), m_data, postState.transactionsFrom(from)) :
-			Transaction(value(), gasPrice(), ui->gas->value(), m_context->fromString(ui->destination->currentText().toStdString()).first, m_data, postState.transactionsFrom(from));
+			Transaction(value(), gasPrice(), ui->gas->value(), toAccount().first, m_data, postState.transactionsFrom(from));
 		t.forceSender(from);
-		Debugger dw(m_context, this);
+		Debugger dw(m_main, this);
 		Executive e(postState, ethereum()->blockChain(), 0);
 		dw.populate(e, t);
 		dw.exec();

alethzero/Transact.h

@@ -27,7 +27,7 @@
 #include <QDialog>
 #include <QMap>
 #include <QList>
-#include "Context.h"
+#include "MainFace.h"
 
 namespace Ui { class Transact; }
 
@@ -54,7 +54,7 @@ class Transact: public QDialog
 	Q_OBJECT
 
 public:
-	explicit Transact(Context* _context, QWidget* _parent = 0);
+	explicit Transact(MainFace* _context, QWidget* _parent = 0);
 	~Transact();
 
 	void resetGasPrice();
@@ -81,7 +81,7 @@ private:
 	void updateNonce();
 
 	dev::Address fromAccount();
-	dev::Address toAccount();
+	std::pair<dev::Address, bytes> toAccount();
 	void updateDestination();
 	void updateFee();
 	bool isCreation() const;
@@ -102,7 +102,7 @@ private:
 
 	dev::AddressHash m_accounts;
 	dev::eth::Client* m_ethereum = nullptr;
-	Context* m_context = nullptr;
+	MainFace* m_main = nullptr;
 	NatSpecFace* m_natSpecDB = nullptr;
 	bool m_allGood = false;
 };

eth/main.cpp

@@ -130,7 +130,7 @@ void help()
 		<< "    -x,--peers <number>  Attempt to connect to given number of peers (default: 11)." << endl
 		<< "    --peer-stretch <number>  Accepted connection multiplier (default: 7)." << endl
 	
-		<< "    --public-ip <ip>  Force public ip to given (default: auto)." << endl
+		<< "    --public-ip <ip>  Force advertised public ip to given (default: auto)." << endl
 		<< "    --listen-ip <ip>(:<port>)  Listen on the given IP for incoming connections (default: 0.0.0.0)." << endl
 		<< "    --listen <port>  Listen on the given port for incoming connections (default: 30303)." << endl
 		<< "    -r,--remote <host>(:<port>)  Connect to remote host (default: none)." << endl
@@ -138,11 +138,12 @@ void help()
 		<< "    --network-id <n> Only connect to other hosts with this network id." << endl
 		<< "    --upnp <on/off>  Use UPnP for NAT (default: on)." << endl
 
-//		<< "	--peers <filename>  Text list of type publickey@host[:port]  (default: network)" << endl
+		<< "    --peerset <list>  Space delimited list of type type:publickey@ipAddress[:port]" << endl
-//		<< "		Types:" << endl
+		<< "        Types:" << endl
-//		<< "		default		Attempt connection when no other peers are available and pinning is disable." << endl
+		<< "        default		Attempt connection when no other peers are available and pinning is disable." << endl
-//		<< "		trusted		Keep connected at all times." << endl
+		<< "        require		Keep connected at all times." << endl
-//		<< "	--trust-peers <filename>  Text list of publickeys." << endl
+// TODO:
+//		<< "	--trust-peers <filename>  Space delimited list of publickeys." << endl
 	
 		<< "    --no-discovery  Disable Node discovery, implies --no-bootstrap." << endl
 		<< "    --pin  Only accept or connect to trusted peers." << endl
@@ -219,8 +220,6 @@ string pretty(h160 _a, dev::eth::State const& _st)
 	return ns;
 }
 
-bool g_exit = false;
-
 inline bool isPrime(unsigned _number)
 {
 	if (((!(_number & 1)) && _number != 2 ) || (_number < 2) || (_number % 3 == 0 && _number != 3))
@@ -231,11 +230,6 @@ inline bool isPrime(unsigned _number)
 	return true;
 }
 
-void sighandler(int)
-{
-	g_exit = true;
-}
-
 enum class NodeMode
 {
 	PeerServer,
@@ -316,9 +310,9 @@ int main(int argc, char** argv)
 	string remoteHost;
 	unsigned short remotePort = 30303;
 	
-	HostPeerPreferences hprefs;
+	unsigned peers = 11;
-	unsigned peers = hprefs.idealPeerCount;
+	unsigned peerStretch = 7;
-	unsigned peerStretch = hprefs.stretchPeerCount;
+	std::map<NodeId, pair<NodeIPEndpoint,bool>> preferredNodes;
 	bool bootstrap = true;
 	bool disableDiscovery = false;
 	bool pinning = false;
@@ -682,6 +676,63 @@ int main(int argc, char** argv)
 			peers = atoi(argv[++i]);
 		else if (arg == "--peer-stretch" && i + 1 < argc)
 			peerStretch = atoi(argv[++i]);
+		else if (arg == "--peerset" && i + 1 < argc)
+		{
+			string peerset = argv[++i];
+			if (peerset.empty())
+			{
+				cerr << "--peerset argument must not be empty";
+				return -1;
+			}
+
+			vector<string> each;
+			boost::split(each, peerset, boost::is_any_of("\t "));
+			for (auto const& p: each)
+			{
+				string type;
+				string pubk;
+				string hostIP;
+				unsigned short port = c_defaultListenPort;
+				
+				// type:key@ip[:port]
+				vector<string> typeAndKeyAtHostAndPort;
+				boost::split(typeAndKeyAtHostAndPort, p, boost::is_any_of(":"));
+				if (typeAndKeyAtHostAndPort.size() < 2 || typeAndKeyAtHostAndPort.size() > 3)
+					continue;
+				
+				type = typeAndKeyAtHostAndPort[0];
+				if (typeAndKeyAtHostAndPort.size() == 3)
+					port = (uint16_t)atoi(typeAndKeyAtHostAndPort[2].c_str());
+
+				vector<string> keyAndHost;
+				boost::split(keyAndHost, typeAndKeyAtHostAndPort[1], boost::is_any_of("@"));
+				if (keyAndHost.size() != 2)
+					continue;
+				pubk = keyAndHost[0];
+				if (pubk.size() != 40)
+					continue;
+				hostIP = keyAndHost[1];
+				
+				// todo: use Network::resolveHost()
+				if (hostIP.size() < 4 /* g.it */)
+					continue;
+				
+				bool required = type == "required";
+				if (!required && type != "default")
+					continue;
+
+				Public publicKey(fromHex(pubk));
+				try
+				{
+					preferredNodes[publicKey] = make_pair(NodeIPEndpoint(bi::address::from_string(hostIP), port, port), required);
+				}
+				catch (...)
+				{
+					cerr << "Unrecognized peerset: " << peerset << endl;
+					return -1;
+				}
+			}
+		}
 		else if ((arg == "-o" || arg == "--mode") && i + 1 < argc)
 		{
 			string m = argv[++i];
@@ -728,7 +779,11 @@ int main(int argc, char** argv)
 	// Set up all the chain config stuff.
 	resetNetwork(releaseNetwork);
 	if (!privateChain.empty())
+	{
 		CanonBlockChain<Ethash>::forceGenesisExtraData(sha3(privateChain).asBytes());
+		CanonBlockChain<Ethash>::forceGenesisDifficulty(c_minimumDifficulty);
+		CanonBlockChain<Ethash>::forceGenesisGasLimit(u256(1) << 32);
+	}
 	if (!genesisJSON.empty())
 		CanonBlockChain<Ethash>::setGenesis(genesisJSON);
 	if (gasFloor != UndefinedU256)
@@ -1022,15 +1077,21 @@ int main(int argc, char** argv)
 	}
 #endif
 
+	for (auto const& p: preferredNodes)
+		if (p.second.second)
+			web3.requirePeer(p.first, p.second.first);
+		else
+			web3.addNode(p.first, p.second.first);
+
 	if (bootstrap)
 		for (auto const& i: Host::pocHosts())
 			web3.requirePeer(i.first, i.second);
 	if (!remoteHost.empty())
 		web3.addNode(p2p::NodeId(), remoteHost + ":" + toString(remotePort));
 
-	signal(SIGABRT, &sighandler);
+	signal(SIGABRT, &Client::exitHandler);
-	signal(SIGTERM, &sighandler);
+	signal(SIGTERM, &Client::exitHandler);
-	signal(SIGINT, &sighandler);
+	signal(SIGINT, &Client::exitHandler);
 
 	if (c)
 	{
@@ -1044,17 +1105,20 @@ int main(int argc, char** argv)
 			shared_ptr<dev::WebThreeStubServer> rpcServer = make_shared<dev::WebThreeStubServer>(*console.connector(), web3, make_shared<SimpleAccountHolder>([&](){ return web3.ethereum(); }, getAccountPassword, keyManager), vector<KeyPair>(), keyManager, *gasPricer);
 			string sessionKey = rpcServer->newSession(SessionPermissions{{Privilege::Admin}});
 			console.eval("web3.admin.setSessionKey('" + sessionKey + "')");
-			while (console.readExpression())
+			while (!Client::shouldExit())
+			{
+				console.readExpression();
 				stopMiningAfterXBlocks(c, n, mining);
+			}
 			rpcServer->StopListening();
 #endif
 		}
 		else
-			while (!g_exit)
+			while (!Client::shouldExit())
 				stopMiningAfterXBlocks(c, n, mining);
 	}
 	else
-		while (!g_exit)
+		while (!Client::shouldExit())
 			this_thread::sleep_for(chrono::milliseconds(1000));
 
 #if ETH_JSONRPC

ethkey/KeyAux.h

@@ -413,6 +413,7 @@ public:
 							cerr << "Couldn't re-encode " << toUUID(u) << "; key corrupt or incorrect password supplied." << endl;
 					else
 						cerr << "Couldn't re-encode " << i << "; not found." << endl;
+				break;
 			case OperationMode::KillBare:
 				for (auto const& i: m_inputs)
 					if (h128 u = fromUUID(i))

ethminer/Farm.h

@@ -1,39 +0,0 @@
-/**
- * This file is generated by jsonrpcstub, DO NOT CHANGE IT MANUALLY!
- */
-
-#ifndef JSONRPC_CPP_STUB_FARM_H_
-#define JSONRPC_CPP_STUB_FARM_H_
-
-#include <jsonrpccpp/client.h>
-
-class Farm : public jsonrpc::Client
-{
-    public:
-        Farm(jsonrpc::IClientConnector &conn, jsonrpc::clientVersion_t type = jsonrpc::JSONRPC_CLIENT_V2) : jsonrpc::Client(conn, type) {}
-
-        Json::Value eth_getWork() throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_getWork",p);
-            if (result.isArray())
-                return result;
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
-        bool eth_submitWork(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p.append(param1);
-            p.append(param2);
-            p.append(param3);
-            Json::Value result = this->CallMethod("eth_submitWork",p);
-            if (result.isBool())
-                return result.asBool();
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
-};
-
-#endif //JSONRPC_CPP_STUB_FARM_H_

ethminer/FarmClient.h

@@ -0,0 +1,70 @@
+/**
+ * This file is generated by jsonrpcstub, DO NOT CHANGE IT MANUALLY!
+ */
+
+#ifndef JSONRPC_CPP_STUB_FARMCLIENT_H_
+#define JSONRPC_CPP_STUB_FARMCLIENT_H_
+
+#include <jsonrpccpp/client.h>
+
+class FarmClient : public jsonrpc::Client
+{
+    public:
+        FarmClient(jsonrpc::IClientConnector &conn, jsonrpc::clientVersion_t type = jsonrpc::JSONRPC_CLIENT_V2) : jsonrpc::Client(conn, type) {}
+
+        Json::Value eth_getWork() throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p = Json::nullValue;
+            Json::Value result = this->CallMethod("eth_getWork",p);
+            if (result.isArray())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+        bool eth_submitWork(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p.append(param1);
+            p.append(param2);
+            p.append(param3);
+            Json::Value result = this->CallMethod("eth_submitWork",p);
+            if (result.isBool())
+                return result.asBool();
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+        bool eth_submitHashrate(int param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p.append(param1);
+            p.append(param2);
+            Json::Value result = this->CallMethod("eth_submitHashrate",p);
+            if (result.isBool())
+                return result.asBool();
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+        Json::Value eth_awaitNewWork() throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p = Json::nullValue;
+            Json::Value result = this->CallMethod("eth_awaitNewWork",p);
+            if (result.isArray())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+        bool eth_progress() throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p = Json::nullValue;
+            Json::Value result = this->CallMethod("eth_progress",p);
+            if (result.isBool())
+                return result.asBool();
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+};
+
+#endif //JSONRPC_CPP_STUB_FARMCLIENT_H_

ethminer/MinerAux.h

@@ -52,7 +52,7 @@
 #include "BuildInfo.h"
 #if ETH_JSONRPC || !ETH_TRUE
 #include "PhoneHome.h"
-#include "Farm.h"
+#include "FarmClient.h"
 #endif
 using namespace std;
 using namespace dev;
@@ -482,7 +482,8 @@ private:
 #if ETH_JSONRPC || !ETH_TRUE
 		jsonrpc::HttpClient client(_remote);
 
-		Farm rpc(client);
+		h256 id = h256::random();
+		::FarmClient rpc(client);
 		GenericFarm<EthashProofOfWork> f;
 		f.setSealers(sealers);
 		if (_m == MinerType::CPU)
@@ -504,10 +505,16 @@ private:
 				});
 				for (unsigned i = 0; !completed; ++i)
 				{
+					auto mp = f.miningProgress();
+					f.resetMiningProgress();
 					if (current)
-						minelog << "Mining on PoWhash" << current.headerHash << ": " << f.miningProgress();
+						minelog << "Mining on PoWhash" << current.headerHash << ": " << mp;
 					else
 						minelog << "Getting work package...";
+
+					auto rate = mp.rate();
+					rpc.eth_submitHashrate((int)rate, "0x" + id.hex());
+
 					Json::Value v = rpc.eth_getWork();
 					h256 hh(v[0].asString());
 					h256 newSeedHash(v[1].asString());

ethminer/farm.json

@@ -1,6 +1,7 @@
 [
 	{ "name": "eth_getWork", "params": [], "order": [], "returns": []},
-	{ "name": "eth_submitWork", "params": ["", "", ""], "order": [], "returns": true}
+	{ "name": "eth_submitWork", "params": ["", "", ""], "order": [], "returns": true},
+	{ "name": "eth_submitHashrate", "params": [0, ""], "order": [], "returns": true},
 	{ "name": "eth_awaitNewWork", "params": [], "order": [], "returns": []},
 	{ "name": "eth_progress", "params": [], "order": [], "returns": true}
 ]

getcoverage.sh

@@ -17,6 +17,10 @@ case $i in
 	TEST_MODE="--all"
 	shift 
 	;;
+	--filltests)
+	TEST_FILL="--filltests"
+	shift
+	;;
 esac
 done
 
@@ -39,9 +43,9 @@ if which lcov >/dev/null; then
 		lcov --capture --initial --directory $BUILD_DIR --output-file $OUTPUT_DIR/coverage_base.info
 
 		echo Running testeth...
-		$CPP_ETHEREUM_PATH/build/test/testeth $TEST_MODE
+		$BUILD_DIR/test/testeth $TEST_MODE $TEST_FILL
-		$CPP_ETHEREUM_PATH/build/test/testeth -t StateTests --jit $TEST_MODE
+		$BUILD_DIR/test/testeth -t StateTests --jit $TEST_MODE
-		$CPP_ETHEREUM_PATH/build/test/testeth -t VMTests --jit $TEST_MODE
+		$BUILD_DIR/test/testeth -t VMTests --jit $TEST_MODE
 
 		echo Prepearing coverage info...
 		lcov --capture --directory $BUILD_DIR --output-file $OUTPUT_DIR/coverage_test.info

libdevcore/CommonData.h

@@ -104,6 +104,7 @@ bytes asNibbles(bytesConstRef const& _s);
 template <class T, class Out>
 inline void toBigEndian(T _val, Out& o_out)
 {
+	static_assert(std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed, "only unsigned types or bigint supported"); //bigint does not carry sign bit on shift
 	for (auto i = o_out.size(); i != 0; _val >>= 8, i--)
 	{
 		T v = _val & (T)0xff;
@@ -134,6 +135,7 @@ inline bytes toBigEndian(u160 _val) { bytes ret(20); toBigEndian(_val, ret); ret
 template <class T>
 inline bytes toCompactBigEndian(T _val, unsigned _min = 0)
 {
+	static_assert(std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed, "only unsigned types or bigint supported"); //bigint does not carry sign bit on shift
 	int i = 0;
 	for (T v = _val; v; ++i, v >>= 8) {}
 	bytes ret(std::max<unsigned>(_min, i), 0);
@@ -150,6 +152,7 @@ inline bytes toCompactBigEndian(byte _val, unsigned _min = 0)
 template <class T>
 inline std::string toCompactBigEndianString(T _val, unsigned _min = 0)
 {
+	static_assert(std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed, "only unsigned types or bigint supported"); //bigint does not carry sign bit on shift
 	int i = 0;
 	for (T v = _val; v; ++i, v >>= 8) {}
 	std::string ret(std::max<unsigned>(_min, i), '\0');
@@ -199,6 +202,7 @@ std::string randomWord();
 template <class T>
 inline unsigned bytesRequired(T _i)
 {
+	static_assert(std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed, "only unsigned types or bigint supported"); //bigint does not carry sign bit on shift
 	unsigned i = 0;
 	for (; _i != 0; ++i, _i >>= 8) {}
 	return i;

libethcore/Common.cpp

@@ -27,6 +27,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/SHA3.h>
+#include "ICAP.h"
 #include "Exceptions.h"
 #include "Params.h"
 #include "BlockInfo.h"
@@ -50,9 +51,26 @@ const unsigned c_databaseBaseVersion = 9;
 const unsigned c_databaseVersionModifier = 0;
 #endif
 
+const unsigned c_databaseVersion = c_databaseBaseVersion + (c_databaseVersionModifier << 8) + (23 << 9);
 
+Address toAddress(std::string const& _s)
+{
+	try
+	{
+		eth::ICAP i = eth::ICAP::decoded(_s);
+		return i.direct();
+	}
+	catch (eth::InvalidICAP&) {}
+	try
+	{
+		auto b = fromHex(_s.substr(0, 2) == "0x" ? _s.substr(2) : _s, WhenError::Throw);
+		if (b.size() == 20)
+			return Address(b);
+	}
+	catch (BadHexCharacter&) {}
+	BOOST_THROW_EXCEPTION(InvalidAddress());
+}
 
-const unsigned c_databaseVersion = c_databaseBaseVersion + (c_databaseVersionModifier << 8) + (23 << 9);
 
 vector<pair<u256, string>> const& units()
 {

libethcore/Common.h

@@ -57,6 +57,11 @@ Network resetNetwork(Network _n);
 /// User-friendly string representation of the amount _b in wei.
 std::string formatBalance(bigint const& _b);
 
+DEV_SIMPLE_EXCEPTION(InvalidAddress);
+
+/// Convert the given string into an address.
+Address toAddress(std::string const& _s);
+
 /// Get information concerning the currency denominations.
 std::vector<std::pair<u256, std::string>> const& units();
 

libethcore/CommonJS.cpp

@@ -22,29 +22,10 @@
  */
 
 #include "CommonJS.h"
-#include "ICAP.h"
 
 namespace dev
 {
 
-Address jsToAddress(std::string const& _s)
-{
-	try
-	{
-		eth::ICAP i = eth::ICAP::decoded(_s);
-		return i.direct();
-	}
-	catch (eth::InvalidICAP&) {}
-	try
-	{
-		auto b = fromHex(_s.substr(0, 2) == "0x" ? _s.substr(2) : _s, WhenError::Throw);
-		if (b.size() == 20)
-			return Address(b);
-	}
-	catch (BadHexCharacter&) {}
-	BOOST_THROW_EXCEPTION(InvalidAddress());
-}
-
 std::string prettyU256(u256 _n, bool _abridged)
 {
 	unsigned inc = 0;

libethcore/CommonJS.h

@@ -33,8 +33,6 @@
 namespace dev
 {
 
-DEV_SIMPLE_EXCEPTION(InvalidAddress);
-
 /// Leniently convert string to Public (h512). Accepts integers, "0x" prefixing, non-exact length.
 inline Public jsToPublic(std::string const& _s) { return jsToFixed<sizeof(dev::Public)>(_s); }
 
@@ -42,7 +40,7 @@ inline Public jsToPublic(std::string const& _s) { return jsToFixed<sizeof(dev::P
 inline Secret jsToSecret(std::string const& _s) { h256 d = jsToFixed<sizeof(dev::Secret)>(_s); Secret ret(d); d.ref().cleanse(); return ret; }
 
 /// Leniently convert string to Address (h160). Accepts integers, "0x" prefixing, non-exact length.
-Address jsToAddress(std::string const& _s);
+inline Address jsToAddress(std::string const& _s) { return eth::toAddress(_s); }
 
 /// Convert u256 into user-readable string. Returns int/hex value of 64 bits int, hex of 160 bits FixedHash. As a fallback try to handle input as h256.
 std::string prettyU256(u256 _n, bool _abridged = true);

libethcore/EthashGPUMiner.cpp

@@ -213,9 +213,9 @@ bool EthashGPUMiner::configureGPU(
 	s_platformId = _platformId;
 	s_deviceId = _deviceId;
 
-	if (_localWorkSize != 32 && _localWorkSize != 64 && _localWorkSize != 128)
+	if (_localWorkSize != 32 && _localWorkSize != 64 && _localWorkSize != 128 && _localWorkSize != 256)
 	{
-		cout << "Given localWorkSize of " << toString(_localWorkSize) << "is invalid. Must be either 32,64, or 128" << endl;
+		cout << "Given localWorkSize of " << toString(_localWorkSize) << "is invalid. Must be either 32,64,128 or 256" << endl;
 		return false;
 	}
 

libethereum/Account.cpp

@@ -20,6 +20,7 @@
  */
 
 #include "Account.h"
+#include <liblll/Compiler.h>
 #include <test/JsonSpiritHeaders.h>
 #include <libethcore/Common.h>
 using namespace std;
@@ -63,7 +64,15 @@ AccountMap dev::eth::jsonToAccountMap(std::string const& _json, AccountMaskMap*
 		if (haveCode)
 		{
 			ret[a] = Account(balance, Account::ContractConception);
-			ret[a].setCode(fromHex(o["code"].get_str()));
+			if (o["code"].type() == json_spirit::str_type)
+			{
+				if (o["code"].get_str().find("0x") != 0)
+					ret[a].setCode(compileLLL(o["code"].get_str(), false));
+				else
+					ret[a].setCode(fromHex(o["code"].get_str().substr(2)));
+			}
+			else
+				cerr << "Error importing code of account " << a << "! Code field needs to be a string";
 		}
 		else
 			ret[a] = Account(balance, Account::NormalCreation);

libethereum/BlockChainSync.h

@@ -113,6 +113,9 @@ protected:
 	/// Request blocks from peer if needed
 	void requestBlocks(std::shared_ptr<EthereumPeer> _peer);
 
+private:
+	EthereumHost& m_host;
+
 protected:
 	Handler<> m_bqRoomAvailable;			///< Triggered once block queue
 	mutable RecursiveMutex x_sync;
@@ -124,8 +127,6 @@ private:
 	static char const* const s_stateNames[static_cast<int>(SyncState::Size)];
 	bool invariants() const override = 0;
 	void logNewBlock(h256 const& _h);
-
-	EthereumHost& m_host;
 };
 
 

libethereum/CanonBlockChain.cpp

@@ -43,6 +43,8 @@ boost::shared_mutex CanonBlockChain<Ethash>::x_genesis;
 Nonce CanonBlockChain<Ethash>::s_nonce(u64(42));
 string CanonBlockChain<Ethash>::s_genesisStateJSON;
 bytes CanonBlockChain<Ethash>::s_genesisExtraData;
+u256 CanonBlockChain<Ethash>::s_genesisDifficulty;
+u256 CanonBlockChain<Ethash>::s_genesisGasLimit;
 
 CanonBlockChain<Ethash>::CanonBlockChain(std::string const& _path, WithExisting _we, ProgressCallback const& _pc):
 	FullBlockChain<Ethash>(createGenesisBlock(), createGenesisState(), _path)
@@ -91,9 +93,9 @@ bytes CanonBlockChain<Ethash>::createGenesisBlock()
 			<< EmptyTrie	// transactions
 			<< EmptyTrie	// receipts
 			<< LogBloom()
-			<< difficulty
+			<< (s_genesisDifficulty ? s_genesisDifficulty : difficulty)
 			<< 0	// number
-			<< gasLimit
+			<< (s_genesisGasLimit ? s_genesisGasLimit : gasLimit)
 			<< 0	// gasUsed
 			<< timestamp
 			<< (s_genesisExtraData.empty() ? extraData : s_genesisExtraData)
@@ -126,6 +128,20 @@ void CanonBlockChain<Ethash>::forceGenesisExtraData(bytes const& _genesisExtraDa
 	s_genesis.reset();
 }
 
+void CanonBlockChain<Ethash>::forceGenesisDifficulty(u256 const& _genesisDifficulty)
+{
+	WriteGuard l(x_genesis);
+	s_genesisDifficulty = _genesisDifficulty;
+	s_genesis.reset();
+}
+
+void CanonBlockChain<Ethash>::forceGenesisGasLimit(u256 const& _genesisGasLimit)
+{
+	WriteGuard l(x_genesis);
+	s_genesisGasLimit = _genesisGasLimit;
+	s_genesis.reset();
+}
+
 Ethash::BlockHeader const& CanonBlockChain<Ethash>::genesis()
 {
 	UpgradableGuard l(x_genesis);

libethereum/CanonBlockChain.h

@@ -103,6 +103,12 @@ public:
 	/// Override the genesis block's extraData field.
 	static void forceGenesisExtraData(bytes const& _genesisExtraData);
 
+	/// Override the genesis block's difficulty field.
+	static void forceGenesisDifficulty(u256 const& _genesisDifficulty);
+
+	/// Override the genesis block's gasLimit field.
+	static void forceGenesisGasLimit(u256 const& _genesisGasLimit);
+
 private:
 	/// Static genesis info and its lock.
 	static boost::shared_mutex x_genesis;
@@ -110,6 +116,8 @@ private:
 	static Nonce s_nonce;
 	static std::string s_genesisStateJSON;
 	static bytes s_genesisExtraData;
+	static u256 s_genesisDifficulty;
+	static u256 s_genesisGasLimit;
 };
 
 }

libethereum/Client.cpp

@@ -67,6 +67,12 @@ const char* ClientTrace::name() { return EthTeal "⧫" EthGray " ◎"; }
 const char* ClientDetail::name() { return EthTeal "⧫" EthCoal " ●"; }
 #endif
 
+bool Client::s_shouldExit = false;
+void Client::exitHandler(int)
+{
+	s_shouldExit = true;
+}
+
 static const Addresses c_canaries =
 {
 	Address("4bb7e8ae99b645c2b7860b8f3a2328aae28bd80a"),		// gav
@@ -110,9 +116,9 @@ void Client::init(p2p::Host* _extNet, std::string const& _dbPath, WithExisting _
 
 	m_gp->update(bc());
 
-	auto host = _extNet->registerCapability(new EthereumHost(bc(), m_tq, m_bq, _networkId));
+	auto host = _extNet->registerCapability(make_shared<EthereumHost>(bc(), m_tq, m_bq, _networkId));
 	m_host = host;
-	_extNet->addCapability(host, EthereumHost::staticName(), EthereumHost::c_oldProtocolVersion); //TODO: remove this one v61+ protocol is common
+	_extNet->addCapability(host, EthereumHost::staticName(), EthereumHost::c_oldProtocolVersion); //TODO: remove this once v61+ protocol is common
 
 	if (_dbPath.size())
 		Defaults::setDBPath(_dbPath);
@@ -503,9 +509,10 @@ WorkingProgress Client::miningProgress() const
 
 uint64_t Client::hashrate() const
 {
+	uint64_t r = externalHashrate();
 	if (Ethash::isWorking(m_sealEngine.get()))
-		return Ethash::workingProgress(m_sealEngine.get()).rate();
+		r += Ethash::workingProgress(m_sealEngine.get()).rate();
-	return 0;
+	return r;
 }
 
 std::list<MineInfo> Client::miningHistory()

libethereum/Client.h

@@ -98,6 +98,8 @@ public:
 
 	/// Get the remaining gas limit in this block.
 	virtual u256 gasLimitRemaining() const override { return m_postMine.gasLimitRemaining(); }
+	/// Get the gas bid price
+	virtual u256 gasBidPrice() const override { return m_gp->bid(); }
 
 	// [PRIVATE API - only relevant for base clients, not available in general]
 	/// Get the block.
@@ -121,6 +123,8 @@ public:
 	BlockQueue const& blockQueue() const { return m_bq; }
 	/// Get the block queue.
 	OverlayDB const& stateDB() const { return m_stateDB; }
+	/// Handles a request to exit the client with a specific signal
+	static void exitHandler(int signal);
 
 	/// Freeze worker thread and sync some of the block queue.
 	std::tuple<ImportRoute, bool, unsigned> syncQueue(unsigned _max = 1);
@@ -144,6 +148,8 @@ public:
 	/// Enable/disable precomputing of the DAG for next epoch
 	void setShouldPrecomputeDAG(bool _precompute);
 
+	/// Check to see if we should exit
+	static bool shouldExit() { return s_shouldExit; }
 	/// Check to see if we'd mine on an apparently bad chain.
 	bool mineOnBadChain() const { return m_mineOnBadChain; }
 	/// Set true if you want to mine even when the canary says you're on the wrong chain.
@@ -324,6 +330,7 @@ protected:
 	bool m_forceMining = false;				///< Mine even when there are no transactions pending?
 	bool m_mineOnBadChain = false;			///< Mine even when the canary says it's a bad chain.
 	bool m_paranoia = false;				///< Should we be paranoid about our state?
+	static bool s_shouldExit;				///< Exit requested?
 
 	mutable std::chrono::system_clock::time_point m_lastGarbageCollection;
 											///< When did we last both doing GC on the watches?

libethereum/ClientBase.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "ClientBase.h"
-
+#include <algorithm>
 #include <libdevcore/StructuredLogger.h>
 #include "BlockChain.h"
 #include "Executive.h"
@@ -492,11 +492,10 @@ int ClientBase::compareBlockHashes(h256 _h1, h256 _h2) const
 	BlockNumber n1 = numberFromHash(_h1);
 	BlockNumber n2 = numberFromHash(_h2);
 
-	if (n1 > n2) {
+	if (n1 > n2)
 		return 1;
-	} else if (n1 == n2) {
+	else if (n1 == n2)
 		return 0;
-	}
 	return -1;
 }
 
@@ -524,3 +523,19 @@ bool ClientBase::isKnownTransaction(h256 const& _blockHash, unsigned _i) const
 {
 	return isKnown(_blockHash) && bc().transactions().size() > _i;
 }
+
+void ClientBase::submitExternalHashrate(int _rate, h256 const& _id)
+{
+	m_externalRates[_id] = make_pair(_rate, chrono::steady_clock::now());
+}
+
+uint64_t ClientBase::externalHashrate() const
+{
+	uint64_t ret = 0;
+	for (auto i = m_externalRates.begin(); i != m_externalRates.end();)
+		if (chrono::steady_clock::now() - i->second.second > chrono::seconds(5))
+			i = m_externalRates.erase(i);
+		else
+			ret += i++->second.first;
+	return ret;
+}

libethereum/ClientBase.h

@@ -148,6 +148,7 @@ public:
 	using Interface::addresses;
 	virtual Addresses addresses(BlockNumber _block) const override;
 	virtual u256 gasLimitRemaining() const override;
+	virtual u256 gasBidPrice() const override { return c_defaultGasPrice; }
 
 	/// Get the coinbase address
 	virtual Address address() const override;
@@ -166,6 +167,8 @@ public:
 	virtual uint64_t hashrate() const override { BOOST_THROW_EXCEPTION(InterfaceNotSupported("ClientBase::hashrate")); }
 	virtual WorkingProgress miningProgress() const override { BOOST_THROW_EXCEPTION(InterfaceNotSupported("ClientBase::miningProgress")); }
 
+	virtual void submitExternalHashrate(int _rate, h256 const& _id) override;
+
 	Block asOf(BlockNumber _h) const;
 
 protected:
@@ -179,6 +182,8 @@ protected:
 	virtual void prepareForTransaction() = 0;
 	/// }
 
+	uint64_t externalHashrate() const;
+
 	TransactionQueue m_tq;							///< Maintains a list of incoming transactions not yet in a block on the blockchain.
 
 	// filters
@@ -187,6 +192,9 @@ protected:
 	std::unordered_map<h256, h256s> m_specialFilters = std::unordered_map<h256, std::vector<h256>>{{PendingChangedFilter, {}}, {ChainChangedFilter, {}}};
 															///< The dictionary of special filters and their additional data
 	std::map<unsigned, ClientWatch> m_watches;				///< Each and every watch - these reference a filter.
+	
+	// external hashrate
+	mutable std::unordered_map<h256, std::pair<uint64_t, std::chrono::steady_clock::time_point>> m_externalRates;
 };
 
 }}

libethereum/EthereumPeer.cpp

@@ -63,7 +63,7 @@ EthereumPeer::~EthereumPeer()
 {
 	if (m_asking != Asking::Nothing)
 	{
-		cnote << "Peer aborting while being asked for " << ::toString(m_asking);
+		clog(NetAllDetail) << "Peer aborting while being asked for " << ::toString(m_asking);
 		setRude();
 	}
 	abortSync();

libethereum/Executive.cpp

@@ -39,7 +39,7 @@ const char* VMTraceChannel::name() { return "EVM"; }
 const char* ExecutiveWarnChannel::name() { return WarnChannel::name(); }
 
 StandardTrace::StandardTrace():
-	m_trace(new Json::Value(Json::arrayValue))
+	m_trace(make_shared<Json::Value>(Json::arrayValue))
 {}
 
 bool changesMemory(Instruction _inst)

libethereum/Interface.h

@@ -190,6 +190,8 @@ public:
 
 	/// Get the remaining gas limit in this block.
 	virtual u256 gasLimitRemaining() const = 0;
+	// Get the gas bidding price
+	virtual u256 gasBidPrice() const = 0;
 
 	// [MINING API]:
 
@@ -215,7 +217,8 @@ public:
 	virtual std::tuple<h256, h256, h256> getEthashWork() { BOOST_THROW_EXCEPTION(InterfaceNotSupported("Interface::getEthashWork")); }
 	/// Submit the nonce for the proof-of-work.
 	virtual bool submitEthashWork(h256 const&, h64 const&) { BOOST_THROW_EXCEPTION(InterfaceNotSupported("Interface::submitEthashWork")); }
-
+	/// Submit the ongoing hashrate of a particular external miner.
+	virtual void submitExternalHashrate(int, h256 const&) { BOOST_THROW_EXCEPTION(InterfaceNotSupported("Interface::submitExternalHashrate")); }
 	/// Check the progress of the mining.
 	virtual WorkingProgress miningProgress() const = 0;
 

libethereum/State.cpp

@@ -243,9 +243,9 @@ unordered_map<Address, u256> State::addresses() const
 void State::setRoot(h256 const& _r)
 {
 	m_cache.clear();
-	m_touched.clear();
+//	m_touched.clear();
 	m_state.setRoot(_r);
-	paranoia("begin resetCurrent", true);
+	paranoia("begin setRoot", true);
 }
 
 bool State::addressInUse(Address const& _id) const

libevmasm/Assembly.h

@@ -112,7 +112,7 @@ protected:
 	unsigned bytesRequired() const;
 
 private:
-	Json::Value streamAsmJson(std::ostream& _out, const StringMap &_sourceCodes) const;
+	Json::Value streamAsmJson(std::ostream& _out, StringMap const& _sourceCodes) const;
 	std::ostream& streamAsm(std::ostream& _out, std::string const& _prefix, StringMap const& _sourceCodes) const;
 	Json::Value createJsonValue(std::string _name, int _begin, int _end, std::string _value = std::string(), std::string _jumpType = std::string()) const;
 

libjsconsole/JSConsole.h

@@ -41,7 +41,7 @@ public:
 	JSConsole(): m_engine(Engine()), m_printer(Printer(m_engine)) {}
 	~JSConsole() {}
 
-	bool readExpression() const
+	void readExpression() const
 	{
 		std::string cmd = "";
 		g_logPost = [](std::string const& a, char const*)
@@ -83,9 +83,6 @@ public:
 			}
 		} while (openBrackets > 0);
 
-		if (cmd == "quit")
-			return false;
-
 		if (!isEmpty)
 		{
 #if ETH_READLINE
@@ -95,7 +92,6 @@ public:
 			std::string result = m_printer.prettyPrint(value).cstr();
 			std::cout << result << std::endl;
 		}
-		return true;
 	}
 
 	void eval(std::string const& _expression) { m_engine.eval(_expression.c_str()); }

libjsengine/JSEngine.h

@@ -59,7 +59,7 @@ class JSEngine
 {
 public:
 	// should be used to evalute javascript expression
-	virtual T eval(char const* _cstr) const = 0;
+	virtual T eval(char const* _cstr, char const* _origin = "(shell)") const = 0;
 };
 
 }

libjsengine/JSV8Engine.cpp

@@ -21,6 +21,8 @@
  */
 
 #include <memory>
+#include <iostream>
+#include <fstream>
 #include "JSV8Engine.h"
 #include "JSV8Printer.h"
 #include "libjsengine/JSEngineResources.hpp"
@@ -93,7 +95,7 @@ void reportException(TryCatch* _tryCatch)
 	}
 }
 
-Handle<Value> ConsoleLog(Arguments const& _args)
+Handle<Value> consoleLog(Arguments const& _args)
 {
 	Local<External> wrap = Local<External>::Cast(_args.Data());
 	auto engine = reinterpret_cast<JSV8Engine const*>(wrap->Value());
@@ -103,6 +105,35 @@ Handle<Value> ConsoleLog(Arguments const& _args)
 	return Undefined();
 }
 
+Handle<Value> loadScript(Arguments const& _args)
+{
+	Local<External> wrap = Local<External>::Cast(_args.Data());
+	auto engine = reinterpret_cast<JSV8Engine const*>(wrap->Value());
+
+	if (_args.Length() < 1)
+		return v8::ThrowException(v8::String::New("Missing file name."));
+	if (_args[0].IsEmpty() || _args[0]->IsUndefined())
+		return v8::ThrowException(v8::String::New("Invalid file name."));
+	v8::String::Utf8Value fileName(_args[0]);
+	if (fileName.length() == 0)
+		return v8::ThrowException(v8::String::New("Invalid file name."));
+
+	std::ifstream is(*fileName, std::ifstream::binary);
+	if (!is)
+		return v8::ThrowException(v8::String::New("Error opening file."));
+
+	string contents;
+	is.seekg(0, is.end);
+	streamoff length = is.tellg();
+	if (length > 0)
+	{
+		is.seekg(0, is.beg);
+		contents.resize(length);
+		is.read(const_cast<char*>(contents.data()), length);
+	}
+
+	return engine->eval(contents.data(), *fileName).value();
+}
 
 class JSV8Scope
 {
@@ -158,11 +189,14 @@ JSV8Engine::JSV8Engine(): m_scope(new JSV8Scope())
 
 	auto consoleTemplate = ObjectTemplate::New();
 
-	Local<FunctionTemplate> function = FunctionTemplate::New(ConsoleLog, External::New(this));
+	Local<FunctionTemplate> consoleLogFunction = FunctionTemplate::New(consoleLog, External::New(this));
-	consoleTemplate->Set(String::New("debug"), function);
+	consoleTemplate->Set(String::New("debug"), consoleLogFunction);
-	consoleTemplate->Set(String::New("log"), function);
+	consoleTemplate->Set(String::New("log"), consoleLogFunction);
-	consoleTemplate->Set(String::New("error"), function);
+	consoleTemplate->Set(String::New("error"), consoleLogFunction);
 	context()->Global()->Set(String::New("console"), consoleTemplate->NewInstance());
+
+	Local<FunctionTemplate> loadScriptFunction = FunctionTemplate::New(loadScript, External::New(this));
+	context()->Global()->Set(String::New("loadScript"), loadScriptFunction->GetFunction());
 }
 
 JSV8Engine::~JSV8Engine()
@@ -170,11 +204,11 @@ JSV8Engine::~JSV8Engine()
 	delete m_scope;
 }
 
-JSV8Value JSV8Engine::eval(char const* _cstr) const
+JSV8Value JSV8Engine::eval(char const* _cstr, char const* _origin) const
 {
 	TryCatch tryCatch;
 	Local<String> source = String::New(_cstr);
-	Local<String> name(String::New("(shell)"));
+	Local<String> name(String::New(_origin));
 	ScriptOrigin origin(name);
 	Handle<Script> script = Script::Compile(source, &origin);
 

libjsengine/JSV8Engine.h

@@ -54,7 +54,7 @@ class JSV8Engine: public JSEngine<JSV8Value>
 public:
 	JSV8Engine();
 	virtual ~JSV8Engine();
-	JSV8Value eval(char const* _cstr) const;
+	JSV8Value eval(char const* _cstr, char const* _origin = "(shell)") const;
 	v8::Handle<v8::Context> const& context() const;
 
 private:

libjsqrc/admin.js

@@ -35,6 +35,11 @@ web3._extend({
         call: 'admin_eth_blockQueueStatus',
         inputFormatter: [getSessionKey],
         params: 1
+    }), new web3._extend.Method({
+        name: 'eth.exit',
+        call: 'admin_eth_exit',
+        inputFormatter: [getSessionKey],
+        params: 1
     }), new web3._extend.Method({
         name: 'net.nodeInfo',
         call: 'admin_net_nodeInfo',

libp2p/Capability.cpp

@@ -35,7 +35,7 @@ Capability::Capability(std::shared_ptr<Session> _s, HostCapabilityFace* _h, unsi
 
 void Capability::disable(std::string const& _problem)
 {
-	clog(NetNote) << "DISABLE: Disabling capability '" << m_hostCap->name() << "'. Reason:" << _problem;
+	clog(NetTriviaSummary) << "DISABLE: Disabling capability '" << m_hostCap->name() << "'. Reason:" << _problem;
 	m_enabled = false;
 }
 

libp2p/Common.h

@@ -221,7 +221,7 @@ class DeadlineOps
 	{
 	public:
 		DeadlineOp(ba::io_service& _io, unsigned _msInFuture, std::function<void(boost::system::error_code const&)> const& _f): m_timer(new ba::deadline_timer(_io)) { m_timer->expires_from_now(boost::posix_time::milliseconds(_msInFuture)); m_timer->async_wait(_f); }
-		~DeadlineOp() {}
+		~DeadlineOp() { if (m_timer) m_timer->cancel(); }
 		
 		DeadlineOp(DeadlineOp&& _s): m_timer(_s.m_timer.release()) {}
 		DeadlineOp& operator=(DeadlineOp&& _s)
@@ -248,6 +248,8 @@ public:
 
 	void stop() { m_stopped = true; DEV_GUARDED(x_timers) m_timers.clear(); }
 
+	bool isStopped() const { return m_stopped; }
+	
 protected:
 	void reap();
 	

libp2p/Host.cpp

@@ -225,7 +225,7 @@ void Host::doneWorking()
 	m_sessions.clear();
 }
 
-void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s)
+void Host::startPeerSession(Public const& _id, RLP const& _rlp, unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s)
 {
 	// session maybe ingress or egress so m_peers and node table entries may not exist
 	shared_ptr<Peer> p;
@@ -237,9 +237,9 @@ void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameCoder*
 		{
 			// peer doesn't exist, try to get port info from node table
 			if (Node n = m_nodeTable->node(_id))
-				p.reset(new Peer(n));
+				p = make_shared<Peer>(n);
 			else
-				p.reset(new Peer(Node(_id, UnspecifiedNodeIPEndpoint)));
+				p = make_shared<Peer>(Node(_id, UnspecifiedNodeIPEndpoint));
 			m_peers[_id] = p;
 		}
 	}
@@ -264,7 +264,7 @@ void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameCoder*
 	clog(NetMessageSummary) << "Hello: " << clientVersion << "V[" << protocolVersion << "]" << _id << showbase << capslog.str() << dec << listenPort;
 	
 	// create session so disconnects are managed
-	auto ps = make_shared<Session>(this, _io, _s, p, PeerSessionInfo({_id, clientVersion, p->endpoint.address.to_string(), listenPort, chrono::steady_clock::duration(), _rlp[2].toSet<CapDesc>(), 0, map<string, string>(), protocolVersion}));
+	auto ps = make_shared<Session>(this, move(_io), _s, p, PeerSessionInfo({_id, clientVersion, p->endpoint.address.to_string(), listenPort, chrono::steady_clock::duration(), _rlp[2].toSet<CapDesc>(), 0, map<string, string>(), protocolVersion}));
 	if (protocolVersion < dev::p2p::c_protocolVersion - 1)
 	{
 		ps->disconnect(IncompatibleProtocol);
@@ -294,7 +294,7 @@ void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameCoder*
 		for (auto const& i: caps)
 			if (haveCapability(i))
 			{
-				ps->m_capabilities[i] = shared_ptr<Capability>(m_capabilities[i]->newPeerCapability(ps, o, i));
+				ps->m_capabilities[i] = m_capabilities[i]->newPeerCapability(ps, o, i);
 				o += m_capabilities[i]->messageCount();
 			}
 		ps->start();
@@ -323,7 +323,7 @@ void Host::onNodeTableEvent(NodeId const& _n, NodeTableEventType const& _e)
 				}
 				else
 				{
-					p.reset(new Peer(n));
+					p = make_shared<Peer>(n);
 					m_peers[_n] = p;
 					clog(NetP2PNote) << "p2p.host.peers.events.peerAdded " << _n << p->endpoint;
 				}
@@ -449,7 +449,7 @@ string Host::pocHost()
 std::unordered_map<Public, std::string> const& Host::pocHosts()
 {
 	static const std::unordered_map<Public, std::string> c_ret = {
-		{ Public("487611428e6c99a11a9795a6abe7b529e81315ca6aad66e2a2fc76e3adf263faba0d35466c2f8f68d561dbefa8878d4df5f1f2ddb1fbeab7f42ffb8cd328bd4a"), "poc-9.ethdev.com:30303" },
+		{ Public("979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9"), "poc-9.ethdev.com:30303" },
 		{ Public("a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c"), "52.16.188.185:30303" },
 		{ Public("7f25d3eab333a6b98a8b5ed68d962bb22c876ffcd5561fca54e3c2ef27f754df6f7fd7c9b74cc919067abac154fb8e1f8385505954f161ae440abc355855e034"), "54.207.93.166:30303" }
 	};
@@ -491,14 +491,14 @@ void Host::requirePeer(NodeId const& _n, NodeIPEndpoint const& _endpoint)
 			}
 			else
 			{
-				p.reset(new Peer(node));
+				p = make_shared<Peer>(node);
 				m_peers[_n] = p;
 			}
 	}
 	else if (m_nodeTable)
 	{
 		m_nodeTable->addNode(node);
-		shared_ptr<boost::asio::deadline_timer> t(new boost::asio::deadline_timer(m_ioService));
+		auto t = make_shared<boost::asio::deadline_timer>(m_ioService);
 		t->expires_from_now(boost::posix_time::milliseconds(600));
 		t->async_wait([this, _n](boost::system::error_code const& _ec)
 		{
@@ -530,14 +530,8 @@ void Host::connect(std::shared_ptr<Peer> const& _p)
 		return;
 	}
 
-	if (!!m_nodeTable && !m_nodeTable->haveNode(_p->id))
+	if (!!m_nodeTable && !m_nodeTable->haveNode(_p->id) && !_p->required)
-	{
-		// connect was attempted, so try again by adding to node table
-		m_nodeTable->addNode(*_p.get());
-		// abort unless peer is required
-		if (!_p->required)
 		return;
-	}
 
 	// prevent concurrently connecting to a node
 	Peer *nptr = _p.get();
@@ -712,7 +706,12 @@ void Host::startedWorking()
 	else
 		clog(NetP2PNote) << "p2p.start.notice id:" << id() << "TCP Listen port is invalid or unavailable.";
 
-	shared_ptr<NodeTable> nodeTable(new NodeTable(m_ioService, m_alias, NodeIPEndpoint(bi::address::from_string(listenAddress()), listenPort(), listenPort()), m_netPrefs.discovery));
+	auto nodeTable = make_shared<NodeTable>(
+		m_ioService,
+		m_alias,
+		NodeIPEndpoint(bi::address::from_string(listenAddress()), listenPort(), listenPort()),
+		m_netPrefs.discovery
+	);
 	nodeTable->setEventHandler(new HostNodeTableHandler(*this));
 	m_nodeTable = nodeTable;
 	restoreNetwork(&m_restoreNetwork);

libp2p/Host.h

@@ -119,16 +119,6 @@ struct NodeInfo
 	std::string version;
 };
 
-struct HostPeerPreferences
-{
-	unsigned const idealPeerCount = 11;	// Ideal number of peers to be connected to.
-	unsigned const stretchPeerCount = 7;	// Accepted connection multiplier (max peers = ideal*stretch).
-	
-//	std::list<NodeId> const defaultPeers;
-//	std::list<NodeId> const requiredPeers;
-//	std::list<NodeId> const trusted;
-};
-
 /**
  * @brief The Host class
  * Capabilities should be registered prior to startNetwork, since m_capabilities is not thread-safe.
@@ -161,7 +151,7 @@ public:
 	static std::unordered_map<Public, std::string> const& pocHosts();
 
 	/// Register a peer-capability; all new peer connections will have this capability.
-	template <class T> std::shared_ptr<T> registerCapability(T* _t) { _t->m_host = this; std::shared_ptr<T> ret(_t); m_capabilities[std::make_pair(T::staticName(), T::staticVersion())] = ret; return ret; }
+	template <class T> std::shared_ptr<T> registerCapability(std::shared_ptr<T> const& _t) { _t->m_host = this; m_capabilities[std::make_pair(T::staticName(), T::staticVersion())] = _t; return _t; }
 	template <class T> void addCapability(std::shared_ptr<T> const & _p, std::string const& _name, u256 const& _version) { m_capabilities[std::make_pair(_name, _version)] = _p; }
 
 	bool haveCapability(CapDesc const& _name) const { return m_capabilities.count(_name) != 0; }
@@ -225,7 +215,7 @@ public:
 	bool haveNetwork() const { return m_run && !!m_nodeTable; }
 	
 	/// Validates and starts peer session, taking ownership of _io. Disconnects and returns false upon error.
-	void startPeerSession(Public const& _id, RLP const& _hello, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s);
+	void startPeerSession(Public const& _id, RLP const& _hello, std::unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s);
 
 	/// Get session by id
 	std::shared_ptr<Session> peerSession(NodeId const& _id) { RecursiveGuard l(x_sessions); return m_sessions.count(_id) ? m_sessions[_id].lock() : std::shared_ptr<Session>(); }

libp2p/HostCapability.h

@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include <memory>
 #include "Peer.h"
 #include "Common.h"
 
@@ -53,7 +54,7 @@ protected:
 	virtual u256 version() const = 0;
 	CapDesc capDesc() const { return std::make_pair(name(), version()); }
 	virtual unsigned messageCount() const = 0;
-	virtual Capability* newPeerCapability(std::shared_ptr<Session> _s, unsigned _idOffset, CapDesc const& _cap) = 0;
+	virtual std::shared_ptr<Capability> newPeerCapability(std::shared_ptr<Session> const& _s, unsigned _idOffset, CapDesc const& _cap) = 0;
 
 	virtual void onStarting() {}
 	virtual void onStopping() {}
@@ -77,7 +78,7 @@ protected:
 	virtual std::string name() const { return PeerCap::name(); }
 	virtual u256 version() const { return PeerCap::version(); }
 	virtual unsigned messageCount() const { return PeerCap::messageCount(); }
-	virtual Capability* newPeerCapability(std::shared_ptr<Session> _s, unsigned _idOffset, CapDesc const& _cap) { return new PeerCap(_s, this, _idOffset, _cap); }
+	virtual std::shared_ptr<Capability> newPeerCapability(std::shared_ptr<Session> const& _s, unsigned _idOffset, CapDesc const& _cap) { return std::make_shared<PeerCap>(_s, this, _idOffset, _cap); }
 };
 
 }

libp2p/Network.cpp

@@ -169,10 +169,10 @@ bi::tcp::endpoint Network::traverseNAT(std::set<bi::address> const& _ifAddresses
 {
 	asserts(_listenPort != 0);
 
-	UPnP* upnp = nullptr;
+	unique_ptr<UPnP> upnp;
 	try
 	{
-		upnp = new UPnP;
+		upnp.reset(new UPnP);
 	}
 	// let m_upnp continue as null - we handle it properly.
 	catch (...) {}
@@ -200,9 +200,6 @@ bi::tcp::endpoint Network::traverseNAT(std::set<bi::address> const& _ifAddresses
 		}
 		else
 			clog(NetWarn) << "Couldn't punch through NAT (or no NAT in place).";
-
-		if (upnp)
-			delete upnp;
 	}
 
 	return upnpEP;

libp2p/Network.h

@@ -37,6 +37,8 @@ namespace dev
 namespace p2p
 {
 
+static const unsigned short c_defaultListenPort = 30303;
+
 struct NetworkPreferences
 {
 	// Default Network Preferences
@@ -52,7 +54,7 @@ struct NetworkPreferences
 	
 	std::string publicIPAddress;
 	std::string listenIPAddress;
-	unsigned short listenPort = 30303;
+	unsigned short listenPort = c_defaultListenPort;
 	
 	
 	/// Preferences

libp2p/NodeTable.cpp

@@ -43,7 +43,7 @@ NodeEntry::NodeEntry(NodeId const& _src, Public const& _pubk, NodeIPEndpoint con
 NodeTable::NodeTable(ba::io_service& _io, KeyPair const& _alias, NodeIPEndpoint const& _endpoint, bool _enabled):
 	m_node(Node(_alias.pub(), _endpoint)),
 	m_secret(_alias.sec()),
-	m_socket(new NodeSocket(_io, *this, (bi::udp::endpoint)m_node.endpoint)),
+	m_socket(make_shared<NodeSocket>(_io, *reinterpret_cast<UDPSocketEvents*>(this), (bi::udp::endpoint)m_node.endpoint)),
 	m_socketPointer(m_socket.get()),
 	m_timers(_io)
 {
@@ -67,8 +67,8 @@ NodeTable::NodeTable(ba::io_service& _io, KeyPair const& _alias, NodeIPEndpoint
 	
 NodeTable::~NodeTable()
 {
-	m_timers.stop();
 	m_socketPointer->disconnect();
+	m_timers.stop();
 }
 
 void NodeTable::processEvents()
@@ -81,7 +81,7 @@ shared_ptr<NodeEntry> NodeTable::addNode(Node const& _node, NodeRelation _relati
 {
 	if (_relation == Known)
 	{
-		shared_ptr<NodeEntry> ret(new NodeEntry(m_node.id, _node.id, _node.endpoint));
+		auto ret = make_shared<NodeEntry>(m_node.id, _node.id, _node.endpoint);
 		ret->pending = false;
 		DEV_GUARDED(x_nodes)
 			m_nodes[_node.id] = ret;
@@ -107,7 +107,7 @@ shared_ptr<NodeEntry> NodeTable::addNode(Node const& _node, NodeRelation _relati
 		if (m_nodes.count(_node.id))
 			return m_nodes[_node.id];
 	
-	shared_ptr<NodeEntry> ret(new NodeEntry(m_node.id, _node.id, _node.endpoint));
+	auto ret = make_shared<NodeEntry>(m_node.id, _node.id, _node.endpoint);
 	DEV_GUARDED(x_nodes)
 		m_nodes[_node.id] = ret;
 	clog(NodeTableConnect) << "addNode pending for" << _node.endpoint;
@@ -167,7 +167,7 @@ void NodeTable::doDiscover(NodeId _node, unsigned _round, shared_ptr<set<shared_
 	}
 	else if (!_round && !_tried)
 		// initialized _tried on first round
-		_tried.reset(new set<shared_ptr<NodeEntry>>());
+		_tried = make_shared<set<shared_ptr<NodeEntry>>>();
 	
 	auto nearest = nearestNodeEntries(_node);
 	list<shared_ptr<NodeEntry>> tried;
@@ -199,7 +199,17 @@ void NodeTable::doDiscover(NodeId _node, unsigned _round, shared_ptr<set<shared_
 	m_timers.schedule(c_reqTimeout.count() * 2, [this, _node, _round, _tried](boost::system::error_code const& _ec)
 	{
 		if (_ec)
-			clog(NodeTableWarn) << "Discovery timer canceled!";
+			clog(NodeTableMessageDetail) << "Discovery timer canceled: " << _ec.value() << _ec.message();
+
+		if (_ec.value() == boost::asio::error::operation_aborted || m_timers.isStopped())
+			return;
+
+		// error::operation_aborted means that the timer was probably aborted. 
+		// It usually happens when "this" object is deallocated, in which case 
+		// subsequent call to doDiscover() would cause a crash. We can not rely on 
+		// m_timers.isStopped(), because "this" pointer was captured by the lambda,
+		// and therefore, in case of deallocation m_timers object no longer exists.
+
 		doDiscover(_node, _round + 1, _tried);
 	});
 }

libp2p/NodeTable.h

@@ -264,7 +264,7 @@ private:
 	std::shared_ptr<NodeSocket> m_socket;							///< Shared pointer for our UDPSocket; ASIO requires shared_ptr.
 	NodeSocket* m_socketPointer;									///< Set to m_socket.get(). Socket is created in constructor and disconnected in destructor to ensure access to pointer is safe.
 
-	DeadlineOps m_timers;
+	DeadlineOps m_timers; ///< this should be the last member - it must be destroyed first
 };
 
 inline std::ostream& operator<<(std::ostream& _out, NodeTable const& _nodeTable)

libp2p/RLPxHandshake.cpp

@@ -143,8 +143,7 @@ void RLPXHandshake::error()
 		clog(NetP2PConnect) << "Handshake Failed (Connection reset by peer)";
 
 	m_socket->close();
-	if (m_io != nullptr)
+	m_io.reset();
-		delete m_io;
 }
 
 void RLPXHandshake::transition(boost::system::error_code _ech)
@@ -194,7 +193,7 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
 
 		/// This pointer will be freed if there is an error otherwise
 		/// it will be passed to Host which will take ownership.
-		m_io = new RLPXFrameCoder(*this);
+		m_io.reset(new RLPXFrameCoder(*this));
 
 		// old packet format
 		// 5 arguments, HelloPacket
@@ -286,7 +285,7 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
 						try
 						{
 							RLP rlp(frame.cropped(1), RLP::ThrowOnFail | RLP::FailIfTooSmall);
-							m_host->startPeerSession(m_remote, rlp, m_io, m_socket);
+							m_host->startPeerSession(m_remote, rlp, move(m_io), m_socket);
 						}
 						catch (std::exception const& _e)
 						{

libp2p/RLPxHandshake.h

@@ -123,7 +123,7 @@ protected:
 	
 	/// Used to read and write RLPx encrypted frames for last step of handshake authentication.
 	/// Passed onto Host which will take ownership.
-	RLPXFrameCoder* m_io = nullptr;
+	std::unique_ptr<RLPXFrameCoder> m_io;
 	
 	std::shared_ptr<RLPXSocket> m_socket;		///< Socket.
 	boost::asio::deadline_timer m_idleTimer;	///< Timer which enforces c_timeout.

libp2p/Session.cpp

@@ -33,9 +33,9 @@ using namespace std;
 using namespace dev;
 using namespace dev::p2p;
 
-Session::Session(Host* _h, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info):
+Session::Session(Host* _h, unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info):
 	m_server(_h),
-	m_io(_io),
+	m_io(move(_io)),
 	m_socket(_s),
 	m_peer(_n),
 	m_info(_info),
@@ -69,7 +69,6 @@ Session::~Session()
 		}
 	}
 	catch (...){}
-	delete m_io;
 }
 
 ReputationManager& Session::repMan() const

libp2p/Session.h

@@ -55,7 +55,7 @@ class Session: public std::enable_shared_from_this<Session>
 	friend class HostCapabilityFace;
 
 public:
-	Session(Host* _server, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info);
+	Session(Host* _server, std::unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info);
 	virtual ~Session();
 
 	void start();
@@ -113,7 +113,7 @@ private:
 
 	Host* m_server;							///< The host that owns us. Never null.
 
-	RLPXFrameCoder* m_io;						///< Transport over which packets are sent.
+	std::unique_ptr<RLPXFrameCoder> m_io;	///< Transport over which packets are sent.
 	std::shared_ptr<RLPXSocket> m_socket;		///< Socket of peer's connection.
 	Mutex x_writeQueue;						///< Mutex for the write queue.
 	std::deque<bytes> m_writeQueue;			///< The write queue.

libp2p/UPnP.cpp

@@ -40,8 +40,8 @@ using namespace dev::p2p;
 UPnP::UPnP()
 {
 #if ETH_MINIUPNPC
-	m_urls.reset(new UPNPUrls);
+	m_urls = make_shared<UPNPUrls>();
-	m_data.reset(new IGDdatas);
+	m_data = make_shared<IGDdatas>();
 
 	m_ok = false;
 

libp2p/UPnP.h

@@ -50,8 +50,8 @@ public:
 private:
 	std::set<int> m_reg;
 	bool m_ok;
-	std::shared_ptr<struct UPNPUrls> m_urls;
+	std::shared_ptr<UPNPUrls> m_urls;
-	std::shared_ptr<struct IGDdatas> m_data;
+	std::shared_ptr<IGDdatas> m_data;
 };
 
 }

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -23,6 +23,7 @@
 
 #include "WebThreeStubServerBase.h"
 
+#include <signal.h>
 // Make sure boost/asio.hpp is included before windows.h.
 #include <boost/asio.hpp>
 
@@ -238,19 +239,22 @@ string WebThreeStubServerBase::eth_getCode(string const& _address, string const&
 	}
 }
 
+void WebThreeStubServerBase::setTransactionDefaults(TransactionSkeleton & _t)
+{
+	if (!_t.from)
+		_t.from = m_ethAccounts->defaultTransactAccount();
+	if (_t.gasPrice == UndefinedU256)
+		_t.gasPrice = client()->gasBidPrice();
+	if (_t.gas == UndefinedU256)
+		_t.gas = min<u256>(client()->gasLimitRemaining() / 5, client()->balanceAt(_t.from) / _t.gasPrice);
+}
+
 string WebThreeStubServerBase::eth_sendTransaction(Json::Value const& _json)
 {
 	try
 	{
 		TransactionSkeleton t = toTransactionSkeleton(_json);
-	
+		setTransactionDefaults(t);
-		if (!t.from)
-			t.from = m_ethAccounts->defaultTransactAccount();
-		if (t.gasPrice == UndefinedU256)
-			t.gasPrice = 10 * dev::eth::szabo;		// TODO: should be determined by user somehow.
-		if (t.gas == UndefinedU256)
-			t.gas = min<u256>(client()->gasLimitRemaining() / 5, client()->balanceAt(t.from) / t.gasPrice);
-
 		return toJS(m_ethAccounts->authenticate(t));
 	}
 	catch (...)
@@ -264,14 +268,7 @@ string WebThreeStubServerBase::eth_signTransaction(Json::Value const& _json)
 	try
 	{
 		TransactionSkeleton t = toTransactionSkeleton(_json);
-
+		setTransactionDefaults(t);
-		if (!t.from)
-			t.from = m_ethAccounts->defaultTransactAccount();
-		if (t.gasPrice == UndefinedU256)
-			t.gasPrice = 10 * dev::eth::szabo;		// TODO: should be determined by user somehow.
-		if (t.gas == UndefinedU256)
-			t.gas = min<u256>(client()->gasLimitRemaining() / 5, client()->balanceAt(t.from) / t.gasPrice);
-
 		m_ethAccounts->authenticate(t);
 
 		return toJS((t.creation ? Transaction(t.value, t.gasPrice, t.gas, t.data) : Transaction(t.value, t.gasPrice, t.gas, t.to, t.data)).sha3(WithoutSignature));
@@ -311,15 +308,7 @@ string WebThreeStubServerBase::eth_call(Json::Value const& _json, string const&
 	try
 	{
 		TransactionSkeleton t = toTransactionSkeleton(_json);
-		if (!t.from)
+		setTransactionDefaults(t);
-			t.from = m_ethAccounts->defaultTransactAccount();
-	//	if (!m_accounts->isRealAccount(t.from))
-	//		return ret;
-		if (t.gasPrice == UndefinedU256)
-			t.gasPrice = 10 * dev::eth::szabo;
-		if (t.gas == UndefinedU256)
-			t.gas = client()->gasLimitRemaining();
-
 		return toJS(client()->call(t.from, t.value, t.to, t.data, t.gas, t.gasPrice, jsToBlockNumber(_blockNumber), FudgeFactor::Lenient).output);
 	}
 	catch (...)
@@ -575,6 +564,13 @@ Json::Value WebThreeStubServerBase::admin_net_nodeInfo(const string& _session)
 	return ret;
 }
 
+bool WebThreeStubServerBase::admin_eth_exit(string const& _session)
+{
+	ADMIN;
+	Client::exitHandler(SIGTERM);
+	return true;
+}
+
 bool WebThreeStubServerBase::admin_eth_setMining(bool _on, std::string const& _session)
 {
 	ADMIN;
@@ -784,6 +780,12 @@ bool WebThreeStubServerBase::eth_submitWork(string const& _nonce, string const&,
 	}
 }
 
+bool WebThreeStubServerBase::eth_submitHashrate(int _hashes, string const& _id)
+{
+	client()->submitExternalHashrate(_hashes, jsToFixed<32>(_id));
+	return true;
+}
+
 string WebThreeStubServerBase::eth_register(string const& _address)
 {
 	try

libweb3jsonrpc/WebThreeStubServerBase.h

@@ -139,6 +139,7 @@ public:
 	virtual Json::Value eth_getLogsEx(Json::Value const& _json);
 	virtual Json::Value eth_getWork();
 	virtual bool eth_submitWork(std::string const& _nonce, std::string const&, std::string const& _mixHash);
+	virtual bool eth_submitHashrate(int _hashes, std::string const& _id);
 	virtual std::string eth_register(std::string const& _address);
 	virtual bool eth_unregister(std::string const& _accountId);
 	virtual Json::Value eth_fetchQueuedTransactions(std::string const& _accountId);
@@ -167,6 +168,7 @@ public:
 	virtual Json::Value admin_net_peers(std::string const& _session);
 	virtual Json::Value admin_net_nodeInfo(std::string const& _session);
 
+	virtual bool admin_eth_exit(std::string const& _session);
 	virtual bool admin_eth_setMining(bool _on, std::string const& _session);
 	virtual Json::Value admin_eth_blockQueueStatus(std::string const& _session) { (void)_session; return Json::Value(); }
 	virtual bool admin_eth_setAskPrice(std::string const& _wei, std::string const& _session) { (void)_wei; (void)_session; return false; }
@@ -192,6 +194,7 @@ public:
 
 protected:
 	void requires(std::string const& _session, Privilege _l) const { if (!hasPrivilegeLevel(_session, _l)) throw jsonrpc::JsonRpcException("Invalid privileges"); }
+	void setTransactionDefaults(eth::TransactionSkeleton & _t);
 	virtual bool hasPrivilegeLevel(std::string const& _session, Privilege _l) const { (void)_session; (void)_l; return false; }
 
 	virtual dev::eth::Interface* client() = 0;

libweb3jsonrpc/abstractwebthreestubserver.h

@@ -60,6 +60,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             this->bindAndAddMethod(jsonrpc::Procedure("eth_getLogsEx", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_getLogsExI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_getWork", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY,  NULL), &AbstractWebThreeStubServer::eth_getWorkI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_submitWork", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING,"param3",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_submitWorkI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_submitHashrate", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_submitHashrateI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_register", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_registerI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_unregister", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_unregisterI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_fetchQueuedTransactions", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_fetchQueuedTransactionsI);
@@ -85,6 +86,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             this->bindAndAddMethod(jsonrpc::Procedure("admin_net_peers", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::admin_net_peersI);
             this->bindAndAddMethod(jsonrpc::Procedure("admin_eth_blockQueueStatus", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::admin_eth_blockQueueStatusI);
             this->bindAndAddMethod(jsonrpc::Procedure("admin_net_nodeInfo", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::admin_net_nodeInfoI);
+            this->bindAndAddMethod(jsonrpc::Procedure("admin_eth_exit", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::admin_eth_exitI);
             this->bindAndAddMethod(jsonrpc::Procedure("admin_eth_setAskPrice", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::admin_eth_setAskPriceI);
             this->bindAndAddMethod(jsonrpc::Procedure("admin_eth_setBidPrice", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::admin_eth_setBidPriceI);
             this->bindAndAddMethod(jsonrpc::Procedure("admin_eth_setReferencePrice", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::admin_eth_setReferencePriceI);
@@ -311,6 +313,10 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         {
             response = this->eth_submitWork(request[0u].asString(), request[1u].asString(), request[2u].asString());
         }
+        inline virtual void eth_submitHashrateI(const Json::Value &request, Json::Value &response)
+        {
+            response = this->eth_submitHashrate(request[0u].asInt(), request[1u].asString());
+        }
         inline virtual void eth_registerI(const Json::Value &request, Json::Value &response)
         {
             response = this->eth_register(request[0u].asString());
@@ -412,6 +418,10 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         {
             response = this->admin_net_nodeInfo(request[0u].asString());
         }
+        inline virtual void admin_eth_exitI(const Json::Value &request, Json::Value &response)
+        {
+            response = this->admin_eth_exit(request[0u].asString());
+        }
         inline virtual void admin_eth_setAskPriceI(const Json::Value &request, Json::Value &response)
         {
             response = this->admin_eth_setAskPrice(request[0u].asString(), request[1u].asString());
@@ -524,6 +534,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         virtual Json::Value eth_getLogsEx(const Json::Value& param1) = 0;
         virtual Json::Value eth_getWork() = 0;
         virtual bool eth_submitWork(const std::string& param1, const std::string& param2, const std::string& param3) = 0;
+        virtual bool eth_submitHashrate(int param1, const std::string& param2) = 0;
         virtual std::string eth_register(const std::string& param1) = 0;
         virtual bool eth_unregister(const std::string& param1) = 0;
         virtual Json::Value eth_fetchQueuedTransactions(const std::string& param1) = 0;
@@ -549,6 +560,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         virtual Json::Value admin_net_peers(const std::string& param1) = 0;
         virtual Json::Value admin_eth_blockQueueStatus(const std::string& param1) = 0;
         virtual Json::Value admin_net_nodeInfo(const std::string& param1) = 0;
+        virtual bool admin_eth_exit(const std::string& param1) = 0;
         virtual bool admin_eth_setAskPrice(const std::string& param1, const std::string& param2) = 0;
         virtual bool admin_eth_setBidPrice(const std::string& param1, const std::string& param2) = 0;
         virtual bool admin_eth_setReferencePrice(const std::string& param1, const std::string& param2) = 0;

libweb3jsonrpc/spec.json

@@ -49,6 +49,7 @@
 { "name": "eth_getLogsEx", "params": [{}], "order": [], "returns": []},
 { "name": "eth_getWork", "params": [], "order": [], "returns": []},
 { "name": "eth_submitWork", "params": ["", "", ""], "order": [], "returns": true},
+{ "name": "eth_submitHashrate", "params": [0, ""], "order": [], "returns": true},
 { "name": "eth_register", "params": [""], "order": [], "returns": ""},
 { "name": "eth_unregister", "params": [""], "order": [], "returns": true},
 { "name": "eth_fetchQueuedTransactions", "params": [""], "order": [], "returns": []},
@@ -77,6 +78,7 @@
 { "name": "admin_net_peers", "params": [""], "returns": [] },
 { "name": "admin_eth_blockQueueStatus", "params": [""], "returns": {}},
 { "name": "admin_net_nodeInfo", "params": [""], "returns": {}},
+{ "name": "admin_eth_exit", "params": [""], "returns": true},
 { "name": "admin_eth_setAskPrice", "params": ["", ""], "returns": true },
 { "name": "admin_eth_setBidPrice", "params": ["", ""], "returns": true },
 { "name": "admin_eth_setReferencePrice", "params": ["", ""], "returns": true },

libwebthree/WebThree.cpp

@@ -64,7 +64,7 @@ WebThreeDirect::WebThreeDirect(
 	}
 
 	if (_interfaces.count("shh"))
-		m_whisper = m_net.registerCapability<WhisperHost>(new WhisperHost);
+		m_whisper = m_net.registerCapability(make_shared<WhisperHost>());
 }
 
 WebThreeDirect::~WebThreeDirect()

mix/CMakeLists.txt

@@ -20,8 +20,13 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") AND NOT (CMAKE_CXX_COMPILER_VER
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override")
 endif ()
 
-find_package (Qt5WebEngine)
+#TODO: remove once qt 5.5.1 is out
 if (APPLE)
+    qt5_add_resources(UI_RESOURCES osx.qrc)
+endif()
+
+find_package (Qt5WebEngine)
+if (APPLE AND (NOT "${Qt5Core_VERSION_STRING}" VERSION_LESS "5.5"))
 # TODO: remove indirect dependencies once macdeployqt is fixed
 	find_package (Qt5WebEngineCore)
 	find_package (Qt5DBus)
@@ -56,7 +61,7 @@ if (${ETH_HAVE_WEBENGINE})
 	add_definitions(-DETH_HAVE_WEBENGINE)
 	list(APPEND LIBRARIES "Qt5::WebEngine")
 endif()
-if (APPLE)
+if (APPLE AND (NOT "${Qt5Core_VERSION_STRING}" VERSION_LESS "5.5"))
 	list(APPEND LIBRARIES "Qt5::WebEngineCore")
 	list(APPEND LIBRARIES "Qt5::DBus")
 	list(APPEND LIBRARIES "Qt5::PrintSupport")

mix/ClientModel.cpp

@@ -444,11 +444,17 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence)
 				{
 					auto contractAddressIter = m_contractAddresses.find(ctrInstance);
 					if (contractAddressIter == m_contractAddresses.end())
+					{
 						emit runFailed("Contract '" + transaction.contractId + tr(" not deployed.") + "' " + tr(" Cannot call ") + transaction.functionId);
+						break;
+					}
 					callAddress(contractAddressIter->second, encoder.encodedData(), transaction);
 				}
 				m_gasCosts.append(m_client->lastExecution().gasUsed);
 				onNewTransaction();
+				TransactionException exception = m_client->lastExecution().excepted;
+				if (exception != TransactionException::None)
+					break;
 			}
 			emit runComplete();
 		}
@@ -764,6 +770,42 @@ void ClientModel::onStateReset()
 void ClientModel::onNewTransaction()
 {
 	ExecutionResult const& tr = m_client->lastExecution();
+
+	switch (tr.excepted)
+	{
+	case TransactionException::None:
+		break;
+	case TransactionException::NotEnoughCash:
+		emit runFailed("Insufficient balance");
+		break;
+	case TransactionException::OutOfGasIntrinsic:
+	case TransactionException::OutOfGasBase:
+	case TransactionException::OutOfGas:
+		emit runFailed("Not enough gas");
+		break;
+	case TransactionException::BlockGasLimitReached:
+		emit runFailed("Block gas limit reached");
+		break;
+	case TransactionException::BadJumpDestination:
+		emit runFailed("Solidity exception (bad jump)");
+		break;
+	case TransactionException::OutOfStack:
+		emit runFailed("Out of stack");
+		break;
+	case TransactionException::StackUnderflow:
+		emit runFailed("Stack underflow");
+		//these should not happen in mix
+	case TransactionException::Unknown:
+	case TransactionException::BadInstruction:
+	case TransactionException::InvalidSignature:
+	case TransactionException::InvalidNonce:
+	case TransactionException::InvalidFormat:
+	case TransactionException::BadRLP:
+		emit runFailed("Internal execution error");
+		break;
+	}
+
+
 	unsigned block = m_client->number() + 1;
 	unsigned recordIndex = tr.executonIndex;
 	QString transactionIndex = tr.isCall() ? QObject::tr("Call") : QString("%1:%2").arg(block).arg(tr.transactionIndex);

mix/ContractCallDataEncoder.cpp

@@ -104,7 +104,7 @@ void ContractCallDataEncoder::encode(QVariant const& _data, SolidityType const&
 		m_dynamicData += empty; //reserve space for count
 		encodeSingleItem(_data.toString(), _type, m_dynamicData);
 		vector_ref<byte> sizeRef(m_dynamicData.data() + sizePos, 32);
-		toBigEndian(_data.toString().size(), sizeRef);
+		toBigEndian(static_cast<unsigned>(_data.toString().size()), sizeRef);
 		m_staticOffsetMap.push_back(std::make_pair(m_encodedData.size(), sizePos));
 		m_encodedData += empty; //reserve space for offset
 	}
@@ -343,9 +343,19 @@ QStringList ContractCallDataEncoder::decode(QList<QVariableDeclaration*> const&
 		if (type.array)
 		{
 			QJsonArray array = decodeArray(type, _v, readPosition);
+			if (type.type == SolidityType::String && array.count() <= 1)
+			{
+				if (array.count() == 1)
+					r.append(array[0].toString());
+				else
+					r.append(QString());
+			}
+			else
+			{
 				QJsonDocument jsonDoc = QJsonDocument::fromVariant(array.toVariantList());
 				r.append(jsonDoc.toJson(QJsonDocument::Compact));
 			}
+		}
 		else
 		{
 			bytesConstRef value(_value.data() + readPosition, 32);

mix/FileIo.cpp

@@ -224,3 +224,11 @@ void FileIo::deleteFile(QString const& _path)
 	QFile file(pathFromUrl(_path));
 	file.remove();
 }
+
+QUrl FileIo::pathFolder(QString const& _path)
+{
+	QFileInfo info(_path);
+	if (info.exists() && info.isDir())
+		return QUrl::fromLocalFile(_path);
+	return QUrl::fromLocalFile(QFileInfo(_path).absolutePath());
+}

mix/FileIo.h

@@ -71,6 +71,11 @@ public:
 	/// delete a directory
 	Q_INVOKABLE void deleteDir(QString const& _url);
 
+	//TODO: remove once qt 5.5.1 is out
+	Q_INVOKABLE QString urlToPath(QUrl const& _url) { return _url.toLocalFile(); }
+	Q_INVOKABLE QUrl pathToUrl(QString const& _path) { return QUrl::fromLocalFile(_path); }
+	Q_INVOKABLE QUrl pathFolder(QString const& _path);
+
 private:
 	QString getHomePath() const;
 	QString pathFromUrl(QString const& _url);

mix/MachineStates.h

@@ -85,6 +85,7 @@ struct ExecutionResult
 	unsigned executonIndex = 0;
 	bytes inputParameters;
 	eth::LocalisedLogEntries logs;
+	eth::TransactionException excepted = eth::TransactionException::Unknown;
 
 	bool isCall() const { return transactionIndex == std::numeric_limits<unsigned>::max(); }
 	bool isConstructor() const { return !isCall() && !address; }

mix/MixApplication.cpp

@@ -41,6 +41,9 @@
 extern int qInitResources_js();
 using namespace dev::mix;
 
+
+
+
 ApplicationService::ApplicationService()
 {
 #ifdef ETH_HAVE_WEBENGINE

mix/MixClient.cpp

@@ -130,8 +130,27 @@ ExecutionResult MixClient::debugTransaction(Transaction const& _t, State const&
 	eth::ExecutionResult er;
 	Executive execution(execState, _envInfo);
 	execution.setResultRecipient(er);
+
+	ExecutionResult d;
+	d.address = _t.receiveAddress();
+	d.sender = _t.sender();
+	d.value = _t.value();
+	d.inputParameters = _t.data();
+	d.executonIndex = m_executions.size();
+	if (!_call)
+		d.transactionIndex = m_postMine.pending().size();
+
+	try
+	{
 		execution.initialize(_t);
 		execution.execute();
+	}
+	catch (Exception const& _e)
+	{
+		d.excepted = toTransactionException(_e);
+		d.transactionData.push_back(_t.data());
+		return d;
+	}
 
 	std::vector<MachineState> machineStates;
 	std::vector<unsigned> levels;
@@ -199,49 +218,14 @@ ExecutionResult MixClient::debugTransaction(Transaction const& _t, State const&
 	execution.go(onOp);
 	execution.finalize();
 
-	switch (er.excepted)
+	d.excepted = er.excepted;
-	{
-	case TransactionException::None:
-		break;
-	case TransactionException::NotEnoughCash:
-		BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Insufficient balance for contract deployment"));
-	case TransactionException::OutOfGasIntrinsic:
-	case TransactionException::OutOfGasBase:
-	case TransactionException::OutOfGas:
-		BOOST_THROW_EXCEPTION(OutOfGas() << errinfo_comment("Not enough gas"));
-	case TransactionException::BlockGasLimitReached:
-		BOOST_THROW_EXCEPTION(OutOfGas() << errinfo_comment("Block gas limit reached"));
-	case TransactionException::BadJumpDestination:
-		BOOST_THROW_EXCEPTION(OutOfGas() << errinfo_comment("Solidity exception (bad jump)"));
-	case TransactionException::OutOfStack:
-		BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Out of stack"));
-	case TransactionException::StackUnderflow:
-		BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Stack underflow"));
-		//these should not happen in mix
-	case TransactionException::Unknown:
-	case TransactionException::BadInstruction:
-	case TransactionException::InvalidSignature:
-	case TransactionException::InvalidNonce:
-	case TransactionException::InvalidFormat:
-	case TransactionException::BadRLP:
-		BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Internal execution error"));
-	}
-
-	ExecutionResult d;
-	d.inputParameters = _t.data();
 	d.result = er;
 	d.machineStates = machineStates;
 	d.executionCode = std::move(codes);
 	d.transactionData = std::move(data);
-	d.address = _t.receiveAddress();
-	d.sender = _t.sender();
-	d.value = _t.value();
 	d.gasUsed = er.gasUsed + er.gasRefunded + c_callStipend;
 	if (_t.isCreation())
 		d.contractAddress = right160(sha3(rlpList(_t.sender(), _t.nonce())));
-	if (!_call)
-		d.transactionIndex = m_postMine.pending().size();
-	d.executonIndex = m_executions.size();
 	return d;
 }
 
@@ -255,9 +239,10 @@ void MixClient::executeTransaction(Transaction const& _t, Block& _block, bool _c
 	ExecutionResult d = debugTransaction(t, _block.state(), envInfo, _call);
 
 	// execute on a state
-	if (!_call)
+	if (!_call && d.excepted == TransactionException::None)
 	{
-		t = _gasAuto ? replaceGas(_t, d.gasUsed, _secret) : _t;
+		u256 useGas = min(d.gasUsed, _block.gasLimitRemaining());
+		t = _gasAuto ? replaceGas(_t, useGas, _secret) : _t;
 		eth::ExecutionResult const& er = _block.execute(envInfo.lastHashes(), t);
 		if (t.isCreation() && _block.state().code(d.contractAddress).empty())
 			BOOST_THROW_EXCEPTION(OutOfGas() << errinfo_comment("Not enough gas for contract deployment"));
@@ -284,7 +269,7 @@ void MixClient::mine()
 	RLPStream header;
 	h.streamRLP(header);
 	m_postMine.sealBlock(header.out());
-	bc().import(m_postMine.blockData(), m_stateDB, ImportRequirements::Everything & ~ImportRequirements::ValidSeal);
+	bc().import(m_postMine.blockData(), m_stateDB, (ImportRequirements::Everything & ~ImportRequirements::ValidSeal) != 0);
 	m_postMine.sync(bc());
 	m_preMine = m_postMine;
 }

mix/osx.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="qml/QFileDialog.qml">qml/MacFileDialog.qml</file>
+    </qresource>
+</RCC>

mix/qml.qrc

@@ -34,6 +34,7 @@
         <file>qml/QStringTypeView.qml</file>
         <file>qml/QVariableDeclaration.qml</file>
         <file>qml/QVariableDefinition.qml</file>
+        <file>qml/QFileDialog.qml</file>
         <file>qml/SourceSansProBold.qml</file>
         <file>qml/SourceSansProLight.qml</file>
         <file>qml/SourceSansProRegular.qml</file>

mix/qml/Application.qml

@@ -217,6 +217,7 @@ ApplicationWindow {
 		shortcut: "Ctrl+Alt+V"
 		onTriggered: mainContent.debuggerPanel.assemblyMode = !mainContent.debuggerPanel.assemblyMode;
 		checked:  mainContent.debuggerPanel.assemblyMode;
+		checkable: true
 		enabled: true
 	}
 
@@ -281,11 +282,12 @@ ApplicationWindow {
 		onTriggered: openProjectFileDialog.open()
 	}
 
-	FileDialog {
+	QFileDialog {
 		id: openProjectFileDialog
 		visible: false
 		title: qsTr("Open a Project")
 		selectFolder: true
+		selectExisting: true
 		onAccepted: {
 			var path = openProjectFileDialog.fileUrl.toString();
 			path += "/";
@@ -333,11 +335,12 @@ ApplicationWindow {
 		onTriggered: addExistingFileDialog.open()
 	}
 
-	FileDialog {
+	QFileDialog {
 		id: addExistingFileDialog
 		visible: false
 		title: qsTr("Add a File")
 		selectFolder: false
+		selectExisting: true
 		onAccepted: {
 			var paths = addExistingFileDialog.fileUrls;
 			projectModel.addExistingFiles(paths);
@@ -427,7 +430,9 @@ ApplicationWindow {
 	}
 
 	Settings {
+		id: appSettings
 		property alias gasEstimation: gasEstimationAction.checked
 		property alias optimizeCode: optimizeCodeAction.checked
+		property string nodeAddress: "http://localhost:8545"
 	}
 }

mix/qml/Block.qml

@@ -12,6 +12,7 @@ ColumnLayout
 {
 	id: root
 	property variant transactions
+	property variant transactionModel
 	property string status
 	property int number
 	property int blockWidth: Layout.preferredWidth - statusWidth - horizontalMargin
@@ -202,6 +203,7 @@ ColumnLayout
 
 					if (index >= 0)
 						transactions.get(index).saveStatus = saveStatus
+						transactionModel[index].saveStatus = saveStatus
 				}
 
 				MouseArea {

mix/qml/BlockChain.qml

@@ -214,6 +214,13 @@ ColumnLayout {
 							else
 								return []
 						}
+						transactionModel:
+						{
+							if (index >= 0)
+								return scenario.blocks[index].transactions
+							else
+								return []
+						}
 
 						status:
 						{
@@ -492,7 +499,7 @@ ColumnLayout {
 
 				ScenarioButton {
 					id: addBlockBtn
-					text: qsTr("Add Block..")
+					text: qsTr("Add Block...")
 					anchors.left: addTransaction.right
 					roundLeft: false
 					roundRight: true
@@ -609,7 +616,7 @@ ColumnLayout {
 
 			ScenarioButton {
 				id: newAccount
-				text: qsTr("New Account..")
+				text: qsTr("New Account...")
 				onClicked: {
 					var ac = projectModel.stateListModel.newAccount("O", QEther.Wei)
 					model.accounts.push(ac)

mix/qml/MacFileDialog.qml

@@ -0,0 +1,298 @@
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Private 1.0 as ControlsPrivate
+import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs.Private 1.1
+import QtQuick.Layouts 1.1
+import QtQuick.Window 2.1
+import Qt.labs.folderlistmodel 2.1
+import Qt.labs.settings 1.0
+
+AbstractDialog {
+
+    id: root
+
+	property string folder: view.model.folder
+	property var nameFilters: []
+	property bool selectFolder: false
+	property bool selectExisting: true
+	property int selectedNameFilterIndex: -1
+	property var selectedNameFilterExtensions: []
+	property string selection: ""
+	property alias fileUrl: root.selection
+
+
+	function selectNameFilter(text) {
+	}
+
+	function clearSelection(text) {
+		selection = "";
+	}
+
+	function addSelection(text) {
+		selection = text;
+	}
+
+    onVisibleChanged: {
+        if (visible) {
+			view.needsWidthAdjustment = true
+            view.selection.clear()
+            view.focus = true
+        }
+	}
+
+    Component.onCompleted: {
+		folder = fileIo.pathToUrl(fileIo.homePath);
+		view.model.nameFilters = root.selectedNameFilterExtensions
+        filterField.currentIndex = root.selectedNameFilterIndex
+        root.favoriteFolders = settings.favoriteFolders
+    }
+
+    Component.onDestruction: {
+        settings.favoriteFolders = root.favoriteFolders
+    }
+
+    property Settings settings: Settings {
+        category: "QQControlsFileDialog"
+        property alias width: root.width
+        property alias height: root.height
+		property variant favoriteFolders: []
+    }
+
+    property bool showFocusHighlight: false
+    property SystemPalette palette: SystemPalette { }
+    property var favoriteFolders: []
+
+    function dirDown(path) {
+        view.selection.clear()
+        root.folder = "file://" + path
+    }
+    function dirUp() {
+		view.selection.clear()
+        if (view.model.parentFolder != "")
+			root.folder = view.model.parentFolder
+	}
+    function acceptSelection() {
+        // transfer the view's selections to QQuickFileDialog
+        clearSelection()
+        if (selectFolder && view.selection.count === 0)
+            addSelection(folder)
+        else {
+            view.selection.forEach(function(idx) {
+                if (view.model.isFolder(idx)) {
+                    if (selectFolder)
+                        addSelection(view.model.get(idx, "fileURL"))
+                } else {
+                    if (!selectFolder)
+                        addSelection(view.model.get(idx, "fileURL"))
+                }
+            })
+        }
+        accept()
+    }
+
+    property Action dirUpAction: Action {
+        text: "\ue810"
+        shortcut: "Ctrl+U"
+        onTriggered: dirUp()
+        tooltip: qsTr("Go up to the folder containing this one")
+    }
+
+    Rectangle {
+        id: window
+		implicitWidth: Math.min(root.__maximumDimension, Math.max(Screen.pixelDensity * 100, view.implicitWidth))
+        implicitHeight: Math.min(root.__maximumDimension, Screen.pixelDensity * 80)
+        color: root.palette.window
+
+        Binding {
+            target: view.model
+            property: "folder"
+            value: root.folder
+        }
+        Binding {
+            target: currentPathField
+            property: "text"
+			value: fileIo.urlToPath(root.folder)
+        }
+        Keys.onPressed: {
+            event.accepted = true
+            switch (event.key) {
+            case Qt.Key_Back:
+            case Qt.Key_Escape:
+                reject()
+                break
+            default:
+                event.accepted = false
+                break
+            }
+        }
+        Keys.forwardTo: [view.flickableItem]
+
+
+		TableView {
+			id: view
+			sortIndicatorVisible: true
+			width: parent.width
+			anchors.top: titleBar.bottom
+			anchors.bottom: bottomBar.top
+
+			property bool needsWidthAdjustment: true
+			selectionMode: root.selectMultiple ?
+				(ControlsPrivate.Settings.hasTouchScreen ? SelectionMode.MultiSelection : SelectionMode.ExtendedSelection) :
+				SelectionMode.SingleSelection
+			onRowCountChanged: if (needsWidthAdjustment && rowCount > 0) {
+				resizeColumnsToContents()
+				needsWidthAdjustment = false
+			}
+			model: FolderListModel {
+				showFiles: !root.selectFolder
+				nameFilters: root.selectedNameFilterExtensions
+				sortField: (view.sortIndicatorColumn === 0 ? FolderListModel.Name :
+							(view.sortIndicatorColumn === 1 ? FolderListModel.Type :
+							(view.sortIndicatorColumn === 2 ? FolderListModel.Size : FolderListModel.LastModified)))
+				sortReversed: view.sortIndicatorOrder === Qt.DescendingOrder
+			}
+
+			onActivated: if (view.focus) {
+				if (view.selection.count > 0 && view.model.isFolder(row)) {
+					dirDown(view.model.get(row, "filePath"))
+				} else {
+					root.acceptSelection()
+				}
+			}
+			onClicked: currentPathField.text = view.model.get(row, "filePath")
+
+
+			TableViewColumn {
+				id: fileNameColumn
+				role: "fileName"
+				title: qsTr("Filename")
+				delegate: Item {
+					implicitWidth: pathText.implicitWidth + pathText.anchors.leftMargin + pathText.anchors.rightMargin
+
+					Text {
+						id: fileIcon
+						width: height
+						verticalAlignment: Text.AlignVCenter
+						font.family: iconFont.name
+						property alias unicode: fileIcon.text
+						FontLoader { id: iconFont; source: "qrc:/QtQuick/Dialogs/qml/icons.ttf"; onNameChanged: console.log("custom font" + name) }
+						x: 4
+						height: parent.height - 2
+						unicode: view.model.isFolder(styleData.row) ? "\ue804" : "\ue802"
+					}
+					Text {
+						id: pathText
+						text: styleData.value
+						anchors {
+							left: parent.left
+							right: parent.right
+							leftMargin: 36 + 6
+							rightMargin: 4
+							verticalCenter: parent.verticalCenter
+						}
+						color: styleData.textColor
+						elide: Text.ElideRight
+						renderType: ControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering
+					}
+				}
+			}
+			TableViewColumn {
+				role: "fileSuffix"
+				title: qsTr("Type", "file type (extension)")
+				// TODO should not need to create a whole new component just to customize the text value
+				// something like textFormat: function(text) { return view.model.get(styleData.row, "fileIsDir") ? "folder" : text }
+				delegate: Item {
+					implicitWidth: sizeText.implicitWidth + sizeText.anchors.leftMargin + sizeText.anchors.rightMargin
+					Text {
+						id: sizeText
+						text: view.model.get(styleData.row, "fileIsDir") ? "folder" : styleData.value
+						anchors {
+							left: parent.left
+							right: parent.right
+							leftMargin: 4
+							rightMargin: 4
+							verticalCenter: parent.verticalCenter
+						}
+						color: styleData.textColor
+						elide: Text.ElideRight
+						renderType: ControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering
+					}
+				}
+			}
+			TableViewColumn {
+				role: "fileSize"
+				title: qsTr("Size", "file size")
+				horizontalAlignment: Text.AlignRight
+			}
+			TableViewColumn { id: modifiedColumn; role: "fileModified" ; title: qsTr("Modified", "last-modified time") }
+			TableViewColumn { id: accessedColumn; role: "fileAccessed" ; title: qsTr("Accessed", "last-accessed time") }
+		}
+
+        ToolBar {
+            id: titleBar
+            RowLayout {
+                anchors.fill: parent
+                ToolButton {
+                    action: dirUpAction
+					//style: IconButtonStyle { }
+                    Layout.maximumWidth: height * 1.5
+                }
+                TextField {
+                    id: currentPathField
+                    Layout.fillWidth: true
+                    function doAccept() {
+                        root.clearSelection()
+						if (root.addSelection(fileIo.pathToUrl(text)))
+                            root.accept()
+                        else
+							root.folder = fileIo.pathFolder(text)
+                    }
+                    onAccepted: doAccept()
+                }
+            }
+        }
+        Item {
+            id: bottomBar
+            width: parent.width
+            height: buttonRow.height + buttonRow.spacing * 2
+            anchors.bottom: parent.bottom
+
+            Row {
+                id: buttonRow
+                anchors.right: parent.right
+                anchors.rightMargin: spacing
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: 4
+				ComboBox {
+                    id: filterField
+                    model: root.nameFilters
+                    visible: !selectFolder
+					width: bottomBar.width - cancelButton.width - okButton.width - parent.spacing * 6
+                    anchors.verticalCenter: parent.verticalCenter
+                    onCurrentTextChanged: {
+                        root.selectNameFilter(currentText)
+                        view.model.nameFilters = root.selectedNameFilterExtensions
+                    }
+                }
+                Button {
+                    id: cancelButton
+                    text: qsTr("Cancel")
+                    onClicked: root.reject()
+                }
+                Button {
+                    id: okButton
+                    text: root.selectFolder ? qsTr("Choose") : (selectExisting ? qsTr("Open") : qsTr("Save"))
+                    onClicked: {
+                        if (view.model.isFolder(view.currentIndex) && !selectFolder)
+                            dirDown(view.model.get(view.currentIndex, "filePath"))
+                        else if (!(root.selectExisting))
+                            currentPathField.doAccept()
+                        else
+                            root.acceptSelection()
+                    }
+                }
+            }
+        }
+    }
+}

mix/qml/NewProjectDialog.qml

@@ -105,7 +105,7 @@ Item
 
 	}
 
-	FileDialog {
+	QFileDialog {
 		id: createProjectFileDialog
 		visible: false
 		title: qsTr("Please choose a path for the project")

mix/qml/PackagingStep.qml

@@ -27,11 +27,12 @@ Rectangle {
 		visible = true
 	}
 
-	FileDialog {
+	QFileDialog {
 		id: ressourcesFolder
 		visible: false
 		title: qsTr("Please choose a path")
 		selectFolder: true
+		selectExisting: true
 		property variant target
 		onAccepted: {
 			var u = ressourcesFolder.fileUrl.toString();

mix/qml/QFileDialog.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Dialogs 1.2
+
+FileDialog { }

mix/qml/ScenarioLoader.qml

@@ -294,8 +294,9 @@ ColumnLayout
 						projectModel.stateListModel.appendState(item)
 						projectModel.stateListModel.save()
 						scenarioList.currentIndex = projectModel.stateListModel.count - 1
+						clientModel.setupScenario(item);
 					}
-					text: qsTr("New..")
+					text: qsTr("New...")
 					roundRight: true
 					roundLeft: false
 				}

mix/qml/StateDialog.qml

@@ -124,7 +124,7 @@ Dialog {
 									importJsonFileDialog.open()
 								}
 							}
-							FileDialog {
+							QFileDialog {
 								id: importJsonFileDialog
 								visible: false
 								title: qsTr("Select State File")

mix/qml/StructView.qml

@@ -12,6 +12,7 @@ Column
 	property int blockIndex
 	property int transactionIndex
 	property string context
+	property bool readOnly
 	Layout.fillWidth: true
 	spacing: 0
 	property int colHeight
@@ -26,7 +27,7 @@ Column
 	Repeater
 	{
 		id: repeater
-		visible: model.length > 0
+		visible: members.length > 0
 		RowLayout
 		{
 			id: row

mix/qml/WebPreview.qml

@@ -94,6 +94,11 @@ Item {
 		onContractInterfaceChanged: reload();
 	}
 
+	Connections {
+		target: clientModel
+		onRunComplete: reload();
+	}
+
 	Connections {
 		target: projectModel
 
@@ -313,7 +318,6 @@ Item {
 				width: parent.width
 				Layout.preferredWidth: parent.width
 				id: webView
-				experimental.settings.localContentCanAccessRemoteUrls: true
 				onJavaScriptConsoleMessage: {
 					console.log(sourceID + ":" + lineNumber + ": " + message);
 					webPreview.javaScriptMessage(level, sourceID, lineNumber - 1, message);

mix/qml/html/cm/anyword-hint.js

@@ -24,6 +24,15 @@
 		list = addSolToken(curWord, list, seen, solMisc(), solMisc);
 	}
 
+	//TODO: tokenize properly
+	if (curLine.slice(start - 6, start) === "block.")
+		list = addSolToken(curWord, list, seen, solBlock(), solBlock);
+	else if (curLine.slice(start - 4, start) === "msg.")
+		list = addSolToken(curWord, list, seen, solMsg(), solMsg);
+	else if (curLine.slice(start - 3, start) === "tx.")
+		list = addSolToken(curWord, list, seen, solTx(), solTx);
+
+
 	var previousWord = "";
 	var re = new RegExp(word.source, "g");
 	for (var dir = -1; dir <= 1; dir += 2) {

mix/qml/html/cm/inkpot.css

@@ -21,7 +21,7 @@ https://github.com/ciaranm/inkpot
 .cm-s-inkpot span.cm-comment     { color: #cd8b00; }
 .cm-s-inkpot span.cm-def         { color: #cfbfad; font-weight:bold; }
 .cm-s-inkpot span.cm-keyword     { color: #808bed; }
-.cm-s-inkpot span.cm-builtin     { color: #cfbfad; }
+.cm-s-inkpot span.cm-builtin     { color: #efac6d; }
 .cm-s-inkpot span.cm-variable    { color: #cfbfad; }
 .cm-s-inkpot span.cm-string      { color: #ffcd8b; }
 .cm-s-inkpot span.cm-number      { color: #f0ad6d; }

mix/qml/html/cm/solidity.js

@@ -16,6 +16,7 @@ CodeMirror.defineMode("solidity", function(config) {
   var stdContract = solStdContract();
   var keywords = solKeywords();
   var atoms = solMisc();
+  var builtins = solBuiltIn();
 
   var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
 
@@ -64,6 +65,7 @@ CodeMirror.defineMode("solidity", function(config) {
 	if (atoms.propertyIsEnumerable(cur)) return "atom";
 	if (types.propertyIsEnumerable(cur)) return "variable-2";
 	if (stdContract.propertyIsEnumerable(cur)) return "variable-3";
+	if (builtins.propertyIsEnumerable(cur)) return "builtin";
 	return "variable";
   }
 

mix/qml/html/cm/solidityToken.js

@@ -28,6 +28,26 @@ function solMisc()
 	return { "true": true, "false": true, "null": true };
 }
 
+function solBuiltIn()
+{
+	return { "msg": true, "tx": true, "block": true, "now": true };
+}
+
+function solBlock()
+{
+	return { "coinbase": true, "difficulty": true, "gaslimit": true, "number": true, "blockhash": true, "timestamp":true };
+}
+
+function solMsg()
+{
+	return { "data": true, "gas": true, "sender": true, "sig": true, "value": true };
+}
+
+function solTx()
+{
+	return { "gasprice": true, "origin": true }
+}
+
 function keywordsName()
 {
 	var keywords = {};
@@ -37,5 +57,9 @@ function keywordsName()
 	keywords[solTime.name.toLowerCase()] = "Time";
 	keywords[solTypes.name.toLowerCase()] = "Type";
 	keywords[solMisc.name.toLowerCase()] = "Misc";
+	keywords[solBuiltIn.name.toLowerCase()] = "BuiltIn";
+	keywords[solBlock.name.toLowerCase()] = "Block";
+	keywords[solMsg.name.toLowerCase()] = "Message";
+	keywords[solTx.name.toLowerCase()] = "Transaction";
 	return keywords;
 }