Merge pull request #982 from kleros/feat(subgraph)/update-subgraph-to-interfaces

Feat(subgraph): update variable names to go with new interfaces

Author: alcercu

subgraph/src/DisputeKitClassic.ts

@@ -9,19 +9,11 @@ import {
   Withdrawal,
 } from "../generated/DisputeKitClassic/DisputeKitClassic";
 import { KlerosCore } from "../generated/KlerosCore/KlerosCore";
-import {
-  ClassicDispute,
-  ClassicEvidence,
-  ClassicRound,
-} from "../generated/schema";
+import { ClassicDispute, ClassicEvidence, ClassicRound } 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, updateCounts } from "./entities/ClassicRound";
 import { createClassicVote } from "./entities/ClassicVote";
 import { ONE, ZERO } from "./utils";
 
@@ -35,14 +27,12 @@ export function handleDisputeCreation(event: DisputeCreation): void {
 }
 
 export function handleEvidenceEvent(event: EvidenceEvent): void {
-  const evidenceGroupID = event.params._evidenceGroupID.toString();
+  const evidenceGroupID = event.params._externalDisputeID.toString();
   const evidenceGroup = ensureClassicEvidenceGroup(evidenceGroupID);
   const evidenceIndex = evidenceGroup.nextEvidenceIndex;
   evidenceGroup.nextEvidenceIndex = evidenceGroup.nextEvidenceIndex.plus(ONE);
   evidenceGroup.save();
-  const evidence = new ClassicEvidence(
-    `${evidenceGroupID}-${evidenceIndex.toString()}`
-  );
+  const evidence = new ClassicEvidence(`${evidenceGroupID}-${evidenceIndex.toString()}`);
   evidence.evidence = event.params._evidence;
   evidence.evidenceGroup = evidenceGroupID.toString();
   evidence.sender = event.params._party.toHexString();
@@ -54,8 +44,7 @@ export function handleJustificationEvent(event: JustificationEvent): void {
   const classicDisputeID = `${DISPUTEKIT_ID}-${coreDisputeID}`;
   const classicDispute = ClassicDispute.load(classicDisputeID);
   if (!classicDispute) return;
-  const currentLocalRoundID =
-    classicDispute.id + "-" + classicDispute.currentLocalRoundIndex.toString();
+  const currentLocalRoundID = classicDispute.id + "-" + classicDispute.currentLocalRoundIndex.toString();
   updateCounts(currentLocalRoundID, event.params._choice);
   createClassicVote(currentLocalRoundID, event);
 }
@@ -85,9 +74,7 @@ export function handleChoiceFunded(event: ChoiceFunded): void {
     const appealCost = klerosCore.appealCost(BigInt.fromString(coreDisputeID));
     localRound.feeRewards = localRound.feeRewards.minus(appealCost);
 
-    const localDispute = ClassicDispute.load(
-      `${DISPUTEKIT_ID}-${coreDisputeID}`
-    );
+    const localDispute = ClassicDispute.load(`${DISPUTEKIT_ID}-${coreDisputeID}`);
     if (!localDispute) return;
     const newRoundIndex = localDispute.currentLocalRoundIndex.plus(ONE);
     const numberOfChoices = localDispute.numberOfChoices;

subgraph/src/KlerosCore.ts

@@ -38,16 +38,14 @@ export function handleCourtCreated(event: CourtCreated): void {
 }
 
 export function handleCourtModified(event: CourtModified): void {
-  const contract = KlerosCore.bind(event.address);
-  const courtContractState = contract.courts(event.params._courtID);
   const court = Court.load(event.params._courtID.toString());
   if (!court) return;
-  court.hiddenVotes = courtContractState.value1;
-  court.minStake = courtContractState.value2;
-  court.alpha = courtContractState.value3;
-  court.feeForJuror = courtContractState.value4;
-  court.jurorsForCourtJump = courtContractState.value5;
-  court.timesPerPeriod = contract.getTimesPerPeriod(event.params._courtID);
+  court.hiddenVotes = event.params._hiddenVotes;
+  court.minStake = event.params._minStake;
+  court.alpha = event.params._alpha;
+  court.feeForJuror = event.params._feeForJuror;
+  court.jurorsForCourtJump = event.params._jurorsForCourtJump;
+  court.timesPerPeriod = event.params._timesPerPeriod;
   court.save();
 }
 
@@ -77,7 +75,7 @@ export function handleDisputeCreation(event: DisputeCreation): void {
   court.save();
   createDisputeFromEvent(event);
   const roundInfo = contract.getRoundInfo(disputeID, ZERO);
-  createRoundFromRoundInfo(disputeID, ZERO, court.feeForJuror, roundInfo);
+  createRoundFromRoundInfo(disputeID, ZERO, roundInfo);
   const arbitrable = event.params._arbitrable.toHexString();
   updateArbitrableCases(arbitrable, ONE);
   updateCases(ONE, event.block.timestamp);
@@ -119,7 +117,7 @@ export function handleAppealDecision(event: AppealDecision): void {
   dispute.save();
   const feeForJuror = getFeeForJuror(dispute.court);
   const roundInfo = contract.getRoundInfo(disputeID, newRoundIndex);
-  createRoundFromRoundInfo(disputeID, newRoundIndex, feeForJuror, roundInfo);
+  createRoundFromRoundInfo(disputeID, newRoundIndex, roundInfo);
 }
 
 export function handleDraw(event: DrawEvent): void {
@@ -154,20 +152,20 @@ export function handleTokenAndETHShift(event: TokenAndETHShiftEvent): void {
   createTokenAndEthShiftFromEvent(event);
   const jurorAddress = event.params._account.toHexString();
   const disputeID = event.params._disputeID.toString();
-  const tokenAmount = event.params._tokenAmount;
-  const ethAmount = event.params._ethAmount;
-  if (tokenAmount.gt(ZERO)) {
-    updateRedistributedPNK(tokenAmount, event.block.timestamp);
-  }
-  updatePaidETH(ethAmount, event.block.timestamp);
+  const pnkAmount = event.params._pnkAmount;
+  const feeAmount = event.params._feeAmount;
   const dispute = Dispute.load(disputeID);
   if (!dispute) return;
   const court = Court.load(dispute.court);
   if (!court) return;
   updateJurorStake(jurorAddress, court.id, KlerosCore.bind(event.address), event.block.timestamp);
-  resolveUserDispute(jurorAddress, tokenAmount, disputeID);
-  court.paidETH = court.paidETH.plus(ethAmount);
-  court.paidPNK = court.paidPNK.plus(tokenAmount);
-  court.save();
+  resolveUserDispute(jurorAddress, pnkAmount, disputeID);
+  court.paidETH = court.paidETH.plus(feeAmount);
+  if (pnkAmount.gt(ZERO)) {
+    court.paidPNK = court.paidPNK.plus(pnkAmount);
+    updateRedistributedPNK(pnkAmount, event.block.timestamp);
+  }
+  updatePaidETH(feeAmount, event.block.timestamp);
   updatePenalty(event);
+  court.save();
 }

subgraph/src/entities/Penalty.ts

@@ -10,12 +10,10 @@ export function updatePenalty(event: TokenAndETHShift): void {
   const penaltyID = `${roundID}-${jurorAddress}`;
   const penalty = Penalty.load(penaltyID);
   if (penalty) {
-    penalty.amount = penalty.amount.plus(event.params._tokenAmount);
+    penalty.amount = penalty.amount.plus(event.params._pnkAmount);
     const totalCoherency = penalty.degreeOfCoherency.times(penalty.numberDraws);
     penalty.numberDraws = penalty.numberDraws.plus(ONE);
-    penalty.degreeOfCoherency = totalCoherency
-      .plus(penalty.degreeOfCoherency)
-      .div(penalty.numberDraws);
+    penalty.degreeOfCoherency = totalCoherency.plus(penalty.degreeOfCoherency).div(penalty.numberDraws);
     penalty.save();
   } else {
     createPenalty(event);
@@ -33,7 +31,7 @@ export function createPenalty(event: TokenAndETHShift): void {
   penalty.round = roundID;
   penalty.juror = jurorAddress;
   penalty.numberDraws = ONE;
-  penalty.amount = event.params._tokenAmount;
+  penalty.amount = event.params._pnkAmount;
   penalty.degreeOfCoherency = event.params._degreeOfCoherency;
   penalty.save();
 }

subgraph/src/entities/Round.ts

@@ -5,17 +5,16 @@ import { Round } from "../../generated/schema";
 export function createRoundFromRoundInfo(
   disputeID: BigInt,
   roundIndex: BigInt,
-  feeForJuror: BigInt,
   roundInfo: KlerosCore__getRoundInfoResult
 ): void {
   const roundID = `${disputeID.toString()}-${roundIndex.toString()}`;
   const round = new Round(roundID);
-  round.disputeKit = roundInfo.value5.toString();
-  round.tokensAtStakePerJuror = roundInfo.value0;
-  round.totalFeesForJurors = roundInfo.value1;
-  round.nbVotes = roundInfo.value1.div(feeForJuror);
-  round.repartitions = roundInfo.value2;
-  round.penalties = roundInfo.value3;
+  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.save();
 }

subgraph/src/entities/TokenAndEthShift.ts

@@ -1,16 +1,14 @@
 import { TokenAndETHShift as TokenAndETHShiftEvent } from "../../generated/KlerosCore/KlerosCore";
 import { TokenAndETHShift } from "../../generated/schema";
 
-export function createTokenAndEthShiftFromEvent(
-  event: TokenAndETHShiftEvent
-): void {
+export function createTokenAndEthShiftFromEvent(event: TokenAndETHShiftEvent): void {
   const jurorAddress = event.params._account.toHexString();
   const disputeID = event.params._disputeID.toString();
   const shiftID = `${jurorAddress}-${disputeID}`;
   const shift = new TokenAndETHShift(shiftID);
   shift.juror = jurorAddress;
   shift.dispute = disputeID;
-  shift.tokenAmount = event.params._tokenAmount;
-  shift.ethAmount = event.params._ethAmount;
+  shift.tokenAmount = event.params._pnkAmount;
+  shift.ethAmount = event.params._feeAmount;
   shift.save();
 }

subgraph/subgraph.yaml

@@ -6,9 +6,9 @@ dataSources:
     name: KlerosCore
     network: arbitrum-goerli
     source:
-      address: "0xA429667Abb1A6c530BAd1083df4C69FBce86D696"
+      address: "0x8Af82E2F8890acb4AB84cbaB3c4C4Eb3E965CF24"
       abi: KlerosCore
-      startBlock: 25602125
+      startBlock: 27808431
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6
@@ -38,7 +38,7 @@ dataSources:
           handler: handleNewPeriod
         - event: CourtCreated(indexed uint256,indexed uint96,bool,uint256,uint256,uint256,uint256,uint256[4],uint256[])
           handler: handleCourtCreated
-        - event: CourtModified(indexed uint96,string)
+        - event: CourtModified(indexed uint96,bool,uint256,uint256,uint256,uint256,uint256[4])
           handler: handleCourtModified
         - event: DisputeKitCreated(indexed uint256,indexed address,indexed uint256)
           handler: handleDisputeKitCreated
@@ -48,7 +48,7 @@ dataSources:
           handler: handleStakeSet
         - event: StakeDelayed(indexed address,uint256,uint256,uint256)
           handler: handleStakeDelayed
-        - event: TokenAndETHShift(indexed address,indexed uint256,indexed uint256,uint256,int256,int256)
+        - event: TokenAndETHShift(indexed address,indexed uint256,indexed uint256,uint256,int256,int256,address)
           handler: handleTokenAndETHShift
         - event: Ruling(indexed address,indexed uint256,uint256)
           handler: handleRuling
@@ -77,9 +77,9 @@ dataSources:
     name: DisputeKitClassic
     network: arbitrum-goerli
     source:
-      address: "0xcBE3aD699919Cf59efDF715e4B41AF30A0E4c92d"
+      address: "0x0245A93ABd9c5b2d767B2D98cE6d5e612208E474"
       abi: DisputeKitClassic
-      startBlock: 25602098
+      startBlock: 27808415
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6