Merge branch 'dev' into feat/atlas-siwe

Author: tractorss

subgraph/core/schema.graphql

@@ -79,9 +79,10 @@ type User @entity {
   resolvedDisputes: [Dispute!]!
   totalResolvedDisputes: BigInt!
   totalDisputes: BigInt!
-  totalCoherent: BigInt!
-  coherenceScore: BigInt!
   totalAppealingDisputes: BigInt!
+  totalCoherentVotes: BigInt!
+  totalResolvedVotes: BigInt!
+  coherenceScore: BigInt!
   votes: [Vote!]! @derivedFrom(field: "juror")
   contributions: [Contribution!]! @derivedFrom(field: "contributor")
   evidences: [Evidence!]! @derivedFrom(field: "sender")
@@ -142,9 +143,11 @@ type Court @entity {
   numberClosedDisputes: BigInt!
   numberVotingDisputes: BigInt!
   numberAppealingDisputes: BigInt!
+  numberVotes: BigInt!
   stakedJurors: [JurorTokensPerCourt!]! @derivedFrom(field: "court")
   numberStakedJurors: BigInt!
   stake: BigInt!
+  effectiveStake: BigInt!
   delayedStake: BigInt!
   paidETH: BigInt!
   paidPNK: BigInt!

subgraph/core/src/KlerosCore.ts

@@ -19,12 +19,12 @@ import { createDisputeKitFromEvent, filterSupportedDisputeKits } from "./entitie
 import { createDisputeFromEvent } from "./entities/Dispute";
 import { createRoundFromRoundInfo, updateRoundTimeline } from "./entities/Round";
 import { updateCases, updateCasesAppealing, updateCasesRuled, updateCasesVoting } from "./datapoint";
-import { addUserActiveDispute, ensureUser } from "./entities/User";
+import { addUserActiveDispute, computeCoherenceScore, ensureUser } from "./entities/User";
 import { updateJurorStake } from "./entities/JurorTokensPerCourt";
 import { createDrawFromEvent } from "./entities/Draw";
 import { updateTokenAndEthShiftFromEvent } from "./entities/TokenAndEthShift";
 import { updateArbitrableCases } from "./entities/Arbitrable";
-import { Court, Dispute, Round, User } from "../generated/schema";
+import { ClassicVote, Court, Dispute, Draw, Round, User } from "../generated/schema";
 import { BigInt } from "@graphprotocol/graph-ts";
 import { updatePenalty } from "./entities/Penalty";
 import { ensureFeeToken } from "./entities/FeeToken";
@@ -75,9 +75,12 @@ export function handleDisputeCreation(event: DisputeCreation): void {
   const court = Court.load(courtID);
   if (!court) return;
   court.numberDisputes = court.numberDisputes.plus(ONE);
+
+  const roundInfo = contract.getRoundInfo(disputeID, ZERO);
+  court.numberVotes = court.numberVotes.plus(roundInfo.nbVotes);
+
   court.save();
   createDisputeFromEvent(event);
-  const roundInfo = contract.getRoundInfo(disputeID, ZERO);
   createRoundFromRoundInfo(KlerosCore.bind(event.address), disputeID, ZERO, roundInfo);
   const arbitrable = event.params._arbitrable.toHexString();
   updateArbitrableCases(arbitrable, ONE);
@@ -124,6 +127,41 @@ export function handleNewPeriod(event: NewPeriod): void {
     dispute.currentRuling = currentRulingInfo.getRuling();
     dispute.overridden = currentRulingInfo.getOverridden();
     dispute.tied = currentRulingInfo.getTied();
+
+    const rounds = dispute.rounds.load();
+    for (let i = 0; i < rounds.length; i++) {
+      const round = Round.load(rounds[i].id);
+      if (!round) continue;
+
+      const draws = round.drawnJurors.load();
+      // Iterate over all draws in the round
+      for (let j = 0; j < draws.length; j++) {
+        const draw = Draw.load(draws[j].id);
+        if (!draw) continue;
+
+        // Since this is a ClassicVote entity, this will only work for the Classic DisputeKit (which has ID "1").
+        const vote = ClassicVote.load(`${round.disputeKit}-${draw.id}`);
+
+        if (!vote) continue;
+
+        const juror = ensureUser(draw.juror);
+        juror.totalResolvedVotes = juror.totalResolvedVotes.plus(ONE);
+
+        if (vote.choice === null) continue;
+
+        // Check if the vote choice matches the final ruling
+        if (vote.choice!.equals(dispute.currentRuling)) {
+          juror.totalCoherentVotes = juror.totalCoherentVotes.plus(ONE);
+        }
+
+        // Recalculate coherenceScore
+        if (juror.totalResolvedVotes.gt(ZERO)) {
+          juror.coherenceScore = computeCoherenceScore(juror.totalCoherentVotes, juror.totalResolvedVotes);
+        }
+
+        juror.save();
+      }
+    }
   }
 
   dispute.period = newPeriod;
@@ -164,6 +202,15 @@ export function handleAppealDecision(event: AppealDecision): void {
   dispute.currentRound = roundID;
   dispute.save();
   const roundInfo = contract.getRoundInfo(disputeID, newRoundIndex);
+
+  const disputeStorage = contract.disputes(disputeID);
+  const courtID = disputeStorage.value0.toString();
+  const court = Court.load(courtID);
+  if (!court) return;
+
+  court.numberVotes = court.numberVotes.plus(roundInfo.nbVotes);
+  court.save();
+
   createRoundFromRoundInfo(KlerosCore.bind(event.address), disputeID, newRoundIndex, roundInfo);
 }
 

subgraph/core/src/entities/Court.ts

@@ -3,6 +3,35 @@ import { CourtCreated } from "../../generated/KlerosCore/KlerosCore";
 import { Court } from "../../generated/schema";
 import { ZERO } from "../utils";
 
+// This function calculates the "effective" stake, which is the specific stake
+// of the current court + the specific stake of all of its children courts
+export function updateEffectiveStake(courtID: string): void {
+  let court = Court.load(courtID);
+  if (!court) return;
+
+  while (court) {
+    let totalStake = court.stake;
+
+    const childrenCourts = court.children.load();
+
+    for (let i = 0; i < childrenCourts.length; i++) {
+      const childCourt = Court.load(childrenCourts[i].id);
+      if (childCourt) {
+        totalStake = totalStake.plus(childCourt.effectiveStake);
+      }
+    }
+
+    court.effectiveStake = totalStake;
+    court.save();
+
+    if (court.parent && court.parent !== null) {
+      court = Court.load(court.parent as string);
+    } else {
+      break;
+    }
+  }
+}
+
 export function createCourtFromEvent(event: CourtCreated): void {
   const court = new Court(event.params._courtID.toString());
   court.hiddenVotes = event.params._hiddenVotes;
@@ -17,8 +46,10 @@ export function createCourtFromEvent(event: CourtCreated): void {
   court.numberClosedDisputes = ZERO;
   court.numberVotingDisputes = ZERO;
   court.numberAppealingDisputes = ZERO;
+  court.numberVotes = ZERO;
   court.numberStakedJurors = ZERO;
   court.stake = ZERO;
+  court.effectiveStake = ZERO;
   court.delayedStake = ZERO;
   court.paidETH = ZERO;
   court.paidPNK = ZERO;

subgraph/core/src/entities/JurorTokensPerCourt.ts

@@ -4,6 +4,7 @@ import { updateActiveJurors, getDelta, updateStakedPNK } from "../datapoint";
 import { ensureUser } from "./User";
 import { ONE, ZERO } from "../utils";
 import { SortitionModule } from "../../generated/SortitionModule/SortitionModule";
+import { updateEffectiveStake } from "./Court";
 
 export function ensureJurorTokensPerCourt(jurorAddress: string, courtID: string): JurorTokensPerCourt {
   const id = `${jurorAddress}-${courtID}`;
@@ -59,6 +60,7 @@ export function updateJurorStake(
   updateActiveJurors(activeJurorsDelta, timestamp);
   juror.save();
   court.save();
+  updateEffectiveStake(courtID);
 }
 
 export function updateJurorDelayedStake(jurorAddress: string, courtID: string, amount: BigInt): void {

subgraph/core/src/entities/TokenAndEthShift.ts

@@ -29,7 +29,7 @@ export function updateTokenAndEthShiftFromEvent(event: TokenAndETHShiftEvent): v
   const previousEthAmount = shift.ethAmount;
   const newEthAmount = previousEthAmount.plus(ethAmount);
   shift.ethAmount = newEthAmount;
-  resolveUserDispute(jurorAddress.toHexString(), previousEthAmount, newEthAmount, disputeID.toString());
+  resolveUserDispute(jurorAddress.toHexString(), disputeID.toString());
   court.paidETH = court.paidETH.plus(ethAmount);
   updatePaidETH(ethAmount, event.block.timestamp);
   if (pnkAmount.gt(ZERO)) {

subgraph/core/src/entities/User.ts

@@ -2,11 +2,11 @@ import { BigInt, BigDecimal } from "@graphprotocol/graph-ts";
 import { User } from "../../generated/schema";
 import { ONE, ZERO } from "../utils";
 
-export function computeCoherenceScore(totalCoherent: BigInt, totalResolvedDisputes: BigInt): BigInt {
+export function computeCoherenceScore(totalCoherentVotes: BigInt, totalResolvedVotes: BigInt): BigInt {
   const smoothingFactor = BigDecimal.fromString("10");
 
-  let denominator = totalResolvedDisputes.toBigDecimal().plus(smoothingFactor);
-  let coherencyRatio = totalCoherent.toBigDecimal().div(denominator);
+  let denominator = totalResolvedVotes.toBigDecimal().plus(smoothingFactor);
+  let coherencyRatio = totalCoherentVotes.toBigDecimal().div(denominator);
 
   const coherencyScore = coherencyRatio.times(BigDecimal.fromString("100"));
 
@@ -36,7 +36,8 @@ export function createUserFromAddress(id: string): User {
   user.totalResolvedDisputes = ZERO;
   user.totalAppealingDisputes = ZERO;
   user.totalDisputes = ZERO;
-  user.totalCoherent = ZERO;
+  user.totalCoherentVotes = ZERO;
+  user.totalResolvedVotes = ZERO;
   user.coherenceScore = ZERO;
   user.save();
 
@@ -54,28 +55,13 @@ export function addUserActiveDispute(id: string, disputeID: string): void {
   user.save();
 }
 
-export function resolveUserDispute(id: string, previousFeeAmount: BigInt, feeAmount: BigInt, disputeID: string): void {
+export function resolveUserDispute(id: string, disputeID: string): void {
   const user = ensureUser(id);
   if (user.resolvedDisputes.includes(disputeID)) {
-    if (previousFeeAmount.gt(ZERO)) {
-      if (feeAmount.le(ZERO)) {
-        user.totalCoherent = user.totalCoherent.minus(ONE);
-      }
-    } else if (previousFeeAmount.le(ZERO)) {
-      if (feeAmount.gt(ZERO)) {
-        user.totalCoherent = user.totalCoherent.plus(ONE);
-      }
-    }
-    user.coherenceScore = computeCoherenceScore(user.totalCoherent, user.totalResolvedDisputes);
-    user.save();
     return;
   }
   user.resolvedDisputes = user.resolvedDisputes.concat([disputeID]);
   user.totalResolvedDisputes = user.totalResolvedDisputes.plus(ONE);
-  if (feeAmount.gt(ZERO)) {
-    user.totalCoherent = user.totalCoherent.plus(ONE);
-  }
   user.activeDisputes = user.activeDisputes.minus(ONE);
-  user.coherenceScore = computeCoherenceScore(user.totalCoherent, user.totalResolvedDisputes);
   user.save();
 }

subgraph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kleros/kleros-v2-subgraph",
-  "version": "0.7.2",
+  "version": "0.7.6",
   "license": "MIT",
   "scripts": {
     "update:core:arbitrum-sepolia-devnet": "./scripts/update.sh arbitrumSepoliaDevnet arbitrum-sepolia core/subgraph.yaml",

web/package.json

@@ -68,6 +68,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "lru-cache": "^7.18.3",
     "typescript": "^5.3.3",
+    "vite": "^5.4.2",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2"
@@ -76,7 +77,7 @@
     "@cyntler/react-doc-viewer": "^1.16.3",
     "@filebase/client": "^0.0.5",
     "@kleros/kleros-sdk": "workspace:^",
-    "@kleros/ui-components-library": "^2.14.0",
+    "@kleros/ui-components-library": "^2.15.0",
     "@lifi/wallet-management": "^3.0.3",
     "@lifi/widget": "^3.2.0",
     "@middy/core": "^5.3.2",
@@ -117,6 +118,6 @@
     "vanilla-jsoneditor": "^0.21.4",
     "viem": "^2.17.3",
     "vite": "^5.2.10",
-    "wagmi": "^2.11.3"
+    "wagmi": "^2.12.8"
   }
 }

web/src/assets/svgs/icons/bookmark.svg

@@ -28,6 +28,11 @@ const CardContainer = styled.div`
   flex-direction: column;
   justify-content: space-between;
 `;
+
+const StyledCaseCardTitleSkeleton = styled(StyledSkeleton)`
+  margin-bottom: 16px;
+`;
+
 const TruncatedTitle = ({ text, maxLength }) => {
   const truncatedText = text.length <= maxLength ? text : text.slice(0, maxLength) + "…";
   return <h3>{truncatedText}</h3>;
@@ -54,7 +59,7 @@ const DisputeCardView: React.FC<IDisputeCardView> = ({ isLoading, ...props }) =>
     <StyledCard hover onClick={() => navigate(`/cases/${props?.disputeID?.toString()}`)}>
       <PeriodBanner id={parseInt(props?.disputeID)} period={props?.period} />
       <CardContainer>
-        {isLoading ? <StyledSkeleton /> : <TruncatedTitle text={props?.title} maxLength={100} />}
+        {isLoading ? <StyledCaseCardTitleSkeleton /> : <TruncatedTitle text={props?.title} maxLength={100} />}
         <DisputeInfo {...props} />
       </CardContainer>
     </StyledCard>