Merge branch 'dev' into feat(web)/add-navbar-settings

alcercu · web-flow · commit bb11c16fc597 · 2023-06-07T10:49:51.000+02:00
diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@efb5c8deb113433243b6b08de1aa879d5aa01cf7 # v1.4.0
+        uses: dependabot/fetch-metadata@cd6e996708b8cfe0b639401134a3b9a3177be7b2 # v1.5.1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
diff --git a/.github/workflows/deploy-bots.yml b/.github/workflows/deploy-bots.yml
@@ -13,7 +13,7 @@ jobs:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
+      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0
       - uses: aws-actions/setup-sam@2993f015a7af30461b7641a256042fe0c6fc0c2e
       - uses: aws-actions/configure-aws-credentials@67fbcbb121271f7775d2e7715933280b06314838
         with:
diff --git a/.github/workflows/deploy-subgraph.yml b/.github/workflows/deploy-subgraph.yml
@@ -0,0 +1,48 @@
+name: Deploy the Subgraph
+
+on:
+  workflow_dispatch:
+    inputs:
+      network:
+        description: The network to deploy the subgraph to
+        required: true
+        default: 'arbitrum-goerli'
+        type: choice
+        options:
+          - arbitrum-goerli
+          - arbitrum
+
+permissions:
+  contents: read
+
+jobs:
+  buildAndDeploy:
+    runs-on: ubuntu-latest
+    environment: kleros-org-subgraph
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+        with:
+          egress-policy: audit
+
+      - name: Checkout code
+        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
+        with:
+          node-version: 16
+
+      - name: Install the dependencies
+        run: yarn install
+
+      - name: Build the subgraph
+        run: |
+          yarn codegen
+          yarn build
+
+      - name: Authenticate with TheGraph
+        run: yarn graph auth "${{ secrets.SUBGRAPH_AUTH_TOKEN }}" --product hosted-service
+
+      - name: Deploy the subgraph
+        run: yarn deploy:${{ inputs.network }}
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -84,6 +84,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.1.27
+        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.1.27
         with:
           sarif_file: results.sarif
diff --git a/bot-pinner/Dockerfile b/bot-pinner/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3@sha256:30f9c5b85d6a9866dd6307d24f4688174f7237bc3293b9293d590b1e59c68fc7
+FROM python:3@sha256:3a619e3c96fd4c5fc5e1998fd4dcb1f1403eb90c4c6409c70d7e80b9468df7df
 
 WORKDIR /usr/src/app
 
diff --git a/contracts/src/arbitration/KlerosCore.sol b/contracts/src/arbitration/KlerosCore.sol
diff --git a/contracts/src/arbitration/SortitionModule.sol b/contracts/src/arbitration/SortitionModule.sol
@@ -249,7 +249,7 @@ contract SortitionModule is ISortitionModule {
             if (currenCourtID == core.GENERAL_COURT()) {
                 finished = true;
             } else {
-                (currenCourtID, , , , , ) = core.courts(currenCourtID);
+                (currenCourtID, , , , , , ) = core.courts(currenCourtID);
             }
         }
     }
diff --git a/contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol b/contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol
@@ -227,7 +227,7 @@ contract DisputeKitClassic is BaseDisputeKit, IEvidence {
 
         Round storage round = dispute.rounds[dispute.rounds.length - 1];
         (uint96 courtID, , , , ) = core.disputes(_coreDisputeID);
-        (, bool hiddenVotes, , , , ) = core.courts(courtID);
+        (, bool hiddenVotes, , , , , ) = core.courts(courtID);
 
         //  Save the votes.
         for (uint256 i = 0; i < _voteIDs.length; i++) {
@@ -538,12 +538,12 @@ contract DisputeKitClassic is BaseDisputeKit, IEvidence {
     /// @return Whether the address can be drawn or not.
     function _postDrawCheck(uint256 _coreDisputeID, address _juror) internal view override returns (bool) {
         (uint96 courtID, , , , ) = core.disputes(_coreDisputeID);
-        (uint256 lockedAmountPerJuror, , , , , ) = core.getRoundInfo(
+        (uint256 lockedAmountPerJuror, , , , , , , ) = core.getRoundInfo(
             _coreDisputeID,
             core.getNumberOfRounds(_coreDisputeID) - 1
         );
         (uint256 stakedTokens, uint256 lockedTokens, ) = core.getJurorBalance(_juror, courtID);
-        (, , uint256 minStake, , , ) = core.courts(courtID);
+        (, , uint256 minStake, , , , ) = core.courts(courtID);
         return stakedTokens >= lockedTokens + lockedAmountPerJuror && stakedTokens >= minStake;
     }
 }
diff --git a/contracts/src/arbitration/dispute-kits/DisputeKitSybilResistant.sol b/contracts/src/arbitration/dispute-kits/DisputeKitSybilResistant.sol
@@ -247,7 +247,7 @@ contract DisputeKitSybilResistant is BaseDisputeKit, IEvidence {
 
         Round storage round = dispute.rounds[dispute.rounds.length - 1];
         (uint96 courtID, , , , ) = core.disputes(_coreDisputeID);
-        (, bool hiddenVotes, , , , ) = core.courts(courtID);
+        (, bool hiddenVotes, , , , , ) = core.courts(courtID);
 
         //  Save the votes.
         for (uint256 i = 0; i < _voteIDs.length; i++) {
@@ -558,12 +558,12 @@ contract DisputeKitSybilResistant is BaseDisputeKit, IEvidence {
     /// @return Whether the address can be drawn or not.
     function _postDrawCheck(uint256 _coreDisputeID, address _juror) internal view override returns (bool) {
         (uint96 courtID, , , , ) = core.disputes(_coreDisputeID);
-        (uint256 lockedAmountPerJuror, , , , , ) = core.getRoundInfo(
+        (uint256 lockedAmountPerJuror, , , , , , , ) = core.getRoundInfo(
             _coreDisputeID,
             core.getNumberOfRounds(_coreDisputeID) - 1
         );
         (uint256 stakedTokens, uint256 lockedTokens, ) = core.getJurorBalance(_juror, courtID);
-        (, , uint256 minStake, , , ) = core.courts(courtID);
+        (, , uint256 minStake, , , , ) = core.courts(courtID);
         if (stakedTokens < lockedTokens + lockedAmountPerJuror || stakedTokens < minStake) {
             return false;
         } else {
diff --git a/subgraph/README.md b/subgraph/README.md
@@ -10,7 +10,8 @@
 ## Build
 
 ```bash
-$ yarn
+# update subgraph.yml using the contract deployment artifacts
+$ yarn update:arbitrum-goerli
 
 $ yarn codegen
 
@@ -19,16 +20,28 @@ $ yarn build
 
 ## Deployment to The Graph (hosted service)
 
-### Authentication
+### Using a personal account for development
+
+#### Authentication
 
 Get an API key from the thegraph.com, then authenticate.
 
 ```bash
 $ yarn run graph auth --product hosted-service
 ```
 
-### Deployment
+#### Deployment
 
 ```bash
-yarn deploy
+yarn deploy:arbitrum-goerli
 ```
+
+### Using the Kleros organization account
+Go to the [Deploy Subgraph Action](https://github.com/kleros/kleros-v2/actions/workflows/deploy-subgraph.yml) and click the Run workflow button:
+
+<img width="1265" alt="image" src="https://github.com/kleros/kleros-v2/assets/22213980/da39f584-baaf-42a2-8c6a-6544aee29420">
+
+Pick the appropriate network. There should be a corresponding yarn script in the form of `deploy:<network>` on the master branch.
+
+Then reach out to a maintainer and request his approval.
+<img width="1265" alt="image" src="https://github.com/kleros/gtcr-subgraph/assets/22213980/3cea54fb-8382-42c4-a44a-37b4bfbeecee">
diff --git a/subgraph/package.json b/subgraph/package.json
@@ -2,10 +2,12 @@
   "name": "@kleros/kleros-v2-subgraph",
   "license": "MIT",
   "scripts": {
-    "update": "./scripts/update.sh",
+    "update:arbitrum-goerli": "./scripts/update.sh arbitrumGoerli arbitrum-goerli",
+    "update:arbitrum": "./scripts/update.sh arbitrum arbitrum",
     "codegen": "graph codegen",
     "build": "graph build",
-    "deploy": "graph deploy --product hosted-service kleros/kleros-v2-core-arbitrum-goerli",
+    "deploy:arbitrum-goerli": "graph deploy --product hosted-service kleros/kleros-v2-core-arbitrum-goerli",
+    "deploy:arbitrum": "graph deploy --product hosted-service kleros/kleros-v2-core-arbitrum",
     "create-local": "graph create --node http://localhost:8020/ kleros/kleros-v2-core-local",
     "remove-local": "graph remove --node http://localhost:8020/ kleros/kleros-v2-core-local",
     "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 kleros/kleros-v2-core-local --version-label v$(date +%s)",
diff --git a/web/src/hooks/useFocusOutside.ts b/web/src/hooks/useFocusOutside.ts
@@ -1,12 +1,9 @@
 import React, { useEffect } from "react";
 
-export function useFocusOutside(
-  ref: React.RefObject<HTMLDivElement>,
-  callback: () => void
-) {
+export function useFocusOutside(ref: React.RefObject<HTMLDivElement>, callback: () => void) {
   useEffect(() => {
-    function handleEvent(event: any) {
-      if (ref.current && !ref.current.contains(event.target)) {
+    function handleEvent(event: FocusEvent | MouseEvent) {
+      if (ref.current && !ref.current.contains(event.target as Node)) {
         callback();
       }
     }
diff --git a/web/src/pages/Courts/CourtDetails/Description.tsx b/web/src/pages/Courts/CourtDetails/Description.tsx
@@ -1,35 +1,34 @@
 import React, { useEffect, useState } from "react";
 import styled from "styled-components";
 import ReactMarkdown from "react-markdown";
-import {
-  Routes,
-  Route,
-  Navigate,
-  useParams,
-  useNavigate,
-  useLocation,
-} from "react-router-dom";
+import { Routes, Route, Navigate, useParams, useNavigate, useLocation } from "react-router-dom";
 import { Tabs } from "@kleros/ui-components-library";
 import { useCourtPolicy } from "queries/useCourtPolicy";
 
+interface IPolicy {
+  description?: string;
+  requiredSkills?: string;
+  summary?: string;
+}
+
 const TABS = [
   {
     text: "Purpose",
     value: 0,
     path: "purpose",
-    isVisible: (policy: any) => !!policy?.description,
+    isVisible: (policy: IPolicy) => !!policy?.description,
   },
   {
     text: "Skills",
     value: 1,
     path: "skills",
-    isVisible: (policy: any) => !!policy?.requiredSkills,
+    isVisible: (policy: IPolicy) => !!policy?.requiredSkills,
   },
   {
     text: "Policy",
     value: 2,
     path: "policy",
-    isVisible: (policy: any) => !!policy?.summary,
+    isVisible: (policy: IPolicy) => !!policy?.summary,
   },
 ];
 
@@ -38,13 +37,8 @@ const Description: React.FC = () => {
   const { data: policy } = useCourtPolicy(id);
   const navigate = useNavigate();
   const currentPathName = useLocation().pathname.split("/").at(-1);
-  const [currentTab, setCurrentTab] = useState(
-    TABS.findIndex(({ path }) => path === currentPathName)
-  );
-  useEffect(
-    () => setCurrentTab(TABS.findIndex(({ path }) => path === currentPathName)),
-    [currentPathName]
-  );
+  const [currentTab, setCurrentTab] = useState(TABS.findIndex(({ path }) => path === currentPathName));
+  useEffect(() => setCurrentTab(TABS.findIndex(({ path }) => path === currentPathName)), [currentPathName]);
 
   const filteredTabs = TABS.filter(({ isVisible }) => isVisible(policy));
 
@@ -72,11 +66,7 @@ const Description: React.FC = () => {
 
 const formatMarkdown = (markdown?: string) =>
   markdown ? (
-    <ReactMarkdown>
-      {typeof markdown === "string"
-        ? markdown.replace(/\n/g, "  \n")
-        : markdown}
-    </ReactMarkdown>
+    <ReactMarkdown>{typeof markdown === "string" ? markdown.replace(/\n/g, "  \n") : markdown}</ReactMarkdown>
   ) : (
     <p>Loading...</p>
   );

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3@sha256:30f9c5b85d6a9866dd6307d24f4688174f7237bc3293b9293d590b1e59c68fc7`
	`1`	`+FROM python:3@sha256:3a619e3c96fd4c5fc5e1998fd4dcb1f1403eb90c4c6409c70d7e80b9468df7df`
`2`	`2`
`3`	`3`	`WORKDIR /usr/src/app`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ contract SortitionModule is ISortitionModule {`
`249`	`249`	`if (currenCourtID == core.GENERAL_COURT()) {`
`250`	`250`	`finished = true;`
`251`	`251`	`} else {`
`252`		`- (currenCourtID, , , , , ) = core.courts(currenCourtID);`
	`252`	`+ (currenCourtID, , , , , , ) = core.courts(currenCourtID);`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`	`}`