fix(arbitration): all tests succeded

Author: hurstelm

contracts/src/arbitration/KlerosCore.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity 0.8.24;
 
 import {KlerosCoreBase, IDisputeKit, ISortitionModule, IERC20} from "./KlerosCoreBase.sol";
 
@@ -15,7 +15,7 @@ contract KlerosCore is KlerosCoreBase {
     // ************************************* //
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
+    constructor() KlerosCoreBase(address(0)) {
         _disableInitializers();
     }
 

contracts/src/arbitration/KlerosCoreBase.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity 0.8.24;
 
 import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
 import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
 import {ISortitionModule} from "./interfaces/ISortitionModule.sol";
 import {Initializable} from "../proxy/Initializable.sol";
 import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
 import {SafeERC20, IERC20} from "../libraries/SafeERC20.sol";
-import {WethLike, SafeSend} from "../libraries/SafeSend.sol";
+import {SafeSend} from "../libraries/SafeSend.sol";
 import "../libraries/Constants.sol";
 
 /// @title KlerosCoreBase
@@ -192,7 +192,7 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
     // *            Constructor            * //
     // ************************************* //
 
-    /** 
+    /**
      * @dev This contract is deployed only once per chain, as the logic master contract.
      *  New instances are created with minimal proxy from the factory.
      *  This is only needed to set the wrapped native token, which is used in SafeSend.
@@ -201,7 +201,7 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
      */
     constructor(address _wNative) {
         W_NATIVE = _wNative;
-}
+    }
 
     function __KlerosCoreBase_initialize(
         address _governor,
@@ -213,7 +213,7 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
         uint256[4] memory _courtParameters,
         uint256[4] memory _timesPerPeriod,
         bytes memory _sortitionExtraData,
-        ISortitionModule _sortitionModuleAddress,
+        ISortitionModule _sortitionModuleAddress
     ) internal onlyInitializing {
         governor = _governor;
         guardian = _guardian;
@@ -477,25 +477,22 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
     /// @param _newStake The new stake.
     /// Note that the existing delayed stake will be nullified as non-relevant.
     function setStake(uint96 _courtID, uint256 _newStake) external virtual whenNotPaused {
-        _setStake(msg.sender, _courtID, _newStake, OnError.Revert);
+        _setStake(msg.sender, _courtID, _newStake, false, OnError.Revert);
     }
 
     /// @dev Sets the stake of a specified account in a court, typically to apply a delayed stake or unstake inactive jurors.
     /// @param _account The account whose stake is being set.
     /// @param _courtID The ID of the court.
     /// @param _newStake The new stake.
-    function setStakeBySortitionModule(address _account, uint96 _courtID, uint256 _newStake) external {
-        if (msg.sender != address(sortitionModule)) revert SortitionModuleOnly();
-        _setStake(_account, _courtID, _newStake, OnError.Return);
-    }
-
-    /// @dev Transfers PNK to the juror by SortitionModule.
-    /// @param _account The account of the juror whose PNK to transfer.
-    /// @param _amount The amount to transfer.
-    function transferBySortitionModule(address _account, uint256 _amount) external {
+    /// @param _alreadyTransferred Whether the PNKs have already been transferred to the contract.
+    function setStakeBySortitionModule(
+        address _account,
+        uint96 _courtID,
+        uint256 _newStake,
+        bool _alreadyTransferred
+    ) external {
         if (msg.sender != address(sortitionModule)) revert SortitionModuleOnly();
-        // Note eligibility is checked in SortitionModule.
-        pinakion.safeTransfer(_account, _amount);
+        _setStake(_account, _courtID, _newStake, _alreadyTransferred, OnError.Return);
     }
 
     /// @inheritdoc IArbitratorV2
@@ -791,25 +788,26 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
 
         // Fully coherent jurors won't be penalized.
         uint256 penalty = (round.pnkAtStakePerJuror * (ALPHA_DIVISOR - degreeOfCoherence)) / ALPHA_DIVISOR;
+        _params.pnkPenaltiesInRound += penalty;
 
         // Unlock the PNKs affected by the penalty
         address account = round.drawnJurors[_params.repartition];
         sortitionModule.unlockStake(account, penalty);
 
         // Apply the penalty to the staked PNKs.
-        (uint256 pnkBalance, uint256 availablePenalty) = sortitionModule.penalizeStake(account, penalty);
-        _params.pnkPenaltiesInRound += availablePenalty;
+        sortitionModule.penalizeStake(account, penalty);
         emit TokenAndETHShift(
             account,
             _params.disputeID,
             _params.round,
             degreeOfCoherence,
-            -int256(availablePenalty),
+            -int256(penalty),
             0,
             round.feeToken
         );
-        // Unstake the juror from all courts if he was inactive or his balance can't cover penalties anymore.
-        if (pnkBalance == 0 || !disputeKit.isVoteActive(_params.disputeID, _params.round, _params.repartition)) {
+
+        if (!disputeKit.isVoteActive(_params.disputeID, _params.round, _params.repartition)) {
+            // The juror is inactive, unstake them.
             sortitionModule.setJurorInactive(account);
         }
         if (_params.repartition == _params.numberOfVotesInRound - 1 && _params.coherentCount == 0) {
@@ -860,6 +858,11 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
         // Release the rest of the PNKs of the juror for this round.
         sortitionModule.unlockStake(account, pnkLocked);
 
+        // Give back the locked PNKs in case the juror fully unstaked earlier.
+        if (!sortitionModule.isJurorStaked(account)) {
+            pinakion.safeTransfer(account, pnkLocked);
+        }
+
         // Transfer the rewards
         uint256 pnkReward = ((_params.pnkPenaltiesInRound / _params.coherentCount) * degreeOfCoherence) / ALPHA_DIVISOR;
         round.sumPnkRewardPaid += pnkReward;
@@ -1085,9 +1088,16 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
     /// @param _account The account to set the stake for.
     /// @param _courtID The ID of the court to set the stake for.
     /// @param _newStake The new stake.
+    /// @param _alreadyTransferred Whether the PNKs were already transferred to/from the staking contract.
     /// @param _onError Whether to revert or return false on error.
     /// @return Whether the stake was successfully set or not.
-    function _setStake(address _account, uint96 _courtID, uint256 _newStake, OnError _onError) internal returns (bool) {
+    function _setStake(
+        address _account,
+        uint96 _courtID,
+        uint256 _newStake,
+        bool _alreadyTransferred,
+        OnError _onError
+    ) internal returns (bool) {
         if (_courtID == FORKING_COURT || _courtID >= courts.length) {
             _stakingFailed(_onError, StakingResult.CannotStakeInThisCourt); // Staking directly into the forking court is not allowed.
             return false;
@@ -1096,16 +1106,15 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
             _stakingFailed(_onError, StakingResult.CannotStakeLessThanMinStake); // Staking less than the minimum stake is not allowed.
             return false;
         }
-        (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) = sortitionModule.validateStake(
+        (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) = sortitionModule.setStake(
             _account,
             _courtID,
-            _newStake
+            _newStake,
+            _alreadyTransferred
         );
-        if (stakingResult != StakingResult.Successful && stakingResult != StakingResult.Delayed) {
+        if (stakingResult != StakingResult.Successful) {
             _stakingFailed(_onError, stakingResult);
             return false;
-        } else if (stakingResult == StakingResult.Delayed) {
-            return true;
         }
         if (pnkDeposit > 0) {
             if (!pinakion.safeTransferFrom(_account, address(this), pnkDeposit)) {
@@ -1119,8 +1128,6 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
                 return false;
             }
         }
-        sortitionModule.setStake(_account, _courtID, pnkDeposit, pnkWithdrawal, _newStake);
-
         return true;
     }
 

contracts/src/arbitration/KlerosCoreNeo.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity 0.8.24;
 
 import {KlerosCoreBase, IDisputeKit, ISortitionModule, IERC20, OnError, StakingResult} from "./KlerosCoreBase.sol";
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
@@ -23,7 +23,7 @@ contract KlerosCoreNeo is KlerosCoreBase {
     // ************************************* //
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
+    constructor() KlerosCoreBase(address(0)) {
         _disableInitializers();
     }
 
@@ -105,7 +105,7 @@ contract KlerosCoreNeo is KlerosCoreBase {
     /// Note that the existing delayed stake will be nullified as non-relevant.
     function setStake(uint96 _courtID, uint256 _newStake) external override whenNotPaused {
         if (jurorNft.balanceOf(msg.sender) == 0) revert NotEligibleForStaking();
-        super._setStake(msg.sender, _courtID, _newStake, OnError.Revert);
+        super._setStake(msg.sender, _courtID, _newStake, false, OnError.Revert);
     }
 
     // ************************************* //

contracts/src/arbitration/KlerosGovernor.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity 0.8.24;
 
 import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitrableV2.sol";
-import {WethLike, SafeSend} from "../libraries/SafeSend.sol";
+import {SafeSend} from "../libraries/SafeSend.sol";
 import "./interfaces/IDisputeTemplateRegistry.sol";
 
 /// @title KlerosGovernor for V2. Note that appeal functionality and evidence submission will be handled by the court.

contracts/src/arbitration/devtools/KlerosCoreRuler.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity 0.8.24;
 
 import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitratorV2.sol";
 import {SafeERC20, IERC20} from "../../libraries/SafeERC20.sol";
-import {WethLike, SafeSend} from "../../libraries/SafeSend.sol";
+import {SafeSend} from "../../libraries/SafeSend.sol";
 import {UUPSProxiable} from "../../proxy/UUPSProxiable.sol";
 import {Initializable} from "../../proxy/Initializable.sol";
 import "../../libraries/Constants.sol";
@@ -87,6 +87,7 @@ contract KlerosCoreRuler is IArbitratorV2, UUPSProxiable, Initializable {
 
     uint256 private constant NON_PAYABLE_AMOUNT = (2 ** 256 - 2) / 2; // An amount higher than the supply of ETH.
 
+    address public governor; // The governor of the contract.
     IERC20 public pinakion; // The Pinakion token contract.
     Court[] public courts; // The courts.
     Dispute[] public disputes; // The disputes.

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

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity 0.8.24;
 
 import {DisputeKitClassicBase, KlerosCore} from "./DisputeKitClassicBase.sol";
 
@@ -11,14 +11,14 @@ import {DisputeKitClassicBase, KlerosCore} from "./DisputeKitClassicBase.sol";
 /// - an incentive system: equal split between coherent votes,
 /// - an appeal system: fund 2 choices only, vote on any choice.
 contract DisputeKitClassic is DisputeKitClassicBase {
-    string public constant override version = "0.11.0";
+    string public constant override version = "0.10.0";
 
     // ************************************* //
     // *            Constructor            * //
     // ************************************* //
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
+    constructor() DisputeKitClassicBase(address(0)) {
         _disableInitializers();
     }
 
@@ -29,7 +29,7 @@ contract DisputeKitClassic is DisputeKitClassicBase {
         __DisputeKitClassicBase_initialize(_governor, _core);
     }
 
-    function initialize7() external reinitializer(7) {
+    function initialize6() external reinitializer(6) {
         // NOP
     }