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

Jump to bottom

fix: Bug fix that incorrectly modification of fixing audit report #18

Merged
merged 2 commits into from
Apr 13, 2022
Merged

fix: Bug fix that incorrectly modification of fixing audit report #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e8addb
fix: incorrectly modified `initValidatorExtraSet`
Apr 13, 2022
9ca4be1
chore: sync template code
Apr 13, 2022
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
4 changes: 2 additions & 2 deletions contracts/BSCValidatorSet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
}

modifier initValidatorExtraSet() {
uint256 validatorsNum = currentValidatorSet.length;
if (validatorsNum == 0) {
if (validatorExtraSet.length == 0) {
ValidatorExtra memory validatorExtra;
// init validatorExtraSet
uint256 validatorsNum = currentValidatorSet.length;
for (uint i; i < validatorsNum; ++i) {
validatorExtraSet.push(validatorExtra);
}
Expand Down
12 changes: 7 additions & 5 deletions contracts/BSCValidatorSet.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
}

modifier initValidatorExtraSet() {
uint256 validatorsNum = currentValidatorSet.length;
if (validatorsNum == 0) {
if (validatorExtraSet.length == 0) {
ValidatorExtra memory validatorExtra;
// init validatorExtraSet
uint256 validatorsNum = currentValidatorSet.length;
for (uint i; i < validatorsNum; ++i) {
validatorExtraSet.push(validatorExtra);
}
Expand Down Expand Up @@ -494,6 +494,8 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
|| numOfMaintaining >= maxNumOfMaintaining // - 2. check if reached upper limit
|| !isWorkingValidator(index) // - 3. check if not working(not jailed and not maintaining)
|| validatorExtraSet[index].enterMaintenanceHeight > 0 // - 5. check if has Maintained during current 24-hour period
// current validators are selected every 24 hours(from 00:00:00 UTC to 23:59:59 UTC)
// for more details, refer to https://github.com/bnb-chain/docs-site/blob/master/docs/smart-chain/validator/Binance%20Smart%20Chain%20Validator%20FAQs%20-%20Updated.md
|| getValidators().length <= 1 // - 6. check num of remaining working validators
) {
return false;
Expand Down Expand Up @@ -735,7 +737,7 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
}

// record the jailed validator in validatorSet
for (uint k = 0; k < _validatorSet.length; ++k) {
for (uint k; k < _validatorSet.length; ++k) {
if (_validatorSet[k].consensusAddress == validator) {
_validatorSet[k].jailed = true;
numOfFelony++;
Expand All @@ -747,7 +749,7 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
// 2. get unjailed validators from validatorSet
unjailedValidatorSet = new Validator[](_validatorSet.length - numOfFelony);
i = 0;
for (uint index = 0; index < _validatorSet.length; ++index) {
for (uint index; index < _validatorSet.length; ++index) {
if (!_validatorSet[index].jailed) {
unjailedValidatorSet[i] = _validatorSet[index];
i++;
Expand Down Expand Up @@ -816,7 +818,7 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
} else if (idx == 1) {
RLPDecode.RLPItem[] memory items = iter.next().toList();
validatorSetPkg.validatorSet =new Validator[](items.length);
for (uint j = 0;j<items.length;++j) {
for (uint j;j<items.length;++j) {
(Validator memory val, bool ok) = decodeValidator(items[j]);
if (!ok) {
return (validatorSetPkg, false);
Expand Down