fix: prevent outOfGas issue (#525)

bnb-chain · Mar 15, 2024 · 2d6372d · 2d6372d
1 parent a803125
commit 2d6372d
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/contracts/BSCValidatorSet.sol b/contracts/BSCValidatorSet.sol
@@ -1205,20 +1205,14 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
       return false;
     }
 
-    // step 0: modify numOfMaintaining
-    --numOfMaintaining;
-
     // step 1: calculate slashCount
     uint256 slashCount =
       block.number
         .sub(validatorExtraSet[index].enterMaintenanceHeight)
         .div(workingValidatorCount)
         .div(maintainSlashScale);
 
-    // step 2: clear maintaining info of the validator
-    validatorExtraSet[index].isMaintaining = false;
-
-    // step3: slash the validator
+    // step2: slash the validator
     (uint256 misdemeanorThreshold, uint256 felonyThreshold) = ISlashIndicator(SLASH_CONTRACT_ADDR).getSlashThresholds();
     isFelony = false;
     if (slashCount >= felonyThreshold) {
@@ -1233,6 +1227,10 @@ contract BSCValidatorSet is IBSCValidatorSet, System, IParamSubscriber, IApplica
       _misdemeanor(validator);
     }
 
+    // step 3: modify global storage
+    --numOfMaintaining;
+    validatorExtraSet[index].isMaintaining = false;
+
     emit validatorExitMaintenance(validator);
   }