chore: merge dev

Author: Anmol-Dhiman

.gitignore

@@ -83,10 +83,6 @@ web_modules/
 .env.test
 .env.production
 
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
 # Next.js build output
 .next
 out

contracts/.gitignore

@@ -96,9 +96,6 @@ typings/
 .env
 .env.test
 
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
 # Next.js build output
 .next
 

contracts/hardhat.config.ts

@@ -21,7 +21,7 @@ dotenv.config();
 
 const config: HardhatUserConfig = {
   solidity: {
-    version: "0.8.18",
+    version: "0.8.24",
     settings: {
       optimizer: {
         enabled: true,

contracts/package.json

@@ -64,13 +64,13 @@
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
     "@nomicfoundation/hardhat-ethers": "^3.0.0",
     "@nomiclabs/hardhat-solhint": "^3.0.1",
-    "@openzeppelin/contracts": "^4.9.5",
+    "@openzeppelin/contracts": "^5.0.2",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.1.0",
     "@types/chai": "^4.3.11",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.11.3",
-    "@wagmi/cli": "^1.5.2",
+    "@wagmi/cli": "^2.0.3",
     "abitype": "^0.10.3",
     "chai": "^4.4.1",
     "dotenv": "^16.3.1",
@@ -98,6 +98,6 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@kleros/vea-contracts": "^0.3.2"
+    "@kleros/vea-contracts": "^0.4.0"
   }
 }

contracts/src/arbitration/CentralizedArbitrator.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import {IArbitrableV2, IArbitratorV2, IERC20} from "./interfaces/IArbitratorV2.sol";
 
@@ -29,9 +29,9 @@ contract CentralizedArbitrator is IArbitratorV2 {
     }
 
     struct Round {
-        mapping(uint256 => uint256) paidFees; // Tracks the fees paid for each choice in this round.
-        mapping(uint256 => bool) hasPaid; // True if this choice was fully funded, false otherwise.
-        mapping(address => mapping(uint256 => uint256)) contributions; // Maps contributors to their contributions for each choice.
+        mapping(uint256 choiceId => uint256) paidFees; // Tracks the fees paid for each choice in this round.
+        mapping(uint256 choiceId => bool) hasPaid; // True if this choice was fully funded, false otherwise.
+        mapping(address account => mapping(uint256 choiceId => uint256)) contributions; // Maps contributors to their contributions for each choice.
         uint256 feeRewards; // Sum of reimbursable appeal fees available to the parties that made contributions to the ruling that ultimately wins a dispute.
         uint256[] fundedChoices; // Stores the choices that are fully funded.
     }

contracts/src/arbitration/DisputeTemplateRegistry.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../proxy/UUPSProxiable.sol";
 import "../proxy/Initializable.sol";

contracts/src/arbitration/KlerosCore.sol

@@ -6,7 +6,7 @@
 /// @custom:bounties: []
 /// @custom:deployments: []
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./KlerosCoreBase.sol";
 import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";

contracts/src/arbitration/KlerosCoreBase.sol

@@ -6,7 +6,7 @@
 /// @custom:bounties: []
 /// @custom:deployments: []
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
 import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
@@ -41,7 +41,7 @@ abstract contract KlerosCoreBase is IArbitratorV2 {
         uint256 feeForJuror; // Arbitration fee paid per juror.
         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 => bool) supportedDisputeKits; // True if DK with this ID is supported by the court. Note that each court must support classic dispute kit.
+        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.
     }
 

contracts/src/arbitration/KlerosCoreNeo.sol

@@ -6,7 +6,7 @@
 /// @custom:bounties: []
 /// @custom:deployments: []
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./KlerosCoreBase.sol";
 import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";

contracts/src/arbitration/KlerosGovernor.sol

@@ -5,7 +5,7 @@
 /// @custom:auditors: []
 /// @custom:deployments: []
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitrableV2.sol";
 import "./interfaces/IDisputeTemplateRegistry.sol";
@@ -31,7 +31,7 @@ contract KlerosGovernor is IArbitrableV2 {
         uint256[] submittedLists; // Tracks all lists that were submitted in a session in the form submittedLists[submissionID].
         uint256 sumDeposit; // Sum of all submission deposits in a session (minus arbitration fees). This is used to calculate the reward.
         Status status; // Status of a session.
-        mapping(bytes32 => bool) alreadySubmitted; // Indicates whether or not the transaction list was already submitted in order to catch duplicates in the form alreadySubmitted[listHash].
+        mapping(bytes32 listHash => bool) alreadySubmitted; // Indicates whether or not the transaction list was already submitted in order to catch duplicates in the form alreadySubmitted[listHash].
         uint256 durationOffset; // Time in seconds that prolongs the submission period after the first submission, to give other submitters time to react.
     }