Merge branch 'fix(web)/staking-refetch-and-improving-fetching-timing' into fix(web)/verdict-result-components

alcercu · web-flow · commit 85b5c8d80542 · 2023-08-02T20:26:57.000+02:00
diff --git a/subgraph/schema.graphql b/subgraph/schema.graphql
@@ -138,6 +138,9 @@ type Dispute @entity {
   arbitrated: Arbitrable!
   period: Period!
   ruled: Boolean!
+  currentRuling: BigInt!
+  tied: Boolean!
+  overridden: Boolean!
   lastPeriodChange: BigInt!
   rounds: [Round!]! @derivedFrom(field: "dispute")
   currentRound: Round!
diff --git a/subgraph/src/DisputeKitClassic.ts b/subgraph/src/DisputeKitClassic.ts
@@ -9,11 +9,15 @@ import {
   Withdrawal,
 } from "../generated/DisputeKitClassic/DisputeKitClassic";
 import { KlerosCore } from "../generated/KlerosCore/KlerosCore";
-import { ClassicDispute, ClassicEvidence, ClassicRound } from "../generated/schema";
+import { ClassicDispute, ClassicEvidence, ClassicRound, Dispute } from "../generated/schema";
 import { ensureClassicContributionFromEvent } from "./entities/ClassicContribution";
 import { createClassicDisputeFromEvent } from "./entities/ClassicDispute";
 import { ensureClassicEvidenceGroup } from "./entities/ClassicEvidenceGroup";
-import { createClassicRound, updateChoiceFundingFromContributionEvent, updateCounts } from "./entities/ClassicRound";
+import {
+  createClassicRound,
+  updateChoiceFundingFromContributionEvent,
+  updateCountsAndGetCurrentRuling,
+} from "./entities/ClassicRound";
 import { createClassicVote } from "./entities/ClassicVote";
 import { ensureUser } from "./entities/User";
 import { ONE, ZERO } from "./utils";
@@ -44,11 +48,15 @@ export function handleEvidenceEvent(event: EvidenceEvent): void {
 
 export function handleJustificationEvent(event: JustificationEvent): void {
   const coreDisputeID = event.params._coreDisputeID.toString();
+  const coreDispute = Dispute.load(coreDisputeID);
   const classicDisputeID = `${DISPUTEKIT_ID}-${coreDisputeID}`;
   const classicDispute = ClassicDispute.load(classicDisputeID);
-  if (!classicDispute) return;
+  if (!classicDispute || !coreDispute) return;
   const currentLocalRoundID = classicDispute.id + "-" + classicDispute.currentLocalRoundIndex.toString();
-  updateCounts(currentLocalRoundID, event.params._choice);
+  const currentRulingInfo = updateCountsAndGetCurrentRuling(currentLocalRoundID, event.params._choice);
+  coreDispute.currentRuling = currentRulingInfo.ruling;
+  coreDispute.tied = currentRulingInfo.tied;
+  coreDispute.save();
   createClassicVote(currentLocalRoundID, event);
 }
 
diff --git a/subgraph/src/KlerosCore.ts b/subgraph/src/KlerosCore.ts
@@ -22,7 +22,7 @@ import { updateCases, updatePaidETH, updateRedistributedPNK, updateCasesRuled, u
 import { addUserActiveDispute, ensureUser } from "./entities/User";
 import { updateJurorDelayedStake, updateJurorStake } from "./entities/JurorTokensPerCourt";
 import { createDrawFromEvent } from "./entities/Draw";
-import { createTokenAndEthShiftFromEvent, updateTokenAndEthShiftFromEvent } from "./entities/TokenAndEthShift";
+import { updateTokenAndEthShiftFromEvent } from "./entities/TokenAndEthShift";
 import { updateArbitrableCases } from "./entities/Arbitrable";
 import { Court, Dispute } from "../generated/schema";
 import { BigInt } from "@graphprotocol/graph-ts";
@@ -82,14 +82,21 @@ export function handleDisputeCreation(event: DisputeCreation): void {
 }
 
 export function handleNewPeriod(event: NewPeriod): void {
-  const disputeID = event.params._disputeID.toString();
-  const dispute = Dispute.load(disputeID);
+  const disputeID = event.params._disputeID;
+  const dispute = Dispute.load(disputeID.toString());
   if (!dispute) return;
   const newPeriod = getPeriodName(event.params._period);
   if (dispute.period === "vote") {
     updateCasesVoting(BigInt.fromI32(-1), event.block.timestamp);
   } else if (newPeriod === "vote") {
     updateCasesVoting(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;
diff --git a/subgraph/src/entities/ClassicRound.ts b/subgraph/src/entities/ClassicRound.ts
@@ -3,11 +3,7 @@ import { Contribution } from "../../generated/DisputeKitClassic/DisputeKitClassi
 import { ClassicRound } from "../../generated/schema";
 import { ONE, ZERO } from "../utils";
 
-export function createClassicRound(
-  disputeID: string,
-  numberOfChoices: BigInt,
-  roundIndex: BigInt
-): void {
+export function createClassicRound(disputeID: string, numberOfChoices: BigInt, roundIndex: BigInt): void {
   const choicesLength = numberOfChoices.plus(ONE);
   const localDisputeID = `1-${disputeID}`;
   const id = `${localDisputeID}-${roundIndex.toString()}`;
@@ -24,9 +20,14 @@ export function createClassicRound(
   classicRound.save();
 }
 
-export function updateCounts(id: string, choice: BigInt): void {
+class CurrentRulingInfo {
+  ruling: BigInt;
+  tied: boolean;
+}
+
+export function updateCountsAndGetCurrentRuling(id: string, choice: BigInt): CurrentRulingInfo {
   const round = ClassicRound.load(id);
-  if (!round) return;
+  if (!round) return { ruling: ZERO, tied: false };
   const choiceNum = choice.toI32();
   const updatedCount = round.counts[choiceNum].plus(ONE);
   let newCounts: BigInt[] = [];
@@ -51,11 +52,10 @@ export function updateCounts(id: string, choice: BigInt): void {
   }
   round.totalVoted = round.totalVoted.plus(ONE);
   round.save();
+  return { ruling: round.winningChoice, tied: round.tied };
 }
 
-export function updateChoiceFundingFromContributionEvent(
-  event: Contribution
-): void {
+export function updateChoiceFundingFromContributionEvent(event: Contribution): void {
   const disputeKitID = "1";
   const coreDisputeID = event.params._coreDisputeID.toString();
   const coreRoundIndex = event.params._coreRoundID.toString();
diff --git a/subgraph/src/entities/Dispute.ts b/subgraph/src/entities/Dispute.ts
@@ -1,7 +1,4 @@
-import {
-  KlerosCore,
-  DisputeCreation,
-} from "../../generated/KlerosCore/KlerosCore";
+import { KlerosCore, DisputeCreation } from "../../generated/KlerosCore/KlerosCore";
 import { Dispute } from "../../generated/schema";
 import { ZERO } from "../utils";
 
@@ -14,6 +11,9 @@ export function createDisputeFromEvent(event: DisputeCreation): void {
   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.currentRoundIndex = ZERO;
   const roundID = `${disputeID.toString()}-${ZERO.toString()}`;
diff --git a/web/src/hooks/queries/useJurorBalance.ts b/web/src/hooks/queries/useJurorBalance.ts
diff --git a/web/src/hooks/queries/usePNKAllowance.ts b/web/src/hooks/queries/usePNKAllowance.ts
diff --git a/web/src/hooks/queries/usePNKBalance.ts b/web/src/hooks/queries/usePNKBalance.ts
diff --git a/web/src/hooks/queries/useVotingHistory.ts b/web/src/hooks/queries/useVotingHistory.ts
@@ -37,7 +37,7 @@ export const useVotingHistory = (disputeID?: string) => {
   const isEnabled = disputeID !== undefined;
 
   return useQuery({
-    queryKey: [`VotingHistory${disputeID}`],
+    queryKey: ["refetchOnBlock", `VotingHistory${disputeID}`],
     enabled: isEnabled,
     queryFn: async () => await graphqlQueryFnHelper(votingHistoryQuery, { disputeID }),
   });
diff --git a/web/src/pages/Cases/CaseDetails/Voting/Classic.tsx b/web/src/pages/Cases/CaseDetails/Voting/Classic.tsx
@@ -44,7 +44,7 @@ const RefuseToArbitrateContainer = styled.div`
   justify-content: center;
 `;
 
-const Binary: React.FC<{ arbitrable: `0x${string}`; voteIDs: string[] }> = ({ arbitrable, voteIDs }) => {
+const Classic: React.FC<{ arbitrable: `0x${string}`; voteIDs: string[] }> = ({ arbitrable, voteIDs }) => {
   const { id } = useParams();
   const parsedDisputeID = BigInt(id ?? 0);
   const parsedVoteIDs = useMemo(() => voteIDs.map((voteID) => BigInt(voteID)), [voteIDs]);
@@ -122,4 +122,4 @@ const Binary: React.FC<{ arbitrable: `0x${string}`; voteIDs: string[] }> = ({ ar
   );
 };
 
-export default Binary;
+export default Classic;
diff --git a/web/src/pages/Cases/CaseDetails/Voting/index.tsx b/web/src/pages/Cases/CaseDetails/Voting/index.tsx
@@ -3,7 +3,7 @@ import { useParams } from "react-router-dom";
 import { useAccount } from "wagmi";
 import { useDisputeDetailsQuery } from "queries/useDisputeDetailsQuery";
 import { useDrawQuery } from "queries/useDrawQuery";
-import Binary from "./Binary";
+import Classic from "./Classic";
 import VotingHistory from "./VotingHistory";
 import { Periods } from "consts/periods";
 import { isUndefined } from "utils/index";
@@ -29,7 +29,7 @@ const Voting: React.FC<{
     currentPeriodIndex === Periods.vote &&
     drawData.draws?.length > 0 &&
     !voted ? (
-    <Binary {...{ arbitrable }} voteIDs={drawData.draws.map((draw) => draw.voteID)} />
+    <Classic {...{ arbitrable }} voteIDs={drawData.draws.map((draw) => draw.voteID)} />
   ) : (
     <VotingHistory {...{ arbitrable }} />
   );
diff --git a/web/src/pages/Courts/CourtDetails/StakePanel/InputDisplay.tsx b/web/src/pages/Courts/CourtDetails/StakePanel/InputDisplay.tsx
@@ -7,8 +7,7 @@ import { useAccount } from "wagmi";
 import { Field } from "@kleros/ui-components-library";
 
 import { useParsedAmount } from "hooks/useParsedAmount";
-import { usePNKBalance } from "queries/usePNKBalance";
-import { useKlerosCoreGetJurorBalance } from "hooks/contracts/generated";
+import { useKlerosCoreGetJurorBalance, usePnkBalanceOf } from "hooks/contracts/generated";
 import StakeWithdrawButton, { ActionType } from "./StakeWithdrawButton";
 import { isUndefined } from "utils/index";
 import { EnsureChain } from "components/EnsureChain";
@@ -49,7 +48,11 @@ const InputDisplay: React.FC<IInputDisplay> = ({ action, isSending, setIsSending
 
   const { id } = useParams();
   const { address } = useAccount();
-  const { data: balance } = usePNKBalance(address);
+  const { data: balance } = usePnkBalanceOf({
+    enabled: !isUndefined(address),
+    args: [address ?? "0x"],
+    watch: true,
+  });
   const parsedBalance = formatEther(balance ?? 0n);
   const { data: jurorBalance } = useKlerosCoreGetJurorBalance({
     enabled: !isUndefined(address),
diff --git a/web/src/pages/Courts/CourtDetails/StakePanel/JurorStakeDisplay.tsx b/web/src/pages/Courts/CourtDetails/StakePanel/JurorStakeDisplay.tsx
@@ -9,7 +9,7 @@ import DiceIcon from "svgs/icons/dice.svg";
 import LockerIcon from "svgs/icons/locker.svg";
 import PNKIcon from "svgs/icons/pnk.svg";
 import { useCourtDetails } from "queries/useCourtDetails";
-import { useJurorBalance } from "queries/useJurorBalance";
+import { useKlerosCoreGetJurorBalance } from "hooks/contracts/generated";
 
 const format = (value: bigint | undefined): string => (value !== undefined ? formatEther(value) : "0");
 
@@ -32,7 +32,11 @@ const formatBigIntPercentage = (numerator: bigint, denominator: bigint): string
 const JurorBalanceDisplay = () => {
   const { id } = useParams();
   const { address } = useAccount();
-  const { data: jurorBalance } = useJurorBalance(address, id);
+  const { data: jurorBalance } = useKlerosCoreGetJurorBalance({
+    enabled: !isUndefined(address),
+    args: [address ?? "0x", BigInt(id ?? 0)],
+    watch: true,
+  });
   const { data: courtDetails } = useCourtDetails(id);
 
   const stakedByAllJurors = courtDetails?.court?.stake;
diff --git a/web/src/pages/Courts/CourtDetails/StakePanel/StakeWithdrawButton.tsx b/web/src/pages/Courts/CourtDetails/StakePanel/StakeWithdrawButton.tsx
@@ -10,8 +10,8 @@ import {
   usePnkIncreaseAllowance,
   usePreparePnkIncreaseAllowance,
   useKlerosCoreGetJurorBalance,
+  usePnkAllowance,
 } from "hooks/contracts/generated";
-import { usePNKAllowance } from "queries/usePNKAllowance";
 import { wrapWithToast } from "utils/wrapWithToast";
 import { isUndefined } from "utils/index";
 import { EnsureChain } from "components/EnsureChain";
@@ -33,6 +33,7 @@ interface IActionButton {
 const StakeWithdrawButton: React.FC<IActionButton> = ({ parsedAmount, action, setAmount, isSending, setIsSending }) => {
   const { id } = useParams();
   const { address } = useAccount();
+  const klerosCore = getKlerosCore({});
   const { data: balance } = usePnkBalanceOf({
     enabled: !isUndefined(address),
     args: [address!],
@@ -43,7 +44,11 @@ const StakeWithdrawButton: React.FC<IActionButton> = ({ parsedAmount, action, se
     args: [address ?? "0x", BigInt(id ?? 0)],
     watch: true,
   });
-  const { data: allowance } = usePNKAllowance(address);
+  const { data: allowance } = usePnkAllowance({
+    enabled: !isUndefined(address),
+    args: [address ?? "0x", klerosCore.address],
+    watch: true,
+  });
   const publicClient = usePublicClient();
 
   const isStaking = action === ActionType.stake;
@@ -62,7 +67,6 @@ const StakeWithdrawButton: React.FC<IActionButton> = ({ parsedAmount, action, se
     return 0n;
   }, [jurorBalance, parsedAmount, isAllowance, isStaking]);
 
-  const klerosCore = getKlerosCore({});
   const { config: increaseAllowanceConfig } = usePreparePnkIncreaseAllowance({
     enabled: isAllowance && !isUndefined(klerosCore) && !isUndefined(targetStake) && !isUndefined(allowance),
     args: [klerosCore?.address, BigInt(targetStake ?? 0) - BigInt(allowance ?? 0)],
