chore: upgrade scripts preparation

Author: jaybuidl

contracts/deploy/upgrade-all.ts

@@ -92,13 +92,15 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     }
   };
 
-  await upgrade(disputeKitClassic, "initialize7", []);
-  await upgrade(disputeKitShutter, "initialize8", []);
-  await upgrade(disputeKitGated, "initialize7", []);
-  await upgrade(disputeKitGatedShutter, "initialize7", []);
+  const wETH = await deployments.get("WETH");
+
+  await upgrade(disputeKitClassic, "reinitialize", [wETH.address]);
+  await upgrade(disputeKitShutter, "reinitialize", [wETH.address]);
+  await upgrade(disputeKitGated, "reinitialize", [wETH.address]);
+  await upgrade(disputeKitGatedShutter, "reinitialize", [wETH.address]);
   await upgrade(disputeTemplateRegistry, "initialize2", []);
   await upgrade(evidence, "initialize2", []);
-  await upgrade(core, "initialize5", []);
+  await upgrade(core, "reinitialize", [wETH.address]);
   await upgrade(policyRegistry, "initialize2", []);
   await upgrade(sortition, "initialize4", []);
 };

contracts/scripts/storage-layout.ts

@@ -4,12 +4,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 task("storage-layout", "Prints the storage layout of a contract").setAction(
   async ({}, hre: HardhatRuntimeEnvironment) => {
     await hre.run("compile");
-    const buildInfo = await hre.artifacts.getBuildInfo(
-      `src/arbitration/dispute-kits/DisputeKitClassic.sol:DisputeKitClassic`
-    );
-    console.log(
-      buildInfo.output.contracts["src/arbitration/dispute-kits/DisputeKitClassic.sol"]["DisputeKitClassic"]
-        .storageLayout
-    );
+    const buildInfo = await hre.artifacts.getBuildInfo(`src/arbitration/KlerosCoreNeo.sol:KlerosCoreNeo`);
+    console.log(buildInfo.output.contracts["src/arbitration/KlerosCoreNeo.sol"]["KlerosCoreNeo"].storageLayout);
   }
 );

contracts/src/arbitration/KlerosCore.sol

@@ -8,7 +8,7 @@ import {KlerosCoreBase, IDisputeKit, ISortitionModule, IERC20} from "./KlerosCor
 /// Core arbitrator contract for Kleros v2.
 /// Note that this contract trusts the PNK token, the dispute kit and the sortition module contracts.
 contract KlerosCore is KlerosCoreBase {
-    string public constant override version = "0.9.4";
+    string public constant override version = "0.10.0";
 
     // ************************************* //
     // *            Constructor            * //
@@ -59,8 +59,8 @@ contract KlerosCore is KlerosCoreBase {
         );
     }
 
-    function initialize5() external reinitializer(5) {
-        // NOP
+    function reinitialize(address _wNative) external reinitializer(6) {
+        wNative = _wNative;
     }
 
     // ************************************* //

contracts/src/arbitration/KlerosCoreNeo.sol

@@ -9,7 +9,7 @@ import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 /// Core arbitrator contract for Kleros v2.
 /// Note that this contract trusts the PNK token, the dispute kit and the sortition module contracts.
 contract KlerosCoreNeo is KlerosCoreBase {
-    string public constant override version = "0.9.4";
+    string public constant override version = "0.10.0";
 
     // ************************************* //
     // *             Storage               * //
@@ -70,8 +70,8 @@ contract KlerosCoreNeo is KlerosCoreBase {
         jurorNft = _jurorNft;
     }
 
-    function initialize5() external reinitializer(5) {
-        // NOP
+    function reinitialize(address _wNative) external reinitializer(6) {
+        wNative = _wNative;
     }
 
     // ************************************* //

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

@@ -11,7 +11,7 @@ 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.12.0";
 
     // ************************************* //
     // *            Constructor            * //
@@ -30,8 +30,8 @@ contract DisputeKitClassic is DisputeKitClassicBase {
         __DisputeKitClassicBase_initialize(_governor, _core, _wNative);
     }
 
-    function initialize7() external reinitializer(7) {
-        // NOP
+    function reinitialize(address _wNative) external reinitializer(9) {
+        wNative = _wNative;
     }
 
     // ************************ //

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

@@ -27,7 +27,7 @@ interface IBalanceHolderERC1155 {
 /// - an incentive system: equal split between coherent votes,
 /// - an appeal system: fund 2 choices only, vote on any choice.
 contract DisputeKitGated is DisputeKitClassicBase {
-    string public constant override version = "0.11.0";
+    string public constant override version = "0.12.0";
 
     // ************************************* //
     // *            Constructor            * //
@@ -46,8 +46,8 @@ contract DisputeKitGated is DisputeKitClassicBase {
         __DisputeKitClassicBase_initialize(_governor, _core, _wNative);
     }
 
-    function initialize7() external reinitializer(7) {
-        // NOP
+    function reinitialize(address _wNative) external reinitializer(9) {
+        wNative = _wNative;
     }
 
     // ************************ //

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

@@ -28,7 +28,7 @@ interface IBalanceHolderERC1155 {
 /// - an incentive system: equal split between coherent votes,
 /// - an appeal system: fund 2 choices only, vote on any choice.
 contract DisputeKitGatedShutter is DisputeKitClassicBase {
-    string public constant override version = "0.11.0";
+    string public constant override version = "0.12.0";
 
     // ************************************* //
     // *              Events               * //
@@ -65,8 +65,8 @@ contract DisputeKitGatedShutter is DisputeKitClassicBase {
         __DisputeKitClassicBase_initialize(_governor, _core, _wNative);
     }
 
-    function initialize7() external reinitializer(7) {
-        // NOP
+    function reinitialize(address _wNative) external reinitializer(9) {
+        wNative = _wNative;
     }
 
     // ************************ //

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

@@ -12,7 +12,7 @@ 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 DisputeKitShutter is DisputeKitClassicBase {
-    string public constant override version = "0.11.1";
+    string public constant override version = "0.12.0";
 
     // ************************************* //
     // *              Events               * //
@@ -49,8 +49,8 @@ contract DisputeKitShutter is DisputeKitClassicBase {
         __DisputeKitClassicBase_initialize(_governor, _core, _wNative);
     }
 
-    function initialize8() external reinitializer(8) {
-        // NOP
+    function reinitialize(address _wNative) external reinitializer(9) {
+        wNative = _wNative;
     }
 
     // ************************ //

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

@@ -18,7 +18,7 @@ interface IProofOfHumanity {
 /// - an incentive system: equal split between coherent votes,
 /// - an appeal system: fund 2 choices only, vote on any choice.
 contract DisputeKitSybilResistant is DisputeKitClassicBase {
-    string public constant override version = "0.10.0";
+    string public constant override version = "0.12.0";
 
     // ************************************* //
     // *             Storage               * //