Feat(web): cases filtering

subgraph/schema.graphql

@@ -71,6 +71,7 @@ type User @entity {
   totalResolvedDisputes: BigInt!
   totalDisputes: BigInt!
   totalCoherent: BigInt!
+  totalAppealingDisputes: BigInt!
   votes: [Vote!]! @derivedFrom(field: "juror")
   contributions: [Contribution!]! @derivedFrom(field: "contributor")
   evidences: [Evidence!]! @derivedFrom(field: "sender")
@@ -128,6 +129,9 @@ type Court @entity {
   supportedDisputeKits: [DisputeKit!]!
   disputes: [Dispute!]! @derivedFrom(field: "court")
   numberDisputes: BigInt!
+  numberClosedDisputes: BigInt!
+  numberVotingDisputes: BigInt!
+  numberAppealingDisputes: BigInt!
   stakedJurors: [JurorTokensPerCourt!]! @derivedFrom(field: "court")
   numberStakedJurors: BigInt!
   stake: BigInt!
@@ -146,9 +150,12 @@ type Dispute @entity {
   tied: Boolean!
   overridden: Boolean!
   lastPeriodChange: BigInt!
+  lastPeriodChangeBlockNumber: BigInt!
+  periodDeadline: BigInt!
   rounds: [Round!]! @derivedFrom(field: "dispute")
   currentRound: Round!
   currentRoundIndex: BigInt!
+  jurors: [User!]! @derivedFrom(field: "disputes")
   shifts: [TokenAndETHShift!]! @derivedFrom(field: "dispute")
   disputeKitDispute: DisputeKitDispute @derivedFrom(field: "coreDispute")
 }
@@ -166,8 +173,9 @@ type Round @entity {
   feeToken: FeeToken
 }
 
-type Draw @entity {
+type Draw @entity(immutable: true) {
   id: ID! # dispute.id-currentRound-voteID
+  blockNumber: BigInt!
   dispute: Dispute!
   round: Round!
   juror: User!
@@ -195,6 +203,7 @@ type Counter @entity {
   cases: BigInt!
   casesVoting: BigInt!
   casesRuled: BigInt!
+  casesAppealing: BigInt!
 }
 
 type FeeToken @entity {

subgraph/src/KlerosCore.ts

@@ -15,17 +15,17 @@ import {
   AcceptedFeeToken,
 } from "../generated/KlerosCore/KlerosCore";
 import { ZERO, ONE } from "./utils";
-import { createCourtFromEvent, getFeeForJuror } from "./entities/Court";
+import { createCourtFromEvent } from "./entities/Court";
 import { createDisputeKitFromEvent, filterSupportedDisputeKits } from "./entities/DisputeKit";
 import { createDisputeFromEvent } from "./entities/Dispute";
 import { createRoundFromRoundInfo } from "./entities/Round";
-import { updateCases, updateCasesRuled, updateCasesVoting } from "./datapoint";
+import { updateCases, updateCasesAppealing, updateCasesRuled, updateCasesVoting } from "./datapoint";
 import { addUserActiveDispute, ensureUser } from "./entities/User";
 import { updateJurorDelayedStake, updateJurorStake } from "./entities/JurorTokensPerCourt";
 import { createDrawFromEvent } from "./entities/Draw";
 import { updateTokenAndEthShiftFromEvent } from "./entities/TokenAndEthShift";
 import { updateArbitrableCases } from "./entities/Arbitrable";
-import { Court, Dispute, FeeToken } from "../generated/schema";
+import { Court, Dispute, User } from "../generated/schema";
 import { BigInt } from "@graphprotocol/graph-ts";
 import { updatePenalty } from "./entities/Penalty";
 import { ensureFeeToken } from "./entities/FeeToken";
@@ -87,31 +87,67 @@ export function handleNewPeriod(event: NewPeriod): void {
   const disputeID = event.params._disputeID;
   const dispute = Dispute.load(disputeID.toString());
   if (!dispute) return;
-  const newPeriod = getPeriodName(event.params._period);
-  if (dispute.period === "vote") {
+  const court = Court.load(dispute.court);
+  if (!court) return;
+
+  if (dispute.period.includes("vote")) {
+    court.numberVotingDisputes = court.numberVotingDisputes.minus(ONE);
     updateCasesVoting(BigInt.fromI32(-1), event.block.timestamp);
-  } else if (newPeriod === "vote") {
+  } else if (dispute.period.includes("appeal")) {
+    let juror: User;
+    for (let i = 0; i < dispute.jurors.entries.length; i++) {
+      juror = ensureUser(dispute.jurors.entries[i].value.toString());
+      juror.totalAppealingDisputes = juror.totalAppealingDisputes.minus(ONE);
+      juror.save();
+    }
+    court.numberAppealingDisputes = court.numberAppealingDisputes.minus(ONE);
+    updateCasesAppealing(BigInt.fromI32(-1), event.block.timestamp);
+  }
+
+  const newPeriod = getPeriodName(event.params._period);
+  if (newPeriod === "vote") {
+    court.numberVotingDisputes = court.numberVotingDisputes.plus(ONE);
     updateCasesVoting(ONE, event.block.timestamp);
+  } else if (newPeriod === "appeal") {
+    let juror: User;
+    for (let i = 0; i < dispute.jurors.entries.length; i++) {
+      juror = ensureUser(dispute.jurors.entries[i].value.toString());
+      juror.totalAppealingDisputes = juror.totalAppealingDisputes.plus(ONE);
+      juror.save();
+    }
+    court.numberAppealingDisputes = court.numberAppealingDisputes.plus(ONE);
+    updateCasesAppealing(ONE, event.block.timestamp);
   } else if (newPeriod === "execution") {
     const contract = KlerosCore.bind(event.address);
     const currentRulingInfo = contract.currentRuling(disputeID);
     dispute.currentRuling = currentRulingInfo.getRuling();
     dispute.overridden = currentRulingInfo.getOverridden();
     dispute.tied = currentRulingInfo.getTied();
-    dispute.save();
   }
+
   dispute.period = newPeriod;
   dispute.lastPeriodChange = event.block.timestamp;
+  dispute.lastPeriodChangeBlockNumber = event.block.number;
+  if (newPeriod !== "execution") {
+    dispute.periodDeadline = event.block.timestamp.plus(court.timesPerPeriod[event.params._period]);
+  } else {
+    dispute.periodDeadline = BigInt.fromU64(U64.MAX_VALUE);
+  }
   dispute.save();
+  court.save();
 }
 
 export function handleRuling(event: Ruling): void {
-  const disputeID = event.params._disputeID.toString();
-  const dispute = Dispute.load(disputeID);
+  updateCasesRuled(ONE, event.block.timestamp);
+  const disputeID = event.params._disputeID;
+  const dispute = Dispute.load(disputeID.toString());
   if (!dispute) return;
   dispute.ruled = true;
   dispute.save();
-  updateCasesRuled(ONE, event.block.timestamp);
+  const court = Court.load(dispute.court);
+  if (!court) return;
+  court.numberClosedDisputes = court.numberClosedDisputes.plus(ONE);
+  court.save();
 }
 
 export function handleAppealDecision(event: AppealDecision): void {
@@ -124,7 +160,6 @@ export function handleAppealDecision(event: AppealDecision): void {
   dispute.currentRoundIndex = newRoundIndex;
   dispute.currentRound = roundID;
   dispute.save();
-  const feeForJuror = getFeeForJuror(dispute.court);
   const roundInfo = contract.getRoundInfo(disputeID, newRoundIndex);
   createRoundFromRoundInfo(disputeID, newRoundIndex, roundInfo);
 }

subgraph/src/datapoint.ts

@@ -6,7 +6,16 @@ export function getDelta(previousValue: BigInt, newValue: BigInt): BigInt {
   return newValue.minus(previousValue);
 }
 
-const VARIABLES = ["stakedPNK", "redistributedPNK", "paidETH", "activeJurors", "cases", "casesVoting", "casesRuled"];
+const VARIABLES = [
+  "stakedPNK",
+  "redistributedPNK",
+  "paidETH",
+  "activeJurors",
+  "cases",
+  "casesVoting",
+  "casesRuled",
+  "casesAppealing",
+];
 
 function updateDataPoint(delta: BigInt, timestamp: BigInt, variable: string): void {
   checkFirstDayActivity();
@@ -33,6 +42,7 @@ function checkFirstDayActivity(): void {
     counter.cases = ZERO;
     counter.casesVoting = ZERO;
     counter.casesRuled = ZERO;
+    counter.casesAppealing = ZERO;
     counter.save();
   }
 }
@@ -72,3 +82,7 @@ export function updateCasesVoting(delta: BigInt, timestamp: BigInt): void {
 export function updateCasesRuled(delta: BigInt, timestamp: BigInt): void {
   updateDataPoint(delta, timestamp, "casesRuled");
 }
+
+export function updateCasesAppealing(delta: BigInt, timestamp: BigInt): void {
+  updateDataPoint(delta, timestamp, "casesAppealing");
+}

subgraph/src/entities/Court.ts

@@ -14,6 +14,9 @@ export function createCourtFromEvent(event: CourtCreated): void {
   court.timesPerPeriod = event.params._timesPerPeriod;
   court.supportedDisputeKits = event.params._supportedDisputeKits.map<string>((value) => value.toString());
   court.numberDisputes = ZERO;
+  court.numberClosedDisputes = ZERO;
+  court.numberVotingDisputes = ZERO;
+  court.numberAppealingDisputes = ZERO;
   court.numberStakedJurors = ZERO;
   court.stake = ZERO;
   court.delayedStake = ZERO;

subgraph/src/entities/Dispute.ts

@@ -1,20 +1,25 @@
 import { KlerosCore, DisputeCreation } from "../../generated/KlerosCore/KlerosCore";
-import { Dispute } from "../../generated/schema";
+import { Court, Dispute } from "../../generated/schema";
 import { ZERO } from "../utils";
 
 export function createDisputeFromEvent(event: DisputeCreation): void {
   const contract = KlerosCore.bind(event.address);
   const disputeID = event.params._disputeID;
   const disputeContractState = contract.disputes(disputeID);
   const dispute = new Dispute(disputeID.toString());
-  dispute.court = disputeContractState.value0.toString();
+  const courtID = disputeContractState.value0.toString();
+  dispute.court = courtID;
   dispute.arbitrated = event.params._arbitrable.toHexString();
   dispute.period = "evidence";
   dispute.ruled = false;
   dispute.currentRuling = ZERO;
   dispute.tied = true;
   dispute.overridden = false;
   dispute.lastPeriodChange = event.block.timestamp;
+  dispute.lastPeriodChangeBlockNumber = event.block.number;
+  const court = Court.load(courtID);
+  if (!court) return;
+  dispute.periodDeadline = event.block.timestamp.plus(court.timesPerPeriod[0]);
   dispute.currentRoundIndex = ZERO;
   const roundID = `${disputeID.toString()}-${ZERO.toString()}`;
   dispute.currentRound = roundID;

subgraph/src/entities/Draw.ts

@@ -8,6 +8,7 @@ export function createDrawFromEvent(event: DrawEvent): void {
   const voteID = event.params._voteID;
   const drawID = `${disputeID}-${roundIndex.toString()}-${voteID.toString()}`;
   const draw = new Draw(drawID);
+  draw.blockNumber = event.block.number;
   draw.dispute = disputeID;
   draw.round = roundID;
   draw.juror = event.params._address.toHexString();

subgraph/src/entities/Round.ts

@@ -1,23 +1,22 @@
 import { BigInt } from "@graphprotocol/graph-ts";
-import { KlerosCore__getRoundInfoResultValue0Struct } from "../../generated/KlerosCore/KlerosCore";
+import { KlerosCore__getRoundInfoResult } from "../../generated/KlerosCore/KlerosCore";
 import { Round } from "../../generated/schema";
 
 export function createRoundFromRoundInfo(
   disputeID: BigInt,
   roundIndex: BigInt,
-  roundInfo: KlerosCore__getRoundInfoResultValue0Struct
+  roundInfo: KlerosCore__getRoundInfoResult
 ): void {
   const roundID = `${disputeID.toString()}-${roundIndex.toString()}`;
   const round = new Round(roundID);
-  const feeToken = roundInfo.feeToken;
-  round.disputeKit = roundInfo.disputeKitID.toString();
-  round.tokensAtStakePerJuror = roundInfo.pnkAtStakePerJuror;
-  round.totalFeesForJurors = roundInfo.totalFeesForJurors;
-  round.nbVotes = roundInfo.nbVotes;
-  round.repartitions = roundInfo.repartitions;
-  round.penalties = roundInfo.pnkPenalties;
+  const feeToken = roundInfo.getFeeToken().toHexString();
+  round.feeToken = feeToken === "0x0000000000000000000000000000000000000000" ? null : feeToken;
+  round.disputeKit = roundInfo.getDisputeKitID().toString();
+  round.tokensAtStakePerJuror = roundInfo.getPnkAtStakePerJuror();
+  round.totalFeesForJurors = roundInfo.getTotalFeesForJurors();
+  round.nbVotes = roundInfo.getNbVotes();
+  round.repartitions = roundInfo.getRepartitions();
+  round.penalties = roundInfo.getPnkPenalties();
   round.dispute = disputeID.toString();
-  round.feeToken =
-    feeToken.toHexString() === "0x0000000000000000000000000000000000000000" ? null : feeToken.toHexString();
   round.save();
 }

subgraph/src/entities/User.ts

@@ -20,6 +20,7 @@ export function createUserFromAddress(id: string): User {
   user.disputes = [];
   user.resolvedDisputes = [];
   user.totalResolvedDisputes = ZERO;
+  user.totalAppealingDisputes = ZERO;
   user.totalDisputes = ZERO;
   user.totalCoherent = ZERO;
   user.save();

subgraph/subgraph.yaml

@@ -48,7 +48,7 @@ dataSources:
           handler: handleDisputeKitEnabled
         - event: StakeSet(indexed address,uint256,uint256)
           handler: handleStakeSet
-        - event: StakeDelayed(indexed address,uint256,uint256)
+        - event: StakeDelayed(indexed address,uint256,uint256,uint256)
           handler: handleStakeDelayed
         - event: TokenAndETHShift(indexed address,indexed uint256,indexed uint256,uint256,int256,int256,address)
           handler: handleTokenAndETHShift

web/.env.devnet.public

@@ -1,4 +1,4 @@
 # Do not enter sensitive information here.
 export REACT_APP_DEPLOYMENT=devnet
 export REACT_APP_KLEROS_CORE_SUBGRAPH_DEVNET=https://api.thegraph.com/subgraphs/name/alcercu/kleroscoredev
-export REACT_APP_DISPUTE_TEMPLATE_ARBGOERLI_SUBGRAPH_DEVNET=https://api.thegraph.com/subgraphs/name/alcercu/templateregistrydevnet
+export REACT_APP_DISPUTE_TEMPLATE_ARBGOERLI_SUBGRAPH_DEVNET=https://api.thegraph.com/subgraphs/name/alcercu/templateregistrydevnet

web/src/app.tsx

@@ -4,9 +4,9 @@ import { SentryRoutes } from "./utils/sentry";
 import "react-loading-skeleton/dist/skeleton.css";
 import "react-toastify/dist/ReactToastify.css";
 import Web3Provider from "context/Web3Provider";
+import IsListProvider from "context/IsListProvider";
 import QueryClientProvider from "context/QueryClientProvider";
 import StyledComponentsProvider from "context/StyledComponentsProvider";
-import { FilterProvider } from "context/FilterProvider";
 import RefetchOnBlock from "context/RefetchOnBlock";
 import Layout from "layout/index";
 import Home from "./pages/Home";
@@ -21,18 +21,18 @@ const App: React.FC = () => {
       <QueryClientProvider>
         <RefetchOnBlock />
         <Web3Provider>
-          <FilterProvider>
+          <IsListProvider>
             <SentryRoutes>
               <Route path="/" element={<Layout />}>
                 <Route index element={<Home />} />
                 <Route path="cases/*" element={<Cases />} />
                 <Route path="courts/*" element={<Courts />} />
-                <Route path="dashboard" element={<Dashboard />} />
+                <Route path="dashboard/:page/:order/:filter" element={<Dashboard />} />
                 <Route path="disputeTemplate" element={<DisputeTemplateView />} />
                 <Route path="*" element={<h1>Justice not found here ¯\_( ͡° ͜ʖ ͡°)_/¯</h1>} />
               </Route>
             </SentryRoutes>
-          </FilterProvider>
+          </IsListProvider>
         </Web3Provider>
       </QueryClientProvider>
     </StyledComponentsProvider>