Merge branch 'dev' into feat/rng-fallback2

jaybuidl · jaybuidl · commit 34f6a65327be · 2025-08-12T02:27:15.000+01:00
diff --git a/contracts/.solcover.js b/contracts/.solcover.js
@@ -7,6 +7,7 @@ const shell = require("shelljs");
 module.exports = {
   istanbulReporter: ["lcov"],
   configureYulOptimizer: true,
+  irMinimum: true,
   onCompileComplete: async function (_config) {
     await run("typechain");
   },
diff --git a/contracts/CHANGELOG.md b/contracts/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Common Changelog](https://common-changelog.org/).
 
 - Set the Hardhat Solidity version to v0.8.30 and enable the IR pipeline ([#2069](https://github.com/kleros/kleros-v2/issues/2069))
 - Set the Foundry Solidity version to v0.8.30 and enable the IR pipeline ([#2073](https://github.com/kleros/kleros-v2/issues/2073))
+- Widen the allowed solc version to any v0.8.x for the interfaces only ([#2083](https://github.com/kleros/kleros-v2/issues/2083))
 - Bump `hardhat` to v2.26.2 ([#2069](https://github.com/kleros/kleros-v2/issues/2069))
 - Bump `@kleros/vea-contracts` to v0.7.0 ([#2073](https://github.com/kleros/kleros-v2/issues/2073))
 
diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -28,7 +28,7 @@ const config: HardhatUserConfig = {
       {
         version: "0.8.30",
         settings: {
-          viaIR: true,
+          viaIR: process.env.VIA_IR !== "false", // Defaults to true
           optimizer: {
             enabled: true,
             runs: 10000,
diff --git a/contracts/scripts/coverage.sh b/contracts/scripts/coverage.sh
@@ -21,6 +21,7 @@ fi
 # Generate the Hardhat coverage report
 yarn clean
 echo "Building contracts with Hardhat..."
+export VIA_IR=false
 yarn build
 echo "Running Hardhat coverage..."
 yarn hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --show-stack-traces --testfiles "test/**/*.ts"
diff --git a/contracts/src/arbitration/interfaces/IArbitrableV2.sol b/contracts/src/arbitration/interfaces/IArbitrableV2.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 import "./IArbitratorV2.sol";
 
diff --git a/contracts/src/arbitration/interfaces/IArbitratorV2.sol b/contracts/src/arbitration/interfaces/IArbitratorV2.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IArbitrableV2.sol";
diff --git a/contracts/src/arbitration/interfaces/IDisputeKit.sol b/contracts/src/arbitration/interfaces/IDisputeKit.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 import "./IArbitratorV2.sol";
 
diff --git a/contracts/src/arbitration/interfaces/IDisputeTemplateRegistry.sol b/contracts/src/arbitration/interfaces/IDisputeTemplateRegistry.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 /// @title IDisputeTemplate
 /// @notice Dispute Template interface.
diff --git a/contracts/src/arbitration/interfaces/IEvidence.sol b/contracts/src/arbitration/interfaces/IEvidence.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 /// @title IEvidence
 interface IEvidence {
diff --git a/contracts/src/arbitration/interfaces/ISortitionModule.sol b/contracts/src/arbitration/interfaces/ISortitionModule.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.24;
+
+pragma solidity >=0.8.0 <0.9.0;
 
 import "../../libraries/Constants.sol";
 
diff --git a/contracts/src/gateway/interfaces/IForeignGateway.sol b/contracts/src/gateway/interfaces/IForeignGateway.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 import "../../arbitration/interfaces/IArbitratorV2.sol";
 import "@kleros/vea-contracts/src/interfaces/gateways/IReceiverGateway.sol";
diff --git a/contracts/src/gateway/interfaces/IHomeGateway.sol b/contracts/src/gateway/interfaces/IHomeGateway.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@kleros/vea-contracts/src/interfaces/gateways/ISenderGateway.sol";
diff --git a/contracts/src/rng/IRNG.sol b/contracts/src/rng/IRNG.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 /// @title Random Number Generator interface
 interface IRNG {
diff --git a/contracts/src/rng/IRandomizer.sol b/contracts/src/rng/IRandomizer.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.24;
+pragma solidity >=0.8.0 <0.9.0;
 
 // Randomizer protocol interface
 interface IRandomizer {
diff --git a/web/netlify.toml b/web/netlify.toml
@@ -9,3 +9,8 @@ YARN_ENABLE_GLOBAL_CACHE = "true"
 
 [functions]
 directory = "web/netlify/functions/"
+
+[[headers]]
+  for = "/*"
+  [headers.values]
+    X-Robots-Tag = "llms-txt"
diff --git a/web/src/hooks/useVotingContext.tsx b/web/src/hooks/useVotingContext.tsx
@@ -3,10 +3,16 @@ import React, { useContext, createContext, useMemo } from "react";
 import { useParams } from "react-router-dom";
 import { useAccount } from "wagmi";
 
-import { REFETCH_INTERVAL } from "consts/index";
-import { useReadDisputeKitClassicIsVoteActive } from "hooks/contracts/generated";
+import { REFETCH_INTERVAL, DisputeKits } from "consts/index";
+import {
+  useReadDisputeKitClassicIsVoteActive,
+  useReadDisputeKitShutterIsVoteActive,
+  useReadDisputeKitGatedIsVoteActive,
+  useReadDisputeKitGatedShutterIsVoteActive,
+} from "hooks/contracts/generated";
 import { useDisputeDetailsQuery } from "hooks/queries/useDisputeDetailsQuery";
 import { useDrawQuery } from "hooks/queries/useDrawQuery";
+import { useDisputeKitAddresses } from "hooks/useDisputeKitAddresses";
 import { isUndefined } from "utils/index";
 
 interface IVotingContext {
@@ -35,16 +41,70 @@ export const VotingContextProvider: React.FC<{ children: React.ReactNode }> = ({
   const { data: drawData, isLoading } = useDrawQuery(address?.toLowerCase(), id, disputeData?.dispute?.currentRound.id);
   const roundId = disputeData?.dispute?.currentRoundIndex;
   const voteId = drawData?.draws?.[0]?.voteIDNum;
-  const { data: hasVoted } = useReadDisputeKitClassicIsVoteActive({
+
+  const disputeKitAddress = disputeData?.dispute?.currentRound?.disputeKit?.address;
+  const { disputeKitName } = useDisputeKitAddresses({ disputeKitAddress });
+
+  const hookArgs = [BigInt(id ?? 0), roundId, voteId] as const;
+  const isEnabled = !isUndefined(roundId) && !isUndefined(voteId);
+
+  // Add a hook call for each DisputeKit
+  const classicVoteResult = useReadDisputeKitClassicIsVoteActive({
+    query: {
+      enabled: isEnabled && disputeKitName === DisputeKits.Classic,
+      refetchInterval: REFETCH_INTERVAL,
+    },
+    args: hookArgs,
+  });
+
+  const shutterVoteResult = useReadDisputeKitShutterIsVoteActive({
     query: {
-      enabled: !isUndefined(roundId) && !isUndefined(voteId),
+      enabled: isEnabled && disputeKitName === DisputeKits.Shutter,
       refetchInterval: REFETCH_INTERVAL,
     },
-    args: [BigInt(id ?? 0), roundId, voteId],
+    args: hookArgs,
   });
 
+  const gatedVoteResult = useReadDisputeKitGatedIsVoteActive({
+    query: {
+      enabled: isEnabled && disputeKitName === DisputeKits.Gated,
+      refetchInterval: REFETCH_INTERVAL,
+    },
+    args: hookArgs,
+  });
+
+  const gatedShutterVoteResult = useReadDisputeKitGatedShutterIsVoteActive({
+    query: {
+      enabled: isEnabled && disputeKitName === DisputeKits.GatedShutter,
+      refetchInterval: REFETCH_INTERVAL,
+    },
+    args: hookArgs,
+  });
+
+  // Add a return for each DisputeKit
+  const hasVoted = useMemo(() => {
+    switch (disputeKitName) {
+      case DisputeKits.Classic:
+        return classicVoteResult.data;
+      case DisputeKits.Shutter:
+        return shutterVoteResult.data;
+      case DisputeKits.Gated:
+        return gatedVoteResult.data;
+      case DisputeKits.GatedShutter:
+        return gatedShutterVoteResult.data;
+      default:
+        return undefined;
+    }
+  }, [
+    disputeKitName,
+    classicVoteResult.data,
+    shutterVoteResult.data,
+    gatedVoteResult.data,
+    gatedShutterVoteResult.data,
+  ]);
+
   const wasDrawn = useMemo(() => !isUndefined(drawData) && drawData.draws.length > 0, [drawData]);
-  const isHiddenVotes = useMemo(() => disputeData?.dispute?.court.hiddenVotes, [disputeData]);
+  const isHiddenVotes = useMemo(() => disputeData?.dispute?.court.hiddenVotes ?? false, [disputeData]);
   const isCommitPeriod = useMemo(() => disputeData?.dispute?.period === "commit", [disputeData]);
   const isVotingPeriod = useMemo(() => disputeData?.dispute?.period === "vote", [disputeData]);
 
diff --git a/web/src/pages/Cases/CaseDetails/Voting/Shutter/Commit.tsx b/web/src/pages/Cases/CaseDetails/Voting/Shutter/Commit.tsx
@@ -85,6 +85,10 @@ const Commit: React.FC<ICommit> = ({
 
   const handleCommit = useCallback(
     async (choice: bigint) => {
+      if (!import.meta.env.REACT_APP_SHUTTER_API || import.meta.env.REACT_APP_SHUTTER_API.trim() === "") {
+        console.error("REACT_APP_SHUTTER_API environment variable is not set or is empty");
+        throw new Error("Cannot commit vote: REACT_APP_SHUTTER_API environment variable is required but not set");
+      }
       const message = { message: saltKey };
       const rawSalt = !isUndefined(signingAccount)
         ? await signingAccount.signMessage(message)
diff --git a/web/src/pages/Cases/CaseDetails/Voting/Shutter/index.tsx b/web/src/pages/Cases/CaseDetails/Voting/Shutter/index.tsx
@@ -26,11 +26,17 @@ const Shutter: React.FC<IShutter> = ({ arbitrable, setIsOpen, dispute, currentPe
   const { isCommitPeriod, isVotingPeriod, commited } = useVotingContext();
   const voteIDs = useMemo(() => drawData?.draws?.map((draw) => draw.voteIDNum) as string[], [drawData]);
 
-  return id && isCommitPeriod && !commited ? (
-    <ShutterCommit {...{ arbitrable, setIsOpen, voteIDs, refetch, dispute, currentPeriodIndex, isGated }} />
-  ) : id && isVotingPeriod ? (
-    <Reveal {...{ setIsOpen, voteIDs, isGated }} />
-  ) : null;
+  const shouldShowCommit = id && isCommitPeriod && !commited;
+  const shouldShowReveal = id && isVotingPeriod;
+
+  return (
+    <>
+      {shouldShowCommit && (
+        <ShutterCommit {...{ arbitrable, setIsOpen, voteIDs, refetch, dispute, currentPeriodIndex, isGated }} />
+      )}
+      {shouldShowReveal && <Reveal {...{ setIsOpen, voteIDs, isGated }} />}
+    </>
+  );
 };
 
 export default Shutter;
diff --git a/web/src/public/llms.txt b/web/src/public/llms.txt
@@ -0,0 +1,9 @@
+# v2.kleros.builders llms.txt
+
+> Facilitates decentralized arbitration by allowing users to create, manage, and resolve dispute cases through crowdsourced juror consensus, rewarding jurors with cryptocurrency for coherent votes on disputes on the blockchain-based Kleros platform.
+
+- [Kleros Dispute Dashboard](https://v2.kleros.builders): Dashboard for managing and viewing decentralized dispute cases, jurors, and court statistics on Kleros platform.
+- [Kleros Dispute Cases](https://v2.kleros.builders/#/cases/display/1/desc/all): Provide a platform for viewing and managing decentralized dispute resolution cases.
+- [Kleros Decentralized Courts](https://v2.kleros.builders/#/courts): Facilitate decentralized dispute resolution by allowing users to stake tokens, participate as jurors, and view court cases.
+- [Kleros Jurors Leaderboard](https://v2.kleros.builders/#/jurors/1/desc/all): Display ranking and statistics of jurors based on coherent voting and rewards in the Kleros decentralized arbitration system.
+- [Get PNK Token](https://v2.kleros.builders/#/get-pnk): Facilitates cross-chain swaps of PNK tokens typically between the Ethereum and Arbitrum networks.

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ const config: HardhatUserConfig = {`
`28`	`28`	`{`
`29`	`29`	`version: "0.8.30",`
`30`	`30`	`settings: {`
`31`		`- viaIR: true,`
	`31`	`+ viaIR: process.env.VIA_IR !== "false", // Defaults to true`
`32`	`32`	`optimizer: {`
`33`	`33`	`enabled: true,`
`34`	`34`	`runs: 10000,`