chore: added storage gaps to KC Court, Dispute and Round, and removed unused Court.disabled

Author: jaybuidl

contracts/src/arbitration/KlerosCore.sol

@@ -43,7 +43,7 @@ contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
         uint256 jurorsForCourtJump; // The appeal after the one that reaches this number of jurors will go to the parent court if any.
         uint256[4] timesPerPeriod; // The time allotted to each dispute period in the form `timesPerPeriod[period]`.
         mapping(uint256 disputeKitId => bool) supportedDisputeKits; // True if DK with this ID is supported by the court. Note that each court must support classic dispute kit.
-        bool disabled; // True if the court is disabled. Unused for now, will be implemented later.
+        uint256[10] __gap; // Reserved slots for future upgrades.
     }
 
     struct Dispute {
@@ -53,6 +53,7 @@ contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
         bool ruled; // True if the ruling has been executed, false otherwise.
         uint256 lastPeriodChange; // The last time the period was changed.
         Round[] rounds; // Rounds of the dispute.
+        uint256[10] __gap; // Reserved slots for future upgrades.
     }
 
     struct Round {
@@ -68,6 +69,7 @@ contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
         uint256 sumPnkRewardPaid; // Total sum of PNK paid to coherent jurors as a reward in this round.
         IERC20 feeToken; // The token used for paying fees in this round.
         uint256 drawIterations; // The number of iterations passed drawing the jurors for this round.
+        uint256[10] __gap; // Reserved slots for future upgrades.
     }
 
     // Workaround "stack too deep" errors

contracts/src/arbitration/SortitionModule.sol

@@ -453,7 +453,7 @@ contract SortitionModule is ISortitionModule, Initializable, UUPSProxiable {
             if (currentCourtID == GENERAL_COURT) {
                 finished = true;
             } else {
-                (currentCourtID, , , , , , ) = core.courts(currentCourtID); // Get the parent court.
+                (currentCourtID, , , , , ) = core.courts(currentCourtID); // Get the parent court.
             }
         }
         emit StakeSet(_account, _courtID, _newStake, juror.stakedPnk);

contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol

@@ -320,7 +320,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
         Round storage round = dispute.rounds[localRoundID];
         {
             (uint96 courtID, , , , ) = core.disputes(_coreDisputeID);
-            (, bool hiddenVotes, , , , , ) = core.courts(courtID);
+            (, bool hiddenVotes, , , , ) = core.courts(courtID);
             bytes32 actualVoteHash = hashVote(_choice, _salt, _justification);
 
             //  Save the votes.
@@ -585,7 +585,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
         Round storage round = dispute.rounds[dispute.rounds.length - 1];
 
         (uint96 courtID, , , , ) = core.disputes(_coreDisputeID);
-        (, bool hiddenVotes, , , , , ) = core.courts(courtID);
+        (, bool hiddenVotes, , , , ) = core.courts(courtID);
         uint256 expectedTotalVoted = hiddenVotes ? round.totalCommitted : round.votes.length;
 
         return round.totalVoted == expectedTotalVoted;

contracts/src/arbitration/university/KlerosCoreUniversity.sol

@@ -39,7 +39,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
         uint256 jurorsForCourtJump; // The appeal after the one that reaches this number of jurors will go to the parent court if any.
         uint256[4] timesPerPeriod; // The time allotted to each dispute period in the form `timesPerPeriod[period]`.
         mapping(uint256 disputeKitId => bool) supportedDisputeKits; // True if DK with this ID is supported by the court. Note that each court must support classic dispute kit.
-        bool disabled; // True if the court is disabled. Unused for now, will be implemented later.
+        uint256[10] __gap; // Reserved slots for future upgrades.
     }
 
     struct Dispute {
@@ -49,6 +49,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
         bool ruled; // True if the ruling has been executed, false otherwise.
         uint256 lastPeriodChange; // The last time the period was changed.
         Round[] rounds;
+        uint256[10] __gap; // Reserved slots for future upgrades.
     }
 
     struct Round {
@@ -64,6 +65,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
         uint256 sumPnkRewardPaid; // Total sum of PNK paid to coherent jurors as a reward in this round.
         IERC20 feeToken; // The token used for paying fees in this round.
         uint256 drawIterations; // The number of iterations passed drawing the jurors for this round.
+        uint256[10] __gap; // Reserved slots for future upgrades.
     }
 
     // Workaround "stack too deep" errors

contracts/src/arbitration/university/SortitionModuleUniversity.sol

@@ -280,7 +280,7 @@ contract SortitionModuleUniversity is ISortitionModuleUniversity, UUPSProxiable,
             if (currentCourtID == GENERAL_COURT) {
                 finished = true;
             } else {
-                (currentCourtID, , , , , , ) = core.courts(currentCourtID);
+                (currentCourtID, , , , , ) = core.courts(currentCourtID);
             }
         }
         emit StakeSet(_account, _courtID, _newStake, juror.stakedPnk);

contracts/test/foundry/KlerosCore_Governance.t.sol

@@ -266,7 +266,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             supportedDK
         );
 
-        _assertCourtParameters(2, GENERAL_COURT, true, 2000, 20000, 0.04 ether, 50, false);
+        _assertCourtParameters(2, GENERAL_COURT, true, 2000, 20000, 0.04 ether, 50);
 
         uint256[] memory children = core.getCourtChildren(2);
         assertEq(children.length, 0, "No children");
@@ -356,7 +356,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             [uint256(10), uint256(20), uint256(30), uint256(40)] // Times per period
         );
 
-        _assertCourtParameters(GENERAL_COURT, FORKING_COURT, true, 2000, 20000, 0.04 ether, 50, false);
+        _assertCourtParameters(GENERAL_COURT, FORKING_COURT, true, 2000, 20000, 0.04 ether, 50);
         _assertTimesPerPeriod(GENERAL_COURT, [uint256(10), uint256(20), uint256(30), uint256(40)]);
     }
 

contracts/test/foundry/KlerosCore_Initialization.t.sol

@@ -23,8 +23,8 @@ contract KlerosCore_InitializationTest is KlerosCore_TestBase {
         assertEq(address(core.sortitionModule()), address(sortitionModule), "Wrong sortitionModule address");
         assertEq(core.getDisputeKitsLength(), 2, "Wrong DK array length");
 
-        _assertCourtParameters(FORKING_COURT, FORKING_COURT, false, 0, 0, 0, 0, false);
-        _assertCourtParameters(GENERAL_COURT, FORKING_COURT, false, 1000, 10000, 0.03 ether, 511, false);
+        _assertCourtParameters(FORKING_COURT, FORKING_COURT, false, 0, 0, 0, 0);
+        _assertCourtParameters(GENERAL_COURT, FORKING_COURT, false, 1000, 10000, 0.03 ether, 511);
 
         uint256[] memory children = core.getCourtChildren(GENERAL_COURT);
         assertEq(children.length, 0, "No children");

contracts/test/foundry/KlerosCore_TestBase.sol

@@ -223,17 +223,15 @@ abstract contract KlerosCore_TestBase is Test {
         uint256 expectedMinStake,
         uint256 expectedAlpha,
         uint256 expectedFeeForJuror,
-        uint256 expectedJurorsForJump,
-        bool expectedDisabled
+        uint256 expectedJurorsForJump
     ) internal {
         (
             uint96 courtParent,
             bool courtHiddenVotes,
             uint256 courtMinStake,
             uint256 courtAlpha,
             uint256 courtFeeForJuror,
-            uint256 courtJurorsForCourtJump,
-            bool courtDisabled
+            uint256 courtJurorsForCourtJump
         ) = core.courts(courtId);
 
         assertEq(courtParent, expectedParent, "Wrong court parent");
@@ -242,7 +240,6 @@ abstract contract KlerosCore_TestBase is Test {
         assertEq(courtAlpha, expectedAlpha, "Wrong alpha value");
         assertEq(courtFeeForJuror, expectedFeeForJuror, "Wrong feeForJuror value");
         assertEq(courtJurorsForCourtJump, expectedJurorsForJump, "Wrong jurorsForCourtJump value");
-        assertEq(courtDisabled, expectedDisabled, "Wrong disabled state");
     }
 
     /// @dev Helper function to check times per period