fix(arbitration): all tests run correctly

Author: hurstelm

contracts/deploy/00-home-chain-arbitration-ruler.ts

@@ -32,6 +32,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       deployer, // governor
       pnk.target,
       [minStake, alpha, feeForJuror, jurorsForCourtJump],
+      weth.target,
     ],
     log: true,
   });

contracts/src/arbitration/KlerosCore.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

@@ -8,7 +8,7 @@ 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;

contracts/src/arbitration/KlerosCoreNeo.sol

@@ -23,7 +23,7 @@ contract KlerosCoreNeo is KlerosCoreBase {
     // ************************************* //
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
+    constructor() KlerosCoreBase(address(0)) {
         _disableInitializers();
     }
 

contracts/src/arbitration/KlerosGovernor.sol

@@ -3,7 +3,7 @@
 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

@@ -4,7 +4,7 @@ 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

@@ -18,7 +18,7 @@ contract DisputeKitClassic is DisputeKitClassicBase {
     // ************************************* //
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
+    constructor() DisputeKitClassicBase(address(0)) {
         _disableInitializers();
     }
 

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

@@ -5,7 +5,7 @@ pragma solidity ^0.8.24;
 import {KlerosCore, KlerosCoreBase, IDisputeKit, ISortitionModule} from "../KlerosCore.sol";
 import {Initializable} from "../../proxy/Initializable.sol";
 import {UUPSProxiable} from "../../proxy/UUPSProxiable.sol";
-import {WethLike, SafeSend} from "../../libraries/SafeSend.sol";
+import {SafeSend} from "../../libraries/SafeSend.sol";
 
 /// @title DisputeKitClassicBase
 /// Abstract Dispute kit classic implementation of the Kleros v1 features including:
@@ -59,7 +59,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
     uint256 public constant ONE_BASIS_POINT = 10000; // One basis point, for scaling.
 
     address public governor; // The governor of the contract.
-    address public wNative; // The address for WETH tranfers.
+    address immutable W_NATIVE; // The address for WETH tranfers.
     KlerosCore public core; // The Kleros Core arbitrator
     Dispute[] public disputes; // Array of the locally created disputes.
     mapping(uint256 => uint256) public coreDisputeIDToLocal; // Maps the dispute ID in Kleros Core to the local dispute ID.
@@ -142,18 +142,23 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
     // *            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.
+     *  Since it is constant per chain, it can be safely set as immutable to optimize gas usage.
+     * @param _wNative The Wrapped Native Token on this chain.
+     */
+    constructor(address _wNative) {
+        W_NATIVE = _wNative;
+    }
+
     /// @dev Initializer.
     /// @param _governor The governor's address.
     /// @param _core The KlerosCore arbitrator.
-    /// @param _wNative The address of the WETH used by SafeSend for fallback transfers.
-    function __DisputeKitClassicBase_initialize(
-        address _governor,
-        KlerosCore _core,
-        address _wNative
-    ) internal onlyInitializing {
+    function __DisputeKitClassicBase_initialize(address _governor, KlerosCore _core) internal onlyInitializing {
         governor = _governor;
         core = _core;
-        wNative = _wNative;
     }
 
     // ************************ //
@@ -418,7 +423,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
             core.appeal{value: appealCost}(_coreDisputeID, dispute.numberOfChoices, dispute.extraData);
         }
 
-        if (msg.value > contribution) SafeSend.safeSend(payable(msg.sender), msg.value - contribution, wNative);
+        if (msg.value > contribution) SafeSend.safeSend(payable(msg.sender), msg.value - contribution, W_NATIVE);
     }
 
     /// @dev Allows those contributors who attempted to fund an appeal round to withdraw any reimbursable fees or rewards after the dispute gets resolved.
@@ -463,7 +468,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
         round.contributions[_beneficiary][_choice] = 0;
 
         if (amount != 0) {
-            SafeSend.safeSend(_beneficiary, amount, wNative); // Deliberate use of send to prevent reverting fallback. It's the user's responsibility to accept ETH.
+            SafeSend.safeSend(_beneficiary, amount, W_NATIVE); // Deliberate use of send to prevent reverting fallback. It's the user's responsibility to accept ETH.
             emit Withdrawal(_coreDisputeID, _coreRoundID, _choice, _beneficiary, amount);
         }
     }

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

@@ -34,7 +34,7 @@ contract DisputeKitGated is DisputeKitClassicBase {
     // ************************************* //
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
+    constructor() DisputeKitClassicBase(address(0)) {
         _disableInitializers();
     }
 

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

@@ -53,7 +53,7 @@ contract DisputeKitGatedShutter is DisputeKitClassicBase {
     // ************************************* //
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
+    constructor() DisputeKitClassicBase(address(0)) {
         _disableInitializers();
     }