Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
destileria2
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blockchain
destileria2
Commits
409b19cb
Commit
409b19cb
authored
4 years ago
by
Robert Martin-Legene
Browse files
Options
Downloads
Patches
Plain Diff
Removing suitor concept / proof of control
parent
b7b18fa0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
destileria2.sol
+0
-36
0 additions, 36 deletions
destileria2.sol
with
0 additions
and
36 deletions
destileria2.sol
+
0
−
36
View file @
409b19cb
...
...
@@ -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);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment