status-im/contracts
2
0
Fork 0
mirror of https://github.com/status-im/contracts.git synced 2025-02-24 12:38:49 +00:00
Code Issues Projects Releases Wiki Activity

fixed infinite recursive call of delegationOfAt and renamed stuff

Browse Source
This commit is contained in:
Ricardo Guilherme Schmidt 2018-03-16 20:43:45 -03:00
parent f198a785ce
commit 1cc1a7c860
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
contracts/democracy/DelegationProxy.sol
View File

@ -16,10 +16,10 @@ contract DelegationProxy {
mapping (address => Delegation[]) public delegations; mapping (address => Delegation[]) public delegations;
//storage of indexes of the addresses to `delegations[to].from` //storage of indexes of the addresses to `delegations[to].from`
mapping (address => uint256) toIndexes; mapping (address => uint256) toIndexes;
//storage of preprocessed view of FinalDelegate
mapping(bytes32 => FinalDelegate) delegationView;
mapping(bytes32 => FinalDelegateSearch) delegateSearch; struct FinalDelegate {
struct FinalDelegateSearch {
address delegate; address delegate;
bool found; bool found;
} }
@ -48,17 +48,17 @@ contract DelegationProxy {
} }
/** /**
* @notice dig into delegate chain to find final delegate, makes delegationOfAt cheaper to call; * @notice Dig into delegate chain to find final delegate, makes delegationOfAt cheaper to call;
* @param _delegator Address to lookup final delegate. * @param _delegator Address to lookup final delegate.
* @param _block From what block. * @param _block From what block.
* @return True when found final delegate. * @return True when found final delegate.
*/ */
function findFinalDelegate(address _delegator, uint256 _block, uint256 loopLimit) function findFinalDelegate(address _delegator, uint256 _block, uint256 loopLimit)
public external
returns (bool) returns (bool)
{ {
bytes32 searchIndex = keccak256(_delegator,_block); bytes32 searchIndex = keccak256(_delegator,_block);
FinalDelegateSearch memory search = delegateSearch[searchIndex]; FinalDelegate memory search = delegationView[searchIndex];
require(!search.found); require(!search.found);
for (uint i = 0; i < loopLimit; i++) { for (uint i = 0; i < loopLimit; i++) {
if (search.delegate == address(0)) { if (search.delegate == address(0)) {
@ -74,36 +74,39 @@ contract DelegationProxy {
break; break;
} }
} }
delegateSearch[searchIndex] = search; delegationView[searchIndex] = search;
return search.found; return search.found;
} }
/** /**
* @notice Explore the chain from `_delegator`, saving search indexes for all delegates * @notice Explore the chain from `_delegator`, saving FinalDelegate indexes for all delegates, makes delegationOfAt cheaper to call.
* @param _delegator Address to lookup final delegate. * @param _delegator Address to lookup final delegate.
* @param _block From what block. * @param _block From what block.
* @param stackLimit how much deep explore to build the indexes * @param _stackLimit how much deep explore to build the indexes
* @return True when found final delegate. * @return address of delegate when found, or the last top delegate found if stacklimit reached without getting into FinalDelegate.
*/ */
function buildSearchIndexingFrom(address _delegator, uint256 _block, uint256 stackLimit) function buildFinalDelegateChain(address _delegator, uint256 _block, uint256 _stackLimit)
public public
returns (address delegate, bool found) returns (address delegate, bool found)
{ {
bytes32 searchIndex = keccak256(_delegator,_block); require(_block > block.number); //cannot renderize current state view ?
FinalDelegateSearch memory search = delegateSearch[searchIndex]; bytes32 searchIndex = keccak256(_delegator, _block);
FinalDelegate memory search = delegationView[searchIndex];
if (!search.found) { if (!search.found) {
if (search.delegate == address(0)) { if (search.delegate == address(0)) {
delegate = delegatedToAt(_delegator, _block); delegate = delegatedToAt(_delegator, _block);
if (delegate == 0) { if (delegate == address(0)) {
//`_delegator` FinalDelegate is itself
delegate = _delegator; delegate = _delegator;
found = true; found = true;
} }
} }
if (!found && stackLimit > 0) { if (!found && _stackLimit > 0) {
(delegate, found) = buildSearchIndexingFrom(delegate, _block, stackLimit-1); //`_delegator` FinalDelegate is the same FinalDelegate of it's `delegate`
(delegate, found) = buildFinalDelegateChain(delegate, _block, _stackLimit - 1);
} }
delegateSearch[searchIndex] = FinalDelegateSearch(delegate, found); delegationView[searchIndex] = FinalDelegate(delegate, found);
} }
return (delegate, found); return (delegate, found);
} }
@ -200,16 +203,17 @@ contract DelegationProxy {
* @param _block From what block. * @param _block From what block.
* @return Final delegate address. * @return Final delegate address.
*/ */
function delegationOfAt(address _who, uint _block) public constant returns(address) { function delegationOfAt(address _who, uint _block) public constant returns(address delegate) {
bytes32 searchIndex = keccak256(_who, _block); bytes32 searchIndex = keccak256(_who, _block);
FinalDelegateSearch memory search = delegateSearch[searchIndex]; FinalDelegate memory search = delegationView[searchIndex];
if (search.found) { if (search.found) {
return search.delegate; delegate = search.delegate;
} else if (search.delegate != address(0)) { } else if (search.delegate != address(0)) {
_who = search.delegate; _who = search.delegate;
delegate = delegatedToAt(_who, _block);
delegate = delegate == 0x0 ? _who : delegate;
} }
address delegate = delegatedToAt(_who, _block); if (delegate != _who) { //_who is delegating?
if (delegate != 0x0) { //_who is delegating?
return delegationOfAt(delegate, _block); //load the delegation of _who delegation return delegationOfAt(delegate, _block); //load the delegation of _who delegation
} else { } else {
return _who; //reached the endpoint of delegation return _who; //reached the endpoint of delegation