Merge branch 'feat/erc20-fees-on-arbitrator' into feat/interfaces-v2-rebased2

Author: jaybuidl

.github/workflows/deploy-subgraph.yml

@@ -11,6 +11,11 @@ on:
         options:
           - arbitrum-goerli
           - arbitrum
+      update:
+        description: Whether to update the subgraph with the current artifacts for the selected network.
+        required: true
+        default: true
+        type: boolean
 
 permissions:
   contents: read
@@ -33,16 +38,38 @@ jobs:
         with:
           node-version: 16
 
+      - name: Install Yarn if running locally
+        if: ${{ env.ACT }}
+        run: npm install -g yarn
+
       - name: Install the dependencies
         run: yarn install
 
+      - name: Install jq and yq
+        if: ${{ inputs.update }}  
+        run: |
+          mkdir bin
+          wget -qO bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64
+          wget -qO bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+          chmod a+x bin/jq bin/yq 
+
+      - name: Update the subgraph definition
+        if: ${{ inputs.update }}
+        run: |
+          export PATH=$PWD/../bin:$PATH
+          yarn update:${{ inputs.network }}
+        working-directory: subgraph
+
       - name: Build the subgraph
         run: |
           yarn codegen
           yarn build
-
+        working-directory: subgraph
+        
       - name: Authenticate with TheGraph
         run: yarn graph auth "${{ secrets.SUBGRAPH_AUTH_TOKEN }}" --product hosted-service
+        working-directory: subgraph
 
       - name: Deploy the subgraph
         run: yarn deploy:${{ inputs.network }}
+        working-directory: subgraph

.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@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27
+        uses: github/codeql-action/upload-sarif@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
         with:
           sarif_file: results.sarif

contracts/.solhint.json

@@ -1,8 +1,13 @@
 {
   "extends": "solhint:recommended",
-  "plugins": ["prettier"],
+  "plugins": [
+    "prettier"
+  ],
   "rules": {
-    "compiler-version": ["error", "^0.8.0"],
+    "compiler-version": [
+      "error",
+      "^0.8.0"
+    ],
     "func-visibility": [
       "warn",
       {

contracts/package.json

@@ -41,19 +41,19 @@
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-solhint": "^3.0.1",
-    "@openzeppelin/contracts": "^4.9.1",
+    "@openzeppelin/contracts": "^4.9.2",
     "@typechain/ethers-v5": "^11.0.0",
     "@typechain/hardhat": "^7.0.0",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.36",
     "chai": "^4.3.7",
-    "dotenv": "^16.1.4",
+    "dotenv": "^16.3.1",
     "ethereumjs-util": "^7.1.5",
     "ethers": "^5.7.2",
     "hardhat": "^2.15.0",
     "hardhat-contract-sizer": "^2.10.0",
-    "hardhat-deploy": "^0.11.30",
+    "hardhat-deploy": "^0.11.31",
     "hardhat-deploy-ethers": "^0.4.0-next.1",
     "hardhat-deploy-tenderly": "^0.2.0",
     "hardhat-docgen": "^1.3.0",

contracts/tsconfig.json

@@ -1,5 +1,13 @@
 {
   "extends": "@kleros/kleros-v2-tsconfig/base.json",
-  "include": ["./src", "./scripts", "./test", "./typechain-types", "./deploy"],
-  "files": ["./hardhat.config.ts"]
+  "include": [
+    "./src",
+    "./scripts",
+    "./test",
+    "./typechain-types",
+    "./deploy"
+  ],
+  "files": [
+    "./hardhat.config.ts"
+  ]
 }

cspell.json

@@ -3,7 +3,11 @@
   "version": "0.2",
   "ignorePaths": [],
   "dictionaryDefinitions": [],
-  "dictionaries": ["en_US", "companies", "softwareTerms"],
+  "dictionaries": [
+    "en_US",
+    "companies",
+    "softwareTerms"
+  ],
   "words": [
     "arbitrum",
     "commitlint",

package.json

@@ -36,6 +36,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
+    "buffer": "^5.5.0",
     "conventional-changelog-cli": "^2.2.2",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.2",

prettier-config/package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "prettier": "^2.8.8",
     "prettier-plugin-solidity": "^1.1.3"
   },

scripts/act-subgraph.yml

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+act workflow_dispatch -j buildAndDeploy --input network=arbitrum-goerli,update=true

scripts/check-prerequisites.sh

@@ -11,10 +11,22 @@ function require() #cmd
   fi
 }
 
+# for the NPM and toolchain version management
+require volta
+
+# for the local subgraph node
 require docker
 require docker-compose
+
+# for some contracts utilities
+require cast
+require forge
+
+# for the subgraph and contracts utilities
 require jq
 require yq
-require volta
+
+# for the local testing of Github Actions
+require act
 
 exit $status

tsconfig/base.json

@@ -15,5 +15,7 @@
     "resolveJsonModule": true,
     "experimentalDecorators": true
   },
-  "exclude": ["node_modules"]
+  "exclude": [
+    "node_modules"
+  ]
 }

tsconfig/react-library.json

@@ -4,7 +4,12 @@
   "extends": "./base.json",
   "compilerOptions": {
     "jsx": "react",
-    "lib": ["es6", "dom", "esnext.asynciterable", "es2017"],
+    "lib": [
+      "es6",
+      "dom",
+      "esnext.asynciterable",
+      "es2017"
+    ],
     "module": "ESNext",
     "target": "es6"
   }

web/.eslintrc.json

@@ -60,7 +60,7 @@
     "max-len": [
       "warn",
       {
-        "code": 80
+        "code": 120
       }
     ],
     "react/prop-types": 0,

web/.gitignore

@@ -22,6 +22,7 @@ parcel-bundle-reports
 .env.development.local
 .env.test.local
 .env.production.local
+src/hooks/contracts/*
 
 npm-debug.log*
 yarn-debug.log*

web/package.json

@@ -27,21 +27,29 @@
     "clean": "rm dist/bundle.js",
     "start": "parcel",
     "start-local": "REACT_APP_SUBGRAPH_ENDPOINT=http://localhost:8000/subgraphs/name/kleros/kleros-v2-core-local parcel",
-    "build": "parcel build",
+    "build": "yarn run generate-hooks && yarn run parcel build",
     "check-style": "eslint 'src/**/*.{js,jsx,ts,tsx}'",
     "check-types": "tsc --noEmit",
-    "generate": "graphql-codegen"
+    "generate-gql": "graphql-codegen",
+    "generate-hooks": "wagmi generate"
   },
+  "prettier": "@kleros/kleros-v2-prettier-config",
   "devDependencies": {
     "@kleros/kleros-v2-eslint-config": "workspace:^",
     "@kleros/kleros-v2-prettier-config": "workspace:^",
     "@kleros/kleros-v2-tsconfig": "workspace:^",
     "@netlify/functions": "^1.6.0",
-    "@parcel/transformer-svg-react": "~2.9.2",
+    "@parcel/transformer-svg-react": "~2.8.0",
     "@parcel/watcher": "~2.1.0",
     "@types/react": "^18.2.12",
     "@types/react-dom": "^18.2.5",
     "@types/styled-components": "^5.1.26",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
+    "@typescript-eslint/utils": "^5.58.0",
+    "@wagmi/cli": "^1.1.0",
+    "eslint": "^8.38.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-parcel": "^1.10.6",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -57,17 +65,16 @@
     "@sentry/react": "^7.55.2",
     "@sentry/tracing": "^7.55.2",
     "@types/react-modal": "^3.16.0",
-    "@web3-react/core": "^6.1.9",
-    "@web3-react/injected-connector": "^6.0.7",
-    "@web3-react/types": "^6.0.7",
+    "@web3modal/ethereum": "^2.2.2",
+    "@web3modal/react": "^2.2.2",
     "chart.js": "^3.9.1",
     "chartjs-adapter-moment": "^1.0.1",
     "core-js": "^3.31.0",
     "ethers": "^5.7.2",
     "graphql": "^16.6.0",
     "graphql-request": "~5.1.0",
     "moment": "^2.29.4",
-    "parcel": "~2.9.2",
+    "parcel": "~2.8.0",
     "react": "^18.2.0",
     "react-chartjs-2": "^4.3.1",
     "react-dom": "^18.2.0",
@@ -82,8 +89,10 @@
     "react-scripts": "^5.0.1",
     "react-toastify": "^9.1.3",
     "react-use": "^17.4.0",
-    "styled-components": "^5.3.11",
-    "swr": "^1.3.0"
+    "styled-components": "^5.3.9",
+    "swr": "^1.3.0",
+    "viem": "^0.3.48",
+    "wagmi": "^1.1.0"
   },
   "volta": {
     "node": "16.18.1",

web/src/app.tsx

@@ -5,13 +5,11 @@ import { Routes, Route } from "react-router-dom";
 import "react-loading-skeleton/dist/skeleton.css";
 import Web3Provider from "context/Web3Provider";
 import StyledComponentsProvider from "context/StyledComponentsProvider";
-import WrongChainBoundary from "components/WrongChainBoundary";
 import Layout from "layout/index";
 import Home from "./pages/Home";
 import Cases from "./pages/Cases";
 import Dashboard from "./pages/Dashboard";
 import Courts from "./pages/Courts";
-
 import "react-toastify/dist/ReactToastify.css";
 
 const fetcherBuilder =
@@ -27,26 +25,20 @@ const App: React.FC = () => {
       <SWRConfig
         value={{
           fetcher: fetcherBuilder(
-            process.env.REACT_APP_SUBGRAPH_ENDPOINT ??
-              "https://api.thegraph.com/subgraphs/name/alcercu/kleroscoretest"
+            process.env.REACT_APP_SUBGRAPH_ENDPOINT ?? "https://api.thegraph.com/subgraphs/name/alcercu/kleroscoretest"
           ),
         }}
       >
         <Web3Provider>
-          <WrongChainBoundary>
-            <Routes>
-              <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="*"
-                  element={<h1>Justice not found here ¯\_( ͡° ͜ʖ ͡°)_/¯</h1>}
-                />
-              </Route>
-            </Routes>
-          </WrongChainBoundary>
+          <Routes>
+            <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="*" element={<h1>Justice not found here ¯\_( ͡° ͜ʖ ͡°)_/¯</h1>} />
+            </Route>
+          </Routes>
         </Web3Provider>
       </SWRConfig>
     </StyledComponentsProvider>