Merge pull request #1099 from kleros/fix(subgraph)/number-of-votes

Fix(web, subgraph): number of votes on voting history

Author: alcercu

subgraph/src/DisputeKitClassic.ts

@@ -47,13 +47,17 @@ export function handleEvidenceEvent(event: EvidenceEvent): void {
 }
 
 export function handleJustificationEvent(event: JustificationEvent): void {
-  const coreDisputeID = event.params._coreDisputeID.toString();
-  const coreDispute = Dispute.load(coreDisputeID);
+  const contract = DisputeKitClassic.bind(event.address);
+  const coreDisputeID = event.params._coreDisputeID;
+  const coreDispute = Dispute.load(coreDisputeID.toString());
   const classicDisputeID = `${DISPUTEKIT_ID}-${coreDisputeID}`;
   const classicDispute = ClassicDispute.load(classicDisputeID);
   if (!classicDispute || !coreDispute) return;
+  const choice = event.params._choice;
+  const coreRoundIndex = coreDispute.currentRoundIndex;
+  const roundInfo = contract.getRoundInfo(coreDisputeID, coreRoundIndex, choice);
   const currentLocalRoundID = classicDispute.id + "-" + classicDispute.currentLocalRoundIndex.toString();
-  const currentRulingInfo = updateCountsAndGetCurrentRuling(currentLocalRoundID, event.params._choice);
+  const currentRulingInfo = updateCountsAndGetCurrentRuling(currentLocalRoundID, choice, roundInfo.getChoiceCount());
   coreDispute.currentRuling = currentRulingInfo.ruling;
   coreDispute.tied = currentRulingInfo.tied;
   coreDispute.save();

subgraph/src/entities/ClassicRound.ts

@@ -25,15 +25,15 @@ class CurrentRulingInfo {
   tied: boolean;
 }
 
-export function updateCountsAndGetCurrentRuling(id: string, choice: BigInt): CurrentRulingInfo {
+export function updateCountsAndGetCurrentRuling(id: string, choice: BigInt, choiceCount: BigInt): CurrentRulingInfo {
   const round = ClassicRound.load(id);
   if (!round) return { ruling: ZERO, tied: false };
   const choiceNum = choice.toI32();
-  const updatedCount = round.counts[choiceNum].plus(ONE);
+  const delta = choiceCount.minus(round.counts[choiceNum]);
   let newCounts: BigInt[] = [];
   for (let i = 0; i < round.counts.length; i++) {
     if (BigInt.fromI32(i).equals(choice)) {
-      newCounts.push(round.counts[i].plus(ONE));
+      newCounts.push(choiceCount);
     } else {
       newCounts.push(round.counts[i]);
     }
@@ -43,14 +43,14 @@ export function updateCountsAndGetCurrentRuling(id: string, choice: BigInt): Cur
   if (choice.equals(round.winningChoice)) {
     if (round.tied) round.tied = false;
   } else {
-    if (updatedCount.equals(currentWinningCount)) {
+    if (choiceCount.equals(currentWinningCount)) {
       if (!round.tied) round.tied = true;
-    } else if (updatedCount.gt(currentWinningCount)) {
+    } else if (choiceCount.gt(currentWinningCount)) {
       round.winningChoice = choice;
       round.tied = false;
     }
   }
-  round.totalVoted = round.totalVoted.plus(ONE);
+  round.totalVoted = round.totalVoted.plus(delta);
   round.save();
   return { ruling: round.winningChoice, tied: round.tied };
 }

web/src/hooks/queries/useVotingHistory.ts

@@ -36,7 +36,7 @@ const votingHistoryQuery = graphql(`
 export const useVotingHistory = (disputeID?: string) => {
   const isEnabled = disputeID !== undefined;
 
-  return useQuery({
+  return useQuery<VotingHistoryQuery>({
     queryKey: ["refetchOnBlock", `VotingHistory${disputeID}`],
     enabled: isEnabled,
     queryFn: async () => await graphqlQueryFnHelper(votingHistoryQuery, { disputeID }),

web/src/pages/Cases/CaseDetails/Voting/VotingHistory.tsx

@@ -112,7 +112,9 @@ const VotingHistory: React.FC<{ arbitrable?: `0x${string}` }> = ({ arbitrable })
             <p>
               {localRounds.at(currentTab)?.totalVoted === rounds.at(currentTab)?.nbVotes
                 ? "All jurors voted"
-                : localRounds.at(currentTab)?.totalVoted + " jurors voted out of " + rounds.at(currentTab)?.nbVotes}
+                : localRounds.at(currentTab)?.totalVoted.toString() +
+                  ` vote${localRounds.at(currentTab)?.totalVoted.toString() === "1" ? "" : "s"} casted out of ` +
+                  rounds.at(currentTab)?.nbVotes}
             </p>
           </StyledBox>
           <StyledAccordion