From 1d07f28333532ae95b943456afaa0342bd60e593 Mon Sep 17 00:00:00 2001 From: Harman-singh-waraich Date: Tue, 14 Jan 2025 18:39:15 +0530 Subject: [PATCH 1/6] fix: align-wagmi-versions --- web-devtools/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-devtools/package.json b/web-devtools/package.json index fe88a287f..779804040 100644 --- a/web-devtools/package.json +++ b/web-devtools/package.json @@ -65,6 +65,6 @@ "typewriter-effect": "^2.21.0", "vanilla-jsoneditor": "^0.21.6", "viem": "^2.21.50", - "wagmi": "^2.13.0" + "wagmi": "^2.13.5" } } From dbcad125f5837f436ca8dd36a052f45f33d20503 Mon Sep 17 00:00:00 2001 From: Harman-singh-waraich Date: Tue, 14 Jan 2025 18:39:43 +0530 Subject: [PATCH 2/6] fix: align-wagmi-versions-globally --- kleros-app/package.json | 2 +- web/netlify.toml | 3 +- web/package.json | 2 +- yarn.lock | 84 ++++++++++++----------------------------- 4 files changed, 28 insertions(+), 63 deletions(-) diff --git a/kleros-app/package.json b/kleros-app/package.json index 43ddf0468..11893c4e9 100644 --- a/kleros-app/package.json +++ b/kleros-app/package.json @@ -61,6 +61,6 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "viem": "^2.21.42", - "wagmi": "^2.13.0" + "wagmi": "^2.13.5" } } diff --git a/web/netlify.toml b/web/netlify.toml index 8cf55aefd..beef2b5da 100644 --- a/web/netlify.toml +++ b/web/netlify.toml @@ -6,6 +6,7 @@ NETLIFY_YARN_WORKSPACES = "true" YARN_ENABLE_GLOBAL_CACHE = "true" # YARN_CACHE_FOLDER = "$HOME/.yarn_cache" # YARN_VERSION = "3.2.0" - +[build] +command = "yarn workspace @kleros/kleros-v2-contracts install && yarn workspace @kleros/kleros-app install && yarn workspace @kleros/kleros-v2-web install && yarn workspace @kleros/kleros-v2-contracts build && yarn workspace @kleros/kleros-app build && yarn workspace @kleros/kleros-v2-web build-netlify" [functions] directory = "web/netlify/functions/" diff --git a/web/package.json b/web/package.json index 0fb99710e..efe863eb5 100644 --- a/web/package.json +++ b/web/package.json @@ -78,7 +78,7 @@ }, "dependencies": { "@cyntler/react-doc-viewer": "^1.17.0", - "@kleros/kleros-app": "^2.0.2", + "@kleros/kleros-app": "workspace:^", "@kleros/kleros-sdk": "workspace:^", "@kleros/kleros-v2-contracts": "workspace:^", "@kleros/ui-components-library": "^2.20.0", diff --git a/yarn.lock b/yarn.lock index 300b1e33f..c075338db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5370,24 +5370,7 @@ __metadata: languageName: node linkType: hard -"@kleros/kleros-app@npm:^2.0.2": - version: 2.0.2 - resolution: "@kleros/kleros-app@npm:2.0.2" - dependencies: - jose: "npm:^5.9.6" - peerDependencies: - "@tanstack/react-query": ^5.59.20 - graphql: ^16.9.0 - graphql-request: ^7.1.2 - react: ^18.3.1 - react-dom: ^18.3.1 - viem: ^2.21.42 - wagmi: ^2.13.0 - checksum: 10/89cf0536fed4bbb887772daa529d7cad209cea0e5105bcd366fe5e4bc7c5c14fca21aa201ba4d848c7e8addd3fc4921ac54e237afe2a5b7224c9cd219f72e08b - languageName: node - linkType: hard - -"@kleros/kleros-app@workspace:kleros-app": +"@kleros/kleros-app@workspace:^, @kleros/kleros-app@workspace:kleros-app": version: 0.0.0-use.local resolution: "@kleros/kleros-app@workspace:kleros-app" dependencies: @@ -5417,7 +5400,7 @@ __metadata: react: ^18.3.1 react-dom: ^18.3.1 viem: ^2.21.42 - wagmi: ^2.13.0 + wagmi: ^2.13.5 languageName: unknown linkType: soft @@ -5607,7 +5590,7 @@ __metadata: typewriter-effect: "npm:^2.21.0" vanilla-jsoneditor: "npm:^0.21.6" viem: "npm:^2.21.50" - wagmi: "npm:^2.13.0" + wagmi: "npm:^2.13.5" languageName: unknown linkType: soft @@ -5621,7 +5604,7 @@ __metadata: "@eslint/js": "npm:^9.15.0" "@graphql-codegen/cli": "npm:^5.0.3" "@graphql-codegen/client-preset": "npm:^4.5.1" - "@kleros/kleros-app": "npm:^2.0.2" + "@kleros/kleros-app": "workspace:^" "@kleros/kleros-sdk": "workspace:^" "@kleros/kleros-v2-contracts": "workspace:^" "@kleros/kleros-v2-eslint-config": "workspace:^" @@ -10967,51 +10950,51 @@ __metadata: languageName: node linkType: hard -"@wagmi/connectors@npm:5.5.0, @wagmi/connectors@npm:^5.5.0": - version: 5.5.0 - resolution: "@wagmi/connectors@npm:5.5.0" +"@wagmi/connectors@npm:5.5.3": + version: 5.5.3 + resolution: "@wagmi/connectors@npm:5.5.3" dependencies: "@coinbase/wallet-sdk": "npm:4.2.3" - "@metamask/sdk": "npm:0.30.1" + "@metamask/sdk": "npm:0.31.1" "@safe-global/safe-apps-provider": "npm:0.18.4" "@safe-global/safe-apps-sdk": "npm:9.1.0" "@walletconnect/ethereum-provider": "npm:2.17.0" cbw-sdk: "npm:@coinbase/wallet-sdk@3.9.3" peerDependencies: - "@wagmi/core": 2.15.0 + "@wagmi/core": 2.15.2 typescript: ">=5.0.4" viem: 2.x peerDependenciesMeta: typescript: optional: true - checksum: 10/fe8898bee0b3abb9f6b2aaa99a0f892c9e431ab99e3189bae028edc0f4edc799dfc326a82b5fd4e7893e900bc5af912ff8e648e7e18890d790713631719da906 + checksum: 10/bf2c58bb62be16387e3084f1bd2d7a9197e413626728b3bfc864c11de0eb0dfecd4637b23b1adc36a05b6570d81b31ef53a3ac107d2e2ded237db8fb17c1d8d2 languageName: node linkType: hard -"@wagmi/connectors@npm:5.5.3": - version: 5.5.3 - resolution: "@wagmi/connectors@npm:5.5.3" +"@wagmi/connectors@npm:^5.5.0": + version: 5.5.0 + resolution: "@wagmi/connectors@npm:5.5.0" dependencies: "@coinbase/wallet-sdk": "npm:4.2.3" - "@metamask/sdk": "npm:0.31.1" + "@metamask/sdk": "npm:0.30.1" "@safe-global/safe-apps-provider": "npm:0.18.4" "@safe-global/safe-apps-sdk": "npm:9.1.0" "@walletconnect/ethereum-provider": "npm:2.17.0" cbw-sdk: "npm:@coinbase/wallet-sdk@3.9.3" peerDependencies: - "@wagmi/core": 2.15.2 + "@wagmi/core": 2.15.0 typescript: ">=5.0.4" viem: 2.x peerDependenciesMeta: typescript: optional: true - checksum: 10/bf2c58bb62be16387e3084f1bd2d7a9197e413626728b3bfc864c11de0eb0dfecd4637b23b1adc36a05b6570d81b31ef53a3ac107d2e2ded237db8fb17c1d8d2 + checksum: 10/fe8898bee0b3abb9f6b2aaa99a0f892c9e431ab99e3189bae028edc0f4edc799dfc326a82b5fd4e7893e900bc5af912ff8e648e7e18890d790713631719da906 languageName: node linkType: hard -"@wagmi/core@npm:2.15.0, @wagmi/core@npm:^2.15.0": - version: 2.15.0 - resolution: "@wagmi/core@npm:2.15.0" +"@wagmi/core@npm:2.15.2, @wagmi/core@npm:^2.15.2": + version: 2.15.2 + resolution: "@wagmi/core@npm:2.15.2" dependencies: eventemitter3: "npm:5.0.1" mipd: "npm:0.0.7" @@ -11025,13 +11008,13 @@ __metadata: optional: true typescript: optional: true - checksum: 10/b40ed089ddb23f7573e682105e41fe510f375e88612591dd841eefba06e2ffd0d2b2fdd8b1603d2c7e6aa4f70aa2bd94d12b6b578b3fe2c7abcb545ef24ff822 + checksum: 10/ed11530d329831c7e1f957ca17bc5633c5d2816ea24722b0ba6a7beb220d309f0264f54c0839dbc7f2f9c1683883435b8ead789ffcc388ffb61c41e2c72a6129 languageName: node linkType: hard -"@wagmi/core@npm:2.15.2, @wagmi/core@npm:^2.15.2": - version: 2.15.2 - resolution: "@wagmi/core@npm:2.15.2" +"@wagmi/core@npm:^2.15.0": + version: 2.15.0 + resolution: "@wagmi/core@npm:2.15.0" dependencies: eventemitter3: "npm:5.0.1" mipd: "npm:0.0.7" @@ -11045,7 +11028,7 @@ __metadata: optional: true typescript: optional: true - checksum: 10/ed11530d329831c7e1f957ca17bc5633c5d2816ea24722b0ba6a7beb220d309f0264f54c0839dbc7f2f9c1683883435b8ead789ffcc388ffb61c41e2c72a6129 + checksum: 10/b40ed089ddb23f7573e682105e41fe510f375e88612591dd841eefba06e2ffd0d2b2fdd8b1603d2c7e6aa4f70aa2bd94d12b6b578b3fe2c7abcb545ef24ff822 languageName: node linkType: hard @@ -36018,25 +36001,6 @@ __metadata: languageName: node linkType: hard -"wagmi@npm:^2.13.0": - version: 2.13.0 - resolution: "wagmi@npm:2.13.0" - dependencies: - "@wagmi/connectors": "npm:5.5.0" - "@wagmi/core": "npm:2.15.0" - use-sync-external-store: "npm:1.2.0" - peerDependencies: - "@tanstack/react-query": ">=5.0.0" - react: ">=18" - typescript: ">=5.0.4" - viem: 2.x - peerDependenciesMeta: - typescript: - optional: true - checksum: 10/68770f64d57be3c6367271a73a79a3c108e27ef5b106e47583c3dcd83e4746ee614e7006861574263dabafda233c43e876fcaeaf7260e4df75b5fe53ae41d8ec - languageName: node - linkType: hard - "wagmi@npm:^2.13.3, wagmi@npm:^2.13.5": version: 2.13.5 resolution: "wagmi@npm:2.13.5" From eddabe0872e6df7c41aa707df8c7404f1117df77 Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Tue, 14 Jan 2025 13:58:34 +0000 Subject: [PATCH 3/6] chore: netlify command tweak --- package.json | 4 +++- web-devtools/package.json | 1 + web/netlify.toml | 4 +++- yarn.lock | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6550c5e39..00787c659 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,9 @@ "local-stack": "scripts/tmux-local-stack.sh", "changelog": "conventional-changelog --infile CHANGELOG.md --same-file --release-count 0 && prettier --write CHANGELOG.md", "postinstall": "yarn check-prerequisites; husky install", - "reinstall": "YARN_CHECKSUM_BEHAVIOR=update yarn install --no-immutable" + "reinstall": "YARN_CHECKSUM_BEHAVIOR=update yarn install --no-immutable", + "build:web:ci": "yarn workspaces focus @kleros/kleros-v2-web && yarn workspaces foreach -Ap --include kleros-app --include contracts run build && yarn workspace @kleros/kleros-v2-web build-netlify", + "build:web-devtools:ci": "yarn workspaces focus @kleros/kleros-v2-web-devtools && yarn workspaces foreach -Ap --include contracts run build && yarn workspace @kleros/kleros-v2-web-devtools build-netlify" }, "alias": { "process": "process/browser.js", diff --git a/web-devtools/package.json b/web-devtools/package.json index 779804040..3d337091d 100644 --- a/web-devtools/package.json +++ b/web-devtools/package.json @@ -48,6 +48,7 @@ }, "dependencies": { "@kleros/kleros-sdk": "workspace:^", + "@kleros/kleros-v2-contracts": "workspace:^", "@kleros/ui-components-library": "^2.20.0", "@tanstack/react-query": "^5.61.0", "@wagmi/connectors": "^5.5.0", diff --git a/web/netlify.toml b/web/netlify.toml index beef2b5da..4eee28833 100644 --- a/web/netlify.toml +++ b/web/netlify.toml @@ -6,7 +6,9 @@ NETLIFY_YARN_WORKSPACES = "true" YARN_ENABLE_GLOBAL_CACHE = "true" # YARN_CACHE_FOLDER = "$HOME/.yarn_cache" # YARN_VERSION = "3.2.0" + [build] -command = "yarn workspace @kleros/kleros-v2-contracts install && yarn workspace @kleros/kleros-app install && yarn workspace @kleros/kleros-v2-web install && yarn workspace @kleros/kleros-v2-contracts build && yarn workspace @kleros/kleros-app build && yarn workspace @kleros/kleros-v2-web build-netlify" +command = "yarn build:web:ci" + [functions] directory = "web/netlify/functions/" diff --git a/yarn.lock b/yarn.lock index c075338db..bb0a93647 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5554,6 +5554,7 @@ __metadata: "@graphql-codegen/cli": "npm:^5.0.3" "@graphql-codegen/client-preset": "npm:^4.5.1" "@kleros/kleros-sdk": "workspace:^" + "@kleros/kleros-v2-contracts": "workspace:^" "@kleros/ui-components-library": "npm:^2.20.0" "@svgr/webpack": "npm:^8.1.0" "@tanstack/react-query": "npm:^5.61.0" From ef395073ee00f6e960b7cfdd07261e4078004327 Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Mon, 13 Jan 2025 19:25:23 +0000 Subject: [PATCH 4/6] fix: contracts testing workflow --- .github/workflows/contracts-testing.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/contracts-testing.yml b/.github/workflows/contracts-testing.yml index 72d261633..db3baa32a 100644 --- a/.github/workflows/contracts-testing.yml +++ b/.github/workflows/contracts-testing.yml @@ -38,16 +38,23 @@ jobs: registry.yarnpkg.com:443 registry.npmjs.org:443 54.185.253.63:443 - - - name: Setup Node.js environment - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 - with: - node-version: 18.x - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: recursive - + + - name: Set up corepack (for yarn) + run: | + corepack enable + corepack prepare yarn@4.5.1 --activate + yarn set version 4.5.1 + + - name: Setup Node.js environment + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 + with: + node-version: 20.x + cache: yarn + - name: Cache node modules uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 env: @@ -61,7 +68,9 @@ jobs: ${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}- - name: Install contracts dependencies - run: yarn workspace @kleros/kleros-v2-contracts install + run: | + # TODO: re-enable hardened mode once the kleros-app resolution is fixed + YARN_ENABLE_HARDENED_MODE=0 yarn workspace @kleros/kleros-v2-contracts install - name: Install Foundry uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0 From e7faa213500404d3d0efe3b17e4351ab8755f175 Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Tue, 14 Jan 2025 13:18:43 +0000 Subject: [PATCH 5/6] chore: removal of the pr-labels workflow which never worked --- .github/workflows/pr-labels.yml | 39 --------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 .github/workflows/pr-labels.yml diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml deleted file mode 100644 index 20f4fe3c8..000000000 --- a/.github/workflows/pr-labels.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Add PR labels - -on: - pull_request: - types: [opened, edited] - branches-ignore: - - 'dependabot/**' - - 'renovate/**' - -permissions: # added using https://github.com/step-security/secure-workflows - contents: read - issues: read - pull-requests: write - -jobs: - copy-labels: - runs-on: ubuntu-latest - name: Copy labels from linked issues - steps: - - name: Harden Runner - uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.5.0 - with: - disable-sudo: true - egress-policy: block - allowed-endpoints: > - yarnpkg.com:443 - github.com:443 - nightly.yarnpkg.com:443 - nodejs.org:443 - objects.githubusercontent.com:443 - registry.yarnpkg.com:443 - registry.npmjs.org:443 - 54.185.253.63:443 - - - name: copy-labels - uses: michalvankodev/copy-issue-labels@f54e957e58fc976eba5ffa36e1a1030572dbb78d # v1.3.0 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - From 1582b52e51277701ab861db9918b02d2deda2df5 Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Tue, 14 Jan 2025 16:52:57 +0000 Subject: [PATCH 6/6] chore: revert netlify.toml --- web/netlify.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/netlify.toml b/web/netlify.toml index 4eee28833..8cf55aefd 100644 --- a/web/netlify.toml +++ b/web/netlify.toml @@ -7,8 +7,5 @@ YARN_ENABLE_GLOBAL_CACHE = "true" # YARN_CACHE_FOLDER = "$HOME/.yarn_cache" # YARN_VERSION = "3.2.0" -[build] -command = "yarn build:web:ci" - [functions] directory = "web/netlify/functions/"