Merge branch 'master' into feat(web)/dashboard-page

Author: alcercu

contracts/src/arbitration/KlerosCore.sol

@@ -823,8 +823,9 @@ contract KlerosCore is IArbitrator {
 
                 // Unstake the juror if he lost due to inactivity.
                 if (!disputeKit.isVoteActive(_disputeID, _round, i)) {
-                    for (uint256 j = 0; j < jurors[account].subcourtIDs.length; j++) {
-                        setStakeForAccount(account, jurors[account].subcourtIDs[j], 0, 0);
+                    uint96[] memory subcourtIDs = getJurorSubcourtIDs(account);
+                    for (uint256 j = 0; j < subcourtIDs.length; j++) {
+                        setStakeForAccount(account, subcourtIDs[j], 0, 0);
                     }
                 }
                 emit TokenAndETHShift(account, _disputeID, -int256(penalty), 0);
@@ -1064,6 +1065,10 @@ contract KlerosCore is IArbitrator {
         return disputesKitIDsThatNeedFreezing;
     }
 
+    function getJurorSubcourtIDs(address _juror) public view returns (uint96[] memory) {
+        return jurors[_juror].subcourtIDs;
+    }
+
     // ************************************* //
     // *            Internal               * //
     // ************************************* //

contracts/src/bridge/FastBridgeReceiverOnEthereum.sol

@@ -117,7 +117,7 @@ contract FastBridgeReceiverOnEthereum is IFastBridgeReceiver, ISafeBridgeReceive
 
         uint256 epochNow = block.timestamp / epochPeriod;
         // allow claim about current or previous epoch
-        require(_epoch == epochNow || _epoch == epochNow + 1, "Invalid Claim");
+        require(_epoch == epochNow || _epoch == epochNow + 1, "Invalid epoch.");
         require(claims[_epoch].bridger == address(0), "Claim already made for most recent finalized epoch.");
 
         claims[_epoch] = Claim({

contracts/src/bridge/FastBridgeReceiverOnGnosis.sol

@@ -115,7 +115,7 @@ contract FastBridgeReceiverOnGnosis is IFastBridgeReceiver, ISafeBridgeReceiver
 
         uint256 epochNow = block.timestamp / epochPeriod;
         // allow claim about current or previous epoch
-        require(_epoch == epochNow || _epoch == epochNow + 1, "Invalid Claim");
+        require(_epoch == epochNow || _epoch == epochNow + 1, "Invalid Epoch.");
         require(claims[_epoch].bridger == address(0), "Claim already made for most recent finalized epoch.");
 
         claims[_epoch] = Claim({

contracts/src/bridge/FastBridgeReceiverOnPolygon.sol

@@ -109,7 +109,7 @@ contract FastBridgeReceiverOnPolygon is FxBaseChildTunnel, IFastBridgeReceiver,
 
         uint256 epochNow = block.timestamp / epochPeriod;
         // allow claim about current or previous epoch
-        require(_epoch == epochNow || _epoch == epochNow + 1, "Invalid Claim");
+        require(_epoch == epochNow || _epoch == epochNow + 1, "Invalid Epoch");
         require(claims[_epoch].bridger == address(0), "Claim already made for most recent finalized epoch.");
 
         claims[_epoch] = Claim({

contracts/test/arbitration/unstake.ts

@@ -0,0 +1,76 @@
+import { ethers, getNamedAccounts, network, deployments } from "hardhat";
+import { BigNumber } from "ethers";
+import { PNK, KlerosCore, DisputeKitClassic } from "../../typechain-types";
+import { expect } from "chai";
+
+/* eslint-disable no-unused-vars */
+/* eslint-disable no-unused-expressions */
+
+describe("Unstake juror", async () => {
+  const ONE_TENTH_ETH = BigNumber.from(10).pow(17);
+  const ONE_THOUSAND_PNK = BigNumber.from(10).pow(21);
+
+  // 2nd court, 3 jurors, 1 dispute kit
+  const extraData =
+    "0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001";
+
+  let deployer;
+  let disputeKit;
+  let pnk;
+  let core;
+
+  beforeEach("Setup", async () => {
+    ({ deployer } = await getNamedAccounts());
+
+    console.log("deployer:%s", deployer);
+    console.log("named accounts: %O", await getNamedAccounts());
+
+    await deployments.fixture(["Arbitration"], {
+      fallbackToGlobal: true,
+      keepExistingDeployments: false,
+    });
+    disputeKit = (await ethers.getContract("DisputeKitClassic")) as DisputeKitClassic;
+    pnk = (await ethers.getContract("PNK")) as PNK;
+    core = (await ethers.getContract("KlerosCore")) as KlerosCore;
+  });
+
+  it("Unstake inactive juror", async () => {
+    const arbitrationCost = ONE_TENTH_ETH.mul(3);
+
+    await core.createSubcourt(1, false, ONE_THOUSAND_PNK, 1000, ONE_TENTH_ETH, 3, [0, 0, 0, 0], 3, [1]); // Parent - general court, Classic dispute kit
+
+    await pnk.approve(core.address, ONE_THOUSAND_PNK.mul(4));
+    await core.setStake(1, ONE_THOUSAND_PNK.mul(2));
+    await core.setStake(2, ONE_THOUSAND_PNK.mul(2));
+
+    expect(await core.getJurorSubcourtIDs(deployer)).to.be.deep.equal([BigNumber.from("1"), BigNumber.from("2")]);
+
+    await core.createDispute(2, extraData, { value: arbitrationCost });
+
+    await network.provider.send("evm_increaseTime", [130]); // Wait for minStakingTime
+    await network.provider.send("evm_mine");
+    await core.passPhase(); // Staking -> Freezing
+
+    for (let index = 0; index < 20; index++) {
+      await network.provider.send("evm_mine"); // Wait for 20 blocks finality
+    }
+    await disputeKit.passPhase(); // Resolving -> Generating
+    await disputeKit.passPhase(); // Generating -> Drawing
+
+    await core.draw(0, 5000);
+
+    await disputeKit.passPhase(); // Drawing -> Resolving
+
+    await core.passPeriod(0); // Evidence -> Voting
+    await core.passPeriod(0); // Voting -> Appeal
+    await core.passPeriod(0); // Appeal -> Execution
+
+    await core.passPhase(); // Freezing -> Staking. Change so we don't deal with delayed stakes
+
+    expect(await core.getJurorSubcourtIDs(deployer)).to.be.deep.equal([BigNumber.from("1"), BigNumber.from("2")]);
+
+    await core.execute(0, 0, 1); // 1 iteration should unstake from both courts
+
+    expect(await core.getJurorSubcourtIDs(deployer)).to.be.deep.equal([]);
+  });
+});

web/src/hooks/useHomePageContext.tsx

@@ -8,6 +8,13 @@ interface IContext {
   isValidating: boolean;
 }
 
+export type HomePageQueryDataPoints =
+  | HomePageQuery["pnkstakedDataPoints"]
+  | HomePageQuery["pnkredistributedDataPoints"]
+  | HomePageQuery["casesDataPoints"]
+  | HomePageQuery["ethpaidDataPoints"]
+  | HomePageQuery["activeJurorsDataPoints"];
+
 const Context = createContext<IContext>({
   data: undefined,
   error: null,

web/src/pages/Home/CourtOverview/Stats.tsx

@@ -1,14 +1,18 @@
 import React from "react";
 import styled from "styled-components";
-import { utils } from "ethers";
+import { utils, BigNumber } from "ethers";
 import { Card } from "@kleros/ui-components-library";
 import StatDisplay, { IStatDisplay } from "components/StatDisplay";
 import PNKIcon from "svgs/icons/pnk.svg";
 import EthereumIcon from "svgs/icons/ethereum.svg";
 import PNKRedistributedIcon from "svgs/icons/redistributed-pnk.svg";
 import JurorIcon from "svgs/icons/user.svg";
 import BalanceIcon from "svgs/icons/law-balance.svg";
-import { useHomePageContext, HomePageQuery } from "hooks/useHomePageContext";
+import {
+  useHomePageContext,
+  HomePageQuery,
+  HomePageQueryDataPoints,
+} from "hooks/useHomePageContext";
 
 const StyledCard = styled(Card)`
   width: auto;
@@ -21,6 +25,9 @@ const StyledCard = styled(Card)`
   flex-wrap: wrap;
 `;
 
+const getLastOrZero = (src: HomePageQueryDataPoints) =>
+  src.length > 0 ? src.at(-1)?.value : BigNumber.from(0).toString();
+
 interface IStat {
   title: string;
   getText: (data: HomePageQuery) => string;
@@ -32,42 +39,41 @@ interface IStat {
 const stats: IStat[] = [
   {
     title: "PNK staked",
-    getText: (data) =>
-      utils.commify(
-        utils.formatUnits(data?.pnkstakedDataPoints.at(-1)?.value, 18)
-      ),
+    getText: ({ pnkstakedDataPoints }) =>
+      utils.commify(utils.formatUnits(getLastOrZero(pnkstakedDataPoints), 18)),
     getSubtext: () => "$ 3 000 000",
     color: "purple",
     icon: PNKIcon,
   },
   {
     title: "ETH Paid to jurors",
-    getText: (data) =>
-      utils.commify(utils.formatEther(data?.ethpaidDataPoints.at(-1)?.value)),
+    getText: ({ ethpaidDataPoints }) =>
+      utils.commify(utils.formatEther(getLastOrZero(ethpaidDataPoints))),
     getSubtext: () => "$ 3,000,000",
     color: "blue",
     icon: EthereumIcon,
   },
   {
     title: "PNK redistributed",
-    getText: (data) =>
+    getText: ({ pnkredistributedDataPoints }) =>
       utils.commify(
-        utils.formatUnits(data?.pnkredistributedDataPoints.at(-1)?.value, 18)
+        utils.formatUnits(getLastOrZero(pnkredistributedDataPoints), 18)
       ),
     getSubtext: () => "$ 3,000,000",
     color: "purple",
     icon: PNKRedistributedIcon,
   },
   {
     title: "Active jurors",
-    getText: (data) => data?.activeJurorsDataPoints.at(-1)?.value,
+    getText: ({ activeJurorsDataPoints }) =>
+      getLastOrZero(activeJurorsDataPoints),
     getSubtext: () => "$ 3,000,000",
     color: "green",
     icon: JurorIcon,
   },
   {
     title: "Cases",
-    getText: (data) => data?.casesDataPoints.at(-1)?.value,
+    getText: ({ casesDataPoints }) => getLastOrZero(casesDataPoints),
     getSubtext: () => "$ 3,000,000",
     color: "orange",
     icon: BalanceIcon,