Merge branch 'feat(subgraph)/add-fields' of github.com:kleros/kleros-v2 into feat(subgraph)/add-fields

alcercu · alcercu · commit beec6657608c · 2023-02-24T11:26:48.000+01:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
+      uses: step-security/harden-runner@c8454efe5d0bdefd25384362fe217428ca277d57
       with:
         disable-sudo: true
         egress-policy: block
@@ -52,11 +52,11 @@ jobs:
           github.com:443
 
     - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4238421316c33d73aeea2801274dd286f157c2bb
+      uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,7 +67,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@4238421316c33d73aeea2801274dd286f157c2bb
+      uses: github/codeql-action/autobuild@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -81,4 +81,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4238421316c33d73aeea2801274dd286f157c2bb
+      uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
diff --git a/.github/workflows/contracts-testing.yml b/.github/workflows/contracts-testing.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
+      uses: step-security/harden-runner@c8454efe5d0bdefd25384362fe217428ca277d57
       with:
         disable-sudo: true
         egress-policy: block
@@ -31,14 +31,14 @@ jobs:
           registry.yarnpkg.com:443
 
     - name: Setup Node.js environment
-      uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
+      uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
       with:
         node-version: 16.x   
         
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
     
     - name: Cache node modules
-      uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
+      uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0
       env:
         cache-name: cache-node-modules
       with:
@@ -69,7 +69,7 @@ jobs:
       working-directory: contracts
 
     - name: Upload a build artifact
-      uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
+      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
       with:    
         name: code-coverage-report    
         path: contracts/coverage
diff --git a/.github/workflows/deploy-bots.yml b/.github/workflows/deploy-bots.yml
@@ -8,13 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
+        uses: step-security/harden-runner@c8454efe5d0bdefd25384362fe217428ca277d57
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984
-      - uses: aws-actions/setup-sam@8dbd164261576216897020cd750587e50e4d2136
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
+      - uses: aws-actions/setup-sam@2993f015a7af30461b7641a256042fe0c6fc0c2e
       - uses: aws-actions/configure-aws-credentials@67fbcbb121271f7775d2e7715933280b06314838
         with:
           aws-access-key-id: ${{ secrets.STAGING_AWS_ACCESS_KEY }}
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.1.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
+        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -59,14 +59,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # 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@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.1.27
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/sentry-release.yml b/.github/workflows/sentry-release.yml
@@ -16,18 +16,35 @@ jobs:
     outputs:
       version: ${{ steps.set-version.outputs.version }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+    
+    - name: Cache node modules
+      uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0
+      env:
+        cache-name: cache-node-modules
+      with:
+        path: | 
+          ~/.npm
+          **/node_modules
+        key: |
+          ${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-
     
     - name: Set up Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
       with:
         node-version: 16
 
     - name: Install dependencies
-      run: yarn workspace @kleros/kleros-v2-web install
+      run: |
+        yarn workspace @kleros/kleros-v2-contracts install
+        yarn workspace @kleros/kleros-v2-web install
 
-    - name: Build and deploy subgraph
-      run: yarn @kleros/kleros-v2-web build
+    - name: Build
+      run: |
+        yarn workspace @kleros/kleros-v2-contracts build
+        yarn workspace @kleros/kleros-v2-web build
 
     - name: Set version
       id: set-version
diff --git a/bot-pinner/package.json b/bot-pinner/package.json
@@ -19,6 +19,6 @@
     "node": ">=16.13.0"
   },
   "devDependencies": {
-    "@dappnode/dappnodesdk": "^0.2.68"
+    "@dappnode/dappnodesdk": "^0.2.71"
   }
 }
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -4,4 +4,12 @@ src = 'src'
 out = 'out'
 libs = ['../node_modules', 'lib']
 
+[rpc_endpoints]
+arbitrumGoerli = "https://goerli-rollup.arbitrum.io/rpc"
+arbitrum = "https://arb1.arbitrum.io/rpc"
+goerli = "https://goerli.infura.io/v3/${process.env.INFURA_API_KEY}"
+mainnet = "https://mainnet.infura.io/v3/${process.env.INFURA_API_KEY}"
+chiado = "https://rpc.chiadochain.net"
+gnosischain = "https://xdai-rpc.gateway.pokt.network"
+
 # See more config options https://book.getfoundry.sh/reference/config.html
diff --git a/contracts/package.json b/contracts/package.json
@@ -39,8 +39,8 @@
     "@types/chai": "^4.3.3",
     "@types/mocha": "^10.0.0",
     "@types/node": "^16",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.41.0",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
     "chai": "^4.3.6",
     "chai-ethers": "^0.0.1",
     "dotenv": "^16.0.3",
@@ -59,7 +59,7 @@
     "hardhat-watcher": "^2.5.0",
     "json-schema": "^0.4.0",
     "mocha": "^10.1.0",
-    "node-fetch": "^3.2.10",
+    "node-fetch": "^3.3.0",
     "npm-run-all": "^4.1.5",
     "shelljs": "^0.8.5",
     "solhint": "^3.3.7",
diff --git a/package.json b/package.json
@@ -45,8 +45,8 @@
     "eslint-plugin-promise": "^5.1.1",
     "eslint-utils": "^3.0.0",
     "husky": "^8.0.2",
-    "lint-staged": "^11.0.0",
-    "prettier": "^2.4.1",
+    "lint-staged": "^13.1.2",
+    "prettier": "^2.8.4",
     "prettier-plugin-solidity": "^1.0.0-rc.1",
     "solhint-plugin-prettier": "^0.0.5"
   },
diff --git a/subgraph/src/entities/JurorTokensPerCourt.ts b/subgraph/src/entities/JurorTokensPerCourt.ts
@@ -1,4 +1,4 @@
-import { BigInt, Address } from "@graphprotocol/graph-ts";
+import { BigInt, Address, log } from "@graphprotocol/graph-ts";
 import { KlerosCore } from "../../generated/KlerosCore/KlerosCore";
 import { Court, JurorTokensPerCourt } from "../../generated/schema";
 import { updateActiveJurors, getDelta, updateStakedPNK } from "../datapoint";
diff --git a/web/package.json b/web/package.json
@@ -38,9 +38,9 @@
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.9",
     "@types/styled-components": "^5.1.26",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
-    "@typescript-eslint/utils": "^5.43.0",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
+    "@typescript-eslint/utils": "^5.53.0",
     "eslint": "^8.27.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-parcel": "^1.10.6",
@@ -51,11 +51,11 @@
     "eslint-plugin-security": "^1.4.0",
     "eslint-utils": "^3.0.0",
     "lru-cache": "^7.8.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.8.4",
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@graphql-codegen/cli": "^2.13.11",
+    "@graphql-codegen/cli": "^3.2.1",
     "@graphql-codegen/typescript": "^2.8.1",
     "@graphql-codegen/typescript-operations": "^2.5.6",
     "@kleros/kleros-v2-contracts": "workspace:^",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`"node": ">=16.13.0"`
`20`	`20`	`},`
`21`	`21`	`"devDependencies": {`
`22`		`- "@dappnode/dappnodesdk": "^0.2.68"`
	`22`	`+ "@dappnode/dappnodesdk": "^0.2.71"`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { BigInt, Address } from "@graphprotocol/graph-ts";`
	`1`	`+import { BigInt, Address, log } from "@graphprotocol/graph-ts";`
`2`	`2`	`import { KlerosCore } from "../../generated/KlerosCore/KlerosCore";`
`3`	`3`	`import { Court, JurorTokensPerCourt } from "../../generated/schema";`
`4`	`4`	`import { updateActiveJurors, getDelta, updateStakedPNK } from "../datapoint";`