Skip to content

Commit 971c713

Browse files
authored
Merge branch 'dev' into refactor/dispute-kits
2 parents 9f953c2 + c0f2f89 commit 971c713

File tree

132 files changed

+6730
-952
lines changed

Some content is hidden

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

132 files changed

+6730
-952
lines changed

.github/workflows/contracts-testing.yml

+14-7
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/[email protected]
27+
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
2828
with:
2929
disable-sudo: true
3030
egress-policy: block
@@ -38,16 +38,23 @@ jobs:
3838
registry.yarnpkg.com:443
3939
registry.npmjs.org:443
4040
54.185.253.63:443
41-
42-
- name: Setup Node.js environment
43-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
44-
with:
45-
node-version: 18.x
4641
4742
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4843
with:
4944
submodules: recursive
50-
45+
46+
- name: Set up corepack (for yarn)
47+
run: |
48+
corepack enable
49+
corepack prepare [email protected] --activate
50+
yarn set version 4.5.1
51+
52+
- name: Setup Node.js environment
53+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
54+
with:
55+
node-version: 20.x
56+
cache: yarn
57+
5158
- name: Cache node modules
5259
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
5360
env:

.github/workflows/pr-labels.yml

-39
This file was deleted.

.github/workflows/sentry-release.yml

+28-21
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,62 @@ jobs:
1717
version: ${{ steps.set-version.outputs.version }}
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.5.0
20+
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
2121
with:
2222
disable-sudo: true
2323
egress-policy: block
2424
allowed-endpoints: >
2525
binaries.soliditylang.org:443
26+
classic.yarnpkg.com:443
2627
github.com:443
28+
nightly.yarnpkg.com:443
2729
nodejs.org:443
30+
objects.githubusercontent.com:443
2831
registry.yarnpkg.com:443
29-
sentry.io:443
32+
registry.npmjs.org:443
3033
54.185.253.63:443
34+
sentry.io:443
3135
32-
- uses: actions/checkout@7739b9ba2efcda9dde65ad1e3c2dbe65b41dfba7
33-
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
with:
38+
submodules: recursive
39+
40+
- name: Set up corepack (for yarn)
41+
run: |
42+
corepack enable
43+
corepack prepare [email protected] --activate
44+
yarn set version 4.5.1
45+
46+
- name: Setup Node.js environment
47+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
48+
with:
49+
node-version: 20.x
50+
cache: yarn
51+
3452
- name: Cache node modules
35-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
53+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
3654
env:
3755
cache-name: cache-node-modules
3856
with:
3957
path: |
4058
~/.npm
4159
**/node_modules
42-
key: |
43-
${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}
60+
key: ${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}
4461
restore-keys: |
4562
${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-
46-
47-
- name: Set up Node.js
48-
uses: actions/setup-node@2a017f350dbf6c4b6bb4508cc83809719115162e
49-
with:
50-
node-version: 16
51-
52-
- name: Install dependencies
53-
run: |
54-
yarn workspace @kleros/kleros-v2-contracts install
55-
yarn workspace @kleros/kleros-v2-web install
5663
57-
- name: Build
64+
- name: Install dependencies and build
5865
run: |
59-
yarn workspace @kleros/kleros-v2-contracts build
60-
yarn workspace @kleros/kleros-v2-web build
66+
. web/.env.mainnet-neo.public
67+
yarn build:web:ci
6168
6269
- name: Set version
6370
id: set-version
6471
run: echo "version=v$(cat package.json | jq -r .version)-$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
6572
working-directory: web
6673

6774
- name: Create Sentry release
68-
uses: getsentry/action-release@4744f6a65149f441c5f396d5b0877307c0db52c7 # v1.4.1
75+
uses: getsentry/action-release@v1
6976
env:
7077
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
7178
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}

contracts/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
1414
- [ChainlinkRNG](https://arbiscan.io/address/0x897d83a7d5F23555eFA15e1BE297d5503522cbA3)
1515
- [DisputeKitClassicNeo: proxy](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421), [implementation](https://arbiscan.io/address/0xAF0325dbBFa812a574743Bb5A085266D31e3e03a)
1616
- [DisputeResolverNeo](https://arbiscan.io/address/0xb5526D022962A1fFf6eD32C93e8b714c901F4323)
17+
- [DisputeResolverRulerNeo](https://arbiscan.io/address/0xb3a5FdEAF461c42caCe148e978e6FBCa97bE6140)
1718
- [DisputeTemplateRegistry: proxy](https://arbiscan.io/address/0x0cFBaCA5C72e7Ca5fFABE768E135654fB3F2a5A2), [implementation](https://arbiscan.io/address/0x57EfD43DAfCeb6C58Df57932b2B299f46fef5c87)
1819
- [EvidenceModule: proxy](https://arbiscan.io/address/0x48e052B4A6dC4F30e90930F1CeaAFd83b3981EB3), [implementation](https://arbiscan.io/address/0xE22500Fa27f696d06702367246bd17Bd2C8a4c5d)
1920
- [KlerosCoreNeo: proxy](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea), [implementation](https://arbiscan.io/address/0x17c39AB53A7072b167A74a85D47b30385c98ae89)
21+
- [KlerosCoreRulerNeo: proxy](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13), [implementation](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
2022
- [KlerosV2NeoEarlyUser](https://arbiscan.io/address/0xfE34a72c55e512601E7d491A9c5b36373cE34d63)
2123
- [Pinakion](https://arbiscan.io/address/0x330bD769382cFc6d50175903434CCC8D206DCAE5)
2224
- [PolicyRegistry: proxy](https://arbiscan.io/address/0x553dcbF6aB3aE06a1064b5200Df1B5A9fB403d3c), [implementation](https://arbiscan.io/address/0x15E5964C7751dF8563eA4bC000301582C79BC454)

0 commit comments

Comments
 (0)