Merge branch 'dev' into dev

Author: leopardracer

contracts/deploy/upgrade-all.ts

@@ -81,7 +81,7 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   await upgrade(disputeKitClassic, "initialize6", []);
   await upgrade(disputeTemplateRegistry, "initialize2", []);
   await upgrade(evidence, "initialize2", []);
-  await upgrade(core, "initialize4", []);
+  await upgrade(core, "initialize5", []);
   await upgrade(policyRegistry, "initialize2", []);
   await upgrade(sortition, "initialize3", []);
 };

contracts/scripts/find-initializer-versions.sh

@@ -0,0 +1,27 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
+declare -A rpcUrls
+rpcUrls["arbitrum"]=$(mesc url arbitrum_alchemy)
+rpcUrls["arbitrumSepolia"]=$(mesc url arbitrumSepolia_alchemy)
+rpcUrls["arbitrumSepoliaDevnet"]=$(mesc url arbitrumSepolia_alchemy)
+
+# event Initialized(uint64 version);
+eventTopic=0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2
+
+for c in arbitrum arbitrumSepolia arbitrumSepoliaDevnet; do
+    echo "--------------------------------"
+    echo "$c"
+    echo "--------------------------------"
+    for f in "$SCRIPT_DIR"/../deployments/"$c"/*_Proxy.json; do
+        address=$(jq -r .address "$f")
+        block=$(jq -r .receipt.blockNumber "$f")
+        basename "$f"
+        results=$(cast logs --from-block "$block" --to-block latest $eventTopic --address "$address" --rpc-url "${rpcUrls[$c]}" --json | jq -r .[].data)
+        initializer=$(cast --to-dec "$(echo "$results" | tail -n1)")
+        version=$(cast call --rpc-url "${rpcUrls[$c]}" "$address" "version()(string)" --json 2>/dev/null | jq -r '.[0]')
+        echo "$initializer" @v"$version"
+        echo
+    done
+done

contracts/scripts/keeperBot.ts

@@ -7,6 +7,7 @@ import { Cores, getContracts as getContractsForCoreType } from "./utils/contract
 
 let request: <T>(url: string, query: string) => Promise<T>; // Workaround graphql-request ESM import
 const { ethers } = hre;
+const MAX_DRAW_CALLS_WITHOUT_JURORS = 10;
 const MAX_DRAW_ITERATIONS = 30;
 const MAX_EXECUTE_ITERATIONS = 20;
 const MAX_DELAYED_STAKES_ITERATIONS = 50;
@@ -248,7 +249,19 @@ const drawJurors = async (dispute: { id: string; currentRoundIndex: string }, it
   const { core } = await getContracts();
   let success = false;
   try {
-    await core.draw.staticCall(dispute.id, iterations, HIGH_GAS_LIMIT);
+    const simulatedIterations = iterations * MAX_DRAW_CALLS_WITHOUT_JURORS; // Drawing will be skipped as long as no juror is available in the next MAX_DRAW_CALLS_WITHOUT_JURORS calls to draw() given this nb of iterations.
+    const { drawnJurors: drawnJurorsBefore } = await core.getRoundInfo(dispute.id, dispute.currentRoundIndex);
+    const nbDrawnJurors = (await core.draw.staticCall(dispute.id, simulatedIterations, HIGH_GAS_LIMIT)) as bigint;
+    const extraJurors = nbDrawnJurors - BigInt(drawnJurorsBefore.length);
+    logger.debug(
+      `Draw: ${extraJurors} jurors available in the next ${simulatedIterations} iterations for dispute ${dispute.id}`
+    );
+    if (extraJurors <= 0n) {
+      logger.warn(
+        `Draw: skipping, no jurors available in the next ${simulatedIterations} iterations for dispute ${dispute.id}`
+      );
+      return success;
+    }
   } catch (e) {
     logger.error(`Draw: will fail for ${dispute.id}, skipping`);
     return success;

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.3";
+    string public constant override version = "0.9.4";
 
     // ************************************* //
     // *            Constructor            * //
@@ -56,7 +56,7 @@ contract KlerosCore is KlerosCoreBase {
         );
     }
 
-    function initialize4() external reinitializer(4) {
+    function initialize5() external reinitializer(5) {
         // NOP
     }
 

contracts/src/arbitration/KlerosCoreBase.sol

@@ -593,7 +593,8 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
     /// @dev Draws jurors for the dispute. Can be called in parts.
     /// @param _disputeID The ID of the dispute.
     /// @param _iterations The number of iterations to run.
-    function draw(uint256 _disputeID, uint256 _iterations) external {
+    /// @return nbDrawnJurors The total number of jurors drawn in the round.
+    function draw(uint256 _disputeID, uint256 _iterations) external returns (uint256 nbDrawnJurors) {
         Dispute storage dispute = disputes[_disputeID];
         uint256 currentRound = dispute.rounds.length - 1;
         Round storage round = dispute.rounds[currentRound];
@@ -616,6 +617,7 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
             }
         }
         round.drawIterations += i;
+        return round.drawnJurors.length;
     }
 
     /// @dev Appeals the ruling of a specified dispute.

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.8.0";
+    string public constant override version = "0.9.4";
 
     // ************************************* //
     // *             Storage               * //
@@ -67,7 +67,7 @@ contract KlerosCoreNeo is KlerosCoreBase {
         jurorNft = _jurorNft;
     }
 
-    function initialize4() external reinitializer(4) {
+    function initialize5() external reinitializer(5) {
         // NOP
     }
 

subgraph/core/src/KlerosCore.ts

@@ -215,10 +215,19 @@ export function handleAppealDecision(event: AppealDecision): void {
   const disputeID = event.params._disputeID;
   const dispute = Dispute.load(disputeID.toString());
   if (!dispute) return;
+
+  // Load the current (previous) round
+  const previousRoundID = dispute.currentRound;
+  const previousRound = Round.load(previousRoundID);
+  if (previousRound) {
+    previousRound.isCurrentRound = false;
+    previousRound.save();
+  }
+
   const newRoundIndex = dispute.currentRoundIndex.plus(ONE);
-  const roundID = `${disputeID}-${newRoundIndex.toString()}`;
+  const newRoundID = `${disputeID}-${newRoundIndex.toString()}`;
   dispute.currentRoundIndex = newRoundIndex;
-  dispute.currentRound = roundID;
+  dispute.currentRound = newRoundID;
   dispute.save();
   const roundInfo = contract.getRoundInfo(disputeID, newRoundIndex);
 

subgraph/core/src/entities/Dispute.ts

@@ -57,10 +57,36 @@ export const updateDisputeRequestData = (event: DisputeCreation): void => {
   if (!receipt) return;
 
   const logs = receipt.logs;
+  const coreDisputeId = event.params._disputeID;
 
   // note that the topic at 0th index is always the event signature
-  const disputeRequestEventIndex = logs.findIndex((log) => log.topics[0] == DisputeRequestSignature);
-  const crossChainDisputeEventIndex = logs.findIndex((log) => log.topics[0] == CrossChainDisputeIncomingSignature);
+  // For DisputeRequestSignature
+  let disputeRequestEventIndex = -1;
+  for (let i = 0; i < logs.length; i++) {
+    let log = logs[i];
+    if (log.topics.length > 2 && log.topics[0] == DisputeRequestSignature) {
+      // 3rd indexed argument in event is _arbitratorDisputeId
+      let decodedId = ethereum.decode("uint256", log.topics[2]);
+      if (decodedId != null && coreDisputeId.equals(decodedId.toBigInt())) {
+        disputeRequestEventIndex = i;
+        break;
+      }
+    }
+  }
+
+  // For CrossChainDisputeIncomingSignature
+  let crossChainDisputeEventIndex = -1;
+  for (let i = 0; i < logs.length; i++) {
+    let log = logs[i];
+    if (log.topics.length > 3 && log.topics[0] == CrossChainDisputeIncomingSignature) {
+      // 4th indexed argument in event is _arbitratorDisputeId
+      let decodedId = ethereum.decode("uint256", log.topics[3]);
+      if (decodedId != null && coreDisputeId.equals(decodedId.toBigInt())) {
+        crossChainDisputeEventIndex = i;
+        break;
+      }
+    }
+  }
 
   if (crossChainDisputeEventIndex !== -1) {
     const crossChainDisputeEvent = logs[crossChainDisputeEventIndex];

subgraph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kleros/kleros-v2-subgraph",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "drtVersion": "0.12.0",
   "license": "MIT",
   "scripts": {

web/src/components/DisputePreview/Policies.tsx

@@ -1,6 +1,8 @@
 import React from "react";
 import styled, { css } from "styled-components";
 
+import { useParams } from "react-router-dom";
+
 import PaperclipIcon from "svgs/icons/paperclip.svg";
 import PolicyIcon from "svgs/icons/policy.svg";
 
@@ -67,17 +69,23 @@ interface IPolicies {
 }
 
 export const Policies: React.FC<IPolicies> = ({ disputePolicyURI, courtId, attachment }) => {
+  const { id } = useParams();
+
   return (
     <Container>
       <StyledP>Policy documents:</StyledP>
       {!isUndefined(attachment) && !isUndefined(attachment.uri) ? (
-        <StyledInternalLink to={`/attachment/?title=${"Case Policy"}&url=${getIpfsUrl(attachment.uri)}`}>
+        <StyledInternalLink
+          to={`/attachment/?disputeId=${id}&title=${"Case Policy"}&url=${getIpfsUrl(attachment.uri)}`}
+        >
           <StyledPaperclipIcon />
           {attachment.label ?? "Attachment"}
         </StyledInternalLink>
       ) : null}
       {isUndefined(disputePolicyURI) ? null : (
-        <StyledInternalLink to={`/attachment/?title=${"Dispute Policy"}&url=${getIpfsUrl(disputePolicyURI)}`}>
+        <StyledInternalLink
+          to={`/attachment/?disputeId=${id}&title=${"Dispute Policy"}&url=${getIpfsUrl(disputePolicyURI)}`}
+        >
           <StyledPolicyIcon />
           Dispute Policy
         </StyledInternalLink>

web/src/components/EvidenceCard.tsx

@@ -3,6 +3,7 @@ import styled, { css } from "styled-components";
 
 import Identicon from "react-identicons";
 import ReactMarkdown from "react-markdown";
+import { useParams } from "react-router-dom";
 
 import { Card } from "@kleros/ui-components-library";
 
@@ -224,6 +225,7 @@ const EvidenceCard: React.FC<IEvidenceCard> = ({
   fileURI,
 }) => {
   const profileLink = `/profile/1/desc/all?address=${sender}`;
+  const { id } = useParams();
 
   const transactionExplorerLink = useMemo(() => {
     return getTxnExplorerLink(transactionHash ?? "");
@@ -258,7 +260,7 @@ const EvidenceCard: React.FC<IEvidenceCard> = ({
         </BottomLeftContent>
         {fileURI && fileURI !== "-" ? (
           <FileLinkContainer>
-            <StyledInternalLink to={`/attachment/?title=${"Evidence File"}&url=${getIpfsUrl(fileURI)}`}>
+            <StyledInternalLink to={`/attachment/?disputeId=${id}&title=${"Evidence File"}&url=${getIpfsUrl(fileURI)}`}>
               <AttachmentIcon />
               <AttachedFileText />
             </StyledInternalLink>

web/src/components/FileViewer/index.tsx

@@ -24,6 +24,10 @@ const StyledDocViewer = styled(DocViewer)`
   #pdf-controls {
     z-index: 3;
   }
+
+  [class*="--loading"] {
+    color: ${({ theme }) => theme.secondaryText};
+  }
 `;
 
 /**

web/src/pages/AttachmentDisplay/Header.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import styled from "styled-components";
 
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 
 import { Button } from "@kleros/ui-components-library";
 
@@ -66,9 +66,20 @@ const StyledButton = styled(Button)`
 
 const Header: React.FC<{ title: string }> = ({ title }) => {
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const disputeId = searchParams.get("disputeId");
+  const attachmentTitle = searchParams.get("title");
 
   const handleReturn = () => {
-    navigate(-1);
+    if (attachmentTitle === "Evidence File") {
+      navigate(`/cases/${disputeId}/evidence`);
+    } else if (attachmentTitle === "Case Policy" || attachmentTitle === "Dispute Policy") {
+      navigate(`/cases/${disputeId}/overview`);
+    } else if (attachmentTitle === "Policy File") {
+      navigate(`/resolver/policy`);
+    } else {
+      navigate("/");
+    }
   };
 
   return (

web/src/pages/Cases/CaseDetails/Timeline.tsx

@@ -83,11 +83,10 @@ const AppealBanner: React.FC = () => {
   const { fundedChoices } = useFundingContext();
 
   const text = useMemo(() => {
-    if (loserSideCountdown)
-      return `${secondsToDayHourMinute(loserSideCountdown)} left until losing options can be funded`;
+    if (loserSideCountdown) return `${secondsToDayHourMinute(loserSideCountdown)} remaining to fund losing options`;
     // only show if loosing option was funded and winner needs funding, else no action is needed from user
     if (winnerSideCountdown && !isUndefined(fundedChoices) && fundedChoices.length > 0)
-      return `${secondsToDayHourMinute(winnerSideCountdown)} left until winning option can be funded`;
+      return `${secondsToDayHourMinute(winnerSideCountdown)} remaining to fund winning option`;
     return;
   }, [loserSideCountdown, winnerSideCountdown, fundedChoices]);