Merge pull request #362 from liquity/fix-underflow-close

fix: underflow when closing Trove that has pending batch management fees
liquity · Aug 26, 2024 · 4b62153 · 4b62153
2 parents 813d4b0 + 13abd60
commit 4b62153
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/contracts/src/ActivePool.sol b/contracts/src/ActivePool.sol
@@ -222,6 +222,11 @@ contract ActivePool is IActivePool {
     {
         _requireCallerIsBOorTroveM();
 
+        // Batch management fees
+        if (_batchAddress != address(0)) {
+            _mintBatchManagementFeeAndAccountForChange(boldToken, _troveChange, _batchAddress);
+        }
+
         // Do the arithmetic in 2 steps here to avoid overflow from the decrease
         uint256 newAggRecordedDebt = aggRecordedDebt; // 1 SLOAD
         newAggRecordedDebt += _mintAggInterest(boldToken, _troveChange.upfrontFee); // adds minted agg. interest + upfront fee
@@ -238,11 +243,6 @@ contract ActivePool is IActivePool {
         newAggWeightedDebtSum += _troveChange.newWeightedRecordedDebt;
         newAggWeightedDebtSum -= _troveChange.oldWeightedRecordedDebt;
         aggWeightedDebtSum = newAggWeightedDebtSum; // 1 SSTORE
-
-        // Batch management fees
-        if (_batchAddress != address(0)) {
-            _mintBatchManagementFeeAndAccountForChange(boldToken, _troveChange, _batchAddress);
-        }
     }
 
     function mintAggInterest() external override {