Skip to content

Commit 5b5ea11

Browse files
committed
Merge branch 'dev' into chore/contract-scripts-improvements
2 parents b196265 + 5238dbb commit 5b5ea11

File tree

87 files changed

+4675
-2097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+4675
-2097
lines changed

.github/workflows/codeql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Harden Runner
41-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
41+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
4242
with:
4343
egress-policy: audit
4444

@@ -47,7 +47,7 @@ jobs:
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
50+
uses: github/codeql-action/init@b8d3b6e8af63cde30bdc382c0bc28114f4346c88 # v2.28.1
5151
with:
5252
languages: ${{ matrix.language }}
5353
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
6161
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6262
# If this step fails, then you should remove it and run the build manually (see below)
6363
- name: Autobuild
64-
uses: github/codeql-action/autobuild@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
64+
uses: github/codeql-action/autobuild@b8d3b6e8af63cde30bdc382c0bc28114f4346c88 # v2.28.1
6565

6666
# ℹ️ Command-line programs to run using the OS shell.
6767
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -74,6 +74,6 @@ jobs:
7474
# ./location_of_script_within_repo/buildscript.sh
7575

7676
- name: Perform CodeQL Analysis
77-
uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
77+
uses: github/codeql-action/analyze@b8d3b6e8af63cde30bdc382c0bc28114f4346c88 # v2.28.1
7878
with:
7979
category: "/language:${{matrix.language}}"

.github/workflows/contracts-testing.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Harden Runner
27-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
27+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2828
with:
2929
disable-sudo: true
3030
egress-policy: block
@@ -50,13 +50,13 @@ jobs:
5050
yarn set version 4.5.1
5151
5252
- name: Setup Node.js environment
53-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
53+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
5454
with:
5555
node-version: 20.x
5656
cache: yarn
5757

5858
- name: Cache node modules
59-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
59+
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
6060
env:
6161
cache-name: cache-node-modules
6262
with:
@@ -71,7 +71,7 @@ jobs:
7171
run: yarn workspace @kleros/kleros-v2-contracts install
7272

7373
- name: Install Foundry
74-
uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
74+
uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # v1.3.1
7575

7676
- name: Install lcov
7777
run: sudo apt-get install -y lcov
@@ -81,7 +81,7 @@ jobs:
8181
working-directory: contracts
8282

8383
- name: Upload a build artifact
84-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
84+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
8585
with:
8686
name: code-coverage-report
8787
path: contracts/coverage

.github/workflows/dependency-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Harden Runner
22-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
22+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2323
with:
2424
disable-sudo: true
2525
egress-policy: block

.github/workflows/deploy-bots.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Harden Runner
11-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
11+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
1212
with:
1313
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
1414

.github/workflows/deploy-subgraph.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
environment: ${{ inputs.graph_environment }}
3636
steps:
3737
- name: Harden Runner
38-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
38+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3939
with:
4040
egress-policy: audit
4141

.github/workflows/scorecards.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: Harden Runner
35-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
35+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3636
with:
3737
disable-sudo: true
3838
egress-policy: block
@@ -56,7 +56,7 @@ jobs:
5656
persist-credentials: false
5757

5858
- name: "Run analysis"
59-
uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
59+
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
6060
with:
6161
results_file: results.sarif
6262
results_format: sarif
@@ -78,14 +78,14 @@ jobs:
7878
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
7979
# format to the repository Actions tab.
8080
- name: "Upload artifact"
81-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
81+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
8282
with:
8383
name: SARIF file
8484
path: results.sarif
8585
retention-days: 5
8686

8787
# Upload the results to GitHub's code scanning dashboard.
8888
- name: "Upload to code-scanning"
89-
uses: github/codeql-action/upload-sarif@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
89+
uses: github/codeql-action/upload-sarif@b8d3b6e8af63cde30bdc382c0bc28114f4346c88 # v2.28.1
9090
with:
9191
sarif_file: results.sarif

.github/workflows/sentry-release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
version: ${{ steps.set-version.outputs.version }}
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
20+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2121
with:
2222
disable-sudo: true
2323
egress-policy: block
@@ -44,13 +44,13 @@ jobs:
4444
yarn set version 4.5.1
4545
4646
- name: Setup Node.js environment
47-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
47+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
4848
with:
4949
node-version: 20.x
5050
cache: yarn
5151

5252
- name: Cache node modules
53-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
53+
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
5454
env:
5555
cache-name: cache-node-modules
5656
with:
@@ -72,7 +72,7 @@ jobs:
7272
working-directory: web
7373

7474
- name: Create Sentry release
75-
uses: getsentry/action-release@f6dfa3d84a1c740b94aa45255c5e032b744a095d # v1.9.0
75+
uses: getsentry/action-release@ffb64465339ef6fb868e2fc261318d78ae0ed8d9 # v1.10.5
7676
env:
7777
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
7878
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}

.github/workflows/sonarcloud.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Harden Runner
22-
uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
22+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2323
with:
2424
egress-policy: audit
2525

.yarnrc.yml

+8
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ enableGlobalCache: false
55
nodeLinker: node-modules
66

77
yarnPath: .yarn/releases/yarn-4.6.0.cjs
8+
9+
logFilters:
10+
- pattern: "*(pde6dc), which doesn't satisfy what react-scripts*"
11+
level: discard
12+
- pattern: "*(p6f2bc), which doesn't satisfy what react-identicons*"
13+
level: discard
14+
- pattern: "*(pca8b0), which doesn't satisfy what react-identicons*"
15+
level: discard

contracts/deploy/upgrade-sortition-module.ts renamed to contracts/deploy/upgrade-sortition-module-v0.9.0.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const deployUpgradeSortitionModule: DeployFunction = async (hre: HardhatRuntimeE
1515
console.log("upgrading SortitionModuleNeo...");
1616
await deployUpgradable(deployments, "SortitionModuleNeo", {
1717
newImplementation: "SortitionModuleNeo",
18-
initializer: "initialize",
18+
initializer: "initialize3",
1919
from: deployer,
2020
// Warning: do not reinitialize everything, only the new variables
2121
args: [],

contracts/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"node": ">=16.0.0"
1212
},
1313
"volta": {
14-
"node": "18.19.0"
14+
"node": "18.20.6"
1515
},
1616
"publishConfig": {
1717
"access": "public",
@@ -73,7 +73,7 @@
7373
"@kleros/kleros-v2-eslint-config": "workspace:^",
7474
"@kleros/kleros-v2-prettier-config": "workspace:^",
7575
"@kleros/kleros-v2-tsconfig": "workspace:^",
76-
"@logtail/pino": "^0.4.22",
76+
"@logtail/pino": "^0.5.0",
7777
"@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
7878
"@nomicfoundation/hardhat-ethers": "^3.0.8",
7979
"@nomiclabs/hardhat-solhint": "^4.0.1",
@@ -83,7 +83,7 @@
8383
"@types/chai": "^4.3.20",
8484
"@types/mocha": "^10.0.10",
8585
"@types/node": "^20.17.6",
86-
"@wagmi/cli": "^2.1.18",
86+
"@wagmi/cli": "^2.2.0",
8787
"abitype": "^0.10.3",
8888
"chai": "^4.5.0",
8989
"dotenv": "^16.4.5",
@@ -115,8 +115,8 @@
115115
},
116116
"dependencies": {
117117
"@chainlink/contracts": "^1.3.0",
118-
"@kleros/vea-contracts": "^0.4.0",
118+
"@kleros/vea-contracts": "^0.6.0",
119119
"@openzeppelin/contracts": "^5.2.0",
120-
"viem": "^2.21.48"
120+
"viem": "^2.24.1"
121121
}
122122
}

0 commit comments

Comments
 (0)