Merge branch 'dev' into ManiBAJPAI22-docs/improve-setup-troubleshooting

Author: ManiBAJPAI22

contracts/CHANGELOG.md

@@ -15,6 +15,10 @@ The format is based on [Common Changelog](https://common-changelog.org/).
 - Bump `hardhat` to v2.26.2 ([#2069](https://github.com/kleros/kleros-v2/issues/2069))
 - Bump `@kleros/vea-contracts` to v0.7.0 ([#2073](https://github.com/kleros/kleros-v2/issues/2073))
 
+### Fixed
+
+- Do not pass to Voting period if all the commits are cast because it breaks the current Shutter auto-reveal process. ([#2085](https://github.com/kleros/kleros-v2/issues/2085))
+
 ## [0.12.0] - 2025-08-05
 
 ### Changed

contracts/src/arbitration/KlerosCoreBase.sol

@@ -566,10 +566,8 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
             if (round.drawnJurors.length != round.nbVotes) revert DisputeStillDrawing();
             dispute.period = court.hiddenVotes ? Period.commit : Period.vote;
         } else if (dispute.period == Period.commit) {
-            if (
-                block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)] &&
-                !disputeKits[round.disputeKitID].areCommitsAllCast(_disputeID)
-            ) {
+            // Note that we do not want to pass to Voting period if all the commits are cast because it breaks the Shutter auto-reveal currently.
+            if (block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)]) {
                 revert CommitPeriodNotPassed();
             }
             dispute.period = Period.vote;

contracts/src/arbitration/evidence/ModeratedEvidenceModule.sol

@@ -5,12 +5,9 @@ pragma solidity ^0.8.24;
 // TODO: standard interfaces should be placed in a separated repo (?)
 import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitrableV2.sol";
 import "../interfaces/IDisputeTemplateRegistry.sol";
-import "../../libraries/CappedMath.sol";
 
 /// @title Implementation of the Evidence Standard with Moderated Submissions
 contract ModeratedEvidenceModule is IArbitrableV2 {
-    using CappedMath for uint256;
-
     // ************************************* //
     // *         Enums / Structs           * //
     // ************************************* //
@@ -205,8 +202,8 @@ contract ModeratedEvidenceModule is IArbitrableV2 {
         ArbitratorData storage arbitratorData = arbitratorDataList[arbitratorDataList.length - 1];
 
         uint256 arbitrationCost = arbitrator.arbitrationCost(arbitratorData.arbitratorExtraData);
-        uint256 totalCost = arbitrationCost.mulCap(totalCostMultiplier) / MULTIPLIER_DIVISOR;
-        uint256 depositRequired = totalCost.mulCap(initialDepositMultiplier) / MULTIPLIER_DIVISOR;
+        uint256 totalCost = (arbitrationCost * totalCostMultiplier) / MULTIPLIER_DIVISOR;
+        uint256 depositRequired = (totalCost * initialDepositMultiplier) / MULTIPLIER_DIVISOR;
 
         Moderation storage moderation = evidenceData.moderations.push();
         // Overpaying is allowed.
@@ -245,12 +242,12 @@ contract ModeratedEvidenceModule is IArbitrableV2 {
         ArbitratorData storage arbitratorData = arbitratorDataList[moderation.arbitratorDataID];
 
         uint256 arbitrationCost = arbitrator.arbitrationCost(arbitratorData.arbitratorExtraData);
-        uint256 totalCost = arbitrationCost.mulCap(totalCostMultiplier) / MULTIPLIER_DIVISOR;
+        uint256 totalCost = (arbitrationCost * totalCostMultiplier) / MULTIPLIER_DIVISOR;
 
         uint256 opposition = 3 - uint256(_side);
         uint256 depositRequired = moderation.paidFees[opposition] * 2;
         if (depositRequired == 0) {
-            depositRequired = totalCost.mulCap(initialDepositMultiplier) / MULTIPLIER_DIVISOR;
+            depositRequired = (totalCost * initialDepositMultiplier) / MULTIPLIER_DIVISOR;
         } else if (depositRequired > totalCost) {
             depositRequired = totalCost;
         }
@@ -317,7 +314,9 @@ contract ModeratedEvidenceModule is IArbitrableV2 {
     ) internal returns (uint256) {
         uint256 contribution;
         uint256 remainingETH;
-        uint256 requiredAmount = _totalRequired.subCap(_moderation.paidFees[uint256(_side)]);
+        uint256 requiredAmount = _moderation.paidFees[uint256(_side)] >= _totalRequired
+            ? 0
+            : _totalRequired - _moderation.paidFees[uint256(_side)];
         (contribution, remainingETH) = calculateContribution(_amount, requiredAmount);
         _moderation.contributions[_contributor][uint256(_side)] += contribution;
         _moderation.paidFees[uint256(_side)] += contribution;

contracts/src/kleros-v1/kleros-liquid-xdai/xKlerosLiquidV2.sol

@@ -9,7 +9,7 @@ import {ITokenController} from "../interfaces/ITokenController.sol";
 import {WrappedPinakion} from "./WrappedPinakion.sol";
 import {IRandomAuRa} from "./interfaces/IRandomAuRa.sol";
 
-import {SortitionSumTreeFactory} from "../../libraries/SortitionSumTreeFactory.sol";
+import {SortitionSumTreeFactory} from "../libraries/SortitionSumTreeFactory.sol";
 import "../../gateway/interfaces/IForeignGateway.sol";
 
 /// @title xKlerosLiquidV2

contracts/src/libraries/SortitionSumTreeFactory.sol renamed to contracts/src/kleros-v1/libraries/SortitionSumTreeFactory.sol

@@ -1622,6 +1622,7 @@ contract KlerosCoreTest is Test {
         }
 
         // Check reveal in the next period
+        vm.warp(block.timestamp + timesPerPeriod[1]);
         core.passPeriod(disputeID);
 
         // Check the require with the wrong choice and then with the wrong salt