Include owner as writer, upgrade deps

- Retire isRemoved function because why?

See merge request cicnet/eth-accounts-index!7

.gitlab-ci.yml

@@ -47,7 +47,10 @@ run-coverage:
   coverage: '/^TOTAL.+?(\d+\%)$/'
   artifacts:
     reports:
-      cobertura: python/htmlcov/index.html
+      coverage_report:
+        coverage_format: cobertura
+        path:  python/htmlcov/index.html
+
 
 slither-analyzer:
   image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-solc-python:latest

python/CHANGELOG

@@ -1,3 +1,28 @@
+* 0.5.3
+	- Add unittest module to packaging
+* 0.5.2
+	- Move test fixture to unittest module	 
+* 0.5.1
+	- Simplify contract events
+	- Split interfaces for mutable and immutable registries
+* 0.4.x, 0.5.0
+	- Update packaging to beta
+	- Change licence to AGPL
+* 0.3.6
+	- Correctly implement writer interface in contract
+	- Add contract json metadata in python package data
+* 0.3.5
+	- Remove contract compile warnings
+* 0.3.4
+	- Add time added entry
+* 0.3.3
+	- Rename cli script from deploy to publish
+	- Refactor cli scripts to use current chainlib setup
+	- Add activate and deactivate option
+* 0.3.2
+	- Add remove option
+* 0.3.0
+	- Upgrade deps
 * 0.1.5
 	- Add missing add_0x in writer cli
 

python/CONTRIBUTORS

@@ -0,0 +1 @@
+Philip Wafula <main@mango-habanero.dev> (pgp:6EE0A544AD62DD87C050DBA4495BB77D198E21D3)

python/LICENSE

@@ -1,45 +1,661 @@
-                        Bprotocol Foundation (Bancor) LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-1. SUBJECT TO THE PROVISIONS SET FORTH HEREIN, INCLUDING “EFFECTIVE DATE”, YOU CAN
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-   USE THIS CODE, FILE AND/OR SOFTWARE (“SOFTWARE”) ONLY IN CONNECTION WITH THE
+ Everyone is permitted to copy and distribute verbatim copies
-   BANCOR LIQUIDITY NETWORK AND/OR THE USE OF BNT ("PERMITTED USE"). ANY OTHER USE IS
+ of this license document, but changing it is not allowed.
-   PROHIBITED UNLESS THE USER SHALL RECEIVE AN EXPLICIT PRIOR WRITTEN APPROVAL FROM
-   BPROTOCOL FOUNDATION (BANCOR) TO DO SO (PLEASE CONTACT license@bancor.network IN
-   THIS REGARD), WHICH APPROVAL, IF GIVEN, MAY REQUIRE THE OBTAINMENT OF SEPARATE
-   LICENSE UNDER A DIFFERENT LICENSING MODEL. USING THIS SOFTWARE NOT IN THE FRAME OF
-   SUCH PERMITTED USE MAY, AMONG OTHERS, ALSO BREACH PATENT RIGHTS CONCERNING PATENTS
-   WHICH ARE EMBODIED/INCORPORATED/USED IN THIS SOFTWARE.
 
-2. ANY SUCH PERMITTED USE SHOULD ALSO COMPLY WITH THE TERMS BELOW.
+                            Preamble
 
-3. Redistribution and use in source and binary forms, with or without modification,
+  The GNU Affero General Public License is a free, copyleft license for
-   are permitted provided that the following conditions are met:
+software and other kinds of works, specifically designed to ensure
-A. Redistributions of source code must retain the above copyright notice, this list
+cooperation with the community in the case of network server software.
-   of conditions and the following disclaimer.
-B. Redistributions in binary form must reproduce the above copyright notice, this
-   list of conditions and the following disclaimer in the documentation and/or other
-   materials provided with the distribution.
-C. Neither the name of the copyright holder nor the names of its contributors may be
-   used to endorse or promote products derived from this software without specific prior
-   written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+  The licenses for most software and other practical works are designed
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+to take away your freedom to share and change the works.  By contrast,
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+our General Public Licenses are intended to guarantee your freedom to
-SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+share and change all versions of a program--to make sure it remains free
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+software for all its users.
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-EFFECTIVE DATE: THIS LICENSE SHALL APPLY ONLY TO SOFTWARE (OR ANY VERSION THEREOF),
+  When we speak of free software, we are referring to freedom, not
-THAT HAS BEEN PUBLISHED AFTER THE DATE AND TIME THIS LICENSE HAS BEEN FIRST PUBLISHED
+price.  Our General Public Licenses are designed to make sure that you
-(“EFFECTIVE DATE”); Any previous versions published prior to the effective date (“Older Versions”)
+have the freedom to distribute copies of free software (and charge for
-shall remain licensed under the Apache License, Version 2.0 (the "Older Versions License");
+them if you wish), that you receive source code or can get it if you
-You may obtain a copy of the Older Version License at http://www.apache.org/licenses/LICENSE-2.0
+want it, that you can change the software or use pieces of it in new
-you may not use this file except in compliance with the Older Version License. Unless
+free programs, and that you know you can do these things.
-required by applicable law or agreed to in writing, Older Versions distributed under the
+
-Older Version License are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+  Developers that use our General Public Licenses protect your rights
-OF ANY KIND, either express or implied. See the Older Version License for the specific
+with two steps: (1) assert copyright on the software, and (2) offer
-language governing permissions and limitations under the Older Version License.
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<https://www.gnu.org/licenses/>.

python/eth_accounts_index/data/AccountsIndex.json

@@ -1 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"addedAccount","type":"address"},{"indexed":true,"internalType":"uint256","name":"accountIndex","type":"uint256"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"addWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"entry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"entryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"have","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_account","type":"address"},{"indexed":false,"internalType":"bool","name":"_active","type":"bool"}],"name":"AddressActive","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"AddressRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"WriterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"WriterDeleted","type":"event"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"activate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"addWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"deactivate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_i","type":"uint256"}],"name":"entry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"entryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"have","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"isActive","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"isWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"remove","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"time","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"writers","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"}]

python/eth_accounts_index/data/AccountsIndex.metadata.json

@@ -0,0 +1 @@
+{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_account","type":"address"},{"indexed":false,"internalType":"bool","name":"_active","type":"bool"}],"name":"AddressActive","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"AddressRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"WriterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_account","type":"address"}],"name":"WriterDeleted","type":"event"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"activate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"addWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"deactivate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_i","type":"uint256"}],"name":"entry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"entryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"have","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"isActive","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"isWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"remove","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"time","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"writers","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"AccountsIndex.sol":"AccountsIndex"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"AccountsIndex.sol":{"keccak256":"0x49353964bdcca15cb5ea2fd8ec1fa525a6ebc34e5a5a6bd817f51242561d30e1","license":"AGPL-3.0-or-later","urls":["bzz-raw://fd4286cf38a61932edd096fcaa8d927557650490ba9b260f0cc07e512f3906b2","dweb:/ipfs/Qmd7bFpa8tAY1P5yfonrXJ6CJS9VF3xRJM6Fq8uJrjYk9u"]}},"version":1}

python/eth_accounts_index/interface.py

@@ -5,22 +5,22 @@ import os
 
 # external imports
 from chainlib.eth.tx import (
-        TxFactory,
+    TxFactory,
-        TxFormat,
+    TxFormat,
-        )
+)
 from chainlib.eth.contract import (
-        ABIContractEncoder,
+    ABIContractEncoder,
-        ABIContractDecoder,
+    ABIContractDecoder,
-        ABIContractType,
+    ABIContractType,
-        abi_decode_single,
+    abi_decode_single,
-        )
+)
 from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.jsonrpc import JSONRPCRequest
 from chainlib.eth.error import RequestMismatchException
 from hexathon import (
-        add_0x,
+    add_0x,
-        strip_0x,
+    strip_0x,
-        )
+)
 
 logg = logging.getLogger()
 
@@ -35,13 +35,37 @@ class AccountsIndex(TxFactory):
         data = enc.get()
         tx = self.template(sender_address, contract_address, use_nonce=True)
         tx = self.set_code(tx, data)
-        tx = self.finalize(tx, tx_format)        
+        tx = self.finalize(tx, tx_format)
         return tx
 
-
     def add(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
         return self.__single_address_method('add', contract_address, sender_address, address, tx_format)
 
+    def remove(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
+        return self.__single_address_method('remove', contract_address, sender_address, address, tx_format)
+
+    def activate(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
+        return self.__single_address_method('activate', contract_address, sender_address, address, tx_format)
+
+    def deactivate(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
+        return self.__single_address_method('deactivate', contract_address, sender_address, address, tx_format)
+
+
+    def time(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None):
+        j = JSONRPCRequest(id_generator)
+        o = j.template()
+        o['method'] = 'eth_call'
+        enc = ABIContractEncoder()
+        enc.method('time')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.address(address)
+        data = add_0x(enc.get())
+        tx = self.template(sender_address, contract_address)
+        tx = self.set_code(tx, data)
+        o['params'].append(self.normalize(tx))
+        return o
+
+
 
     def have(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None):
         j = JSONRPCRequest(id_generator)
@@ -57,6 +81,20 @@ class AccountsIndex(TxFactory):
         o['params'].append(self.normalize(tx))
         return o
 
+    def is_active(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None):
+        j = JSONRPCRequest(id_generator)
+        o = j.template()
+        o['method'] = 'eth_call'
+        enc = ABIContractEncoder()
+        enc.method('isActive')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.address(address)
+        data = add_0x(enc.get())
+        tx = self.template(sender_address, contract_address)
+        tx = self.set_code(tx, data)
+        o['params'].append(self.normalize(tx))
+        return o
+
 
     def entry_count(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
         j = JSONRPCRequest(id_generator)
@@ -70,11 +108,9 @@ class AccountsIndex(TxFactory):
         o['params'].append(self.normalize(tx))
         return o
 
-
     def count(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
         return self.entry_count(contract_address, sender_address=sender_address, id_generator=id_generator)
-
+    
-
     def entry(self, contract_address, idx, sender_address=ZERO_ADDRESS, id_generator=None):
         j = JSONRPCRequest(id_generator)
         o = j.template()
@@ -89,22 +125,18 @@ class AccountsIndex(TxFactory):
         o['params'].append(self.normalize(tx))
         return o
 
-
     @classmethod
     def parse_account(self, v):
         return abi_decode_single(ABIContractType.ADDRESS, v)
 
-
     @classmethod
     def parse_entry_count(self, v):
         return abi_decode_single(ABIContractType.UINT256, v)
 
-
     @classmethod
     def parse_have(self, v):
         return abi_decode_single(ABIContractType.BOOLEAN, v)
 
-
     @classmethod
     def parse_add_request(self, v):
         v = strip_0x(v)
@@ -121,6 +153,6 @@ class AccountsIndex(TxFactory):
 
         dec = ABIContractDecoder()
         dec.typ(ABIContractType.ADDRESS)
-        dec.val(v[cursor:cursor+64])
+        dec.val(v[cursor:cursor + 64])
         r = dec.decode()
-        return r 
+        return r

python/eth_accounts_index/registry.py

@@ -1,14 +1,16 @@
 # standard imports
 import os
+import json
 
+import pathlib
 # external imports
 from chainlib.eth.tx import (
-        TxFormat,
+    TxFormat,
-        )
+)
 from chainlib.eth.contract import (
-        ABIContractEncoder,
+    ABIContractEncoder,
-        ABIContractType,
+    ABIContractType,
-        )
+)
 
 # local imports
 from .interface import AccountsIndex
@@ -18,40 +20,34 @@ datadir = os.path.join(moddir, 'data')
 
 
 class AccountRegistry(AccountsIndex):
-
     __abi = None
     __bytecode = None
 
     @staticmethod
     def abi():
-        if AccountRegistry.__abi == None:
+        if AccountRegistry.__abi is None:
-            f = open(os.path.join(datadir, 'AccountsIndex.json'), 'r')
+            with open(os.path.join(datadir, 'AccountsIndex.json'), 'r') as f:
-            AccountRegistry.__abi = json.load(f)
+                AccountRegistry.__abi = json.load(f)
-            f.close()
         return AccountRegistry.__abi
 
-
     @staticmethod
     def bytecode():
-        if AccountRegistry.__bytecode == None:
+        if AccountRegistry.__bytecode is None:
-            f = open(os.path.join(datadir, 'AccountsIndex.bin'))
+            AccountRegistry.__bytecode = pathlib.Path(
-            AccountRegistry.__bytecode = f.read()
+                os.path.join(datadir, 'AccountsIndex.bin')
-            f.close()
+            ).read_text()
         return AccountRegistry.__bytecode
 
-
     @staticmethod
     def gas(code=None):
         return 1200000
 
-
     def constructor(self, sender_address):
         code = AccountRegistry.bytecode()
         tx = self.template(sender_address, None, use_nonce=True)
         tx = self.set_code(tx, code)
         return self.build(tx)
 
-
     def __single_address_method(self, method, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
         enc = ABIContractEncoder()
         enc.method(method)
@@ -60,13 +56,11 @@ class AccountRegistry(AccountsIndex):
         data = enc.get()
         tx = self.template(sender_address, contract_address, use_nonce=True)
         tx = self.set_code(tx, data)
-        tx = self.finalize(tx, tx_format)        
+        tx = self.finalize(tx, tx_format)
         return tx
 
-
     def add_writer(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
         return self.__single_address_method('addWriter', contract_address, sender_address, address, tx_format)
 
-
     def delete_writer(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
         return self.__single_address_method('deleteWriter', contract_address, sender_address, address, tx_format)

python/eth_accounts_index/runnable/add.py

@@ -18,6 +18,18 @@ from chainlib.chain import ChainSpec
 from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
 from chainlib.eth.address import to_checksum_address
+from chainlib.eth.cli.arg import (
+        Arg,
+        ArgFlag,
+        process_args,
+        )
+from chainlib.eth.cli.config import (
+        Config,
+        process_config,
+        )
+from chainlib.eth.cli.log import process_log
+from chainlib.eth.settings import process_settings
+from chainlib.settings import ChainSettings
 
 # local imports
 from eth_accounts_index.registry import AccountRegistry
@@ -25,46 +37,52 @@ from eth_accounts_index.registry import AccountRegistry
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC
+
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
+def process_config_local(config, arg, args, flags):
-argparser.add_positional('address', type=str, help='Address to add to registry')
+    address = to_checksum_address(config.get('_POSARG'))
+    config.add(address, '_ADDRESS')
+    return config
+
+
+arg_flags = ArgFlag()
+arg = Arg(arg_flags)
+flags = arg_flags.STD_WRITE | arg_flags.EXEC 
+
+argparser = chainlib.eth.cli.ArgumentParser()
+argparser = process_args(argparser, arg, flags)
+argparser.add_argument('address', type=str, help='Address to add to registry')
 args = argparser.parse_args()
 
-extra_args = {
+logg = process_log(args, logg)
-    'address': None,
-        }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=AccountRegistry.gas())
 
-wallet = chainlib.eth.cli.Wallet()
+config = Config()
-wallet.from_config(config)
+config = process_config(config, arg, args, flags, positional_name='address')
+config = process_config_local(config, arg, args, flags)
+logg.debug('config loaded:\n{}'.format(config))
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
+settings = ChainSettings()
-conn = rpc.connect_by_config(config)
+settings = process_settings(settings, config)
-
+logg.debug('settings loaded:\n{}'.format(settings))
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
 
 
 def main():
-    signer = rpc.get_signer()
+    conn = settings.get('CONN')
-    signer_address = rpc.get_sender_address()
+    c = AccountRegistry(
+            settings.get('CHAIN_SPEC'),
+            signer=settings.get('SIGNER'),
+            gas_oracle=settings.get('FEE_ORACLE'),
+            nonce_oracle=settings.get('NONCE_ORACLE'),
+            )
 
-    gas_oracle = rpc.get_gas_oracle()
+    (tx_hash_hex, o) = c.add(
-    nonce_oracle = rpc.get_nonce_oracle()
+            settings.get('EXEC'),
+            settings.get('SENDER_ADDRESS'),
+            config.get('_ADDRESS'),
+            )
 
-    subject_address = to_checksum_address(config.get('_ADDRESS'))
+    if settings.get('RPC_SEND'):
-    if not config.true('_UNSAFE') and subject_address != add_0x(config.get('_ADDRESS')):
-        raise ValueError('invalid checksum address for subject_address')
-
-    contract_address = to_checksum_address(config.get('_EXEC_ADDRESS'))
-    if not config.true('_UNSAFE') and contract_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    c = AccountRegistry(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-    (tx_hash_hex, o) = c.add(contract_address, signer_address, subject_address)
-
-    if config.get('_RPC_SEND'):
         conn.do(o)
-        if config.get('_WAIT'):
+        if config.true('_WAIT'):
             r = conn.wait(tx_hash_hex)
             if r['status'] == 0:
                 sys.stderr.write('EVM revert while deploying contract. Wish I had more to tell you')

python/eth_accounts_index/runnable/deploy.py

@@ -1,71 +0,0 @@
-"""Deploys accounts index, registering arbitrary number of writers
-
-.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
-.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
-
-"""
-
-# standard imports
-import sys
-import os
-import json
-import argparse
-import logging
-
-# external imports
-import chainlib.eth.cli
-from chainlib.chain import ChainSpec
-from chainlib.eth.connection import EthHTTPConnection
-from chainlib.eth.tx import receipt
-
-# local imports
-from eth_accounts_index.registry import AccountRegistry
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-arg_flags = chainlib.eth.cli.argflag_std_write
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-args = argparser.parse_args()
-
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, default_fee_limit=AccountRegistry.gas())
-
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
-
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
-
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
-
-def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    c = AccountRegistry(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-    (tx_hash_hex, o) = c.constructor(signer_address)
-
-    if config.get('_RPC_SEND'):
-        conn.do(o)
-        if config.get('_WAIT'):
-            r = conn.wait(tx_hash_hex)
-            if r['status'] == 0:
-                sys.stderr.write('EVM revert while deploying contract. Wish I had more to tell you')
-                sys.exit(1)
-            # TODO: pass through translator for keys (evm tester uses underscore instead of camelcase)
-            address = r['contractAddress']
-
-            print(address)
-        else:
-            print(tx_hash_hex)
-    else:
-        print(o)
-
-
-if __name__ == '__main__':
-    main()

python/eth_accounts_index/runnable/list.py

@@ -19,6 +19,19 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
 from chainlib.eth.constant import ZERO_CONTENT
 from chainlib.error import JSONRPCException
+from chainlib.eth.cli.arg import (
+        Arg,
+        ArgFlag,
+        process_args,
+        )
+from chainlib.eth.cli.config import (
+        Config,
+        process_config,
+        )
+from chainlib.eth.cli.log import process_log
+from chainlib.eth.settings import process_settings
+from chainlib.settings import ChainSettings
+from chainlib.eth.address import to_checksum_address
 
 # local imports
 from eth_accounts_index import AccountsIndex
@@ -27,23 +40,34 @@ from eth_accounts_index.registry import AccountRegistry
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC
+
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
+def process_config_local(config, arg, args, flags):
-argparser.add_positional('address', required=False, type=str, help='Check only whether given address is in registry')
+    address = config.get('_POSARG')
+    if address != None:
+        address = to_checksum_address(address)
+    config.add(address, '_ADDRESS')
+    return config
+
+
+arg_flags = ArgFlag()
+arg = Arg(arg_flags)
+flags = arg_flags.STD_READ | arg_flags.EXEC
+
+argparser = chainlib.eth.cli.ArgumentParser()
+argparser = process_args(argparser, arg, flags)
+argparser.add_argument('address', type=str, help='Address to add to registry')
 args = argparser.parse_args()
 
-extra_args = {
+logg = process_log(args, logg)
-    'address': None,
-        }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=AccountRegistry.gas())
 
-wallet = chainlib.eth.cli.Wallet()
+config = Config()
-wallet.from_config(config)
+config = process_config(config, arg, args, flags, positional_name='address')
+config = process_config_local(config, arg, args, flags)
+logg.debug('config loaded:\n{}'.format(config))
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
+settings = ChainSettings()
-conn = rpc.connect_by_config(config)
+settings = process_settings(settings, config)
-
+logg.debug('settings loaded:\n{}'.format(settings))
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
 
 
 def out_element(e, w=sys.stdout):
@@ -71,13 +95,26 @@ def ls(ifc, conn, contract_address, w=sys.stdout):
 
 
 def main():
+    conn = settings.get('CONN')
     address = config.get('_ADDRESS')
-    contract_address = config.get('_EXEC_ADDRESS')
+    c = AccountsIndex(
-    c = AccountsIndex(chain_spec)
+            settings.get('CHAIN_SPEC')
+            )
     if address != None:
-        element(c, conn, contract_address, address, w=sys.stdout)
+        element(
+                c,
+                conn,
+                settings.get('EXEC'),
+                address,
+                w=sys.stdout,
+                )
     else:
-        ls(c, conn, contract_address, w=sys.stdout)
+        ls(
+                c,
+                conn,
+                settings.get('EXEC'),
+                w=sys.stdout,
+                )
 
 
 if __name__ == '__main__':

python/eth_accounts_index/runnable/publish.py

@@ -0,0 +1,88 @@
+"""Deploys accounts index, registering arbitrary number of writers
+
+.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
+.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
+
+"""
+
+# standard imports
+import sys
+import os
+import logging
+
+# external imports
+import chainlib.eth.cli
+from chainlib.chain import ChainSpec
+from chainlib.eth.connection import EthHTTPConnection
+from chainlib.eth.tx import receipt
+from chainlib.eth.cli.arg import (
+        Arg,
+        ArgFlag,
+        process_args,
+        )
+from chainlib.eth.cli.config import (
+        Config,
+        process_config,
+        )
+from chainlib.eth.cli.log import process_log
+from chainlib.eth.settings import process_settings
+from chainlib.settings import ChainSettings
+
+# local imports
+from eth_accounts_index.registry import AccountRegistry
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+arg_flags = ArgFlag()
+arg = Arg(arg_flags)
+flags = arg_flags.STD_WRITE 
+
+argparser = chainlib.eth.cli.ArgumentParser()
+argparser = process_args(argparser, arg, flags)
+args = argparser.parse_args()
+
+logg = process_log(args, logg)
+
+config = Config()
+config = process_config(config, arg, args, flags)
+logg.debug('config loaded:\n{}'.format(config))
+
+settings = ChainSettings()
+settings = process_settings(settings, config)
+logg.debug('settings loaded:\n{}'.format(settings))
+
+
+def main():
+    conn = settings.get('CONN')
+
+    c = AccountRegistry(
+            settings.get('CHAIN_SPEC'),
+            signer=settings.get('SIGNER'),
+            gas_oracle=settings.get('FEE_ORACLE'),
+            nonce_oracle=settings.get('NONCE_ORACLE'),
+            )
+
+    (tx_hash_hex, o) = c.constructor(
+            settings.get('SENDER_ADDRESS'),
+            )
+
+    if settings.get('RPC_SEND'):
+        conn.do(o)
+        if config.true('_WAIT'):
+            r = conn.wait(tx_hash_hex)
+            if r['status'] == 0:
+                sys.stderr.write('EVM revert while deploying contract. Wish I had more to tell you')
+                sys.exit(1)
+            # TODO: pass through translator for keys (evm tester uses underscore instead of camelcase)
+            address = r['contractAddress']
+
+            print(address)
+        else:
+            print(tx_hash_hex)
+    else:
+        print(o)
+
+
+if __name__ == '__main__':
+    main()

python/eth_accounts_index/runnable/writer.py

@@ -1,86 +0,0 @@
-"""Adds/removes writers to accounts index
-
-.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
-.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
-
-"""
-
-# standard imports
-import os
-import json
-import argparse
-import logging
-import sys
-
-# external imports
-import chainlib.eth.cli
-from chainlib.chain import ChainSpec
-from chainlib.eth.connection import EthHTTPConnection
-from chainlib.eth.tx import receipt
-from chainlib.eth.address import to_checksum_address
-from hexathon import add_0x
-
-# local imports
-from eth_accounts_index.registry import AccountRegistry
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('--rm', action='store_true', help='Delete entry')
-argparser.add_positional('address', type=str, help='Update writer array with this address')
-args = argparser.parse_args()
-
-extra_args = {
-    'rm': None,
-    'address': None,
-        }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=AccountRegistry.gas())
-
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
-
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
-
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
-
-def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    c = AccountRegistry(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-    subject_address = to_checksum_address(config.get('_ADDRESS'))
-    if not config.true('_UNSAFE') and subject_address != add_0x(config.get('_ADDRESS')):
-        raise ValueError('invalid checksum address for subject_address')
-
-
-    contract_address = to_checksum_address(config.get('_EXEC_ADDRESS'))
-    if not config.true('_UNSAFE') and contract_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    if config.get('_RM'):
-        (tx_hash_hex, o) = c.delete_writer(contract_address, signer_address, subject_address)
-    else:
-        (tx_hash_hex, o) = c.add_writer(contract_address, signer_address, subject_address)
-    if config.get('_RPC_SEND'):
-        conn.do(o)
-        if config.get('_WAIT'):
-            r = conn.wait(tx_hash_hex)
-            if r['status'] == 0:
-                sys.stderr.write('EVM revert while deploying contract. Wish I had more to tell you')
-                sys.exit(1)
-
-        print(tx_hash_hex)
-    else:
-        print(o)
-
-
-if __name__ == '__main__':
-    main()

python/eth_accounts_index/unittest/__init__.py

@@ -0,0 +1 @@
+from .base import TestAccountsIndex

python/eth_accounts_index/unittest/base.py

@@ -0,0 +1,38 @@
+# standard imports
+import logging
+
+# external imports
+from chainlib.eth.unittest.ethtester import EthTesterCase
+from chainlib.connection import RPCConnection
+from chainlib.eth.nonce import RPCNonceOracle
+from chainlib.eth.address import to_checksum_address
+from chainlib.eth.tx import receipt
+
+# local imports
+from eth_accounts_index.registry import AccountRegistry
+
+logg = logging.getLogger(__name__)
+
+
+class TestAccountsIndex(EthTesterCase):
+
+    def setUp(self):
+        super(TestAccountsIndex, self).setUp()
+        self.conn = RPCConnection.connect(self.chain_spec, 'default')
+        nonce_oracle = RPCNonceOracle(self.accounts[0], conn=self.conn)
+
+        c = AccountRegistry(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash, o) = c.constructor(self.accounts[0])
+        r = self.conn.do(o)
+        logg.debug(f'published with hash {r}')
+
+        o = receipt(r)
+        r = self.conn.do(o)
+        self.address = to_checksum_address(r['contract_address'])
+
+        (tx_hash, o) = c.add_writer(self.address, self.accounts[0], self.accounts[0])
+        r = self.conn.do(o)
+
+        o = receipt(r)
+        r = self.conn.do(o)
+        self.assertEqual(r['status'], 1)

python/requirements.txt

@@ -1,2 +1,3 @@
-confini>=0.5.6,<0.7.0
+confini~=0.6.0
-chainlib-eth>=0.3.0,<0.4.0
+#chainlib-eth>=0.4.24,<0.6.0
+chainlib-eth~=0.6.2

python/setup.cfg

@@ -1,31 +1,33 @@
 [metadata]
 name = eth-accounts-index
-version = 0.2.1
+version = 0.6.0
 description = Accounts index evm contract tooling with permissioned writes
 author = Louis Holbrook
 author_email = dev@holbrook.no
-url = https://gitlab.com/cicnet/eth-accounts-index
+url = https://holbrook.no/src/eth-accounts-index/log.html
 keywords =
 	ethereum
 classifiers =
 	Programming Language :: Python :: 3
 	Operating System :: OS Independent
-	Development Status :: 3 - Alpha
+	Development Status :: 4 - Beta
-	Environment :: No Input/Output (Daemon)
+	Environment :: Console
 	Intended Audience :: Developers
-	License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+	License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+	Topic :: Software Development :: Libraries
 	Topic :: Internet
 	#Topic :: Blockchain :: EVM
-license = GPL3
+license = AGPLv3+
 licence_files =
-	LICENSE.txt
+	LICENSE
 
 [options]
 include_package_data = True
-python_requires = >= 3.6
+python_requires = >= 3.8
 packages = 
 	eth_accounts_index
 	eth_accounts_index.runnable
+	eth_accounts_index.unittest
 
 [options.extras_require]
 testing = 
@@ -40,7 +42,6 @@ testing =
 
 [options.entry_points]
 console_scripts =
-	eth-accounts-index-deploy = eth_accounts_index.runnable.deploy:main
+	eth-accounts-index-publish = eth_accounts_index.runnable.publish:main
 	eth-accounts-index-add = eth_accounts_index.runnable.add:main
-	eth-accounts-index-writer = eth_accounts_index.runnable.writer:main
 	eth-accounts-index-list = eth_accounts_index.runnable.list:main

python/setup.py

@@ -20,13 +20,6 @@ f.close()
 
 
 setup(
-        package_data={
-            '': [
-                'data/*.abi.json',
-                'data/*.bin',
-                ],
-            },
-        include_package_data=True,
         install_requires=requirements,
         tests_require=test_requirements,
         )

python/test_requirements.txt

@@ -1,2 +1,3 @@
-eth_tester==0.5.0b3
+eth_tester==0.10.0b4
-py-evm==0.3.0a20
+py-evm==0.10.0b4
+

python/tests/test_app.py

@@ -18,10 +18,15 @@ from chainlib.eth.contract import (
         abi_decode_single,
         ABIContractType,
         )
+from chainlib.eth.block import (
+        block_latest,
+        block_by_number,
+        )
 
 # local imports
 from eth_accounts_index.registry import AccountRegistry
 from eth_accounts_index import AccountsIndex
+from eth_accounts_index.unittest import TestAccountsIndex
 
 logging.basicConfig(level=logging.DEBUG)
 logg = logging.getLogger()
@@ -29,39 +34,10 @@ logg = logging.getLogger()
 testdir = os.path.dirname(__file__)
 
 
-class TestNonceOracle:
+class Test(TestAccountsIndex):
-
-    def __init__(self, address, default_value=0):
-        self.nonce = default_value
-
-
-    def next_nonce(self):
-        nonce = self.nonce
-        self.nonce += 1
-        return nonce
-
-
-class Test(EthTesterCase):
 
     def setUp(self):
         super(Test, self).setUp()
-        nonce_oracle = TestNonceOracle(self.accounts[0])
-        c = AccountRegistry(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        (tx_hash, o) = c.constructor(self.accounts[0])
-        self.conn = RPCConnection.connect(self.chain_spec, 'default')
-        r = self.conn.do(o)
-        logg.debug('deployed with hash {}'.format(r))
-        
-        o = receipt(r)
-        r = self.conn.do(o)
-        self.address = to_checksum_address(r['contract_address'])
-
-        (tx_hash, o) = c.add_writer(self.address, self.accounts[0], self.accounts[0])
-        r = self.conn.do(o)
-
-        o = receipt(r)
-        r = self.conn.do(o)
-        self.assertEqual(r['status'], 1)
 
 
     def test_1_count(self):
@@ -76,19 +52,25 @@ class Test(EthTesterCase):
     def test_2_add(self):
         b = os.urandom(20)
         a = to_checksum_address(b.hex())
+        b = os.urandom(20)
+        b = to_checksum_address(b.hex())
 
         nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
         c = AccountsIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
         (tx_hash, o) = c.add(self.address, self.accounts[0], a)
-        r = self.conn.do(o)
+        self.conn.do(o)
-        self.assertEqual(tx_hash, r)
-
         o = receipt(tx_hash)
-        rcpt = self.conn.do(o)
+        r = self.conn.do(o)
+        self.assertEqual(r['status'], 1)
 
         self.helper.mine_block()
         o = c.have(self.address, a, sender_address=self.accounts[0])
         r = self.conn.do(o)
+        self.assertEqual(int(r, 16), 1)
+
+        o = c.have(self.address, b, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        self.assertEqual(int(r, 16), 0)
 
 
     def test_3_add_rlpsigned(self):
@@ -128,68 +110,135 @@ class Test(EthTesterCase):
         self.assertEqual(count, 2)
 
 
-        #registry = AccountRegistry(self.w3, self.address, self.w3.eth.accounts[1])
+    def test_5_deactivate(self):
-        #registry.add(self.w3.eth.accounts[2])
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
+        c = AccountsIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
 
-        #self.assertFalse(registry.have(self.w3.eth.accounts[3]))
+        b = os.urandom(20)
+        a = to_checksum_address(b.hex())
+        (tx_hash, o) = c.add(self.address, self.accounts[0], a)
+        r = self.conn.do(o)
+
+        o = c.entry_count(self.address, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        count = c.parse_entry_count(r)
+        self.assertEqual(count, 1)
+
+        b = os.urandom(20)
+        a = to_checksum_address(b.hex())
+        (tx_hash, o) = c.add(self.address, self.accounts[0], a)
+        r = self.conn.do(o)
+
+        o = c.entry_count(self.address, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        count = c.parse_entry_count(r)
+        self.assertEqual(count, 2)
+
+        (tx_hash, o) = c.deactivate(self.address, self.accounts[0], a)
+        r = self.conn.do(o)
+        o = receipt(r)
+        r = self.conn.do(o)
+        self.assertEqual(r['status'], 1)
+
+        o = c.entry_count(self.address, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        count = c.parse_entry_count(r)
+        self.assertEqual(count, 2)
+
+        o = c.have(self.address, a, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        self.assertEqual(int(r, 16), 1)
+
+        o = c.is_active(self.address, a, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        self.assertEqual(int(r, 16), 0)
+
+        (tx_hash, o) = c.activate(self.address, self.accounts[0], a)
+        r = self.conn.do(o)
+        o = receipt(r)
+        r = self.conn.do(o)
+        self.assertEqual(r['status'], 1)
+
+        o = c.have(self.address, a, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        self.assertEqual(int(r, 16), 1)
+
+        o = c.is_active(self.address, a, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        self.assertEqual(int(r, 16), 1)
 
 
+    def test_6_remove(self):
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
+        c = AccountsIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
 
-# TODO: reinstate all tests
+        b = os.urandom(20)
-#    def test_access(self):
+        a = to_checksum_address(b.hex())
-#        registry = AccountRegistry(self.w3, self.address, self.w3.eth.accounts[1])
+        (tx_hash, o) = c.add(self.address, self.accounts[0], a)
-#        registry.add(self.w3.eth.accounts[2])
+        r = self.conn.do(o)
-#        self.eth_tester.mine_block()
+
-#        self.assertEqual(registry.count(), 2)
+        o = c.entry_count(self.address, sender_address=self.accounts[0])
-#
+        r = self.conn.do(o)
-#        # account 2 does not have access
+        self.assertEqual(int(r, 16), 1)
-#        registry = AccountRegistry(self.w3, self.address, self.w3.eth.accounts[2])
+
-#        registry.add(self.w3.eth.accounts[2])
+        (tx_hash, o) = c.remove(self.address, self.accounts[0], a)
-#        self.eth_tester.mine_block()
+        r = self.conn.do(o)
-#        self.assertEqual(registry.count(), 2)
+        o = receipt(r)
-#
+        r = self.conn.do(o)
-#        # after this account 2 has access
+        self.assertEqual(r['status'], 1)
-#        registry.contract.functions.addWriter(self.w3.eth.accounts[2]).transact()
+
-#        registry.add(self.w3.eth.accounts[3])
+        o = c.entry_count(self.address, sender_address=self.accounts[0])
-#        self.eth_tester.mine_block()
+        r = self.conn.do(o)
-#        self.assertEqual(registry.count(), 3)
+        self.assertEqual(int(r, 16), 0)
-#
+
-#        # after this account 2 no longer has access
+        addrs = []
-#        registry.contract.functions.deleteWriter(self.w3.eth.accounts[2]).transact()
+        for i in range(8):
-#        registry.add(self.w3.eth.accounts[3])
+            b = os.urandom(20)
-#        self.eth_tester.mine_block()
+            addrs.append(to_checksum_address(b.hex()))
-#        self.assertEqual(registry.count(), 3)
+            (tx_hash, o) = c.add(self.address, self.accounts[0], addrs[i])
-#
+            r = self.conn.do(o)
-#
+            o = receipt(tx_hash)
+            r = self.conn.do(o)
+            self.assertEqual(r['status'], 1)
+
+        o = c.entry_count(self.address, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        self.assertEqual(int(r, 16), 8)
+
+        (tx_hash, o) = c.remove(self.address, self.accounts[0], addrs[4])
+        r = self.conn.do(o)
+        o = receipt(r)
+        r = self.conn.do(o)
+        self.assertEqual(r['status'], 1)
+
+        r = []
+        for i in range(7):
+            o = c.entry(self.address, i, sender_address=self.accounts[0])
+            r.append(self.conn.do(o))
+
+        self.assertEqual(len(r), 7)
+        self.assertNotIn(addrs[4], r)
+
+
+    def test_7_time(self):
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
+        c = AccountsIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+
+        b = os.urandom(20)
+        a = to_checksum_address(b.hex())
+        (tx_hash, o) = c.add(self.address, self.accounts[0], a)
+        self.conn.do(o)
+
+        o = block_latest()
+        r = self.conn.do(o)
+        o = block_by_number(r)
+        r = self.conn.do(o)
+        t = r['timestamp']
+
+        o = c.time(self.address, a, sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        self.assertEqual(t, int(r, 16))
 
-#    def test_no_duplicates(self):
-#        registry = AccountRegistry(self.w3, self.address, self.w3.eth.accounts[1])
-#        tx_hash = registry.add(self.w3.eth.accounts[2])
-#        self.eth_tester.mine_block()
-#        tx_hash = registry.add(self.w3.eth.accounts[3])
-#        self.eth_tester.mine_block()
-#        # BUG: eth_tester does not detect the duplicate here, but does in the test.py file in the solidity folder
-#        #self.assertRaises(Exception):
-#        tx_hash = registry.add(self.w3.eth.accounts[2]) 
-#        self.eth_tester.mine_block()
-#
-#
-#    def test_list(self):
-#        registry = AccountRegistry(self.w3, self.address, self.w3.eth.accounts[1])
-#
-#        for i in range(2, 10):
-#            registry.add(self.w3.eth.accounts[i])
-#
-#        self.assertEqual(registry.count(), 9)
-#
-#        accounts_reverse = []
-#        for i in range(9, 1, -1):
-#            accounts_reverse.append(self.w3.eth.accounts[i])
-#
-#        accounts_list = registry.last(8)
-#        for i in range(8):
-#            self.assertEqual(accounts_list[i], accounts_reverse[i])
-#
 
 if __name__ == '__main__':
     unittest.main()

solidity/AccountsIndex.sol

@@ -1,82 +1,161 @@
-pragma solidity >0.6.11;
+pragma solidity >=0.8.0;
 
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0-or-later
-// File-Version: 1
+// File-Version: 3
 
-contract CustodialAccountIndex {
+contract AccountsIndex {
-
+	uint256 constant blockedField = 1 << 128;
-	address[] entries;
+	address[] entryList;
 	mapping(address => uint256) entryIndex;
-	mapping(address => bool) writers;
+
+	// Implements Writer
+	mapping(address => bool) public writers;
+
+	// Implements ERC173
 	address public owner;
-	address newOwner;
 
-	event AddressAdded(address indexed addedAccount, uint256 indexed accountIndex); // AccountsIndex
+	// Implements AccountsIndex
+	event AddressAdded(address _account); // AccountsIndex
+	// Implements AccountsIndexMutable
+	event AddressActive(address indexed _account, bool _active);
+	// Implements AccountsIndexMutable
+	event AddressRemoved(address _account);
+	// Implements ERC173
 	event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); // EIP173
+	// Implements Writer
+	event WriterAdded(address _account); // AccountsIndex
+	// Implements Writer
+	event WriterDeleted(address _account);
 
-	constructor() public {
+	constructor() {
 		owner = msg.sender;
-		entries.push(address(0));
+		entryList.push(address(0));
-		count = 1;
 	}
 
+	// Implements AccountsIndex
+	function entryCount() external view returns (uint256) {
+		return entryList.length - 1;
+	}
+
+	// Implements Writer
 	function addWriter(address _writer) public returns (bool) {
-		require(owner == msg.sender);
+		require(owner == msg.sender, 'ERR_AXX');
 		writers[_writer] = true;
+		emit WriterAdded(_writer);
 		return true;
 	}
 
+	// Implements Writer
 	function deleteWriter(address _writer) public returns (bool) {
-		require(owner == msg.sender);
+		require(owner == msg.sender, 'ERR_AXX');
 		delete writers[_writer];
+		emit WriterDeleted(_writer);
 		return true;
 	}
 
+	// Implements Writer
+	function isWriter(address _writer) public view returns (bool) {
+		return writers[_writer] || _writer == owner;
+	}
+
 	// Implements AccountsIndex
 	function add(address _account) external returns (bool) {
-		require(writers[msg.sender]);
+		uint256 i;
+		uint256 _entry;
+
+		require(isWriter(msg.sender));
 		require(entryIndex[_account] == 0);
-		entryIndex[_account] = entries.length;
+		require(entryList.length < (1 << 64));
-		entries.push(_account);
+		i = entryList.length;
-		emit AddressAdded(_account, entries.length-1);
+		entryList.push(_account);
+		_entry = uint64(i);
+		_entry |= block.timestamp << 64;
+		entryIndex[_account] = _entry;
+		emit AddressAdded(_account);
 		return true;
 	}
 
+	// Implements AccountsIndexMutable
+	function remove(address _account) external returns (bool) {
+		uint256 i;
+		uint256 l;
+
+		require(isWriter(msg.sender), 'ERR_AXX');
+		require(this.have(_account), 'ERR_ACL');
+
+		l = entryList.length - 1;
+
+		i = entryIndex[_account];
+		if (i < l) {
+			entryList[i] = entryList[l];
+		}		
+		entryList.pop();
+		entryIndex[_account] = 0;
+		emit AddressRemoved(_account);
+		return true;
+	}
+
+	// Implements AccountsIndexMutable
+	function activate(address _account) external returns (bool) {
+		require(isWriter(msg.sender), 'ERR_AXX');
+		require(entryIndex[_account] > 0, 'ERR_NOT_FOUND');
+	        require(entryIndex[_account] & blockedField == blockedField, 'ERR_NOT_BLOCKED');
+		entryIndex[_account] >>= 129;
+		emit AddressActive(_account, true);
+		return true;
+	}
+
+	// Implements AccountsIndexMutable
+	function deactivate(address _account) external returns (bool) {
+		require(isWriter(msg.sender));
+		require(entryIndex[_account] > 0, 'ERR_NOT_FOUND');
+		require(entryIndex[_account] & blockedField == 0, 'ERR_NOT_ACTIVE');
+		entryIndex[_account] <<= 129;
+		entryIndex[_account] |= blockedField;
+		emit AddressActive(_account, false);
+		return true;
+	}
+
+	// Implements AccountsIndex
+	function entry(uint256 _i) external view returns (address) {
+		return entryList[_i + 1];
+	}
+
+	// Implements AccountsIndex
+	function time(address _account) external view returns (uint256) {
+		require(entryIndex[_account] > 0);
+		return entryIndex[_account] >> 64;
+	}
+
+
 	// Implements AccountsIndex
 	function have(address _account) external view returns (bool) {
 		return entryIndex[_account] > 0;
 	}
 
-	// Implements AccountsIndex
+	// Implements AccountsIndexMutable
-	function entry(uint256 _idx) public returns (address) {
+	function isActive(address _account) external view returns (bool) {
-		return entries[_idx+1];
+		return this.have(_account) && entryIndex[_account] & blockedField != blockedField;
-	}
-
-	// Implements AccountsIndex
-	function entryCount() public returns (uint256) {
-		return entries.length - 1;
 	}
 
 	// Implements EIP173
 	function transferOwnership(address _newOwner) public returns (bool) {
-		require(msg.sender == owner);
-		newOwner = _newOwner;
-	}
-
-	// Implements OwnedAccepter
-	function acceptOwnership() public returns (bool) {
 		address oldOwner;
+		require(msg.sender == owner, 'ERR_AXX');
+
+		oldOwner = owner;
+		owner = _newOwner;
 
-		require(msg.sender == newOwner);
-		oldOwner = owner; 
-		owner = newOwner;
-		newOwner = address(0);
 		emit OwnershipTransferred(oldOwner, owner);
+		return true;
 	}
 
 	// Implements EIP165
 	function supportsInterface(bytes4 _sum) public pure returns (bool) {
-		if (_sum == 0xcbdb05c7) { // AccountsIndex
+		if (_sum == 0xb7bca625) { // AccountsIndex
+			return true;
+		}
+		if (_sum == 0x9479f0ae) { // AccountsIndexMutable
 			return true;
 		}
 		if (_sum == 0x01ffc9a7) { // EIP165
@@ -85,10 +164,7 @@ contract CustodialAccountIndex {
 		if (_sum == 0x9493f8b2) { // EIP173
 			return true;
 		}
-		if (_sum == 0x37a47be4) { // OwnedAccepter
+		if (_sum == 0xabe1f1f5) { // Writer
-			return true;
-		}
-		if (_sum == 0x80c84bd6) { // Writer
 			return true;
 		}
 		return false;

solidity/Makefile

@@ -2,9 +2,11 @@ SOLC = /usr/bin/solc
 
 all:
 	$(SOLC) --bin AccountsIndex.sol --evm-version byzantium | awk 'NR>3' > AccountsIndex.bin
-	truncate -s -1 AccountsIndex.bin
 	$(SOLC) --abi AccountsIndex.sol --evm-version byzantium | awk 'NR>3' > AccountsIndex.json
+	$(SOLC) --metadata AccountsIndex.sol --evm-version byzantium | awk 'NR>3' > AccountsIndex.metadata.json
+	truncate -s -1 AccountsIndex.bin
 
 install: all
-	cp -v *{json,bin} ../python/eth_accounts_index/data/
+	cp -v *.json ../python/eth_accounts_index/data/
+	cp -v *.bin ../python/eth_accounts_index/data/