Merge branch 'dev' into feat/shutter-dispute-kit

Author: jaybuidl

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.16.3",
+  "version": "0.16.4",
   "drtVersion": "0.12.2",
   "license": "MIT",
   "scripts": {

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/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]);