diff --git a/destileria2.sol b/destileria2.sol index c342e05fe748b3a65afcd286b58884666700fb36..19b0954238c16b6a5026c2a26a9cc7883058f73b 100644 --- a/destileria2.sol +++ b/destileria2.sol @@ -18,16 +18,10 @@ contract PeronEther { 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; @@ -41,27 +35,6 @@ contract PeronEther { _; } - 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)); } @@ -82,15 +55,6 @@ contract PeronEther { 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);