Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Fix) Deny repeatedly adding removed mining key #208

Merged
merged 10 commits into from
Jun 21, 2019
Merged

(Fix) Deny repeatedly adding removed mining key #208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1999135
prevent repeated creation of mining key after removing
maxaleks Jun 17, 2019
d2a1195
fix existing tests
maxaleks Jun 17, 2019
0b963e4
add a test for repeatedly adding removed mining key
maxaleks Jun 17, 2019
4e0ecc2
make requested changes
maxaleks Jun 18, 2019
bad967d
deny swaping on removed key
maxaleks Jun 18, 2019
596a904
fix swapping keys and add a test for it
maxaleks Jun 19, 2019
175180b
return removed test and change it
maxaleks Jun 19, 2019
85de5c2
add more tests
maxaleks Jun 20, 2019
8b80098
add more tests for creating a ballot with removed mining key
maxaleks Jun 21, 2019
e253973
add missing key type
maxaleks Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion contracts/KeysManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ contract KeysManager is EternalStorage, IKeysManager {
return true;
}

if (hasMiningKeyBeenRemoved(_newKey)) {
return true;
}

if (_currentKey == address(0)) {
return false;
}
Expand Down Expand Up @@ -446,6 +450,9 @@ contract KeysManager is EternalStorage, IKeysManager {
{
if (_key == _oldMiningKey) return false;
if (!isMiningActive(_oldMiningKey)) return false;
if (hasMiningKeyBeenRemoved(_key)) {
return false;
}
if (!IPoaNetworkConsensus(poaNetworkConsensus()).swapValidatorKey(_key, _oldMiningKey)) {
return false;
}
Expand All @@ -461,6 +468,7 @@ contract KeysManager is EternalStorage, IKeysManager {
_setMiningKeyByVoting(votingKey, _key);
_setMiningKeyByPayout(payoutKey, _key);
_getValidatorMetadata().moveMetadata(_oldMiningKey, _key);
_setHasMiningKeyBeenRemoved(_key);
maxaleks marked this conversation as resolved.
Show resolved Hide resolved
emit MiningKeyChanged(_key, "swapped");
return true;
}
Expand Down Expand Up @@ -610,7 +618,7 @@ contract KeysManager is EternalStorage, IKeysManager {
] = _success;
}

function _setHasMiningKeyBeenRemoved(address _key) internal {
function _setHasMiningKeyBeenRemoved(address _key) private {
boolStorage[
keccak256(abi.encode(HAS_MINING_KEY_BEEN_REMOVED, _key))
] = true;
Expand Down
1 change: 0 additions & 1 deletion contracts/VotingToChangeKeys.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ contract VotingToChangeKeys is VotingToChange, EnumKeyTypes {
address _newPayoutKey
) public returns(uint256) {
IKeysManager keysManager = _getKeysManager();
require(!keysManager.hasMiningKeyBeenRemoved(_newMiningKey));
require(keysManager.miningKeyByVoting(_newVotingKey) == address(0));
require(keysManager.miningKeyByPayout(_newPayoutKey) == address(0));
require(_newVotingKey != _newMiningKey);
Expand Down