Fix initialization #16
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vkomenda
reviewed
Jan 17, 2019
| @@ -435,7 +430,7 @@ contract ValidatorSetBase is EternalStorage, IValidatorSet { | |||
| function _removeFromPoolsInactive(address _who) internal { | |||
| address[] storage poolsInactive = addressArrayStorage[POOLS_INACTIVE]; | |||
| uint256 indexToRemove = poolInactiveIndex(_who); | |||
| if (poolsInactive[indexToRemove] == _who) { | |||
| if (indexToRemove + 1 && poolsInactive[indexToRemove] == _who) { | |||
There was a problem hiding this comment.
This doesn't compile for me.
/home/vk/src/poanetwork/pos-test-setup/pos-contracts/contracts/abstracts/ValidatorSetBase.sol:433:13: TypeError: Operator && not compatible with types uint256 and bool
if (indexToRemove + 1 && poolsInactive[indexToRemove] == _who) {
^-------------------------------------------------------^
,/home/vk/src/poanetwork/pos-test-setup/pos-contracts/contracts/abstracts/ValidatorSetBase.sol:433:13: TypeError: Type uint256 is not implicitly convertible to expected type bool.
if (indexToRemove + 1 && poolsInactive[indexToRemove] == _who) {
^-------------------------------------------------------^
vkomenda
reviewed
Jan 17, 2019
| @@ -661,6 +653,7 @@ contract ValidatorSetBase is EternalStorage, IValidatorSet { | |||
| keccak256(abi.encode(POOL_STAKERS, _pool)) | |||
| ]; | |||
| uint256 indexToRemove = poolStakerIndex(_pool, _staker); | |||
| if (!(indexToRemove + 1)) return; | |||
There was a problem hiding this comment.
This doesn't compile either.
,/home/vk/src/poanetwork/pos-test-setup/pos-contracts/contracts/abstracts/ValidatorSetBase.sol:656:13: TypeError: Unary operator ! cannot be applied to type uint256
if (!(indexToRemove + 1)) return;
^------------------^
,/home/vk/src/poanetwork/pos-test-setup/pos-contracts/contracts/abstracts/ValidatorSetBase.sol:656:13: TypeError: Type uint256 is not implicitly convertible to expected type bool.
if (!(indexToRemove + 1)) return;
^------------------^
afck
reviewed
Jan 17, 2019
vkomenda
suggested changes
Jan 17, 2019
|
@vkomenda I thought the EVM guaranteed wrapping, but I could be wrong. |
I think there really isn't: https://solidity.readthedocs.io/en/v0.4.21/types.html#mappings |
Contracts must be initialized before their proxies.
DemiMarie
force-pushed
the
fix-initialization
branch
2 times, most recently
from
cbb1674 to
ef5d527
Compare
This showed up as an out-of-bounds array access during initialization, but it could have just as easily caused problems at runtime. Additionally, document that the pool index lookup functions return uint256(~0) if the address is not found.
and so should not be in the repository
DemiMarie
force-pushed
the
fix-initialization
branch
from
ef5d527 to
25795c4
Compare
|
@afck, thanks for the link. I concur. |
vkomenda
approved these changes
Jan 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes allow the smart contracts to successfully initialize, and for the node to successfully boot.