status-im
/
topic-democracy
mirror of https://github.com/status-im/topic-democracy.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

small improvements

This commit is contained in:
Ricardo Guilherme Schmidt 2019-03-25 03:38:34 -03:00
parent 08c24fc1f9
commit 5ab38c899a
No known key found for this signature in database
GPG Key ID: BFB3F5C8ED618A94
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contracts/democracy/delegation/DelegationAbstract.sol
View File

@ -9,7 +9,7 @@ import "./Delegation.sol";
*/ */
contract DelegationAbstract is InstanceAbstract, Delegation { contract DelegationAbstract is InstanceAbstract, Delegation {
struct DelegateSet { struct DelegateSet {
uint128 fromBlock; //when this was updated uint96 fromBlock; //when this was updated
address to; //who recieved this delegaton address to; //who recieved this delegaton
} }
//default delegation proxy, being used when user didn't set any delegation at this level. //default delegation proxy, being used when user didn't set any delegation at this level.
@ -36,7 +36,7 @@ contract DelegationAbstract is InstanceAbstract, Delegation {
DelegateSet[] storage fromHistory = delegations[_from]; DelegateSet[] storage fromHistory = delegations[_from];
//Add the new delegation //Add the new delegation
_newFrom.fromBlock = uint128(block.number); _newFrom.fromBlock = uint96(block.number);
_newFrom.to = _to; //delegate address _newFrom.to = _to; //delegate address
fromHistory.push(_newFrom); //register `from` delegation update; fromHistory.push(_newFrom); //register `from` delegation update;
@ -87,25 +87,24 @@ contract DelegationAbstract is InstanceAbstract, Delegation {
//In case there is no registry //In case there is no registry
if (checkpoints.length == 0) { if (checkpoints.length == 0) {
if (address(parentDelegation) != address(0)) { return getDefaultDelegate(_who, _block);
return Delegation(parentDelegation).delegatedToAt(_who, _block);
} else {
return _who;
}
} }
DelegateSet memory d = getMemoryAt(checkpoints, _block); DelegateSet memory d = getMemoryAt(checkpoints, _block);
// Case user unset delegation // Case user unset delegation
if (d.to == address(0)) { if (d.to == address(0)) {
if (address(parentDelegation) != address(0)) { return getDefaultDelegate(_who, _block);
return Delegation(parentDelegation).delegatedToAt(_who, _block);
} else {
return _who;
}
} }
return d.to; return d.to;
} }
function getDefaultDelegate(address _who, uint256 _block) internal view returns(address) {
if (address(parentDelegation) != address(0)) {
return parentDelegation.delegatedToAt(_who, _block);
} else {
return _who;
}
}
/** /**
* @notice Reads the final delegate of `_who` at block number `_block`. * @notice Reads the final delegate of `_who` at block number `_block`.
* @param _who Address to lookup. * @param _who Address to lookup.
@ -121,11 +120,8 @@ contract DelegationAbstract is InstanceAbstract, Delegation {
returns(address finalDelegate) returns(address finalDelegate)
{ {
finalDelegate = findDelegatedToAt(_who, _block); finalDelegate = findDelegatedToAt(_who, _block);
if (finalDelegate == _who) { //_who is delegating to someone? if (finalDelegate != _who) { //_who is delegating to someone?
return _who; //no, reached the endpoint of delegation finalDelegate = findDelegationOfAt(finalDelegate, _block); //yes, load the delegation of _who delegation
} else {
return findDelegationOfAt(finalDelegate, _block); //yes, load the delegation of _who delegation
} }
} }
} }