Copiado de https://gitlab.bfa.ar/pkumagae/Poppins.git commit...

Copiado de https://gitlab.bfa.ar/pkumagae/Poppins.git commit e5ee31e7ff18cffcdfb643900581da054b46ee93

LICENSE

+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+                     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
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
\ No newline at end of file

README.md

 # destileria2
 
-Destileria de DGSI.
\ No newline at end of file
+Destileria de DGSI (faucet).
+
+# Contrato de distribución de ether
+
+peronEther.sol
+
+### Sobre la problemática:
+Sobre redes con consenso de Proof of Authority, al no tener mecanismo de emisión de token descentralizado, es necesario tener una idea de cómo distribuir el ether. Y esta herramienta, tiene que permitir entregar ether a aquellos que NO tengan capacidad de generarlo, y que además tenga restricciones para, al monitorear abusos, limitar o incluso expulsar a los receptores de ether.
+
+Además, el otro problema es verificar que las cuentas que corresponden a los beneficiarios, efectivamente están bajo control, o más bien, que sus claves privadas estén asignadas a gente que tenga acceso a ellas, para no entregar ether a claves públicas sin control   
+
+### Funcional: 
+
+La idea de este contrato es tener una herramienta de entrega de ether, con un sistema de autorización sencillo.
+Se identifican 3 roles:
+    
+- Beneficiario: un account sobre el que se le va a enviar ether según el criterio del distribuidor
+
+- Distribuidor: un account que puede asignar, eliminar y modificar topes de beneficiarios, y puede hacer los reabastecimientos
+    
+- Owner: el account que hace el deploy del contrato es quien tiene este rol, y es quien puede agregar, eliminar y modificar topes de distribuidores y beneficiarios
+
+Cada beneficiario tiene un tope, y si en el momento de reabastecimiento, se le dará la diferencia entre su balance y el tope. Este es asignado por el distribuidor que lo agregó, quien también puede modificarlo en cualquier momento, y a su vez, el tope que puede asignar un distribuidor a un beneficiario no puede ser mayor que su propio tope, que es finalmente decidido por el owner. Esto es para asegurar que los distribuidores no asignan límites de balance demasiado altos a los beneficiarios.
+En cualquier momento un distribuidor puede reabastecer a todos, algunos o un beneficiario, si el balance del contrato es suficiente para la acción
+
+Sobre la verificación de las cuentas, es un paso difícil, porque naturalmente la blockchain como tecnología piensa en las cuentas como pares de claves públicas/privadas para desacoplar el hecho de que hay un ser humano detrás con el control de la privada, y por lo tanto de la cuenta y todas sus acciones. Es parte de la problemática entender que la asociación de una cuenta implica que hay alguien que dice tener el control sobre la cuenta a asociar, y que de hecho lo tiene. 
+Para eso, el contrato tiene un servicio para agregar candidatos, que realiza los siguientes pasos:
+
+- Agregar un candidato a beneficiario, y el hash de una clave generada según un criterio arbitrario a nivel dapp, aunque esta clave tiene que ser universalmente única, y esa clave es revelada al usuario a nivel dapp
+- A ese candidato, se le pasa una cantidad mínima de ether
+- El candidato invoca al contrato, lo cual puede hacer porque se le habilitó el saldo suficiente, y pasa la clave sin aplicarle el hash al contrato, el contrato hashea la clave y compara con la pasada originalmente, si coincide, el candidato es aprobado
+
+La decisión de pasar el hash al contrato al principio es porque, como en blockchain todo es público, pasar la clave en ese momento no sirve para distinguir porque cualquiera la puede ver en cualquier momento, por eso el hash. Además en el momento que el candidato haga la verificación, ahí si pasa la clave original, porque si la clave es de hecho la correcta, el contrato la hashea y si coincide entonces ya está aprobado el candidato, y no hay problema con que la clave esté pública ya que no tiene utilidad 
+
+### Interfaz:
+
+- Constructor: define el poseedor del contrato
+
+- addDistributor(address distr, unsigned int tope) -> bool : precondición el account es el owner. distr es agregado al listado de distribuidores con tope como su límite de asignación
+
+- kickDistributor(address distr) -> bool : devuelve True si distr es un distribuidor y el account es el owner, caso contrario devuelve False. Quita a distr del listado
+
+- addBeneficiary(address ben, unsigned int top) -> bool : devuelve True si ben no es distribuidor ni owner, y el account que está haciendo la transacción sí es distribuidor u owner, tope es menor o igual al tope del account haciendo la transacción, caso contrario devuelve False. Agrega el beneficiario al listado de beneficiarios
+
+- kickBeneficiary(address ben) -> bool : devuelve True si el beneficiario está en el listado de beneficiarios y el account haciendo la transacción es distribuidor u owner, caso contrario devuelve False. Elimina ben del listado de beneficiarios 
+
+- changeLimit(address ben, unsigned int top) -> bool: devuelve True si ben es beneficiario, el account haciendo la transacción es distribuidor u owner, y tope es menor al tope asignado al distribuidor, caso contrario devuelve False. Cambia el tope del beneficiario
+
+- replenish(address ben, unsigned int amount) -> bool: devuelve True si ben es beneficiario, el account haciendo la transacción es distribuidor, el balance de ben es menor a su tope y el balance del contrato es mayor a amount, caso contrario devuelve False. Transfiere amount ether a ben
+
+- getDistributorLimit(address dist) -> unsigned int: devuelve el tope de asignación del distribuidor
+
+- getBeneficiaryLimit(address ben) -> unsigned int: devuelve el tope a recibir del beneficiario
+
+- getBeneficiaryCount() -> unsigned int: devuelve la cantidad de beneficiarios
+
+- addSuitor(address add, string password) -> bool: devuelve true si el contrato tiene suficiente ether para transferir al candidato, y false en caso contrario. NO IMPLEMENTADO
+
+- proveControl() -> bool: NO IMPLEMENTADO
+
+Los métodos replenishAll y replenishList tienen funcionalidad similar a la de replenish pero para hacer reabastecimientos masivos
+
+Notas:
+
+- Todos los métodos tienen valor de return para poder hacer un call antes de una transacción para verificar su funcionamiento y lograr ahorrar gas
+
+### Comparando con el SC original
+
+Aunque conceptualmente, ambos contratos son similares, porque tienen una lista de beneficiarios y un servicio para distribuir el ether, sin embargo presentan las sig diferencias:
+
+- El original tiene un sistema de permisos más limitado, todo el poder concetrado en un sólo admin, y aunque en este tipo de contextos, donde sistemas de autorización son más difíciles de definir, este contrato es un poco más flexible, al tener administradores con limites de asignación de tope distintos
+
+- El método distribute del original, entrega indiscriminadamente la diferencia entre el balance y el tope de cada beneficiario, lo cual puede no ser necesariamente la intención, en el nuevo ademaś de tener este servicio, presenta otros métodos que ofrecen más granularidad, para reabastecer cuentas específicas una cantidad de ether permitida que no sea necesariamente la diferencia
+
+- El nuevo tiene separadas las funcionalidades de setEtherAllowance en varios métodos para facilitar el uso
+
+- El nuevo, en los métodos que tienen loops implementados, no se hace verificación de gas, porque es algo que se puede estimar, ya que los casos son los sigs:
+  - Entre invocaciones no se hizo transacción que altere el tamaño de los beneficiarios, entonces al usar estimateGas del lado de geth o web3, es la estimación precisa
+  - Si se hacen invocaciones que alteran el tamaño de los beneficiarios, y esas transacciones están pendientes, se puede tomar estimar el costo de esas transacciones y agregarlo al de esta
+    
+### TODOs
+
+- [x] Mecanismo de verificación de cuenta, para verificar que los beneficiarios a agregar son cuentas con clave privada bajo control, todavía queda decidir si esto es parte de este smart contract
+- [ ] Implementar addSuitor y proveControl, que son los métodos para el mecanismo de verificación de cuenta

peronEther.sol

+/*
+Copyright 2019 de la Dirección General de Sistemas Informáticos – Secretaría Legal y Técnica - Nación.
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/
+*/
+pragma solidity ^0.4.11;
+
+
+contract PeronEther {
+    
+    event addedBeneficiary(address indexed distr, address indexed added, uint256 limit);
+    event addedDistributor(address indexed added, uint256 top);
+    event kickedBeneficiary(address indexed distr, address indexed kicked);
+    event kickedDistributor(address indexed kicked);
+    event limitChanged(address indexed distr, address indexed ben, uint256 newLimit);
+    event replenished(address indexed distr, uint256 amount);
+    event suitorAdded(address indexed suitor, address indexed distr);
+    event suitorApproved(address indexed suitor);
+    event suitorNotApproved(address indexed suitor);
+    event proofOfControlWeiAmountChanged(uint256 amount);
+    
+    address     owner;
+    itmap    beneficiaries;
+    itmap    distributors;
+    mapping(address=>bytes32)    suitors;
+    uint256 proofOfControlWeiAmount;
+
+    constructor() payable public {
+        owner = msg.sender;
+    }
+    modifier onlyOwner {
+        require( msg.sender == owner );
+        _;
+    }
+    modifier onlyDistributor {
+        require (contains(distributors, msg.sender) || msg.sender == owner);
+        _;
+    }
+    
+    function addSuitor(address add, bytes32 password) public payable onlyDistributor returns(bool){
+        if(address(this).balance >= proofOfControlWeiAmount){
+            suitors[add] = password;
+            emit suitorAdded(add, msg.sender);    
+            add.transfer(proofOfControlWeiAmount);
+            return true;
+        }
+        return false;
+    }
+    
+    function proveControl(string key) public returns(bool){
+        if(proofOfControlWeiAmount > 0 && this.hash(key)==suitors[msg.sender]){
+            emit suitorApproved(msg.sender);
+            delete suitors[msg.sender];
+            return true;
+        }else{
+            emit suitorNotApproved(msg.sender);
+            return false;
+        }
+    }
+    
+    function hash(string key) public pure returns(bytes32){
+        return keccak256(abi.encodePacked(key));
+    }
+    
+    function addBeneficiary(address acc, uint256 limit) public onlyDistributor returns(bool){
+        if (!contains(distributors, acc) && limit < get(distributors, msg.sender)){
+            emit addedBeneficiary(msg.sender, acc, limit);
+            return !insert(beneficiaries, acc, limit);    
+        }
+        return false;
+    }
+    
+    function addDistributor(address acc, uint256 top) public onlyOwner returns(bool){
+        if (!contains(beneficiaries, acc)){
+            emit addedDistributor(acc, top);
+            return !insert(distributors, acc, top);    
+        }
+        return false;
+    }
+    
+    function setProofOfControlWeiAmount(uint256 amount) public onlyOwner returns(bool){
+        proofOfControlWeiAmount = amount;
+        emit proofOfControlWeiAmountChanged(amount);
+    }
+    
+    function getProofOfControlWeiAmount() public view returns(uint256){
+        return proofOfControlWeiAmount;
+    }
+    
+    function kickDistributor(address acc) public onlyOwner returns(bool){
+        if (contains(distributors, acc)){
+            emit kickedDistributor(acc);
+            return remove(distributors, acc);
+        }
+        return false;
+    }
+    
+    function kickBeneficiary(address acc) public onlyOwner returns(bool){
+        if (contains(distributors, acc)){
+            emit kickedBeneficiary(msg.sender, acc);
+            return remove(distributors, acc);
+        }
+        return false;
+    }
+    
+    function changeLimit(address acc, uint256 limit) public onlyDistributor returns(bool){
+        if (contains(beneficiaries, acc) && get(distributors, msg.sender) > limit){
+            modify(beneficiaries, acc, limit);
+            emit limitChanged(msg.sender, acc, limit);
+            return true;
+        }
+        return false;
+    }
+    
+    function replenish(address acc, uint256 amount) public payable onlyDistributor returns(bool){
+        if(contains(beneficiaries,acc) 
+            && acc.balance < get(beneficiaries,acc)
+            && address(this).balance > amount){
+            acc.transfer(amount);
+            emit replenished(msg.sender, amount);
+            return true;
+        }
+        return false;
+    }
+    
+    function replenishList(address[] accs, uint256[] amounts) public payable{
+        require(accs.length == amounts.length);
+        uint256 i = 0;
+        if (contractHasEnoughEtherForThese(accs)){
+            for( ;i< accs.length; i++){
+                accs[i].transfer(get(beneficiaries, accs[i]) - accs[i].balance);
+            }    
+        }
+    }
+    
+    function replenishAll() public payable onlyDistributor returns(bool){
+        if (contractHasEnoughEtherForAll()){
+            uint256 i = iterate_start(beneficiaries);
+            for (; iterate_valid(beneficiaries, i); i = iterate_next(beneficiaries, i)){
+                var (cuenta, top) = iterate_get(beneficiaries, i);
+                if(top > cuenta.balance){
+                    cuenta.transfer(top - cuenta.balance);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+    
+    function contractHasEnoughEtherForThese(address[] accs) private view returns(bool){
+        uint256 i = 0;
+        uint256 sum = 0;
+        for( ;i< accs.length; i++){
+            uint256 top = get(beneficiaries, accs[i]);
+            if ( top > accs[i].balance){
+                sum += top - accs[i].balance;
+            }
+        }
+        return sum < address(this).balance;
+    }
+    
+    function contractHasEnoughEtherForAll() private view returns(bool){
+        uint256 i = iterate_start(beneficiaries);
+        uint256 sum = 0;
+        for (; iterate_valid(beneficiaries, i); i = iterate_next(beneficiaries, i)){
+            var (cuenta, top) = iterate_get(beneficiaries, i);
+            if(top > cuenta.balance){
+                sum += top - cuenta.balance;    
+            }
+        }
+        return sum < address(this).balance;
+    }
+    
+    function getDistributorLimit(address acc) public view returns(uint256){
+        return get(distributors, acc);
+    }
+    
+    function getBeneficiaryLimit(address acc) public view returns(uint256){
+        return get(beneficiaries, acc);
+    }
+    
+    function getBeneficiariesCount() public view returns(uint256){
+        return beneficiaries.size;
+    }
+    
+    function isBeneficiary(address add) public view returns(bool){
+        return contains(beneficiaries, add);
+    }
+    
+    function isDistributor(address add) public view returns(bool){
+        return contains(distributors, add);
+    }
+    
+    // itmap
+    
+    struct itmap{
+        mapping(address => IndexValue) data;
+        KeyFlag[] keys;
+        uint256 size;
+    }
+  
+    struct IndexValue {
+        uint256 keyIndex;
+        uint256 value; 
+    }
+  
+    struct KeyFlag {
+        address key;
+        bool deleted;
+    }
+  
+  function insert(itmap storage self, address key, uint256 value) private returns (bool replaced){
+    uint256 keyIndex = self.data[key].keyIndex;
+    self.data[key].value = value;
+    if (keyIndex > 0){
+        return true;
+    }else{
+        keyIndex = self.keys.length++;
+        self.data[key].keyIndex = keyIndex + 1;
+        self.keys[keyIndex].key = key;
+        self.size++;
+        return false;
+    }
+  }
+  
+  function size(itmap storage self) private view returns(uint256){
+      return self.size;
+  }
+  
+  function remove(itmap storage self, address key) private returns (bool success){
+    uint256 keyIndex = self.data[key].keyIndex;
+    if (keyIndex == 0)
+        return false;
+    delete self.data[key];
+    self.keys[keyIndex - 1].deleted = true;
+    self.size --;
+    return true;
+  }
+  
+   function modify(itmap storage self, address key, uint256 value) private returns (bool success){
+    uint256 keyIndex = self.data[key].keyIndex;
+    if (keyIndex == 0)
+      return false;
+    self.data[key].value = value;
+    return true;
+  }
+  
+  function get(itmap storage self, address key) private view returns(uint){
+      return self.data[key].value;
+  }
+  
+  function contains(itmap storage self, address key) private view returns (bool){
+    return self.data[key].keyIndex > 0;
+  }
+  function iterate_start(itmap storage self) private view returns (uint keyIndex){
+    return iterate_next(self, uint256(-1));
+  }
+  function iterate_valid(itmap storage self, uint256 keyIndex) private view returns (bool){
+    return keyIndex < self.keys.length;
+  }
+  function iterate_next(itmap storage self, uint256 keyIndex) private view returns (uint256 r_keyIndex){
+    keyIndex++;
+    while (keyIndex < self.keys.length && self.keys[keyIndex].deleted)
+        keyIndex++;
+    return keyIndex;
+  }
+  function iterate_get(itmap storage self, uint256 keyIndex) private view returns (address key, uint256 value){
+    key = self.keys[keyIndex].key;
+    value = self.data[key].value;
+  }
+}