Merge pull request #73 from hive-engine/witnesses-patch

Prevent potential double subtraction of witness approval weight
hive-engine · Jul 7, 2024 · bb3a519 · bb3a519
2 parents 0e0cba0 + bff5842
commit bb3a519
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/contracts/witnesses.js b/contracts/witnesses.js
@@ -576,10 +576,13 @@ const changeCurrentWitness = async () => {
         // disable the witness if missed maxRoundsMissedInARow
         if (scheduledWitness.missedRoundsInARow >= maxRoundsMissedInARow) {
           scheduledWitness.missedRoundsInARow = 0;
-          scheduledWitness.enabled = false;
 
-          params.totalEnabledApprovalWeight = api.BigNumber(params.totalEnabledApprovalWeight)
-            .minus(scheduledWitness.approvalWeight.$numberDecimal).toFixed(GOVERNANCE_TOKEN_PRECISION);
+          if (scheduledWitness.enabled) {
+            params.totalEnabledApprovalWeight = api.BigNumber(params.totalEnabledApprovalWeight)
+              .minus(scheduledWitness.approvalWeight.$numberDecimal).toFixed(GOVERNANCE_TOKEN_PRECISION);
+          }
+
+          scheduledWitness.enabled = false;
 
           // Emit that witness got disabled
           api.emit('witnessDisabledForMissingTooManyRoundsInARow', { witness: scheduledWitness.account });
@@ -640,10 +643,13 @@ const changeCurrentWitness = async () => {
         // disable the witness if missed maxRoundsMissedInARow
         if (scheduledWitness.missedRoundsInARow >= maxRoundsMissedInARow) {
           scheduledWitness.missedRoundsInARow = 0;
-          scheduledWitness.enabled = false;
 
-          params.totalEnabledApprovalWeight = api.BigNumber(params.totalEnabledApprovalWeight)
-            .minus(scheduledWitness.approvalWeight.$numberDecimal).toFixed(GOVERNANCE_TOKEN_PRECISION);
+          if (scheduledWitness.enabled) {
+            params.totalEnabledApprovalWeight = api.BigNumber(params.totalEnabledApprovalWeight)
+              .minus(scheduledWitness.approvalWeight.$numberDecimal).toFixed(GOVERNANCE_TOKEN_PRECISION);
+          }
+
+          scheduledWitness.enabled = false;
 
           // Emit that witness got disabled
           api.emit('witnessDisabledForMissingTooManyRoundsInARow', { witness: scheduledWitness.account });